From 2f72435f72438523246e600e5177f2309226ec58 Mon Sep 17 00:00:00 2001 From: Ziyang Hu Date: Thu, 13 Oct 2022 12:40:30 +0800 Subject: [PATCH] refactor bin --- Cargo.lock | 108 ++++-------------- Cargo.toml | 5 +- cozorocks/deps/rocksdb | 2 +- cozoserver/Cargo.toml | 21 ---- .../src/main.rs => src/bin/cozoserver.rs | 0 5 files changed, 26 insertions(+), 110 deletions(-) delete mode 100644 cozoserver/Cargo.toml rename cozoserver/src/main.rs => src/bin/cozoserver.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 93edb054..e7543c83 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -226,16 +226,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "change-detection" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "159fa412eae48a1d94d0b9ecdb85c97ce56eb2a347c62394d3fdbf221adabc1a" -dependencies = [ - "path-matchers", - "path-slash", -] - [[package]] name = "chrono" version = "0.4.22" @@ -353,6 +343,7 @@ dependencies = [ "casey", "chrono", "chrono-tz", + "clap", "cozorocks", "csv", "either", @@ -374,6 +365,7 @@ dependencies = [ "rmp", "rmp-serde", "rmpv", + "rouille", "serde", "serde_bytes", "serde_derive", @@ -394,22 +386,6 @@ dependencies = [ "miette", ] -[[package]] -name = "cozoserver" -version = "0.1.0" -dependencies = [ - "clap", - "cozo", - "env_logger", - "log", - "miette", - "rouille", - "serde", - "serde_derive", - "serde_json", - "static-files", -] - [[package]] name = "cpufeatures" version = "0.2.5" @@ -549,9 +525,9 @@ dependencies = [ [[package]] name = "deflate" -version = "0.9.1" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f95bf05dffba6e6cce8dfbb30def788154949ccd9aed761b472119c21e01c70" +checksum = "c86f7e25f518f4b81808a2cf1c50996a61f5c2eb394b2393bd87f2a4780a432f" dependencies = [ "adler32", "gzip-header", @@ -658,17 +634,11 @@ version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22030e2c5a68ec659fde1e949a745124b48e6fa8b045b7ed5bd1fe4ccc5c4e5d" -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - [[package]] name = "gzip-header" -version = "0.3.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0131feb3d3bb2a5a238d8a4d09f6353b7ebfdc52e77bccbf4ea6eaa751dde639" +checksum = "95cc527b92e6029a62960ad99aa8a6660faa4555fe5f731aab13aa6a921795a2" dependencies = [ "crc32fast", ] @@ -703,6 +673,12 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +[[package]] +name = "httpdate" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" + [[package]] name = "humantime" version = "2.1.0" @@ -806,9 +782,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.134" +version = "0.2.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "329c933548736bc49fd575ee68c89e8be4d260064184389a5b77517cddd99ffb" +checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c" [[package]] name = "link-cplusplus" @@ -1135,21 +1111,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1de2e551fb905ac83f73f7aedf2f0cb4a0da7e35efa24a202a936269f1f18e1" -[[package]] -name = "path-matchers" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36cd9b72a47679ec193a5f0229d9ab686b7bd45e1fbc59ccf953c9f3d83f7b2b" -dependencies = [ - "glob", -] - -[[package]] -name = "path-slash" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498a099351efa4becc6a19c72aa9270598e8fd274ca47052e37455241c88b696" - [[package]] name = "percent-encoding" version = "2.2.0" @@ -1197,7 +1158,7 @@ checksum = "4c8717927f9b79515e565a64fe46c38b8cd0427e64c40680b14a7365ab09ac8d" dependencies = [ "once_cell", "pest", - "sha1 0.10.5", + "sha1", ] [[package]] @@ -1444,9 +1405,9 @@ dependencies = [ [[package]] name = "rouille" -version = "3.5.0" +version = "3.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18b2380c42510ef4a28b5f228a174c801e0dec590103e215e60812e2e2f34d05" +checksum = "4f86e4c51a773f953f02bbab5fd049f004bfd384341d62da2a079aff812ab176" dependencies = [ "base64", "brotli", @@ -1460,7 +1421,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sha1 0.6.1", + "sha1", "threadpool", "time 0.3.15", "tiny_http", @@ -1576,15 +1537,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - [[package]] name = "sha1" version = "0.10.5" @@ -1596,12 +1548,6 @@ dependencies = [ "digest", ] -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - [[package]] name = "simba" version = "0.7.2" @@ -1648,17 +1594,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" -[[package]] -name = "static-files" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64712ea1e3e140010e1d9605872ba205afa2ab5bd38191cc6ebd248ae1f6a06b" -dependencies = [ - "change-detection", - "mime_guess", - "path-slash", -] - [[package]] name = "static_assertions" version = "1.1.0" @@ -1806,15 +1741,14 @@ dependencies = [ [[package]] name = "tiny_http" -version = "0.8.2" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ce51b50006056f590c9b7c3808c3bd70f0d1101666629713866c227d6e58d39" +checksum = "389915df6413a2e74fb181895f933386023c71110878cd0825588928e64cdc82" dependencies = [ "ascii", - "chrono", "chunked_transfer", + "httpdate", "log", - "url", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 5eafe8f2..aa007f91 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,6 +45,9 @@ uuid = { version = "1.1.2", features = ["v1", "v4", "serde"] } csv = "1.1.6" cozorocks = { path = "cozorocks" } +clap = { version = "3.2.8", features = ["derive"] } +rouille = "3.5.0" + #[target.'cfg(not(target_env = "msvc"))'.dependencies] #tikv-jemallocator = { version = "0.5", features = ["disable_initial_exec_tls"] } @@ -55,4 +58,4 @@ cozorocks = { path = "cozorocks" } #debug = true [workspace] -members = ["cozorocks", "cozoserver"] \ No newline at end of file +members = ["cozorocks"] \ No newline at end of file diff --git a/cozorocks/deps/rocksdb b/cozorocks/deps/rocksdb index 59495ff2..eb9a80fe 160000 --- a/cozorocks/deps/rocksdb +++ b/cozorocks/deps/rocksdb @@ -1 +1 @@ -Subproject commit 59495ff26a410eab30dab4f76b76ec5ba4ad293b +Subproject commit eb9a80fe1f18017b4d7f4084e8f2554f12234822 diff --git a/cozoserver/Cargo.toml b/cozoserver/Cargo.toml deleted file mode 100644 index 164845fd..00000000 --- a/cozoserver/Cargo.toml +++ /dev/null @@ -1,21 +0,0 @@ -[package] -name = "cozoserver" -version = "0.1.0" -edition = "2021" -license = "AGPL-3.0-or-later" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -clap = { version = "3.2.8", features = ["derive"] } -log = "0.4.16" -miette = { version = "5.3.0", features = ["fancy"] } -env_logger = "0.9.0" -serde = "1.0.144" -serde_json = "1.0.81" -serde_derive = "1.0.144" -rouille = "3.5.0" -cozo = { path = ".." } - -[build-dependencies] -static-files = "0.2.3" \ No newline at end of file diff --git a/cozoserver/src/main.rs b/src/bin/cozoserver.rs similarity index 100% rename from cozoserver/src/main.rs rename to src/bin/cozoserver.rs