diff --git a/src/unit_test/executor/pipeline/fragment.cpp b/src/unit_test/executor/pipeline/fragment.cpp index 6637892331..5696ffb361 100644 --- a/src/unit_test/executor/pipeline/fragment.cpp +++ b/src/unit_test/executor/pipeline/fragment.cpp @@ -75,4 +75,10 @@ TEST_F(FragmentTest, test_build_fragment) { EXPECT_EQ(result7->definition_ptr_->column_count(), 8u); auto result8 = SQLRunner::Run("show table t2", true); EXPECT_EQ(result8->definition_ptr_->column_count(), 2u); + + /// DDL + auto result9 = SQLRunner::Run("drop table t3", true); + EXPECT_EQ(result9->definition_ptr_.get()->columns()[0]->name_, "OK"); + auto result10 = SQLRunner::Run("drop table t2", true); + EXPECT_EQ(result9->definition_ptr_.get()->columns()[0]->name_, "OK"); } diff --git a/test/sql/ddl/index/test_annivfflat.slt b/test/sql/ddl/index/test_annivfflat.slt index aa637ddabf..612400b40b 100644 --- a/test/sql/ddl/index/test_annivfflat.slt +++ b/test/sql/ddl/index/test_annivfflat.slt @@ -22,3 +22,5 @@ DROP INDEX idx1 ON test_annivfflat; statement ok CREATE INDEX idx2 ON test_annivfflat (col1) USING IVFFlat WITH (metric = l2); +statement ok +DROP TABLE test_annivfflat; \ No newline at end of file diff --git a/test/sql/ddl/index/test_hnsw.slt b/test/sql/ddl/index/test_hnsw.slt index 7022e8fbee..1636cb7420 100644 --- a/test/sql/ddl/index/test_hnsw.slt +++ b/test/sql/ddl/index/test_hnsw.slt @@ -30,3 +30,5 @@ CREATE INDEX idx2 ON test_hnsw (col1) USING Hnsw WITH (metric = l2); statement ok CREATE INDEX IF NOT EXISTS idx2 ON test_hnsw (col1) USING Hnsw WITH (metric = l2); +statement ok +DROP TABLE test_hnsw; \ No newline at end of file diff --git a/test/sql/ddl/index/test_index.slt b/test/sql/ddl/index/test_index.slt index 6876c91bbc..13a64e078b 100644 --- a/test/sql/ddl/index/test_index.slt +++ b/test/sql/ddl/index/test_index.slt @@ -42,3 +42,6 @@ DROP INDEX idx1 ON test_index; statement ok CREATE INDEX idx1 ON test_index (col1) USING IVFFlat WITH (centroids_count = 128, metric = l2); + +statement ok +DROP TABLE test_index; \ No newline at end of file diff --git a/test/sql/dml/compact/test_compact.slt b/test/sql/dml/compact/test_compact.slt index ddfb1e6714..d6a5df604e 100644 --- a/test/sql/dml/compact/test_compact.slt +++ b/test/sql/dml/compact/test_compact.slt @@ -46,3 +46,6 @@ SELECT * FROM test_compact; 1 2,3,4 5 6,7,8 9 10,11,12 + +statement ok +DROP TABLE test_compact; \ No newline at end of file diff --git a/test/sql/dml/compact/test_compact_import_insert.slt b/test/sql/dml/compact/test_compact_import_insert.slt index 26df40c61c..a60e419d95 100644 --- a/test/sql/dml/compact/test_compact_import_insert.slt +++ b/test/sql/dml/compact/test_compact_import_insert.slt @@ -51,3 +51,6 @@ SELECT * FROM test_compact_import_delete; 5 6,7,8 9 10,11,12 9 10,11,12 + +statement ok +DROP TABLE test_compact_import_delete; \ No newline at end of file diff --git a/test/sql/dml/compact/test_compact_with_delete.slt b/test/sql/dml/compact/test_compact_with_delete.slt index 5f647feaea..82539becbc 100644 --- a/test/sql/dml/compact/test_compact_with_delete.slt +++ b/test/sql/dml/compact/test_compact_with_delete.slt @@ -41,4 +41,7 @@ SELECT * FROM test_compact_with_delete; 5 6,7,8 9 10,11,12 5 6,7,8 -9 10,11,12 \ No newline at end of file +9 10,11,12 + +statement ok +DROP TABLE test_compact_with_delete; \ No newline at end of file diff --git a/test/sql/dml/compact/test_compact_with_index.slt b/test/sql/dml/compact/test_compact_with_index.slt index 16dff4dba8..09985fcdbd 100644 --- a/test/sql/dml/compact/test_compact_with_index.slt +++ b/test/sql/dml/compact/test_compact_with_index.slt @@ -54,3 +54,6 @@ SELECT c1 FROM test_compact_with_index SEARCH KNN(c2, [0.3, 0.3, 0.2, 0.2], 'flo 8 8 8 + +statement ok +DROP TABLE test_compact_with_index; \ No newline at end of file diff --git a/test/sql/dml/delete/test_delete_with_hnsw.slt b/test/sql/dml/delete/test_delete_with_hnsw.slt index 7352ff1f64..17feeb9d9b 100644 --- a/test/sql/dml/delete/test_delete_with_hnsw.slt +++ b/test/sql/dml/delete/test_delete_with_hnsw.slt @@ -66,3 +66,6 @@ SELECT c1 FROM test_delete_with_hnsw SEARCH KNN(c2, [0.3, 0.3, 0.2, 0.2], 'float 6 4 4 + +statement ok +DROP TABLE test_delete_with_hnsw; diff --git a/test/sql/dml/insert/test_insert_embedding.slt b/test/sql/dml/insert/test_insert_embedding.slt index 119053289d..f1b4c6380b 100644 --- a/test/sql/dml/insert/test_insert_embedding.slt +++ b/test/sql/dml/insert/test_insert_embedding.slt @@ -43,3 +43,6 @@ query II SELECT * FROM test_insert_embedding; ---- 0 0.1,1.1,2.1,3.1,4.1,5.1,6.1,7.1,8.1,9.1,10.1,11.1,12.1,13.1,14.1,15.1 + +statement ok +DROP TABLE test_insert_embedding; \ No newline at end of file diff --git a/test/sql/dml/update.slt b/test/sql/dml/update.slt index 5724572c2a..ca3676db55 100644 --- a/test/sql/dml/update.slt +++ b/test/sql/dml/update.slt @@ -70,3 +70,6 @@ CREATE TABLE T2 (c1 boolean, c2 boolean); statement error UPDATE t2 SET c1 = 1 WHERE c2 = true; + +statement ok +DROP TABLE T2; diff --git a/test/sql/dql/knn/test_knn_annivfflat_ip.slt b/test/sql/dql/knn/test_knn_annivfflat_ip.slt index 7ee96da179..6ad36c7873 100644 --- a/test/sql/dql/knn/test_knn_annivfflat_ip.slt +++ b/test/sql/dql/knn/test_knn_annivfflat_ip.slt @@ -57,3 +57,5 @@ SELECT c1 FROM test_knn_annivfflat_ip SEARCH KNN(c2, [0.3, 0.3, 0.2, 0.2], 'floa 8 8 +statement ok +DROP TABLE test_knn_annivfflat_ip; \ No newline at end of file diff --git a/test/sql/dql/knn/test_knn_annivfflat_ip_filter.slt b/test/sql/dql/knn/test_knn_annivfflat_ip_filter.slt index 99e9f527f4..6de893caa5 100644 --- a/test/sql/dql/knn/test_knn_annivfflat_ip_filter.slt +++ b/test/sql/dql/knn/test_knn_annivfflat_ip_filter.slt @@ -92,4 +92,7 @@ SELECT c1 FROM test_knn_annivfflat_ip_filter SEARCH KNN(c2, [0.3, 0.3, 0.2, 0.2] 4 2 2 -2 \ No newline at end of file +2 + +statement ok +DROP TABLE test_knn_annivfflat_ip_filter; \ No newline at end of file diff --git a/test/sql/dql/knn/test_knn_annivfflat_l2.slt b/test/sql/dql/knn/test_knn_annivfflat_l2.slt index f0f15b9a97..40679fb077 100644 --- a/test/sql/dql/knn/test_knn_annivfflat_l2.slt +++ b/test/sql/dql/knn/test_knn_annivfflat_l2.slt @@ -57,3 +57,5 @@ SELECT c1 FROM test_knn_annivfflat_l2 SEARCH KNN(c2, [0.3, 0.3, 0.2, 0.2], 'floa 8 8 +statement ok +DROP TABLE test_knn_annivfflat_l2; \ No newline at end of file diff --git a/test/sql/dql/knn/test_knn_annivfflat_l2_filter.slt b/test/sql/dql/knn/test_knn_annivfflat_l2_filter.slt index db0c65ee7a..0230e24b9a 100644 --- a/test/sql/dql/knn/test_knn_annivfflat_l2_filter.slt +++ b/test/sql/dql/knn/test_knn_annivfflat_l2_filter.slt @@ -92,4 +92,7 @@ SELECT c1 FROM test_knn_annivfflat_l2_filter SEARCH KNN(c2, [0.3, 0.3, 0.2, 0.2] 4 2 2 -2 \ No newline at end of file +2 + +statement ok +DROP TABLE test_knn_annivfflat_l2_filter; \ No newline at end of file diff --git a/test/sql/dql/knn/test_knn_hnsw_ip.slt b/test/sql/dql/knn/test_knn_hnsw_ip.slt index 24c9df8856..1a8aeaeb97 100644 --- a/test/sql/dql/knn/test_knn_hnsw_ip.slt +++ b/test/sql/dql/knn/test_knn_hnsw_ip.slt @@ -58,4 +58,7 @@ SELECT c1 FROM test_knn_hnsw_ip SEARCH KNN(c2, [0.3, 0.3, 0.2, 0.2], 'float', 'i ---- 8 8 -8 \ No newline at end of file +8 + +statement ok +DROP TABLE test_knn_hnsw_ip; \ No newline at end of file diff --git a/test/sql/dql/knn/test_knn_hnsw_ip_filter.slt b/test/sql/dql/knn/test_knn_hnsw_ip_filter.slt index fa60c62a93..25d1234c7d 100644 --- a/test/sql/dql/knn/test_knn_hnsw_ip_filter.slt +++ b/test/sql/dql/knn/test_knn_hnsw_ip_filter.slt @@ -94,4 +94,7 @@ SELECT c1 FROM test_knn_hnsw_ip_filter SEARCH KNN(c2, [0.3, 0.3, 0.2, 0.2], 'flo 4 2 2 -2 \ No newline at end of file +2 + +statement ok +DROP TABLE test_knn_hnsw_ip_filter; \ No newline at end of file diff --git a/test/sql/dql/knn/test_knn_hnsw_l2.slt b/test/sql/dql/knn/test_knn_hnsw_l2.slt index daadf55a0c..00075ae96e 100644 --- a/test/sql/dql/knn/test_knn_hnsw_l2.slt +++ b/test/sql/dql/knn/test_knn_hnsw_l2.slt @@ -60,3 +60,5 @@ SELECT c1 FROM test_knn_hnsw_l2 SEARCH KNN(c2, [0.3, 0.3, 0.2, 0.2], 'float', 'l 8 8 +statement ok +DROP TABLE test_knn_hnsw_l2; \ No newline at end of file diff --git a/test/sql/dql/knn/test_knn_hnsw_l2_filter.slt b/test/sql/dql/knn/test_knn_hnsw_l2_filter.slt index a1c31fcf47..fc31d9b73e 100644 --- a/test/sql/dql/knn/test_knn_hnsw_l2_filter.slt +++ b/test/sql/dql/knn/test_knn_hnsw_l2_filter.slt @@ -94,4 +94,7 @@ SELECT c1 FROM test_knn_hnsw_l2_filter SEARCH KNN(c2, [0.3, 0.3, 0.2, 0.2], 'flo 4 2 2 -2 \ No newline at end of file +2 + +statement ok +DROP TABLE test_knn_hnsw_l2_filter; \ No newline at end of file diff --git a/test/sql/dql/knn/test_knn_ip.slt b/test/sql/dql/knn/test_knn_ip.slt index a830c48c39..19abf19a7a 100644 --- a/test/sql/dql/knn/test_knn_ip.slt +++ b/test/sql/dql/knn/test_knn_ip.slt @@ -76,3 +76,6 @@ SELECT c1 FROM test_knn_ip SEARCH KNN(c2, [0.3, 0.3, 0.2, 0.2], 'float', 'ip', 1 2 2 2 + +statement ok +DROP TABLE test_knn_ip; \ No newline at end of file diff --git a/test/sql/dql/knn/test_knn_ip_filter.slt b/test/sql/dql/knn/test_knn_ip_filter.slt index fff31c192a..abfd74c609 100644 --- a/test/sql/dql/knn/test_knn_ip_filter.slt +++ b/test/sql/dql/knn/test_knn_ip_filter.slt @@ -99,4 +99,7 @@ SELECT c1 FROM test_knn_ip_filter SEARCH KNN(c2, [0.3, 0.3, 0.2, 0.2], 'float', 4 2 2 -2 \ No newline at end of file +2 + +statement ok +DROP TABLE test_knn_ip_filter; \ No newline at end of file diff --git a/test/sql/dql/knn/test_knn_l2.slt b/test/sql/dql/knn/test_knn_l2.slt index 6228d5b5e3..4e1a2e72e8 100644 --- a/test/sql/dql/knn/test_knn_l2.slt +++ b/test/sql/dql/knn/test_knn_l2.slt @@ -58,4 +58,7 @@ SELECT c1 FROM test_knn_l2 SEARCH KNN(c2, [0.3, 0.3, 0.2, 0.2], 'float', 'l2', 3 ---- 8 8 -8 \ No newline at end of file +8 + +statement ok +DROP TABLE test_knn_l2; \ No newline at end of file diff --git a/test/sql/dql/knn/test_knn_l2_filter.slt b/test/sql/dql/knn/test_knn_l2_filter.slt index aad5c8f966..8972a83cf6 100644 --- a/test/sql/dql/knn/test_knn_l2_filter.slt +++ b/test/sql/dql/knn/test_knn_l2_filter.slt @@ -100,4 +100,7 @@ SELECT c1 FROM test_knn_l2_filter SEARCH KNN(c2, [0.3, 0.3, 0.2, 0.2], 'float', 4 2 2 -2 \ No newline at end of file +2 + +statement ok +DROP TABLE test_knn_l2_filter; \ No newline at end of file diff --git a/test/sql/dql/knn/test_multi_thread.slt b/test/sql/dql/knn/test_multi_thread.slt index bf2a770ca9..b57e09905a 100644 --- a/test/sql/dql/knn/test_multi_thread.slt +++ b/test/sql/dql/knn/test_multi_thread.slt @@ -68,3 +68,6 @@ SELECT c1 FROM test_knn_hnsw_l2 SEARCH KNN(c2, [0.3, 0.3, 0.2, 0.2], 'float', 'l 8 8 8 + +statement ok +DROP TABLE test_knn_hnsw_l2; \ No newline at end of file diff --git a/test/sql/dql/limit.slt b/test/sql/dql/limit.slt index eafcc55e49..6c93dfe0bf 100644 --- a/test/sql/dql/limit.slt +++ b/test/sql/dql/limit.slt @@ -52,4 +52,7 @@ SELECT * FROM test_limit order by c1 desc limit 2 offset 2; query II SELECT * FROM test_limit limit 2 offset 4; ----- \ No newline at end of file +---- + +statement ok +DROP TABLE test_limit; \ No newline at end of file diff --git a/test/sql/dql/select.slt b/test/sql/dql/select.slt index 761943a19d..d60a3ac960 100644 --- a/test/sql/dql/select.slt +++ b/test/sql/dql/select.slt @@ -98,3 +98,5 @@ SELECT 'abccccccccccccccccccccccccccccccccccccccccc'; ---- abccccccccccccccccccccccccccccccccccccccccc +statement ok +DROP TABLE select3; diff --git a/tools/generate_compact.py b/tools/generate_compact.py index 2b2a64f48a..d48815b752 100644 --- a/tools/generate_compact.py +++ b/tools/generate_compact.py @@ -71,6 +71,10 @@ def generate(generate_if_exists: bool, copy_dir: str): slt_file.write("{}\n".format(x1)) slt_file.write("\n") + slt_file.write("statement ok\n") + slt_file.write("DROP TABLE {};\n".format(table_name)) + slt_file.write("\n") + pass diff --git a/tools/generate_hnsw_with_delete.py b/tools/generate_hnsw_with_delete.py index e844ec1d97..d009353387 100644 --- a/tools/generate_hnsw_with_delete.py +++ b/tools/generate_hnsw_with_delete.py @@ -160,6 +160,10 @@ def find_nearest(delete_set: set[int]) -> dict[int, int]: slt_file.write("{}\n".format(to_result_embedding(v_x))) slt_file.write("\n") + slt_file.write("statement ok\n") + slt_file.write("DROP TABLE {};\n".format(table_name)) + slt_file.write("\n") + if __name__ == "__main__": parser = argparse.ArgumentParser(description="Generate top data for test") diff --git a/tools/generate_many_import.py b/tools/generate_many_import.py index fd003c7029..ae6eacdb06 100644 --- a/tools/generate_many_import.py +++ b/tools/generate_many_import.py @@ -56,6 +56,10 @@ def generate(generate_if_exists: bool, copy_dir: str): ) slt_file.write("\n") + slt_file.write("statement ok\n") + slt_file.write("DROP TABLE {};\n".format(table_name)) + slt_file.write("\n") + # # The delete will throw exception when compacting, so add this to wait for sometime # slt_file.write("statement ok\n") # slt_file.write("SELECT * FROM {};\n".format(table_name)) diff --git a/tools/generate_many_import_drop.py b/tools/generate_many_import_drop.py index aab61185b5..10fd3e1ccb 100644 --- a/tools/generate_many_import_drop.py +++ b/tools/generate_many_import_drop.py @@ -59,6 +59,9 @@ def generate(generate_if_exists: bool, copy_dir: str): ) slt_file.write("\n") + slt_file.write("statement ok\n") + slt_file.write("DROP TABLE {};\n".format(table_name)) + slt_file.write("\n") # # The delete will throw exception when compacting, so add this to wait for sometime # slt_file.write("statement ok\n") # slt_file.write("SELECT * FROM {};\n".format(table_name)) diff --git a/tools/generate_mem_hnsw.py b/tools/generate_mem_hnsw.py index 9d542d5588..7d193bc309 100644 --- a/tools/generate_mem_hnsw.py +++ b/tools/generate_mem_hnsw.py @@ -78,6 +78,10 @@ def generate(generate_if_exist: bool, copy_dir: str): slt_file.write("{}\n".format(row_id)) slt_file.write("\n") + slt_file.write("statement ok\n") + slt_file.write("DROP TABLE {};\n".format(table_name)) + slt_file.write("\n") + if __name__ == "__main__": parser = argparse.ArgumentParser(description="Generate mem hnsw data for test")