Skip to content

Commit 68e911e

Browse files
arthurpassosarthurpassos
authored
Merge branch 'antalya-25.8' into fp_antaya_25_8_parquet_metadata_caching
2 parents 5119fa5 + 3fafecb commit 68e911e

File tree

7 files changed

+154
-27
lines changed

7 files changed

+154
-27
lines changed

‎.github/workflows/grype_scan.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ jobs:
113113
' result.json >> $GITHUB_STEP_SUMMARY
114114
fi
115115
116-
HIGH_COUNT=$(jq -r '.matches | map(.vulnerability.severity) | map(select(. == "High")) | length' result.json)
117-
CRITICAL_COUNT=$(jq -r '.matches | map(.vulnerability.severity) | map(select(. == "Critical")) | length' result.json)
116+
HIGH_COUNT=$(jq -r '.matches | map(.vulnerability) | unique_by(.id) | map(.severity) | map(select(. == "High")) | length' result.json)
117+
CRITICAL_COUNT=$(jq -r '.matches | map(.vulnerability) | unique_by(.id) | map(.severity) | map(select(. == "Critical")) | length' result.json)
118118
TOTAL_HIGH_CRITICAL=$((HIGH_COUNT + CRITICAL_COUNT))
119119
echo "total_high_critical=$TOTAL_HIGH_CRITICAL" >> $GITHUB_OUTPUT
120120

‎.github/workflows/regression.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
strategy:
150150
fail-fast: false
151151
matrix:
152-
SUITE: [aes_encryption, atomic_insert, base_58, data_types, datetime64_extended_range, disk_level_encryption, dns, engines, example, extended_precision_data_types, functions, kafka, kerberos, key_value, lightweight_delete, memory, part_moves_between_shards, selects, session_timezone, swarms, tiered_storage, version, window_functions]
152+
SUITE: [aes_encryption, atomic_insert, base_58, data_types, datetime64_extended_range, disk_level_encryption, dns, engines, example, extended_precision_data_types, functions, kafka, kerberos, key_value, lightweight_delete, memory, part_moves_between_shards, selects, session_timezone, swarms, version, window_functions]
153153
needs: [runner_labels_setup]
154154
runs-on: ${{ fromJson(needs.runner_labels_setup.outputs.runner_labels) }}
155155
timeout-minutes: ${{ inputs.timeout_minutes }}
@@ -299,7 +299,7 @@ jobs:
299299
REPORTS_PATH=${{ runner.temp }}/reports_dir
300300
SUITE=alter
301301
STORAGE=/${{ matrix.ONLY }}_partition
302-
PART='${{ matrix.PART }}'
302+
PART=${{ matrix.PART }}
303303
EOF
304304
- name: Setup
305305
run: .github/setup.sh
@@ -971,7 +971,7 @@ jobs:
971971
strategy:
972972
fail-fast: false
973973
matrix:
974-
STORAGE: [minio, s3amazon, s3gcs]
974+
STORAGE: [local, minio, s3amazon, s3gcs]
975975
needs: [runner_labels_setup]
976976
runs-on: ${{ fromJson(needs.runner_labels_setup.outputs.runner_labels) }}
977977
timeout-minutes: ${{ inputs.timeout_minutes }}
@@ -1014,7 +1014,7 @@ jobs:
10141014
--gcs-key-id ${{ secrets.REGRESSION_GCS_KEY_ID }}
10151015
--gcs-key-secret ${{ secrets.REGRESSION_GCS_KEY_SECRET }}
10161016
--gcs-uri ${{ secrets.REGRESSION_GCS_URI }}
1017-
--with-${{ matrix.STORAGE }}
1017+
${{ matrix.STORAGE == 'local' && '' || format('--with-{0}', matrix.STORAGE) }}
10181018
--attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name="$GITHUB_JOB (${{ matrix.STORAGE }})" job.retry=$GITHUB_RUN_ATTEMPT job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
10191019
${{ env.args }} || EXITCODE=$?;
10201020
.github/add_link_to_logs.sh;

‎ci/workflows/pull_request.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
workflow_filter_hooks=[should_skip_job],
138138
post_hooks=[
139139
# "python3 ./ci/jobs/scripts/workflow_hooks/feature_docs.py", # NOTE (strtgbb): we don't build docs
140-
"python3 ./ci/jobs/scripts/workflow_hooks/new_tests_check.py",
140+
# "python3 ./ci/jobs/scripts/workflow_hooks/new_tests_check.py", # NOTE (strtgbb): we don't use this
141141
# "python3 ./ci/jobs/scripts/workflow_hooks/can_be_merged.py", # NOTE (strtgbb): relies on labels we don't use
142142
],
143143
)

‎tests/broken_tests.json‎

Lines changed: 143 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
{
2+
"02844_max_backup_bandwidth_s3": {
3+
"reason": "INVESTIGATE - Fails on debug",
4+
"message": "result differs with reference",
5+
"check_types": [
6+
"debug"
7+
]
8+
},
29
"03455_direct_io_read_array_values": {
310
"reason": "INVESTIGATE - Unstable on tsan",
411
"check_types": [
@@ -26,6 +33,13 @@
2633
"tsan"
2734
]
2835
},
36+
"02435_rollback_cancelled_queries": {
37+
"reason": "INVESTIGATE - Unstable on tsan",
38+
"message": "DB::Exception: There is no current transaction. (INVALID_TRANSACTION)",
39+
"check_types": [
40+
"tsan"
41+
]
42+
},
2943
"02443_detach_attach_partition": {
3044
"reason": "INVESTIGATE - Unstable",
3145
"message": "Cannot rename parts to perform operation on them: Code: 521. DB::ErrnoException: Cannot rename"
@@ -37,10 +51,18 @@
3751
"tsan"
3852
]
3953
},
54+
"03100_lwu_03_join": {
55+
"reason": "INVESTIGATE - Unstable on tsan",
56+
"message": "DB::Exception: Timeout exceeded (180 s) while flushing system log",
57+
"check_types": [
58+
"tsan"
59+
]
60+
},
4061
"02479_race_condition_between_insert_and_droppin_mv": {
4162
"reason": "INVESTIGATE - Timeout in ClickHouse query",
4263
"check_types": [
43-
"tsan"
64+
"tsan",
65+
"msan"
4466
]
4567
},
4668
"01037_polygon_dicts_correctness_fast": {
@@ -61,7 +83,8 @@
6183
"03357_join_pk_sharding": {
6284
"reason": "INVESTIGATE - Timeout. Unstable?",
6385
"check_types": [
64-
"tsan"
86+
"tsan",
87+
"msan"
6588
]
6689
},
6790
"01630_simple_aggregate_all_functions_in_summing_merge_tree": {
@@ -179,7 +202,6 @@
179202
},
180203
"02581_share_big_sets_between_mutation_tasks_with_storage_set": {
181204
"reason": "INVESTIGATE - Timeout on tsan",
182-
"message": "Timeout! Processes left in process group",
183205
"check_types": [
184206
"tsan"
185207
]
@@ -214,17 +236,26 @@
214236
]
215237
},
216238
"00172_hits_joins": {
217-
"reason": "INVESTIGATE - Timeout on tsan",
239+
"reason": "INVESTIGATE - Timeout on tsan, msan",
218240
"message": "Timeout! Processes left in process group",
219241
"check_types": [
220-
"tsan"
242+
"tsan",
243+
"msan"
221244
]
222245
},
223246
"00084_external_aggregation": {
224-
"reason": "INVESTIGATE - Timeout on tsan",
247+
"reason": "INVESTIGATE - Timeout on tsan, msan",
225248
"message": "Timeout! Processes left in process group",
226249
"check_types": [
227-
"tsan"
250+
"tsan",
251+
"msan"
252+
]
253+
},
254+
"03127_system_unload_primary_key_table": {
255+
"reason": "INVESTIGATE - Timeout on msan",
256+
"message": "Timeout! Processes left in process group",
257+
"check_types": [
258+
"msan"
228259
]
229260
},
230261
"00184_parallel_hash_returns_same_res_as_hash": {
@@ -242,6 +273,13 @@
242273
"msan"
243274
]
244275
},
276+
"00159_parallel_formatting_json_and_friends_1": {
277+
"reason": "INVESTIGATE - Timeout on msan",
278+
"message": "Timeout! Processes left in process group",
279+
"check_types": [
280+
"msan"
281+
]
282+
},
245283
"02177_issue_31009": {
246284
"reason": "INVESTIGATE - Timeout on ubsan",
247285
"message": "Timeout! Processes left in process group",
@@ -257,11 +295,13 @@
257295
]
258296
},
259297
"00024_random_counters": {
260-
"reason": "INVESTIGATE - Timeout on tsan, coverage",
298+
"reason": "INVESTIGATE - Timeout on tsan, coverage, asan, msan",
261299
"message": "Timeout! Processes left in process group",
262300
"check_types": [
263301
"tsan",
264-
"coverage"
302+
"coverage",
303+
"asan",
304+
"msan"
265305
]
266306
},
267307
"00159_parallel_formatting_json_and_friends_2": {
@@ -273,7 +313,7 @@
273313
},
274314
"01782_field_oom": {
275315
"reason": "INVESTIGATE - Timeout on tsan",
276-
"message": "Timeout! Processes left in process group",
316+
"message": "Timeout",
277317
"check_types": [
278318
"tsan"
279319
]
@@ -284,9 +324,30 @@
284324
"msan"
285325
]
286326
},
327+
"03262_column_sizes_with_dynamic_structure": {
328+
"reason": "INVESTIGATE - Unstable on tsan",
329+
"message": "DB::Exception: Estimated query execution time",
330+
"check_types": [
331+
"tsan"
332+
]
333+
},
334+
"03096_order_by_system_tables": {
335+
"reason": "INVESTIGATE - Unstable on tsan",
336+
"message": "Timeout",
337+
"check_types": [
338+
"tsan"
339+
]
340+
},
341+
"02210_processors_profile_log": {
342+
"reason": "INVESTIGATE - Unstable on tsan",
343+
"message": "Timeout",
344+
"check_types": [
345+
"tsan"
346+
]
347+
},
287348
"03555_json_shared_data_advanced_paths_indexes": {
288349
"reason": "INVESTIGATE - Timeout on tsan, msan",
289-
"message": "Timeout! Processes left in process group",
350+
"message": "Timeout",
290351
"check_types": [
291352
"tsan",
292353
"msan"
@@ -299,13 +360,42 @@
299360
"tsan"
300361
]
301362
},
363+
"03100_lwu_23_apply_patches": {
364+
"reason": "INVESTIGATE - Timeout on tsan",
365+
"message": "Timeout exceeded (180 s) while flushing system log",
366+
"check_types": [
367+
"tsan"
368+
]
369+
},
302370
"00284_external_aggregation": {
303-
"reason": "INVESTIGATE - Timeout in query on tsan",
371+
"reason": "INVESTIGATE - Timeout in query on tsan, msan",
304372
"message": "DB::Exception: Timeout exceeded",
373+
"check_types": [
374+
"tsan",
375+
"msan"
376+
]
377+
},
378+
"03550_analyzer_remote_view_columns": {
379+
"reason": "INVESTIGATE - Timeout on tsan",
380+
"message": "DB::Exception: Timeout exceeded (180 s) while flushing system log",
381+
"check_types": [
382+
"tsan"
383+
]
384+
},
385+
"01630_simple_aggregate_all_functions_in_aggregating_merge_tree": {
386+
"reason": "INVESTIGATE - Timeout on tsan",
387+
"message": "Timeout exceeded",
305388
"check_types": [
306389
"tsan"
307390
]
308391
},
392+
"03593_backup_with_broken_projection": {
393+
"reason": "INVESTIGATE - Timeout on msan",
394+
"message": "Timeout",
395+
"check_types": [
396+
"msan"
397+
]
398+
},
309399
"00159_parallel_formatting_http": {
310400
"reason": "INVESTIGATE - Timeout in curl on tsan",
311401
"message": "curl: (28) Operation timed out",
@@ -320,11 +410,19 @@
320410
"tsan"
321411
]
322412
},
413+
"03221_refreshable_matview_progress": {
414+
"reason": "INVESTIGATE - Unstable on msan",
415+
"message": "result differs with reference",
416+
"check_types": [
417+
"msan"
418+
]
419+
},
323420
"test_scheduler_cpu_preemptive/test.py::test_downscaling[cpu-slot-preemption-timeout-1ms]": {
324-
"reason": "INVESTIGATE - Unstable on tsan",
421+
"reason": "INVESTIGATE - Unstable on tsan, asan",
325422
"message": "Failed: Timeout >900.0s",
326423
"check_types": [
327-
"tsan"
424+
"tsan",
425+
"asan"
328426
]
329427
},
330428
"test_grpc_protocol/test.py::test_ipv6_select_one": {
@@ -343,16 +441,25 @@
343441
"reason": "INVESTIGATE - NETLINK_ERROR",
344442
"message": "NETLINK_ERROR"
345443
},
444+
"test_overcommit_tracker/test.py::test_user_overcommit": {
445+
"reason": "INVESTIGATE - NETLINK_ERROR on tsan",
446+
"message": "NETLINK_ERROR",
447+
"check_types": [
448+
"tsan"
449+
]
450+
},
346451
"test_storage_delta/test.py::test_concurrent_queries[False]": {
347-
"reason": "INVESTIGATE - NETLINK_ERROR",
348-
"message": "NETLINK_ERROR"
452+
"reason": "INVESTIGATE - Unstable test"
349453
},
350454
"test_storage_s3_queue/test_0.py::test_streaming_to_many_views[unordered]": {
351455
"reason": "INVESTIGATE: Broken test?"
352456
},
353457
"test_storage_s3_queue/test_0.py::test_streaming_to_many_views[ordered]": {
354458
"reason": "INVESTIGATE: Broken test?"
355459
},
460+
"test_storage_s3_queue/test_2.py::test_shards_distributed[unordered-1]": {
461+
"reason": "INVESTIGATE: Unstable test"
462+
},
356463
"test_storage_s3_queue/test_4.py::test_list_and_delete_race": {
357464
"reason": "KNOWN: Unstable test",
358465
"message": "AssertionError"
@@ -416,5 +523,25 @@
416523
"check_types": [
417524
"tsan"
418525
]
526+
},
527+
"test_database_hms/test.py::test_list_tables": {
528+
"reason": "KNOWN: Occasional timeout",
529+
"message": "docker_compose_iceberg_hms_catalog.yml', '--verbose', 'up', '-d']' timed out after 300 seconds"
530+
},
531+
"test_database_hms/test.py::test_many_namespaces": {
532+
"reason": "KNOWN: Occasional timeout",
533+
"message": "docker_compose_iceberg_hms_catalog.yml', '--verbose', 'up', '-d']' timed out after 300 seconds"
534+
},
535+
"test_database_hms/test.py::test_select": {
536+
"reason": "KNOWN: Occasional timeout",
537+
"message": "docker_compose_iceberg_hms_catalog.yml', '--verbose', 'up', '-d']' timed out after 300 seconds"
538+
},
539+
"test_database_hms/test.py::test_tables_with_same_location": {
540+
"reason": "KNOWN: Occasional timeout",
541+
"message": "docker_compose_iceberg_hms_catalog.yml', '--verbose', 'up', '-d']' timed out after 300 seconds"
542+
},
543+
"test_database_hms/test.py::test_hide_sensitive_info": {
544+
"reason": "KNOWN: Occasional timeout",
545+
"message": "docker_compose_iceberg_hms_catalog.yml', '--verbose', 'up', '-d']' timed out after 300 seconds"
419546
}
420547
}

‎tests/integration/compose/docker_compose_iceberg_hms_catalog.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ services:
1717
- 10001:10001
1818
stop_grace_period: 5s
1919
hive:
20-
image: clickhouse/integration-test-with-hms
20+
image: altinityinfra/integration-test-with-hms
2121
restart: unless-stopped
2222
depends_on:
2323
minio:

‎tests/integration/compose/docker_compose_iceberg_lakekeeper_catalog.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ services:
6464

6565

6666
db:
67-
image: bitnami/postgresql:16.3.0
67+
image: bitnamilegacy/postgresql:16.3.0
6868
environment:
6969
- POSTGRESQL_USERNAME=postgres
7070
- POSTGRESQL_PASSWORD=postgres
@@ -78,7 +78,7 @@ services:
7878

7979
# TODO: can we simply use with_minio=True instead?
8080
minio:
81-
image: bitnami/minio:2025.4.22
81+
image: bitnamilegacy/minio:2025.4.22
8282
environment:
8383
- MINIO_ROOT_USER=minio
8484
- MINIO_ROOT_PASSWORD=ClickHouse_Minio_P@ssw0rd

‎tests/integration/compose/docker_compose_ldap.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
openldap:
3-
image: bitnami/openldap:2.6.8
3+
image: bitnamilegacy/openldap:2.6.8
44
stop_grace_period: 5s
55
restart: always
66
environment:

0 commit comments

Comments
 (0)