diff --git a/tests/queries/0_stateless/03269_explain_unique_ids.reference b/tests/queries/0_stateless/03269_explain_unique_ids.reference index b70b7427621..e5e693b5bfb 100644 --- a/tests/queries/0_stateless/03269_explain_unique_ids.reference +++ b/tests/queries/0_stateless/03269_explain_unique_ids.reference @@ -5,7 +5,7 @@ digraph { rankdir="LR"; { node [shape = rect] - n0[label="MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder)_5"]; + n0[label="MergeTreeSelect_5"]; n1[label="FilterTransform_6"]; n2[label="ExpressionTransform_7"]; n3[label="AggregatingTransform_8"]; @@ -79,7 +79,7 @@ digraph ('MergeSortingTransform_23','Sorting_7') ('MergeSortingTransform_24','Sorting_7') ('MergeSortingTransform_25','Sorting_7') -('MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder)_5','ReadFromMergeTree_0') +('MergeTreeSelect_5','ReadFromMergeTree_0') ('MergingSortedTransform_26','Sorting_7') ('NullSource_30','') ('NullSource_31','') diff --git a/tests/queries/0_stateless/03269_explain_unique_ids.sh b/tests/queries/0_stateless/03269_explain_unique_ids.sh index 2d495345143..0122b909e8e 100755 --- a/tests/queries/0_stateless/03269_explain_unique_ids.sh +++ b/tests/queries/0_stateless/03269_explain_unique_ids.sh @@ -10,7 +10,6 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) opts=( --enable_analyzer=1 - --join_algorithm='parallel_hash' --max_threads=4 ) @@ -23,6 +22,8 @@ $CLICKHOUSE_CLIENT -q " ORDER BY a; INSERT INTO t SELECT number FROM numbers_mt(1e6); + + OPTIMIZE TABLE t FINAL; " query=" @@ -35,14 +36,14 @@ query=" FROM t WHERE a IN (t0) GROUP BY a - ORDER BY a; + ORDER BY a " $CLICKHOUSE_CLIENT "${opts[@]}" -q "EXPLAIN json=1 $query" printf "\n\n" -$CLICKHOUSE_CLIENT "${opts[@]}" -q "EXPLAIN PIPELINE compact=0,graph=1 $query" +$CLICKHOUSE_CLIENT "${opts[@]}" -q "SELECT replaceRegexpAll(explain, '(\w+)\(.*\)', '\\1') FROM (EXPLAIN PIPELINE compact=0,graph=1 $query)" printf "\n\n" @@ -52,7 +53,7 @@ $CLICKHOUSE_CLIENT "${opts[@]}" --log_processors_profiles=1 --query_id="$query_i $CLICKHOUSE_CLIENT -q " SYSTEM FLUSH LOGS; - SELECT DISTINCT (processor_uniq_id, step_uniq_id) + SELECT DISTINCT (replaceRegexpAll(processor_uniq_id, '(\w+)\(.*\)', '\\1'), step_uniq_id) FROM system.processors_profile_log WHERE query_id = '$query_id' ORDER BY ALL;