@@ -29,6 +29,10 @@ def setup(self, store_type):
2929 columns_in_pk_limit = 20
3030 self .count_rows = 30
3131 self .store_type = store_type
32+
33+ if store_type == "COLUMN" and min (self .versions ) < (26 , 1 ):
34+ types_not_supported_yet_in_columnshard .add ("Bool" )
35+
3236 # not all the types are supported for column tables
3337 supported_pk_types = pk_types if store_type == "ROW" else {k : v for k , v in pk_types .items () if k not in types_not_supported_yet_in_columnshard }
3438 supported_non_pk_types = non_pk_types if store_type == "ROW" else {k : v for k , v in non_pk_types .items () if k not in types_not_supported_yet_in_columnshard }
@@ -52,12 +56,17 @@ def setup(self, store_type):
5256 }
5357 )
5458 self .table_names .append (f"table_{ i } _{ self .store_type } " )
59+
60+ extra_feature_flags = {
61+ "enable_parameterized_decimal" : True ,
62+ "enable_table_datetime64" : True ,
63+ }
64+
65+ if min (self .versions ) >= (26 , 1 ):
66+ extra_feature_flags ["enable_columnshard_bool" ] = True
67+
5568 yield from self .setup_cluster (
56- extra_feature_flags = {
57- "enable_parameterized_decimal" : True ,
58- "enable_table_datetime64" : True ,
59- "enable_columnshard_bool" : True ,
60- },
69+ extra_feature_flags = extra_feature_flags ,
6170 column_shard_config = {
6271 "disabled_on_scheme_shard" : False ,
6372 },
@@ -259,10 +268,6 @@ def test_data_type(self):
259268 if (min (self .versions ) < (25 , 1 )):
260269 types_not_supported_yet_in_columnshard .add ("Decimal" )
261270
262- if any ("Bool" in type_name for type_name in self .all_types .keys ()) and self .store_type == "COLUMN" :
263- if (min (self .versions ) < (26 , 1 )):
264- types_not_supported_yet_in_columnshard .add ("Bool" )
265-
266271 self .create_table ()
267272
268273 self .write_data ()
@@ -280,10 +285,6 @@ def test_parametrized_data_type(self):
280285 if (min (self .versions ) < (25 , 1 )):
281286 types_not_supported_yet_in_columnshard .add ("Decimal" )
282287
283- if any ("Bool" in type_name for type_name in self .all_types .keys ()) and self .store_type == "COLUMN" :
284- if (min (self .versions ) < (26 , 1 )):
285- types_not_supported_yet_in_columnshard .add ("Bool" )
286-
287288 self .create_table ()
288289
289290 self .parametrized_write_data ()
0 commit comments