Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions ydb/tests/compatibility/test_data_type.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ def setup(self, store_type):
columns_in_pk_limit = 20
self.count_rows = 30
self.store_type = store_type

if store_type == "COLUMN" and min(self.versions) < (26, 1):
types_not_supported_yet_in_columnshard.add("Bool")

# not all the types are supported for column tables
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}
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}
Expand All @@ -52,12 +56,17 @@ def setup(self, store_type):
}
)
self.table_names.append(f"table_{i}_{self.store_type}")

extra_feature_flags = {
"enable_parameterized_decimal": True,
"enable_table_datetime64": True,
}

if min(self.versions) >= (26, 1):
extra_feature_flags["enable_columnshard_bool"] = True

yield from self.setup_cluster(
extra_feature_flags={
"enable_parameterized_decimal": True,
"enable_table_datetime64": True,
"enable_columnshard_bool": True,
},
extra_feature_flags=extra_feature_flags,
column_shard_config={
"disabled_on_scheme_shard": False,
},
Expand Down Expand Up @@ -259,10 +268,6 @@ def test_data_type(self):
if (min(self.versions) < (25, 1)):
types_not_supported_yet_in_columnshard.add("Decimal")

if any("Bool" in type_name for type_name in self.all_types.keys()) and self.store_type == "COLUMN":
if (min(self.versions) < (26, 1)):
types_not_supported_yet_in_columnshard.add("Bool")

self.create_table()

self.write_data()
Expand All @@ -280,10 +285,6 @@ def test_parametrized_data_type(self):
if (min(self.versions) < (25, 1)):
types_not_supported_yet_in_columnshard.add("Decimal")

if any("Bool" in type_name for type_name in self.all_types.keys()) and self.store_type == "COLUMN":
if (min(self.versions) < (26, 1)):
types_not_supported_yet_in_columnshard.add("Bool")

self.create_table()

self.parametrized_write_data()
Expand Down