chore: rename glaredb -> cli crate (#2830)

GlareDB · Apr 4, 2024 · e8ff7a9 · e8ff7a9
1 parent 5b517d5
commit e8ff7a9
Show file tree

Hide file tree

Showing 33 changed files with 60 additions and 66 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bindings/nodejs/Cargo.toml b/bindings/nodejs/Cargo.toml
@@ -10,7 +10,6 @@ crate-type = ["cdylib"]
 workspace = true
 
 [dependencies]
-# Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix
 ioutil = { path = "../../crates/ioutil" }
 sqlexec = { path = "../../crates/sqlexec" }
 metastore = { path = "../../crates/metastore" }
@@ -19,7 +18,6 @@ pgsrv = { path = "../../crates/pgsrv" }
 pgrepr = { path = "../../crates/pgrepr" }
 datafusion_ext = { path = "../../crates/datafusion_ext" }
 arrow_util = { path = "../../crates/arrow_util" }
-glaredb = { path = "../../crates/glaredb" }
 terminal_util = { path = "../../crates/terminal_util" }
 futures = { workspace = true }
 datafusion = { workspace = true }
@@ -29,13 +27,11 @@ anyhow = { workspace = true }
 async-trait = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
+lzma-sys = { version = "*", features = ["static"] } # Prevent dynamic linking of lzma, which comes from datafusion
 napi = { version = "2.16.1", default-features = false, features = ["full"] }
 napi-derive = "2.16.1"
 once_cell = "1.19.0"
 bytes = "1.6.0"
 
-# Prevent dynamic linking of lzma, which comes from datafusion
-lzma-sys = { version = "*", features = ["static"] }
-
 [build-dependencies]
 napi-build = "2.1.2"
diff --git a/bindings/python/Cargo.toml b/bindings/python/Cargo.toml
@@ -27,12 +27,12 @@ pgsrv = { path = "../../crates/pgsrv" }
 pgrepr = { path = "../../crates/pgrepr" }
 datafusion_ext = { path = "../../crates/datafusion_ext" }
 arrow_util = { path = "../../crates/arrow_util" }
-glaredb = { path = "../../crates/glaredb" }
+# glaredb = { path = "../../crates/glaredb" }
 terminal_util = { path = "../../crates/terminal_util" }
 futures = { workspace = true }
 uuid = "1.8.0"
 async-trait = { workspace = true }
 once_cell = "1.19.0"
 
 # Prevent dynamic linking of lzma, which comes from datafusion
-lzma-sys = { version = "*", features = ["static"] }
+lzma-sys = { version = "*", features = ["static"] }
diff --git a/crates/bench_runner/Cargo.toml b/crates/bench_runner/Cargo.toml
@@ -8,7 +8,7 @@ workspace = true
 
 [dependencies]
 logutil = {path = "../logutil"}
-glaredb = {path = "../glaredb"}
+cli = {path = "../cli"}
 pgsrv = {path = "../pgsrv"}
 anyhow = { workspace = true }
 async-trait = { workspace = true }

diff --git a/crates/bench_runner/src/main.rs b/crates/bench_runner/src/main.rs
@@ -4,7 +4,7 @@ use std::time::{Duration, SystemTime};
 
 use anyhow::Result;
 use clap::Parser;
-use glaredb::server::ComputeServer;
+use cli::server::ComputeServer;
 use glob::glob;
 use pgsrv::auth::SingleUserAuthenticator;
 use tokio::net::TcpListener;

diff --git a/crates/glaredb/Cargo.toml → crates/cli/Cargo.toml b/crates/glaredb/Cargo.toml → crates/cli/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "glaredb"
+name = "cli"
 version = { workspace = true }
 edition = { workspace = true }
 

diff --git a/crates/glaredb/build.rs → crates/cli/build.rs b/crates/glaredb/build.rs → crates/cli/build.rs
diff --git a/crates/glaredb/src/args/local.rs → crates/cli/src/args/local.rs b/crates/glaredb/src/args/local.rs → crates/cli/src/args/local.rs
diff --git a/crates/glaredb/src/args/mod.rs → crates/cli/src/args/mod.rs b/crates/glaredb/src/args/mod.rs → crates/cli/src/args/mod.rs
diff --git a/crates/glaredb/src/args/server.rs → crates/cli/src/args/server.rs b/crates/glaredb/src/args/server.rs → crates/cli/src/args/server.rs
diff --git a/crates/glaredb/src/args/slt.rs → crates/cli/src/args/slt.rs b/crates/glaredb/src/args/slt.rs → crates/cli/src/args/slt.rs
diff --git a/crates/glaredb/src/bin/main.rs → crates/cli/src/bin/main.rs b/crates/glaredb/src/bin/main.rs → crates/cli/src/bin/main.rs
@@ -1,7 +1,7 @@
 use anyhow::Result;
 use clap::{Parser, ValueEnum};
-use glaredb::args::LocalArgs;
-use glaredb::commands::Commands;
+use cli::args::LocalArgs;
+use cli::commands::Commands;
 
 #[derive(Debug, Clone, Copy, ValueEnum, Default)]
 enum LoggingMode {

diff --git a/crates/glaredb/src/commands.rs → crates/cli/src/commands.rs b/crates/glaredb/src/commands.rs → crates/cli/src/commands.rs
diff --git a/crates/glaredb/src/highlighter.rs → crates/cli/src/highlighter.rs b/crates/glaredb/src/highlighter.rs → crates/cli/src/highlighter.rs
diff --git a/crates/glaredb/src/lib.rs → crates/cli/src/lib.rs b/crates/glaredb/src/lib.rs → crates/cli/src/lib.rs
diff --git a/crates/glaredb/src/local.rs → crates/cli/src/local.rs b/crates/glaredb/src/local.rs → crates/cli/src/local.rs
diff --git a/crates/glaredb/src/metastore.rs → crates/cli/src/metastore.rs b/crates/glaredb/src/metastore.rs → crates/cli/src/metastore.rs
diff --git a/crates/glaredb/src/prompt.rs → crates/cli/src/prompt.rs b/crates/glaredb/src/prompt.rs → crates/cli/src/prompt.rs
diff --git a/crates/glaredb/src/proxy/mod.rs → crates/cli/src/proxy/mod.rs b/crates/glaredb/src/proxy/mod.rs → crates/cli/src/proxy/mod.rs
diff --git a/crates/glaredb/src/proxy/pg.rs → crates/cli/src/proxy/pg.rs b/crates/glaredb/src/proxy/pg.rs → crates/cli/src/proxy/pg.rs
diff --git a/crates/glaredb/src/proxy/rpc.rs → crates/cli/src/proxy/rpc.rs b/crates/glaredb/src/proxy/rpc.rs → crates/cli/src/proxy/rpc.rs
diff --git a/crates/glaredb/src/server.rs → crates/cli/src/server.rs b/crates/glaredb/src/server.rs → crates/cli/src/server.rs
diff --git a/crates/glaredb/tests/catalog_compat.rs → crates/cli/tests/catalog_compat.rs b/crates/glaredb/tests/catalog_compat.rs → crates/cli/tests/catalog_compat.rs
diff --git a/crates/glaredb/tests/drop_tables_test.rs → crates/cli/tests/drop_tables_test.rs b/crates/glaredb/tests/drop_tables_test.rs → crates/cli/tests/drop_tables_test.rs
@@ -1,6 +1,6 @@
-use glaredb::args::{LocalClientOpts, StorageConfigArgs};
-use glaredb::local::LocalSession;
-use glaredb::server::ComputeServer;
+use cli::args::{LocalClientOpts, StorageConfigArgs};
+use cli::local::LocalSession;
+use cli::server::ComputeServer;
 use tokio::net::TcpListener;
 
 #[tokio::test]
@@ -30,7 +30,7 @@ async fn test_drop_tables_removes_files() {
         },
         timing: false,
         ignore_rpc_auth: true,
-        mode: glaredb::args::OutputMode::Table,
+        mode: cli::args::OutputMode::Table,
         max_width: None,
         max_rows: None,
         disable_tls: true,

diff --git a/crates/glaredb/tests/iss_2309.rs → crates/cli/tests/iss_2309.rs b/crates/glaredb/tests/iss_2309.rs → crates/cli/tests/iss_2309.rs
diff --git a/crates/glaredb/tests/local_args_test.rs → crates/cli/tests/local_args_test.rs b/crates/glaredb/tests/local_args_test.rs → crates/cli/tests/local_args_test.rs
diff --git a/crates/glaredb/tests/log_file_test.rs → crates/cli/tests/log_file_test.rs b/crates/glaredb/tests/log_file_test.rs → crates/cli/tests/log_file_test.rs
diff --git a/crates/glaredb/tests/logging_test.rs → crates/cli/tests/logging_test.rs b/crates/glaredb/tests/logging_test.rs → crates/cli/tests/logging_test.rs
diff --git a/crates/glaredb/tests/output_mode_test.rs → crates/cli/tests/output_mode_test.rs b/crates/glaredb/tests/output_mode_test.rs → crates/cli/tests/output_mode_test.rs
diff --git a/crates/glaredb/tests/server_args_test.rs → crates/cli/tests/server_args_test.rs b/crates/glaredb/tests/server_args_test.rs → crates/cli/tests/server_args_test.rs
diff --git a/crates/glaredb/tests/setup.rs → crates/cli/tests/setup.rs b/crates/glaredb/tests/setup.rs → crates/cli/tests/setup.rs
@@ -3,7 +3,7 @@ use std::time::Duration;
 use assert_cmd::cmd::Command;
 
 pub fn make_cli() -> Command {
-    Command::cargo_bin(env!("CARGO_PKG_NAME")).expect("Failed to find binary")
+    Command::cargo_bin("glaredb").expect("Failed to find binary")
 }
 
 #[allow(dead_code)] // Used in the tests. IDK why clippy is complaining about it.

diff --git a/crates/glaredb/tests/version_test.rs → crates/cli/tests/version_test.rs b/crates/glaredb/tests/version_test.rs → crates/cli/tests/version_test.rs
diff --git a/flake.nix b/flake.nix
@@ -19,7 +19,7 @@
           src = ./.;
           doCheck = false;
           nativeBuildInputs = with pkgs; [ protobuf ];
-          buildAndTestSubdir = "crates/glaredb";
+          buildAndTestSubdir = "crates/cli";
           preBuild = ''
             export PROTOC=${pkgs.protobuf}/bin/protoc
           '';