resolve conflicts

GreptimeTeam · Apr 25, 2024 · f7668c6 · f7668c6
1 parent 7ac5998
commit f7668c6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -115,7 +115,7 @@ etcd-client = { git = "https://github.com/MichaelScofield/etcd-client.git", rev
 fst = "0.4.7"
 futures = "0.3"
 futures-util = "0.3"
-greptime-proto = { git = "https://github.com/KKould/greptime-proto.git", rev = "78616e096c6794e5e8aa9b57dfd5541e98abbdac" }
+greptime-proto = { git = "https://github.com/KKould/greptime-proto.git", rev = "9022a4eb94b25696c20ec816834d39c305b46122" }
 humantime = "2.1"
 humantime-serde = "1.1"
 itertools = "0.10"

diff --git a/src/operator/src/expr_factory.rs b/src/operator/src/expr_factory.rs
@@ -38,7 +38,6 @@ use sql::statements::create::{CreateExternalTable, CreateTable, TIME_INDEX};
 use sql::statements::{
     column_def_to_schema, sql_column_def_to_grpc_column_def, sql_data_type_to_concrete_data_type,
 };
-use sql::util::to_lowercase_options_map;
 use table::requests::{TableOptions, FILE_TABLE_META_KEY};
 use table::table_reference::TableReference;