Skip to content

Commit 8b99549

Browse files
AlgunenanoAlgunenano
committed
Fix test
1 parent fda8b42 commit 8b99549

File tree

3 files changed

+84
-19
lines changed

3 files changed

+84
-19
lines changed

‎tests/queries/0_stateless/02995_merge_tree_settings_settings_25_8_1.tsv‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ allow_experimental_replacing_merge_with_cleanup 0
77
allow_experimental_reverse_key 0
88
allow_floating_point_partition_key 0
99
allow_nullable_key 0
10+
allow_part_offset_column_in_projections 1
1011
allow_reduce_blocking_parts_task 1
1112
allow_remote_fs_zero_copy_replication 0
1213
allow_summing_columns_in_partition_or_order_key 0
@@ -45,6 +46,7 @@ disable_detach_partition_for_zero_copy_replication 1
4546
disable_fetch_partition_for_zero_copy_replication 1
4647
disable_freeze_partition_for_zero_copy_replication 1
4748
disk
49+
dynamic_serialization_version v2
4850
enable_block_number_column 0
4951
enable_block_offset_column 0
5052
enable_index_granularity_compression 1
@@ -87,7 +89,6 @@ max_compress_block_size 0
8789
max_concurrent_queries 0
8890
max_delay_to_insert 1
8991
max_delay_to_mutate_ms 1000
90-
max_digestion_size_per_segment 268435456
9192
max_file_name_length 127
9293
max_files_to_modify_in_alter_columns 75
9394
max_files_to_remove_in_alter_columns 50
@@ -113,6 +114,7 @@ max_replicated_mutations_in_queue 8
113114
max_replicated_sends_network_bandwidth 0
114115
max_suspicious_broken_parts 100
115116
max_suspicious_broken_parts_bytes 1073741824
117+
max_uncompressed_bytes_in_patches 32212254720
116118
merge_max_block_size 8192
117119
merge_max_block_size_bytes 10485760
118120
merge_max_bytes_to_prewarm_cache 1073741824
@@ -167,6 +169,11 @@ number_of_free_entries_in_pool_to_lower_max_size_of_merge 8
167169
number_of_mutations_to_delay 500
168170
number_of_mutations_to_throw 1000
169171
number_of_partitions_to_consider_for_merge 10
172+
object_serialization_version v2
173+
object_shared_data_buckets_for_compact_part 8
174+
object_shared_data_buckets_for_wide_part 32
175+
object_shared_data_serialization_version map
176+
object_shared_data_serialization_version_for_zero_level_parts map
170177
old_parts_lifetime 480
171178
optimize_row_order 0
172179
part_moves_between_shards_delay_seconds 30
@@ -206,6 +213,7 @@ replicated_max_parallel_fetches_for_table 0
206213
replicated_max_parallel_sends 0
207214
replicated_max_parallel_sends_for_table 0
208215
replicated_max_ratio_of_wrong_parts 0.5
216+
search_orphaned_parts_disks any
209217
shared_merge_tree_create_per_replica_metadata_nodes 1
210218
shared_merge_tree_disable_merges_and_mutations_assignment 0
211219
shared_merge_tree_enable_coordinated_merges 0
@@ -242,9 +250,11 @@ shared_merge_tree_postpone_next_merge_for_locally_merged_parts_rows_threshold 10
242250
shared_merge_tree_range_for_merge_window_size 10
243251
shared_merge_tree_read_virtual_parts_from_leader 1
244252
shared_merge_tree_try_fetch_part_in_memory_data_from_replicas 0
253+
shared_merge_tree_update_replica_flags_delay_ms 30000
245254
shared_merge_tree_use_metadata_hints_cache 1
246255
shared_merge_tree_use_outdated_parts_compact_format 0
247256
shared_merge_tree_use_too_many_parts_count_from_virtual_parts 0
257+
shared_merge_tree_virtual_parts_discovery_batch 1
248258
simultaneous_parts_removal_limit 0
249259
sleep_before_commit_local_part_in_replicated_table_ms 0
250260
sleep_before_loading_outdated_parts_ms 0
@@ -270,7 +280,7 @@ write_ahead_log_bytes_to_fsync 104857600
270280
write_ahead_log_interval_ms_to_fsync 100
271281
write_ahead_log_max_bytes 1073741824
272282
write_final_mark 1
273-
write_marks_for_substreams_in_compact_parts 0
283+
write_marks_for_substreams_in_compact_parts 1
274284
zero_copy_concurrent_part_removal_max_postpone_ratio 0.05
275285
zero_copy_concurrent_part_removal_max_split_times 5
276286
zero_copy_merge_mutation_min_parts_size_sleep_before_lock 1073741824

‎tests/queries/0_stateless/02995_new_settings_history.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ fi
2323

2424
# Note that this is a broad check. A per version check is done in the upgrade test
2525
# Baselines generated with v25.7.1 (pre-release)
26-
# clickhouse local --query "select name, default from system.settings order by name format TSV" > 02995_settings_25_7_1.tsv
27-
# clickhouse local --query "select name, value from system.merge_tree_settings order by name format TSV" > 02995_merge_tree_settings_settings_25_7_1.tsv
26+
# clickhouse local --query "select name, default from system.settings order by name format TSV" > 02995_settings_25_8_1.tsv
27+
# clickhouse local --query "select name, value from system.merge_tree_settings order by name format TSV" > 02995_merge_tree_settings_settings_25_8_1.tsv
2828
$CLICKHOUSE_LOCAL --query "
2929
WITH old_settings AS
3030
(
31-
SELECT * FROM file('${CUR_DIR}/02995_settings_25_7_1.tsv', 'TSV', 'name String, default String')
31+
SELECT * FROM file('${CUR_DIR}/02995_settings_25_8_1.tsv', 'TSV', 'name String, default String')
3232
),
3333
old_merge_tree_settings AS
3434
(
35-
SELECT * FROM file('${CUR_DIR}/02995_merge_tree_settings_settings_25_7_1.tsv', 'TSV', 'name String, default String')
35+
SELECT * FROM file('${CUR_DIR}/02995_merge_tree_settings_settings_25_8_1.tsv', 'TSV', 'name String, default String')
3636
),
3737
new_settings AS
3838
(
@@ -52,7 +52,7 @@ $CLICKHOUSE_LOCAL --query "
5252
)) AND (name NOT IN (
5353
SELECT arrayJoin(tupleElement(changes, 'name'))
5454
FROM system.settings_changes
55-
WHERE type = 'Session' AND splitByChar('.', version)[1]::UInt64 > 25 OR (splitByChar('.', version)[1]::UInt64 == 25 AND splitByChar('.', version)[2]::UInt64 > 7)
55+
WHERE type = 'Session' AND splitByChar('.', version)[1]::UInt64 > 25 OR (splitByChar('.', version)[1]::UInt64 == 25 AND splitByChar('.', version)[2]::UInt64 > 8)
5656
))
5757
UNION ALL
5858
(
@@ -64,7 +64,7 @@ $CLICKHOUSE_LOCAL --query "
6464
)) AND (name NOT IN (
6565
SELECT arrayJoin(tupleElement(changes, 'name'))
6666
FROM system.settings_changes
67-
WHERE type = 'MergeTree' AND splitByChar('.', version)[1]::UInt64 > 25 OR (splitByChar('.', version)[1]::UInt64 == 25 AND splitByChar('.', version)[2]::UInt64 > 7)
67+
WHERE type = 'MergeTree' AND splitByChar('.', version)[1]::UInt64 > 25 OR (splitByChar('.', version)[1]::UInt64 == 25 AND splitByChar('.', version)[2]::UInt64 > 8)
6868
))
6969
)
7070
UNION ALL
@@ -75,7 +75,7 @@ $CLICKHOUSE_LOCAL --query "
7575
WHERE (new_settings.default != old_settings.default) AND (name NOT IN (
7676
SELECT arrayJoin(tupleElement(changes, 'name'))
7777
FROM system.settings_changes
78-
WHERE type = 'Session' AND splitByChar('.', version)[1]::UInt64 > 25 OR (splitByChar('.', version)[1]::UInt64 == 25 AND splitByChar('.', version)[2]::UInt64 > 7)
78+
WHERE type = 'Session' AND splitByChar('.', version)[1]::UInt64 > 25 OR (splitByChar('.', version)[1]::UInt64 == 25 AND splitByChar('.', version)[2]::UInt64 > 8)
7979
)) AND ${IGNORE_SETTINGS_FOR_SANITIZERS}
8080
)
8181
UNION ALL
@@ -86,7 +86,7 @@ $CLICKHOUSE_LOCAL --query "
8686
WHERE (new_merge_tree_settings.default != old_merge_tree_settings.default) AND (name NOT IN (
8787
SELECT arrayJoin(tupleElement(changes, 'name'))
8888
FROM system.settings_changes
89-
WHERE type = 'MergeTree' AND splitByChar('.', version)[1]::UInt64 > 25 OR (splitByChar('.', version)[1]::UInt64 == 25 AND splitByChar('.', version)[2]::UInt64 > 7)
89+
WHERE type = 'MergeTree' AND splitByChar('.', version)[1]::UInt64 > 25 OR (splitByChar('.', version)[1]::UInt64 == 25 AND splitByChar('.', version)[2]::UInt64 > 8)
9090
)) AND ${IGNORED_MERGETREE_SETTINGS_FOR_CLOUD}
9191
)
9292
)

0 commit comments

Comments
 (0)