Skip to content

Commit

Permalink
Merge pull request #175 from Aiven-Open/kmichel-unset-allow
Browse files Browse the repository at this point in the history
clickhouse: don't SET merge_tree_allow_nullable_key

#175
  • Loading branch information
aris-aiven authored Dec 29, 2023
2 parents f869609 + d1d76dc commit 20baa00
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 3 deletions.
1 change: 0 additions & 1 deletion astacus/coordinator/plugins/clickhouse/steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,6 @@ def _create_dbs(client: ClickHouseClient) -> Iterator[Awaitable[None]]:
b"SET allow_experimental_object_type=true",
b"SET allow_suspicious_codecs=true",
b"SET allow_suspicious_low_cardinality_types=true",
b"SET merge_tree_allow_nullable_key=true",
# If a table was created with flatten_nested=0, we must be careful to not re-create the
# table with flatten_nested=1, since this would recreate the table with a different schema.
# If a table was created with flatten_nested=1, the query in system.tables.create_table_query
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ async def setup_cluster_content(clients: List[HttpClickHouseClient], use_named_c
b"SETTINGS allow_experimental_object_type=1"
)
# test that we can re-create a table requiring custom merge tree settings.
# Unlike other cases, we don't have to SET a global settings because it's merge tree setting.
await clients[0].execute(
b"CREATE TABLE default.with_nullable_key (thekey Nullable(UInt32), thedata String) "
b"ENGINE = ReplicatedMergeTree ORDER BY (thekey) "
Expand Down
2 changes: 0 additions & 2 deletions tests/unit/coordinator/plugins/clickhouse/test_steps.py
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,6 @@ async def test_creates_all_replicated_databases_and_tables_in_manifest() -> None
b"SET allow_experimental_object_type=true",
b"SET allow_suspicious_codecs=true",
b"SET allow_suspicious_low_cardinality_types=true",
b"SET merge_tree_allow_nullable_key=true",
b"SET flatten_nested=0",
b"CREATE TABLE db-one.table-uno ...",
b"CREATE TABLE db-one.table-dos ...",
Expand Down Expand Up @@ -850,7 +849,6 @@ async def test_creates_all_replicated_databases_and_tables_in_manifest_with_cust
b"SET allow_experimental_object_type=true",
b"SET allow_suspicious_codecs=true",
b"SET allow_suspicious_low_cardinality_types=true",
b"SET merge_tree_allow_nullable_key=true",
b"SET flatten_nested=0",
b"CREATE TABLE db-one.table-uno ...",
b"CREATE TABLE db-one.table-dos ...",
Expand Down

0 comments on commit 20baa00

Please sign in to comment.