fix test case

Author: dantengsky

src/query/service/src/sessions/query_ctx.rs

@@ -1528,27 +1528,38 @@ impl TableContext for QueryContext {
         previous_snapshot: Option<Arc<TableSnapshot>>,
     ) -> Result<TableMetaTimestamps> {
         let table_id = table.get_id();
-        //{
-        //    // Defensively check that:
-        //    // For each table, the previous_snapshot's timestamp passed in is strictly increasing,
-        //    // Or put it another way, caller should always pass in the same or newer snapshot of the same table.
-        //    let table_snapshot_timestamp_history =
-        //        self.shared.get_table_snapshot_timestamp_history();
-        //    let mut history = table_snapshot_timestamp_history.lock();
-        //    let previous_snapshot_timestamp = previous_snapshot.as_ref().and_then(|s| s.timestamp);
-        //    if let Some(last_accessed) = history.get(&table_id) {
-        //        if last_accessed > &previous_snapshot_timestamp {
-        //            return Err(ErrorCode::Internal(
-        //                format!(
-        //                    "[QUERY-CTX] Generating new table meta timestamps failed: table_id = {}, previous_snapshot_timestamp {:?} is lesser than the snapshot timestamp accessed last time {:?}",
-        //                    table_id, previous_snapshot_timestamp, last_accessed
-        //                )
-        //            ));
-        //        }
-        //    }
-        //    history.insert(table_id, previous_snapshot_timestamp);
-        //    drop(history)
-        //}
+
+        // Defensively check that:
+        // For each table, the previous_snapshot's timestamp passed in is strictly increasing,
+        // Or put it another way, caller should always pass in the same or newer snapshot of the same table.
+        {
+            let table_snapshot_timestamp_history =
+                self.shared.get_table_snapshot_timestamp_history();
+            let previous_snapshot_timestamp = previous_snapshot.as_ref().and_then(|s| s.timestamp);
+            let mut valid_access = true;
+            let mut last_accessed_ts = None;
+            {
+                let mut history = table_snapshot_timestamp_history.lock();
+                if let Some(last_accessed) = history.get(&table_id) {
+                    if last_accessed > &previous_snapshot_timestamp {
+                        valid_access = false;
+                        last_accessed_ts = last_accessed.clone();
+                    }
+                }
+                if valid_access {
+                    history.insert(table_id, previous_snapshot_timestamp);
+                }
+            }
+
+            if !valid_access {
+                return Err(ErrorCode::Internal(
+                    format!(
+                        "[QUERY-CTX] Generating new table meta timestamps failed: table_id = {}, previous_snapshot_timestamp {:?} is lesser than the snapshot timestamp accessed last time {:?}",
+                        table_id, previous_snapshot_timestamp, last_accessed_ts
+                    )
+                ));
+            }
+        }
 
         let delta = {
             let fuse_table = FuseTable::try_from_table(table)?;
@@ -1576,8 +1587,6 @@ impl TableContext for QueryContext {
             })?
         };
 
-        // TODO Add defensive check that in auto-commit mode, table meta timestamps of this table
-        // has not be generated before, or get it from a cache.
         let table_meta_timestamps = TableMetaTimestamps::new(previous_snapshot, delta);
         {
             let txn_mgr_ref = self.txn_mgr();

tests/sqllogictests/suites/base/issues/issue_18214.test

@@ -24,7 +24,7 @@ insert into t values(2);
 statement ok
 abort;
 
-statement ok
+query T
 select * from t;
 ----
 1