Merge branch 'main' into bug-drop-current-db

Author: mergify[bot]

src/common/storage/src/config.rs

@@ -451,6 +451,7 @@ pub struct StorageMokaConfig {
 }
 
 impl Default for StorageMokaConfig {
+    #[no_sanitize(address)]
     fn default() -> Self {
         Self {
             // Use 1G as default.

src/common/storage/src/lib.rs

@@ -28,6 +28,8 @@
 //! - Table snapshots, segments cache must be stored accessed via cache operator.
 //! - Intermediate data generated by query could be stored by temporary operator.
 
+#![feature(no_sanitize)]
+
 mod config;
 pub use config::CacheConfig;
 pub use config::ShareTableConfig;

src/query/ast/src/ast/statements/table.rs

@@ -30,6 +30,7 @@ use crate::ast::UriLocation;
 
 #[derive(Debug, Clone, PartialEq)] // Tables
 pub struct ShowTablesStmt<'a> {
+    pub catalog: Option<Identifier<'a>>,
     pub database: Option<Identifier<'a>>,
     pub full: bool,
     pub limit: Option<ShowLimit<'a>>,
@@ -47,7 +48,11 @@ impl Display for ShowTablesStmt<'_> {
             write!(f, " HISTORY")?;
         }
         if let Some(database) = &self.database {
-            write!(f, " FROM {database}")?;
+            write!(f, " FROM ")?;
+            if let Some(catalog) = &self.catalog {
+                write!(f, "{catalog}.",)?;
+            }
+            write!(f, "{database}")?;
         }
         if let Some(limit) = &self.limit {
             write!(f, " {limit}")?;

src/query/ast/src/parser/statement.rs

@@ -332,11 +332,17 @@ pub fn statement(i: Input) -> IResult<StatementMsg> {
     );
     let show_tables = map(
         rule! {
-            SHOW ~ FULL? ~ TABLES ~ HISTORY? ~ ( ( FROM | IN ) ~ ^#ident )? ~ #show_limit?
+            SHOW ~ FULL? ~ TABLES ~ HISTORY? ~ ( ( FROM | IN ) ~ #peroid_separated_idents_1_to_2 )? ~ #show_limit?
         },
-        |(_, opt_full, _, opt_history, opt_database, limit)| {
+        |(_, opt_full, _, opt_history, ctl_db, limit)| {
+            let (catalog, database) = match ctl_db {
+                Some((_, (Some(c), d))) => (Some(c), Some(d)),
+                Some((_, (None, d))) => (None, Some(d)),
+                _ => (None, None),
+            };
             Statement::ShowTables(ShowTablesStmt {
-                database: opt_database.map(|(_, database)| database),
+                catalog,
+                database,
                 full: opt_full.is_some(),
                 limit,
                 with_history: opt_history.is_some(),

src/query/ast/tests/it/parser.rs

@@ -67,6 +67,9 @@ fn test_statement() {
         r#"show databases format TabSeparatedWithNamesAndTypes;"#,
         r#"show tables"#,
         r#"show tables format TabSeparatedWithNamesAndTypes;"#,
+        r#"show full tables"#,
+        r#"show full tables from db"#,
+        r#"show full tables from ctl.db"#,
         r#"show processlist;"#,
         r#"show create table a.b;"#,
         r#"show create table a.b format TabSeparatedWithNamesAndTypes;"#,

src/query/ast/tests/it/testdata/statement.txt

@@ -37,6 +37,7 @@ SHOW TABLES
 ---------- AST ------------
 ShowTables(
     ShowTablesStmt {
+        catalog: None,
         database: None,
         full: false,
         limit: None,
@@ -52,6 +53,7 @@ SHOW TABLES
 ---------- AST ------------
 ShowTables(
     ShowTablesStmt {
+        catalog: None,
         database: None,
         full: false,
         limit: None,
@@ -64,6 +66,72 @@ ShowTables(
 Some(
     "TabSeparatedWithNamesAndTypes",
 )
+---------- Input ----------
+show full tables
+---------- Output ---------
+SHOW FULL TABLES
+---------- AST ------------
+ShowTables(
+    ShowTablesStmt {
+        catalog: None,
+        database: None,
+        full: true,
+        limit: None,
+        with_history: false,
+    },
+)
+
+
+---------- Input ----------
+show full tables from db
+---------- Output ---------
+SHOW FULL TABLES FROM db
+---------- AST ------------
+ShowTables(
+    ShowTablesStmt {
+        catalog: None,
+        database: Some(
+            Identifier {
+                name: "db",
+                quote: None,
+                span: Ident(22..24),
+            },
+        ),
+        full: true,
+        limit: None,
+        with_history: false,
+    },
+)
+
+
+---------- Input ----------
+show full tables from ctl.db
+---------- Output ---------
+SHOW FULL TABLES FROM ctl.db
+---------- AST ------------
+ShowTables(
+    ShowTablesStmt {
+        catalog: Some(
+            Identifier {
+                name: "ctl",
+                quote: None,
+                span: Ident(22..25),
+            },
+        ),
+        database: Some(
+            Identifier {
+                name: "db",
+                quote: None,
+                span: Ident(26..28),
+            },
+        ),
+        full: true,
+        limit: None,
+        with_history: false,
+    },
+)
+
+
 ---------- Input ----------
 show processlist;
 ---------- Output ---------

src/query/config/src/lib.rs

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#![feature(no_sanitize)]
+
 /// Config mods provide config support.
 ///
 /// We are providing two config types:

src/query/config/src/outer_v0.rs

@@ -136,6 +136,7 @@ impl Config {
     /// with_args is to control whether we need to load from args or not.
     /// We should set this to false during tests because we don't want
     /// our test binary to parse cargo's args.
+    #[no_sanitize(address)]
     pub fn load(with_args: bool) -> Result<Self> {
         let mut arg_conf = Self::default();
 

src/query/service/tests/it/servers/http/http_query_handlers.rs

@@ -137,7 +137,7 @@ async fn test_simple_sql() -> Result<()> {
     assert!(result.schema.is_some(), "{:?}", result);
     assert_eq!(
         result.schema.as_ref().unwrap().fields().len(),
-        10,
+        11,
         "{:?}",
         result
     );