Skip to content

Commit a54e290

Browse files
authored
Merge branch 'master' into fix-pr-n-way-cross-join
2 parents 3037e33 + 1c49a09 commit a54e290

File tree

99 files changed

+3933
-2842
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+3933
-2842
lines changed

ci/jobs/functional_tests.py

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,10 @@ def start():
532532
# Track collected test results across multiple runs (only used when run_sets_cnt > 1)
533533
collected_test_results = []
534534
seen_test_names = set()
535+
# Track accumulated run time per test for the targeted check per-test time cap
536+
test_time_accumulated: dict[str, float] = {}
537+
TIME_CAP_PER_TEST_SEC = 10 * 60
538+
tests_to_run = list(tests) if tests else tests
535539

536540
for cnt in range(run_sets_cnt):
537541
# For targeted checks with multiple iterations, recalculate
@@ -542,9 +546,9 @@ def start():
542546
)
543547

544548
run_tests(
545-
batch_num=batch_num if not tests else 0,
546-
batch_total=total_batches if not tests else 0,
547-
tests=tests,
549+
batch_num=batch_num if not tests_to_run else 0,
550+
batch_total=total_batches if not tests_to_run else 0,
551+
tests=tests_to_run,
548552
extra_args=runner_options,
549553
random_order=is_flaky_check
550554
or is_targeted_check
@@ -559,6 +563,27 @@ def start():
559563
if run_sets_cnt > 1:
560564
is_final_run = cnt == run_sets_cnt - 1
561565

566+
# Accumulate per-test run time and filter tests that exceeded the time cap
567+
if is_targeted_check:
568+
for test_case_result in test_result.results:
569+
if test_case_result.duration is not None:
570+
test_time_accumulated[test_case_result.name] = (
571+
test_time_accumulated.get(test_case_result.name, 0.0)
572+
+ test_case_result.duration
573+
)
574+
if not is_final_run:
575+
tests_to_run = [
576+
t
577+
for t in tests_to_run
578+
if test_time_accumulated.get(t, 0.0)
579+
< TIME_CAP_PER_TEST_SEC
580+
]
581+
if not tests_to_run:
582+
print(
583+
"NOTE: All tests exceeded the time cap; stopping early"
584+
)
585+
is_final_run = True
586+
562587
for test_case_result in test_result.results:
563588
# Only collect each test once (first failure or final result)
564589
if test_case_result.name not in seen_test_names:

docs/en/engines/table-engines/integrations/mysql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,4 +196,4 @@ Default value: `300`.
196196
## See also {#see-also}
197197

198198
- [The mysql table function](../../../sql-reference/table-functions/mysql.md)
199-
- [Using MySQL as a dictionary source](/sql-reference/dictionaries#mysql)
199+
- [Using MySQL as a dictionary source](/sql-reference/statements/create/dictionary/sources#mysql)

docs/en/engines/table-engines/integrations/odbc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,5 +138,5 @@ SELECT * FROM odbc_t
138138

139139
## See also {#see-also}
140140

141-
- [ODBC dictionaries](/sql-reference/dictionaries#mysql)
141+
- [ODBC dictionaries](/sql-reference/statements/create/dictionary/sources#mysql)
142142
- [ODBC table function](../../../sql-reference/table-functions/odbc.md)

docs/en/engines/table-engines/integrations/postgresql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ CREATE TABLE pg_table_schema_with_dots (a UInt32)
222222
**See Also**
223223

224224
- [The `postgresql` table function](../../../sql-reference/table-functions/postgresql.md)
225-
- [Using PostgreSQL as a dictionary source](/sql-reference/dictionaries#mysql)
225+
- [Using PostgreSQL as a dictionary source](/sql-reference/statements/create/dictionary/sources#mysql)
226226

227227
## Related content {#related-content}
228228

docs/en/engines/table-engines/special/dictionary.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ doc_type: 'reference'
1010

1111
# Dictionary table engine
1212

13-
The `Dictionary` engine displays the [dictionary](../../../sql-reference/dictionaries/index.md) data as a ClickHouse table.
13+
The `Dictionary` engine displays the [dictionary](../../../sql-reference/statements/create/dictionary/index.md) data as a ClickHouse table.
1414

1515
## Example {#example}
1616

docs/en/operations/caches.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ There are also a host of additional cache types:
2727
- [Vector similarity index](../engines/table-engines/mergetree-family/annindexes.md) cache.
2828
- [Text index](../engines/table-engines/mergetree-family/textindexes.md#caching) cache.
2929
- [Avro format](/interfaces/formats/Avro) schemas cache.
30-
- [Dictionaries](../sql-reference/dictionaries/index.md) data cache.
30+
- [Dictionaries](../sql-reference/statements/create/dictionary/index.md) data cache.
3131
- Schema inference cache.
3232
- [Filesystem cache](storing-data.md) over S3, Azure, Local and other disks.
3333
- [Userspace page cache](/operations/userspace-page-cache)

docs/en/operations/server-configuration-parameters/_server_settings_outside_source.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ Path:
371371
- The path can contain wildcards \* and ?.
372372

373373
See also:
374-
- "[Dictionaries](../../sql-reference/dictionaries/index.md)".
374+
- "[Dictionaries](../../sql-reference/statements/create/dictionary/index.md)".
375375

376376
**Example**
377377

docs/en/operations/system-tables/dictionaries.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import SystemTableCloud from '@site/docs/_snippets/_system_table_cloud.md';
1010

1111
<SystemTableCloud/>
1212

13-
Contains information about [dictionaries](../../sql-reference/dictionaries/index.md).
13+
Contains information about [dictionaries](../../sql-reference/statements/create/dictionary/index.md).
1414

1515
Columns:
1616

0 commit comments

Comments
 (0)