Revert "feat: tweak table data life-cycle related sql stmts (databend…

…labs#13015)"

This reverts commit e14dc7c.

benchmark/clickbench/hits/clear.sql

@@ -1,2 +1 @@
-drop table hits;
-VACUUM DROP TABLE retain 0 hours;
+drop table hits all;

benchmark/clickbench/tpch/clear.sql

@@ -1,9 +1,8 @@
-drop table customer;
-drop table lineitem;
-drop table nation;
-drop table orders;
-drop table partsupp;
-drop table part;
-drop table region;
-drop table supplier;
-VACUUM DROP TABLE retain 0 hours;
+drop table customer all;
+drop table lineitem all;
+drop table nation all;
+drop table orders all;
+drop table partsupp all;
+drop table part all;
+drop table region all;
+drop table supplier all;

benchmark/tpcds/load_data.sh

@@ -36,11 +36,9 @@ tables=(
 # Clear Data
 for t in ${tables[@]}
 do
-    echo "DROP TABLE IF EXISTS $t" | $MYSQL_CLIENT_CONNECT
+    echo "DROP TABLE IF EXISTS $t ALL" | $MYSQL_CLIENT_CONNECT
 done
 
-echo "VACUUM DROP TABLE retain 0 hours" | $MYSQL_CLIENT_CONNECT
-
 # Create Tables;
 cat "$CURDIR"/tpcds.sql | $MYSQL_CLIENT_CONNECT
 

docs/doc/14-sql-commands/00-ddl/20-table/20-ddl-drop-table.md

@@ -18,6 +18,9 @@ DROP TABLE [IF EXISTS] [db.]name
 :::caution
 
 `DROP TABLE` only remove the table schema from meta service, we do not remove the underlying data from the storage.
+If you want to delete the data and table all, please use:
+
+`DROP TABLE <table_name> ALL;`
 
 :::
 

docs/doc/14-sql-commands/00-ddl/20-table/40-ddl-truncate-table.md

@@ -2,14 +2,14 @@
 title: TRUNCATE TABLE
 ---
 
-Removes all data from a table while preserving the table's schema. It deletes all rows in the table, making it an empty table with the same columns and constraints. Please note that, it does not release the disk space allocated to the table.
+Removes all data from a table while preserving the table's schema. It deletes all rows in the table, making it an empty table with the same columns and constraints. Please note that, it does not release the disk space allocated to the table. To release the disk space, include the PURGE option, which is used to release the disk space allocated to the table when the truncate operation is performed.
 
 See also: [DROP TABLE](20-ddl-drop-table.md)
 
 ## Syntax
 
 ```sql
-TRUNCATE TABLE [db.]table_name
+TRUNCATE TABLE [db.]table_name [PURGE]
 ```
 
 ## Examples
@@ -50,4 +50,10 @@ FROM
   test_truncate
 
 0 row in 0.017 sec. Processed 0 rows, 0B (0 rows/s, 0B/s)
+
+root@localhost> TRUNCATE TABLE test_truncate PURGE;
+
+TRUNCATE TABLE test_truncate PURGE
+
+0 row in 0.118 sec. Processed 0 rows, 0B (0 rows/s, 0B/s)
 ```

scripts/benchmark/query/load/hits.sh

@@ -7,11 +7,7 @@ select version();
 SQL
 
 cat <<SQL | bendsql
-DROP TABLE IF EXISTS hits;
-SQL
-
-cat <<SQL | bendsql
-VACUUM DROP TABLE retain 0 hours;
+DROP TABLE IF EXISTS hits ALL;
 SQL
 
 cat <<SQL | bendsql

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

@@ -256,6 +256,7 @@ pub struct DropTableStmt {
     pub catalog: Option<Identifier>,
     pub database: Option<Identifier>,
     pub table: Identifier,
+    pub all: bool,
 }
 
 impl Display for DropTableStmt {
@@ -271,6 +272,9 @@ impl Display for DropTableStmt {
                 .chain(&self.database)
                 .chain(Some(&self.table)),
         )?;
+        if self.all {
+            write!(f, " ALL")?;
+        }
 
         Ok(())
     }
@@ -464,6 +468,7 @@ pub struct TruncateTableStmt {
     pub catalog: Option<Identifier>,
     pub database: Option<Identifier>,
     pub table: Identifier,
+    pub purge: bool,
 }
 
 impl Display for TruncateTableStmt {
@@ -476,6 +481,9 @@ impl Display for TruncateTableStmt {
                 .chain(&self.database)
                 .chain(Some(&self.table)),
         )?;
+        if self.purge {
+            write!(f, " PURGE")?;
+        }
 
         Ok(())
     }

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

@@ -575,14 +575,15 @@ pub fn statement(i: Input) -> IResult<StatementMsg> {
     );
     let drop_table = map(
         rule! {
-            DROP ~ TABLE ~ ( IF ~ ^EXISTS )? ~ #dot_separated_idents_1_to_3
+            DROP ~ TABLE ~ ( IF ~ ^EXISTS )? ~ #dot_separated_idents_1_to_3 ~ ALL?
         },
-        |(_, _, opt_if_exists, (catalog, database, table))| {
+        |(_, _, opt_if_exists, (catalog, database, table), opt_all)| {
             Statement::DropTable(DropTableStmt {
                 if_exists: opt_if_exists.is_some(),
                 catalog,
                 database,
                 table,
+                all: opt_all.is_some(),
             })
         },
     );
@@ -635,13 +636,14 @@ pub fn statement(i: Input) -> IResult<StatementMsg> {
     );
     let truncate_table = map(
         rule! {
-            TRUNCATE ~ TABLE ~ #dot_separated_idents_1_to_3
+            TRUNCATE ~ TABLE ~ #dot_separated_idents_1_to_3 ~ PURGE?
         },
-        |(_, _, (catalog, database, table))| {
+        |(_, _, (catalog, database, table), opt_purge)| {
             Statement::TruncateTable(TruncateTableStmt {
                 catalog,
                 database,
                 table,
+                purge: opt_purge.is_some(),
             })
         },
     );
@@ -1457,7 +1459,7 @@ pub fn statement(i: Input) -> IResult<StatementMsg> {
             | #undrop_table : "`UNDROP TABLE [<database>.]<table>`"
             | #alter_table : "`ALTER TABLE [<database>.]<table> <action>`"
             | #rename_table : "`RENAME TABLE [<database>.]<table> TO <new_table>`"
-            | #truncate_table : "`TRUNCATE TABLE [<database>.]<table>`"
+            | #truncate_table : "`TRUNCATE TABLE [<database>.]<table> [PURGE]`"
             | #optimize_table : "`OPTIMIZE TABLE [<database>.]<table> (ALL | PURGE | COMPACT [SEGMENT])`"
             | #vacuum_table : "`VACUUM TABLE [<database>.]<table> [RETAIN number HOURS] [DRY RUN]`"
             | #vacuum_drop_table : "`VACUUM DROP TABLE [FROM [<catalog>.]<database>] [RETAIN number HOURS] [DRY RUN]`"

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

@@ -109,7 +109,7 @@ error:
   --> SQL:1:21
   |
 1 | truncate table a.b.c.d
-  |                     ^ expected `FORMAT` or `;`
+  |                     ^ expected `PURGE`, `FORMAT`, or `;`
 
 
 ---------- Input ----------
@@ -121,7 +121,7 @@ error:
 1 | truncate a
   | -------- ^ expected `TABLE`
   | |         
-  | while parsing `TRUNCATE TABLE [<database>.]<table>`
+  | while parsing `TRUNCATE TABLE [<database>.]<table> [PURGE]`
 
 
 ---------- Input ----------

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

@@ -1462,6 +1462,7 @@ TruncateTable(
                 15..16,
             ),
         },
+        purge: false,
     },
 )
 
@@ -1492,6 +1493,7 @@ TruncateTable(
                 19..20,
             ),
         },
+        purge: false,
     },
 )
 
@@ -1513,6 +1515,7 @@ DropTable(
                 11..12,
             ),
         },
+        all: false,
     },
 )
 
@@ -1544,6 +1547,7 @@ DropTable(
                 23..26,
             ),
         },
+        all: false,
     },
 )
 
@@ -2355,6 +2359,7 @@ TruncateTable(
                 15..19,
             ),
         },
+        purge: false,
     },
 )
 
@@ -2383,6 +2388,7 @@ TruncateTable(
                 23..27,
             ),
         },
+        purge: false,
     },
 )
 
@@ -2404,6 +2410,7 @@ DropTable(
                 11..17,
             ),
         },
+        all: false,
     },
 )
 
@@ -2425,6 +2432,7 @@ DropTable(
                 21..27,
             ),
         },
+        all: false,
     },
 )
 

src/query/catalog/src/table.rs

@@ -214,8 +214,8 @@ pub trait Table: Sync + Send {
     }
 
     #[async_backtrace::framed]
-    async fn truncate(&self, ctx: Arc<dyn TableContext>) -> Result<()> {
-        let _ = ctx;
+    async fn truncate(&self, ctx: Arc<dyn TableContext>, purge: bool) -> Result<()> {
+        let (_, _) = (ctx, purge);
         Ok(())
     }
 

src/query/ee/tests/it/aggregating_index/index_scan.rs

@@ -1110,8 +1110,8 @@ async fn test_fuzz_impl(format: &str, spill: bool) -> Result<()> {
             }
 
             // Clear data
-            execute_sql(fixture.ctx(), "DROP TABLE rt").await?;
-            execute_sql(fixture.ctx(), "DROP TABLE t").await?;
+            execute_sql(fixture.ctx(), "DROP TABLE rt ALL").await?;
+            execute_sql(fixture.ctx(), "DROP TABLE t ALL").await?;
         }
     }
     Ok(())

src/query/service/src/api/rpc/packets/packet_truncate_table.rs

@@ -25,6 +25,7 @@ use crate::api::FlightAction;
 
 #[derive(serde::Serialize, serde::Deserialize, Clone, Debug)]
 pub struct TruncateTablePacket {
+    pub purge: bool,
     pub table_name: String,
     pub catalog_name: String,
     pub database_name: String,
@@ -37,8 +38,10 @@ impl TruncateTablePacket {
         table_name: String,
         catalog_name: String,
         database_name: String,
+        purge: bool,
     ) -> TruncateTablePacket {
         TruncateTablePacket {
+            purge,
             table_name,
             catalog_name,
             database_name,

src/query/service/src/interpreters/interpreter_table_drop.rs

@@ -14,6 +14,7 @@
 
 use std::sync::Arc;
 
+use common_catalog::table::TableExt;
 use common_exception::ErrorCode;
 use common_exception::Result;
 use common_meta_app::schema::DropTableByIdReq;
@@ -77,6 +78,15 @@ impl Interpreter for DropTableInterpreter {
                 })
                 .await?;
 
+            // if `plan.all`, truncate, then purge the historical data
+            if self.plan.all {
+                let purge = true;
+                // the above `catalog.drop_table` operation changed the table meta version,
+                // thus if we do not refresh the table instance, `truncate` will fail
+                let latest = tbl.as_ref().refresh(self.ctx.as_ref()).await?;
+                latest.truncate(self.ctx.clone(), purge).await?
+            }
+
             if let Some((spec_vec, share_table_info)) = resp.spec_vec {
                 save_share_spec(
                     &self.ctx.get_tenant(),

src/query/service/src/interpreters/interpreter_table_truncate.rs

@@ -27,6 +27,7 @@ use crate::sessions::TableContext;
 
 pub struct TruncateTableInterpreter {
     ctx: Arc<QueryContext>,
+    purge: bool,
     table_name: String,
     catalog_name: String,
     database_name: String,
@@ -38,6 +39,7 @@ impl TruncateTableInterpreter {
     pub fn try_create(ctx: Arc<QueryContext>, plan: TruncateTablePlan) -> Result<Self> {
         Ok(TruncateTableInterpreter {
             ctx,
+            purge: plan.purge,
             table_name: plan.table,
             catalog_name: plan.catalog,
             database_name: plan.database,
@@ -48,6 +50,7 @@ impl TruncateTableInterpreter {
     pub fn from_flight(ctx: Arc<QueryContext>, packet: TruncateTablePacket) -> Result<Self> {
         Ok(TruncateTableInterpreter {
             ctx,
+            purge: packet.purge,
             table_name: packet.table_name,
             catalog_name: packet.catalog_name,
             database_name: packet.database_name,
@@ -81,13 +84,14 @@ impl Interpreter for TruncateTableInterpreter {
                         self.table_name.clone(),
                         self.catalog_name.clone(),
                         self.database_name.clone(),
+                        self.purge,
                     );
                     truncate_packet.commit(conf.as_ref(), timeout).await?;
                 }
             }
         }
 
-        table.truncate(self.ctx.clone()).await?;
+        table.truncate(self.ctx.clone(), self.purge).await?;
         Ok(PipelineBuildResult::create())
     }
 }

src/query/service/tests/it/storages/fuse/operations/analyze.rs

@@ -77,7 +77,7 @@ async fn test_fuse_snapshot_analyze_and_truncate() -> Result<()> {
             .get_table(ctx.get_tenant().as_str(), &db, &tbl)
             .await?;
         let fuse_table = FuseTable::try_from_table(table.as_ref())?;
-        fuse_table.truncate(ctx).await?;
+        fuse_table.truncate(ctx, false).await?;
     }
 
     // optimize after truncate table, ts file location will become None

src/query/service/tests/it/storages/fuse/operations/gc.rs

@@ -114,9 +114,9 @@ async fn test_fuse_purge_normal_orphan_snapshot() -> Result<()> {
         "do_gc: there should be 1 snapshot, 0 segment/block",
         expected_num_of_snapshot,
         0, // 0 snapshot statistic
-        1, // 1 segments
-        1, // 1 blocks
-        1, // 1 index
+        1, // 0 segments
+        1, // 0 blocks
+        1, // 0 index
         Some(()),
         None,
     )

src/query/service/tests/it/storages/fuse/operations/mod.rs

@@ -23,6 +23,7 @@ mod mutation;
 mod navigate;
 mod optimize;
 mod purge_drop;
+mod purge_truncate;
 mod read_plan;
 mod replace_into;
 mod table_analyze;