Don't make field public

Signed-off-by: Xuanwo <github@xuanwo.io>

Author: Xuanwo

src/query/planner/src/metadata.rs

@@ -174,21 +174,21 @@ impl Metadata {
 
 #[derive(Clone)]
 pub struct TableEntry {
-    pub index: IndexType,
-    pub name: String,
-    pub catalog: String,
-    pub database: String,
+    catalog: String,
+    database: String,
+    name: String,
+    index: IndexType,
 
-    pub table: Arc<dyn Table>,
+    table: Arc<dyn Table>,
 }
 
 impl Debug for TableEntry {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("TableEntry")
-            .field("index", &self.index)
-            .field("name", &self.name)
             .field("catalog", &self.catalog)
             .field("database", &self.database)
+            .field("name", &self.name)
+            .field("index", &self.index)
             .finish_non_exhaustive()
     }
 }
@@ -209,6 +209,31 @@ impl TableEntry {
             table,
         }
     }
+
+    /// Get the catalog name of this table entry.
+    pub fn catalog(&self) -> &str {
+        &self.catalog
+    }
+
+    /// Get the database name of this table entry.
+    pub fn database(&self) -> &str {
+        &self.database
+    }
+
+    /// Get the name of this table entry.
+    pub fn name(&self) -> &str {
+        &self.name
+    }
+
+    /// Get the index this table entry.
+    pub fn index(&self) -> IndexType {
+        self.index
+    }
+
+    /// Get the table of this table entry.
+    pub fn table(&self) -> Arc<dyn Table> {
+        self.table.clone()
+    }
 }
 
 #[derive(Clone, Debug)]

src/query/service/src/sql/executor/format.rs

@@ -69,7 +69,7 @@ fn table_scan_to_format_tree(
         return Ok(FormatTreeNode::new("DummyTableScan".to_string()));
     }
     let table = metadata.read().table(plan.table_index).clone();
-    let table_name = format!("{}.{}.{}", table.catalog, table.database, table.name);
+    let table_name = format!("{}.{}.{}", table.catalog(), table.database(), table.name());
     let filters = plan
         .source
         .push_downs

src/query/service/src/sql/executor/physical_plan_builder.rs

@@ -136,15 +136,15 @@ impl PhysicalPlanBuilder {
                 }
 
                 let table_entry = metadata.table(scan.table_index);
-                let table = table_entry.table.clone();
+                let table = table_entry.table();
                 let table_schema = table.schema();
 
                 let push_downs = self.push_downs(scan, &table_schema, has_inner_column)?;
 
                 let source = table
                     .read_plan_with_catalog(
                         self.ctx.clone(),
-                        table_entry.catalog.clone(),
+                        table_entry.catalog().to_string(),
                         Some(push_downs),
                     )
                     .await?;

src/query/service/src/sql/executor/physical_scalar.rs

@@ -72,7 +72,7 @@ impl PhysicalScalar {
                 let column = metadata.read().column(index).clone();
                 let table_name = match column.table_index {
                     Some(table_index) => {
-                        format!("{}.", metadata.read().table(table_index).name.clone())
+                        format!("{}.", metadata.read().table(table_index).name())
                     }
                     None => "".to_string(),
                 };

src/query/service/src/sql/planner/binder/table.rs

@@ -294,7 +294,7 @@ impl<'a> Binder {
         for column in columns.iter() {
             let column_binding = ColumnBinding {
                 database_name: Some(database_name.to_string()),
-                table_name: Some(table.name.clone()),
+                table_name: Some(table.name().to_string()),
                 column_name: column.name.clone(),
                 index: column.column_index,
                 data_type: Box::new(column.data_type.clone()),
@@ -306,7 +306,7 @@ impl<'a> Binder {
             };
             bind_context.add_column_binding(column_binding);
         }
-        let stat = table.table.statistics(self.ctx.clone()).await?;
+        let stat = table.table().statistics(self.ctx.clone()).await?;
         Ok((
             SExpr::create_leaf(
                 LogicalGet {

src/query/service/src/sql/planner/format/display_rel_operator.rs

@@ -246,7 +246,9 @@ fn physical_scan_to_format_tree(
             vec![
                 FormatTreeNode::new(FormatContext::Text(format!(
                     "table: {}.{}.{}",
-                    &table.catalog, &table.database, &table.name,
+                    table.catalog(),
+                    table.database(),
+                    table.name(),
                 ))),
                 FormatTreeNode::new(FormatContext::Text(format!(
                     "filters: [{}]",
@@ -302,7 +304,9 @@ fn logical_get_to_format_tree(
             vec![
                 FormatTreeNode::new(FormatContext::Text(format!(
                     "table: {}.{}.{}",
-                    &table.catalog, &table.database, &table.name,
+                    table.catalog(),
+                    table.database(),
+                    table.name(),
                 ))),
                 FormatTreeNode::new(FormatContext::Text(format!(
                     "filters: [{}]",

src/query/service/src/sql/planner/optimizer/heuristic/prewhere_optimization.rs

@@ -95,7 +95,7 @@ impl PrewhereOptimizer {
             let mut get: LogicalGet = s_expr.child(0)?.plan().clone().try_into()?;
             let metadata = self.metadata.read().clone();
 
-            let table = metadata.table(get.table_index).table.clone();
+            let table = metadata.table(get.table_index).table();
             if !table.support_prewhere() {
                 // cannot optimize
                 return Ok(s_expr);

src/query/service/src/sql/planner/optimizer/util.rs

@@ -25,7 +25,7 @@ pub fn contains_local_table_scan(s_expr: &SExpr, metadata: &MetadataRef) -> bool
         .iter()
         .any(|s_expr| contains_local_table_scan(s_expr, metadata))
         || if let RelOperator::LogicalGet(get) = s_expr.plan() {
-            metadata.read().table(get.table_index).table.is_local()
+            metadata.read().table(get.table_index).table().is_local()
         } else {
             false
         }