Skip to content

Commit 4507f88

Browse files
authored
Merge pull request ClickHouse#33976 from azat/fix-00985_merge_stack_overflow
Disable parallel run for 00985_merge_stack_overflow
2 parents fe84167 + 7111f41 commit 4507f88

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
1+
-- Tags: no-parallel
2+
-- ^^^^^^^^^^^ otherwise you may hit TOO_DEEP_RECURSION error during querying system.columns
3+
14
DROP TABLE IF EXISTS merge1;
25
DROP TABLE IF EXISTS merge2;
36

47
CREATE TABLE IF NOT EXISTS merge1 (x UInt64) ENGINE = Merge(currentDatabase(), '^merge\\d$');
58
CREATE TABLE IF NOT EXISTS merge2 (x UInt64) ENGINE = Merge(currentDatabase(), '^merge\\d$');
69

7-
SELECT * FROM merge1; -- { serverError 306 }
8-
SELECT * FROM merge2; -- { serverError 306 }
10+
SELECT * FROM merge1; -- { serverError TOO_DEEP_RECURSION }
11+
SELECT * FROM merge2; -- { serverError TOO_DEEP_RECURSION }
912

1013
DROP TABLE merge1;
1114
DROP TABLE merge2;

utils/check-style/check-style

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,9 @@ tables_with_database_column=(
184184
tests_with_database_column=( $(
185185
find $ROOT_PATH/tests/queries -iname '*.sql' -or -iname '*.sh' -or -iname '*.py' -or -iname '*.j2' |
186186
grep -vP $EXCLUDE_DIRS |
187-
xargs grep --with-filename $(printf -- "-e %s " "${tables_with_database_column[@]}") | cut -d: -f1 | sort -u
187+
xargs grep --with-filename $(printf -- "-e %s " "${tables_with_database_column[@]}") |
188+
grep -v -e ':--' -e ':#' |
189+
cut -d: -f1 | sort -u
188190
) )
189191
for test_case in "${tests_with_database_column[@]}"; do
190192
grep -qE database.*currentDatabase "$test_case" || {

0 commit comments

Comments
 (0)