From 1e6211bc6ed19ce1cf85f867c7b62c51681b6a64 Mon Sep 17 00:00:00 2001 From: Ziyang Hu Date: Thu, 14 Apr 2022 20:06:05 +0800 Subject: [PATCH] rename --- .gitignore | 3 ++- Cargo.toml | 2 +- {cozo-rocks-sys => cozo-rocks}/Cargo.toml | 2 +- {cozo-rocks-sys => cozo-rocks}/build.rs | 2 +- {cozo-rocks-sys => cozo-rocks}/include/cozorocks.h | 0 {cozo-rocks-sys => cozo-rocks}/src/cozorocks.cc | 2 +- {cozo-rocks-sys => cozo-rocks}/src/lib.rs | 2 +- src/storage.rs | 4 ++-- 8 files changed, 9 insertions(+), 8 deletions(-) rename {cozo-rocks-sys => cozo-rocks}/Cargo.toml (81%) rename {cozo-rocks-sys => cozo-rocks}/build.rs (94%) rename {cozo-rocks-sys => cozo-rocks}/include/cozorocks.h (100%) rename {cozo-rocks-sys => cozo-rocks}/src/cozorocks.cc (86%) rename {cozo-rocks-sys => cozo-rocks}/src/lib.rs (99%) diff --git a/.gitignore b/.gitignore index 1c3e7955..29856e87 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ Cargo.lock # These are backup files generated by rustfmt **/*.rs.bk -_path* \ No newline at end of file +_path* +*.db \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index 3b80a1bf..a2cb6faf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,4 +14,4 @@ chrono = "0.4" anyhow = "1.0" lazy_static = "1.4.0" thiserror = "1.0.30" -cozo-rocks-sys = { path = "cozo-rocks-sys" } \ No newline at end of file +cozo-rocks = { path = "cozo-rocks" } \ No newline at end of file diff --git a/cozo-rocks-sys/Cargo.toml b/cozo-rocks/Cargo.toml similarity index 81% rename from cozo-rocks-sys/Cargo.toml rename to cozo-rocks/Cargo.toml index 787c8e05..b77e1d7b 100644 --- a/cozo-rocks-sys/Cargo.toml +++ b/cozo-rocks/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "cozo-rocks-sys" +name = "cozo-rocks" version = "0.1.0" edition = "2021" diff --git a/cozo-rocks-sys/build.rs b/cozo-rocks/build.rs similarity index 94% rename from cozo-rocks-sys/build.rs rename to cozo-rocks/build.rs index 63c1dde7..ef1c55d9 100644 --- a/cozo-rocks-sys/build.rs +++ b/cozo-rocks/build.rs @@ -4,7 +4,7 @@ fn main() { .include("../rocksdb/include") .include("include") .flag_if_supported("-std=c++17") - .compile("rocksdb-sys"); + .compile("cozo-rocks"); println!("cargo:rustc-link-search=rocksdb/"); println!("cargo:rustc-link-lib=rocksdb"); diff --git a/cozo-rocks-sys/include/cozorocks.h b/cozo-rocks/include/cozorocks.h similarity index 100% rename from cozo-rocks-sys/include/cozorocks.h rename to cozo-rocks/include/cozorocks.h diff --git a/cozo-rocks-sys/src/cozorocks.cc b/cozo-rocks/src/cozorocks.cc similarity index 86% rename from cozo-rocks-sys/src/cozorocks.cc rename to cozo-rocks/src/cozorocks.cc index 295d04e2..ceeefbad 100644 --- a/cozo-rocks-sys/src/cozorocks.cc +++ b/cozo-rocks/src/cozorocks.cc @@ -3,7 +3,7 @@ // #include "cozorocks.h" -#include "cozo-rocks-sys/src/lib.rs.h" +#include "cozo-rocks/src/lib.rs.h" void write_status_impl(Status &status, StatusCode code, StatusSubCode subcode, StatusSeverity severity) { status.code = code; diff --git a/cozo-rocks-sys/src/lib.rs b/cozo-rocks/src/lib.rs similarity index 99% rename from cozo-rocks-sys/src/lib.rs rename to cozo-rocks/src/lib.rs index 58284fca..79293a93 100644 --- a/cozo-rocks-sys/src/lib.rs +++ b/cozo-rocks/src/lib.rs @@ -59,7 +59,7 @@ mod ffi { } unsafe extern "C++" { - include!("cozo-rocks-sys/include/cozorocks.h"); + include!("cozo-rocks/include/cozorocks.h"); type StatusCode; type StatusSubCode; diff --git a/src/storage.rs b/src/storage.rs index c3598f22..6eebaf4d 100644 --- a/src/storage.rs +++ b/src/storage.rs @@ -75,14 +75,14 @@ mod tests { #[test] fn import() { - use cozo_rocks_sys::*; + use cozo_rocks::*; let db = DB::open(Options::default() .increase_parallelism() .optimize_level_style_compaction() .set_create_if_missing(true) .set_comparator("cozo_comparator_v1", cozo_comparator_v1), - "xxyyzz"); + "xxyyzz.db"); let mut x = vec![]; let mut builder = ByteArrayBuilder::new(&mut x);