Skip to content

Commit 46be94f

Browse files
committed
test: set the block size per index so fixtures run before ClickHouse 26.6
1 parent cb34879 commit 46be94f

2 files changed

Lines changed: 8 additions & 13 deletions

File tree

‎packages/common-utils/src/__tests__/kvItemsRewrite.int.test.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,10 @@ describe('KV items rewrite integration', () => {
7070
LogAttributeItems Array(String) MATERIALIZED
7171
arrayMap((x) -> concat(x.1, '=', x.2), LogAttributes::Array(Tuple(String, String)))
7272
CODEC(ZSTD(1)),
73-
INDEX idx_log_attr_items LogAttributeItems TYPE text(tokenizer = 'array') GRANULARITY 1
73+
INDEX idx_log_attr_items LogAttributeItems TYPE text(tokenizer = 'array', dictionary_block_size = 8192) GRANULARITY 1
7474
)
7575
ENGINE = MergeTree
76-
ORDER BY (Timestamp)
77-
SETTINGS text_index_dictionary_block_size = 8192`,
76+
ORDER BY (Timestamp)`,
7877
});
7978

8079
await client.insert({

‎packages/common-utils/src/__tests__/metadata.int.test.ts‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -697,11 +697,10 @@ describe('Metadata Integration Tests', () => {
697697
ResourceAttributeItems Array(String) MATERIALIZED
698698
arrayMap(x -> concat(x.1, '=', x.2), CAST(ResourceAttributes, 'Array(Tuple(String, String))'))
699699
CODEC(ZSTD(1)),
700-
INDEX idx_res_attr_items ResourceAttributeItems TYPE text(tokenizer = 'array') GRANULARITY 1
700+
INDEX idx_res_attr_items ResourceAttributeItems TYPE text(tokenizer = 'array', dictionary_block_size = 8192) GRANULARITY 1
701701
)
702702
ENGINE = MergeTree()
703703
ORDER BY (Timestamp)
704-
SETTINGS text_index_dictionary_block_size = 8192
705704
`,
706705
});
707706

@@ -713,11 +712,10 @@ describe('Metadata Integration Tests', () => {
713712
LogAttributeItems Array(String) MATERIALIZED
714713
arrayMap((x) -> concat(x.1, '=', x.2), LogAttributes::Array(Tuple(String, String)))
715714
CODEC(ZSTD(1)),
716-
INDEX idx_log_attr_items LogAttributeItems TYPE text(tokenizer = 'array') GRANULARITY 1
715+
INDEX idx_log_attr_items LogAttributeItems TYPE text(tokenizer = 'array', dictionary_block_size = 8192) GRANULARITY 1
717716
)
718717
ENGINE = MergeTree()
719718
ORDER BY (Timestamp)
720-
SETTINGS text_index_dictionary_block_size = 8192
721719
`,
722720
});
723721
});
@@ -1659,14 +1657,14 @@ describe('Metadata Integration Tests', () => {
16591657
{
16601658
path: 'key',
16611659
tableName: 'test_map_keys_key_text_index_order',
1662-
indexDefinition: `INDEX idx_log_attr_key mapKeys(LogAttributes) TYPE text(tokenizer = 'array') GRANULARITY 1`,
1660+
indexDefinition: `INDEX idx_log_attr_key mapKeys(LogAttributes) TYPE text(tokenizer = 'array', dictionary_block_size = 8192) GRANULARITY 1`,
16631661
},
16641662
{
16651663
path: 'kv',
16661664
tableName: 'test_map_keys_kv_text_index_order',
16671665
indexDefinition: `LogAttributeItems Array(String) MATERIALIZED
16681666
arrayMap(x -> concat(x.1, '=', x.2), CAST(LogAttributes, 'Array(Tuple(String, String))')),
1669-
INDEX idx_log_attr_items LogAttributeItems TYPE text(tokenizer = 'array') GRANULARITY 1`,
1667+
INDEX idx_log_attr_items LogAttributeItems TYPE text(tokenizer = 'array', dictionary_block_size = 8192) GRANULARITY 1`,
16701668
},
16711669
])(
16721670
'getMapKeys - $path text index ordering',
@@ -1690,7 +1688,6 @@ describe('Metadata Integration Tests', () => {
16901688
ENGINE = MergeTree()
16911689
PARTITION BY toDate(Timestamp)
16921690
ORDER BY Timestamp
1693-
SETTINGS text_index_dictionary_block_size = 8192
16941691
`,
16951692
});
16961693

@@ -1786,13 +1783,12 @@ describe('Metadata Integration Tests', () => {
17861783
ResourceAttributeItems Array(String) MATERIALIZED
17871784
arrayMap(x -> concat(x.1, '=', x.2), CAST(ResourceAttributes, 'Array(Tuple(String, String))')),
17881785
Tags Array(String),
1789-
INDEX idx_res_attr_items ResourceAttributeItems TYPE text(tokenizer = 'array') GRANULARITY 1,
1790-
INDEX idx_tags Tags TYPE text(tokenizer = 'array') GRANULARITY 1
1786+
INDEX idx_res_attr_items ResourceAttributeItems TYPE text(tokenizer = 'array', dictionary_block_size = 8192) GRANULARITY 1,
1787+
INDEX idx_tags Tags TYPE text(tokenizer = 'array', dictionary_block_size = 8192) GRANULARITY 1
17911788
)
17921789
ENGINE = MergeTree()
17931790
PARTITION BY toDate(Timestamp)
17941791
ORDER BY Timestamp
1795-
SETTINGS text_index_dictionary_block_size = 8192
17961792
`,
17971793
});
17981794
await client.command({

0 commit comments

Comments
 (0)