chore: Remove unused engine_options

GreptimeTeam · Sep 18, 2023 · 5bf31f5 · 5bf31f5
1 parent b582ea4
commit 5bf31f5
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 20 deletions.
diff --git a/src/cmd/src/cli/bench.rs b/src/cmd/src/cli/bench.rs
@@ -120,7 +120,6 @@ fn create_table_info(table_id: TableId, table_name: TableName) -> RawTableInfo {
         created_on: chrono::DateTime::default(),
         primary_key_indices: vec![],
         next_column_id: columns as u32 + 1,
-        engine_options: Default::default(),
         value_indices: vec![],
         options: Default::default(),
         region_numbers: (1..=100).collect(),

diff --git a/src/common/meta/src/key/table_info.rs b/src/common/meta/src/key/table_info.rs
@@ -275,7 +275,6 @@ mod tests {
             created_on: chrono::DateTime::default(),
             primary_key_indices: vec![0, 1],
             next_column_id: 3,
-            engine_options: Default::default(),
             value_indices: vec![2, 3],
             options: Default::default(),
             region_numbers: vec![1],

diff --git a/src/meta-srv/src/procedure/utils.rs b/src/meta-srv/src/procedure/utils.rs
@@ -100,7 +100,6 @@ pub mod mock {
 
 #[cfg(test)]
 pub mod test_data {
-    use std::collections::HashMap;
     use std::sync::Arc;
 
     use chrono::DateTime;
@@ -178,7 +177,6 @@ pub mod test_data {
                 engine: MITO2_ENGINE.to_string(),
                 next_column_id: 3,
                 region_numbers: vec![1, 2, 3],
-                engine_options: HashMap::new(),
                 options: TableOptions::default(),
                 created_on: DateTime::default(),
                 partition_key_indices: vec![],

diff --git a/src/meta-srv/src/table_routes.rs b/src/meta-srv/src/table_routes.rs
@@ -70,8 +70,6 @@ pub(crate) async fn fetch_tables(
 
 #[cfg(test)]
 pub(crate) mod tests {
-    use std::collections::HashMap;
-
     use chrono::DateTime;
     use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, MITO_ENGINE};
     use common_meta::key::TableMetadataManagerRef;
@@ -103,7 +101,6 @@ pub(crate) mod tests {
                 engine: MITO_ENGINE.to_string(),
                 next_column_id: 1,
                 region_numbers: vec![1, 2, 3, 4],
-                engine_options: HashMap::new(),
                 options: TableOptions::default(),
                 created_on: DateTime::default(),
                 partition_key_indices: vec![],

diff --git a/src/operator/src/statement/ddl.rs b/src/operator/src/statement/ddl.rs
@@ -446,7 +446,6 @@ fn create_table_info(
         engine: create_table.engine.clone(),
         next_column_id: column_schemas.len() as u32,
         region_numbers: vec![],
-        engine_options: HashMap::new(),
         options: table_options,
         created_on: DateTime::default(),
         partition_key_indices,

diff --git a/src/query/src/sql/show_create_table.rs b/src/query/src/sql/show_create_table.rs
@@ -228,7 +228,6 @@ mod tests {
             .value_indices(vec![2, 3])
             .engine("mito".to_string())
             .next_column_id(0)
-            .engine_options(Default::default())
             .options(Default::default())
             .created_on(Default::default())
             .region_numbers(regions)
@@ -297,7 +296,6 @@ WITH(
             .primary_key_indices(vec![])
             .engine("file".to_string())
             .next_column_id(0)
-            .engine_options(Default::default())
             .options(options)
             .created_on(Default::default())
             .build()

diff --git a/src/table/src/metadata.rs b/src/table/src/metadata.rs
@@ -107,10 +107,6 @@ pub struct TableMeta {
     #[builder(default, setter(into))]
     pub region_numbers: Vec<u32>,
     pub next_column_id: ColumnId,
-    // TODO(yingwen): Remove engine_options.
-    /// Options for table engine.
-    #[builder(default)]
-    pub engine_options: HashMap<String, String>,
     /// Table options.
     #[builder(default)]
     pub options: TableOptions,
@@ -230,7 +226,6 @@ impl TableMeta {
         let mut builder = TableMetaBuilder::default();
         let _ = builder
             .engine(&self.engine)
-            .engine_options(self.engine_options.clone())
             .options(self.options.clone())
             .created_on(self.created_on)
             .region_numbers(self.region_numbers.clone())
@@ -532,7 +527,6 @@ pub struct RawTableMeta {
     pub engine: String,
     pub next_column_id: ColumnId,
     pub region_numbers: Vec<u32>,
-    pub engine_options: HashMap<String, String>,
     pub options: TableOptions,
     pub created_on: DateTime<Utc>,
     #[serde(default)]
@@ -548,7 +542,6 @@ impl From<TableMeta> for RawTableMeta {
             engine: meta.engine,
             next_column_id: meta.next_column_id,
             region_numbers: meta.region_numbers,
-            engine_options: meta.engine_options,
             options: meta.options,
             created_on: meta.created_on,
             partition_key_indices: meta.partition_key_indices,
@@ -567,7 +560,6 @@ impl TryFrom<RawTableMeta> for TableMeta {
             engine: raw.engine,
             region_numbers: raw.region_numbers,
             next_column_id: raw.next_column_id,
-            engine_options: raw.engine_options,
             options: raw.options,
             created_on: raw.created_on,
             partition_key_indices: raw.partition_key_indices,

diff --git a/src/table/src/test_util/memtable.rs b/src/table/src/test_util/memtable.rs
@@ -73,7 +73,6 @@ impl MemTable {
             .value_indices(vec![])
             .engine("mito".to_string())
             .next_column_id(0)
-            .engine_options(Default::default())
             .options(Default::default())
             .created_on(Default::default())
             .region_numbers(regions)

diff --git a/src/table/src/test_util/table_info.rs b/src/table/src/test_util/table_info.rs
@@ -29,7 +29,6 @@ pub fn test_table_info(
         .value_indices(vec![])
         .engine("mito".to_string())
         .next_column_id(0)
-        .engine_options(Default::default())
         .options(Default::default())
         .created_on(Default::default())
         .region_numbers(vec![1])