fix up tests

Tishj · Jan 8, 2025 · 825a620 · 825a620
1 parent 375c8d9
commit 825a620
Show file tree

Hide file tree

Showing 29 changed files with 30 additions and 31 deletions.
diff --git a/benchmark/micro/compression/dictionary/dictionary_read.benchmark b/benchmark/micro/compression/dictionary/dictionary_read.benchmark
@@ -8,7 +8,7 @@ storage persistent
 
 load
 DROP TABLE IF EXISTS test;
-PRAGMA force_compression='dictionary';
+PRAGMA force_compression='dict_fsst';
 CREATE TABLE test AS SELECT (100 + (i%1000))::VARCHAR AS i FROM range(0, 200000000) tbl(i);
 checkpoint;
 

diff --git a/benchmark/micro/compression/dictionary/dictionary_read_best_case.benchmark b/benchmark/micro/compression/dictionary/dictionary_read_best_case.benchmark
@@ -8,7 +8,7 @@ storage persistent
 
 load
 DROP TABLE IF EXISTS test;
-PRAGMA force_compression='dictionary';
+PRAGMA force_compression='dict_fsst';
 CREATE TABLE test AS SELECT (100 + (i%2))::VARCHAR AS i FROM range(0, 200000000) tbl(i);
 checkpoint;
 

diff --git a/benchmark/micro/compression/dictionary/dictionary_read_worst_case.benchmark b/benchmark/micro/compression/dictionary/dictionary_read_worst_case.benchmark
@@ -8,7 +8,7 @@ storage persistent
 
 load
 DROP TABLE IF EXISTS test;
-PRAGMA force_compression='dictionary';
+PRAGMA force_compression='dict_fsst';
 CREATE TABLE test AS SELECT i::VARCHAR AS i FROM range(0, 200000000) tbl(i);
 checkpoint;
 

diff --git a/benchmark/micro/compression/dictionary/dictionary_store.benchmark b/benchmark/micro/compression/dictionary/dictionary_store.benchmark
@@ -8,7 +8,7 @@ storage persistent
 require_reinit
 
 load
-PRAGMA force_compression='dictionary';
+PRAGMA force_compression='dict_fsst';
 DROP TABLE IF EXISTS test;
 
 run

diff --git a/benchmark/micro/compression/dictionary/dictionary_store_worst_case.benchmark b/benchmark/micro/compression/dictionary/dictionary_store_worst_case.benchmark
@@ -8,7 +8,7 @@ storage persistent
 require_reinit
 
 load
-PRAGMA force_compression='dictionary';
+PRAGMA force_compression='dict_fsst';
 DROP TABLE IF EXISTS test;
 
 run

diff --git a/benchmark/micro/compression/fsst/fsst_late_decompression.benchmark b/benchmark/micro/compression/fsst/fsst_late_decompression.benchmark
@@ -8,7 +8,7 @@ storage persistent
 
 load
 DROP TABLE IF EXISTS test;
-PRAGMA force_compression='fsst';
+PRAGMA force_compression='dict_fsst';
 CREATE TABLE test AS SELECT i as id, (100 + (i%2))::VARCHAR AS value FROM range(0, 50000000) tbl(i);
 checkpoint;
 SET enable_fsst_vectors=false;

diff --git a/benchmark/micro/compression/fsst/fsst_read.benchmark b/benchmark/micro/compression/fsst/fsst_read.benchmark
@@ -8,7 +8,7 @@ storage persistent
 
 load
 DROP TABLE IF EXISTS test;
-PRAGMA force_compression='fsst';
+PRAGMA force_compression='dict_fsst';
 CREATE TABLE test AS SELECT (100 + (i%1000))::VARCHAR AS i FROM range(0, 50000000) tbl(i);
 checkpoint;
 

diff --git a/benchmark/micro/compression/fsst/fsst_read_worst_case.benchmark b/benchmark/micro/compression/fsst/fsst_read_worst_case.benchmark
@@ -8,7 +8,7 @@ storage persistent
 
 load
 DROP TABLE IF EXISTS test;
-PRAGMA force_compression='fsst';
+PRAGMA force_compression='dict_fsst';
 CREATE TABLE test AS SELECT gen_random_uuid()::VARCHAR AS i FROM range(0, 20000000) tbl(i);
 checkpoint;
 

diff --git a/benchmark/micro/compression/fsst/fsst_store.benchmark b/benchmark/micro/compression/fsst/fsst_store.benchmark
@@ -8,7 +8,7 @@ storage persistent
 require_reinit
 
 load
-PRAGMA force_compression='fsst';
+PRAGMA force_compression='dict_fsst';
 
 run
 CREATE TABLE test_compressed AS SELECT (100 + (i%1000))::VARCHAR AS i FROM range(0, 2500000) tbl(i);

diff --git a/benchmark/micro/compression/fsst/fsst_store_worst_case.benchmark b/benchmark/micro/compression/fsst/fsst_store_worst_case.benchmark
@@ -8,7 +8,7 @@ storage persistent
 require_reinit
 
 load
-PRAGMA force_compression='fsst';
+PRAGMA force_compression='dict_fsst';
 DROP TABLE IF EXISTS test;
 
 run

diff --git a/scripts/sqllogictest/parser/parser.py b/scripts/sqllogictest/parser/parser.py
@@ -93,7 +93,7 @@ def __init__(self):
             TokenType.SQLLOGIC_ONLY_IF: self.decorator_onlyif,
         }
         self.FOREACH_COLLECTIONS = {
-            "<compression>": ["none", "uncompressed", "rle", "bitpacking", "dictionary", "fsst", "alp", "alprd"],
+            "<compression>": ["none", "uncompressed", "rle", "bitpacking", "dict_fsst", "alp", "alprd"],
             "<alltypes>": ["bool", "interval", "varchar"],
             "<numeric>": ["float", "double"],
             "<integral>": ["tinyint", "smallint", "integer", "bigint", "hugeint"],

diff --git a/test/sql/pragma/test_force_compression.test b/test/sql/pragma/test_force_compression.test
@@ -2,7 +2,7 @@
 # description: Test PRAGMA force_compression
 # group: [pragma]
 
-foreach compression none uncompressed rle dictionary pfor bitpacking fsst
+foreach compression none uncompressed rle dict_fsst pfor bitpacking
 
 statement ok
 PRAGMA force_compression='${compression}'

diff --git a/test/sql/storage/compression/fsst/issue_5675.test b/test/sql/storage/compression/fsst/issue_5675.test
@@ -34,7 +34,7 @@ INSERT INTO TEST values ('33y93uhg3qi3f13hnh8xjrvvbz7iwevroaaif8v5ecfetwnd5yqde9
 
 # Now create our FSST table
 statement ok
-pragma force_compression='fsst';
+pragma force_compression='dict_fsst';
 
 statement ok
 CREATE TABLE TEST2 as SELECT * FROM TEST;

diff --git a/test/sql/storage/compression/fsst/issue_5675_followup.test b/test/sql/storage/compression/fsst/issue_5675_followup.test
@@ -23,7 +23,7 @@ END FROM range(0,2214) tbl(i);
 
 # Now create our FSST table
 statement ok
-pragma force_compression='fsst';
+pragma force_compression='dict_fsst';
 
 statement ok
 CREATE TABLE TEST2 as SELECT * FROM TEST;
diff --git a/test/sql/storage/compression/string/big_strings.test b/test/sql/storage/compression/string/big_strings.test
@@ -13,7 +13,7 @@ foreach enable_fsst_vector true false
 statement ok
 SET enable_fsst_vectors='${enable_fsst_vector}'
 
-foreach compression fsst dictionary
+foreach compression dict_fsst
 
 statement ok
 PRAGMA force_compression='${compression}'

diff --git a/test/sql/storage/compression/string/blob.test b/test/sql/storage/compression/string/blob.test
@@ -12,7 +12,7 @@ foreach enable_fsst_vector true false
 statement ok
 SET enable_fsst_vectors='${enable_fsst_vector}'
 
-foreach compression fsst dictionary
+foreach compression dict_fsst
 
 statement ok
 PRAGMA force_compression='${compression}'

diff --git a/test/sql/storage/compression/string/empty.test b/test/sql/storage/compression/string/empty.test
@@ -6,7 +6,7 @@ require vector_size 512
 # load the DB from disk
 load __TEST_DIR__/test_dictionary.db
 
-foreach compression fsst dictionary
+foreach compression dict_fsst
 
 foreach enable_fsst_vector true false
 

diff --git a/test/sql/storage/compression/string/filter_pushdown.test b/test/sql/storage/compression/string/filter_pushdown.test
@@ -8,7 +8,7 @@ load __TEST_DIR__/test_string_compression.db
 statement ok
 pragma verify_fetch_row
 
-foreach compression fsst dictionary
+foreach compression dict_fsst
 
 foreach enable_fsst_vector true false
 

diff --git a/test/sql/storage/compression/string/index_fetch.test b/test/sql/storage/compression/string/index_fetch.test
@@ -8,7 +8,7 @@ load __TEST_DIR__/test_string_compression.db
 statement ok
 pragma verify_fetch_row
 
-foreach compression fsst dictionary
+foreach compression dict_fsst
 
 foreach enable_fsst_vector true false
 

diff --git a/test/sql/storage/compression/string/large.test_slow b/test/sql/storage/compression/string/large.test_slow
@@ -8,7 +8,7 @@ load __TEST_DIR__/test_dictionary.db
 statement ok
 PRAGMA enable_verification
 
-foreach compression fsst dictionary
+foreach compression dict_fsst
 
 foreach enable_fsst_vector true false
 

diff --git a/test/sql/storage/compression/string/lists.test_slow b/test/sql/storage/compression/string/lists.test_slow
@@ -4,7 +4,7 @@
 
 load __TEST_DIR__/test_string_compression.db
 
-foreach compression fsst dictionary
+foreach compression dict_fsst
 
 foreach enable_fsst_vector true false
 

diff --git a/test/sql/storage/compression/string/medium.test b/test/sql/storage/compression/string/medium.test
@@ -5,7 +5,7 @@
 # load the DB from disk
 load __TEST_DIR__/test_dictionary.db
 
-foreach compression fsst dictionary
+foreach compression dict_fsst
 
 foreach enable_fsst_vector true false
 

diff --git a/test/sql/storage/compression/string/null.test_slow b/test/sql/storage/compression/string/null.test_slow
@@ -8,7 +8,7 @@ load __TEST_DIR__/test_rle.db
 statement ok
 pragma enable_verification
 
-foreach compression fsst dictionary
+foreach compression dict_fsst
 
 foreach enable_fsst_vector true false
 

diff --git a/test/sql/storage/compression/string/null_large.test_slow b/test/sql/storage/compression/string/null_large.test_slow
@@ -4,7 +4,7 @@
 
 load __TEST_DIR__/test_string_compression.db
 
-foreach compression fsst dictionary
+foreach compression dict_fsst
 
 foreach enable_fsst_vector true false
 
@@ -34,7 +34,7 @@ endloop
 endloop
 
 # Do same for empty strings
-foreach compression fsst dictionary
+foreach compression dict_fsst
 
 foreach enable_fsst_vector true false
 

diff --git a/test/sql/storage/compression/string/simple.test b/test/sql/storage/compression/string/simple.test
@@ -5,7 +5,7 @@
 # load the DB from disk
 load __TEST_DIR__/test_dictionary.db
 
-foreach compression fsst dictionary
+foreach compression dict_fsst
 
 foreach enable_fsst_vector true false
 

diff --git a/test/sql/storage/compression/string/struct.test b/test/sql/storage/compression/string/struct.test
@@ -5,7 +5,7 @@
 # load the DB from disk
 load __TEST_DIR__/test_string_compression.db
 
-foreach compression fsst dictionary
+foreach compression dict_fsst
 
 foreach enable_fsst_vector true false
 

diff --git a/test/sql/storage/compression/string/table_copy.test b/test/sql/storage/compression/string/table_copy.test
@@ -7,7 +7,7 @@ require tpch
 # load the DB from disk
 load __TEST_DIR__/test_string_compression.db
 
-foreach compression fsst dictionary
+foreach compression dict_fsst
 
 foreach enable_fsst_vector true false
 

diff --git a/test/sql/storage/list_dictionary.test_slow b/test/sql/storage/list_dictionary.test_slow
@@ -6,7 +6,7 @@
 load __TEST_DIR__/list_dictionary.db
 
 statement ok
-PRAGMA force_compression='dictionary'
+PRAGMA force_compression='dict_fsst'
 
 statement ok
 CREATE TABLE test (a VARCHAR[]);

diff --git a/test/sqlite/sqllogic_test_runner.cpp b/test/sqlite/sqllogic_test_runner.cpp
@@ -232,8 +232,7 @@ bool SQLLogicTestRunner::ForEachTokenReplace(const string &parameter, vector<str
 		result.push_back("uncompressed");
 		result.push_back("rle");
 		result.push_back("bitpacking");
-		result.push_back("dictionary");
-		result.push_back("fsst");
+		result.push_back("dict_fsst");
 		result.push_back("alp");
 		result.push_back("alprd");
 		collection = true;