This is an automated email from the ASF dual-hosted git repository.
csringhofer pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git
The following commit(s) were added to refs/heads/master by this push:
new 90389331a IMPALA-14793: Replace row regex with aggregation tests
90389331a is described below
commit 90389331a09f3d27dffa1566506b56bb930afa71
Author: Surya Hebbar <[email protected]>
AuthorDate: Mon Mar 2 02:01:04 2026 +0530
IMPALA-14793: Replace row regex with aggregation tests
In the end-to-end python tests, there are many 'row_regex' searches
that can instead be treated as 'aggregation()' tests.
Rewriting these tests as aggregations can make the syntax easier,
while providing compatibility for both the traditional profile
and the new aggregated profile.
In many cases this results in better efficiency as the regex pattern to
search for is less complex than the original.
This is a split change associated with IMPALA-9846, in order to enable
the aggegated profile.
This reduces the number of lines from the large change IMPALA-9846
by a little, in order to aid the reviewer.
Change-Id: Ied342a3b89eb922137f0c1a7d3b2978b813de381
Reviewed-on: http://gerrit.cloudera.org:8080/24058
Reviewed-by: Impala Public Jenkins <[email protected]>
Tested-by: Impala Public Jenkins <[email protected]>
---
.../analytic-fns-tpcds-partitioned-topn.test | 6 ++--
.../queries/QueryTest/basic-spilling.test | 2 +-
.../queries/QueryTest/binary-type.test | 6 ++--
.../queries/QueryTest/full-acid-original-file.test | 10 +++----
.../queries/QueryTest/runtime_filters_mt_dop.test | 2 +-
.../queries/QueryTest/runtime_row_filters.test | 2 +-
.../queries/QueryTest/spilling-aggs.test | 34 +++++++++++-----------
.../QueryTest/spilling-broadcast-joins.test | 12 ++++----
.../queries/QueryTest/spilling-query-options.test | 10 +++----
.../queries/QueryTest/spilling.test | 18 ++++++------
.../queries/tpch-passthrough-aggregations.test | 10 +++----
testdata/workloads/tpch/queries/tpch-q1.test | 2 +-
testdata/workloads/tpch/queries/tpch-q10.test | 2 +-
testdata/workloads/tpch/queries/tpch-q11.test | 2 +-
testdata/workloads/tpch/queries/tpch-q12.test | 2 +-
testdata/workloads/tpch/queries/tpch-q13.test | 2 +-
testdata/workloads/tpch/queries/tpch-q14.test | 2 +-
testdata/workloads/tpch/queries/tpch-q15.test | 2 +-
testdata/workloads/tpch/queries/tpch-q16.test | 2 +-
testdata/workloads/tpch/queries/tpch-q17.test | 2 +-
testdata/workloads/tpch/queries/tpch-q18.test | 2 +-
testdata/workloads/tpch/queries/tpch-q19.test | 2 +-
testdata/workloads/tpch/queries/tpch-q2.test | 2 +-
testdata/workloads/tpch/queries/tpch-q20.test | 2 +-
testdata/workloads/tpch/queries/tpch-q21.test | 2 +-
testdata/workloads/tpch/queries/tpch-q22.test | 2 +-
testdata/workloads/tpch/queries/tpch-q3.test | 2 +-
testdata/workloads/tpch/queries/tpch-q4.test | 2 +-
testdata/workloads/tpch/queries/tpch-q5.test | 2 +-
testdata/workloads/tpch/queries/tpch-q6.test | 2 +-
testdata/workloads/tpch/queries/tpch-q7.test | 2 +-
testdata/workloads/tpch/queries/tpch-q8.test | 2 +-
testdata/workloads/tpch/queries/tpch-q9.test | 2 +-
33 files changed, 78 insertions(+), 78 deletions(-)
diff --git
a/testdata/workloads/functional-query/queries/QueryTest/analytic-fns-tpcds-partitioned-topn.test
b/testdata/workloads/functional-query/queries/QueryTest/analytic-fns-tpcds-partitioned-topn.test
index 8d277d271..ac455fc8d 100644
---
a/testdata/workloads/functional-query/queries/QueryTest/analytic-fns-tpcds-partitioned-topn.test
+++
b/testdata/workloads/functional-query/queries/QueryTest/analytic-fns-tpcds-partitioned-topn.test
@@ -293,7 +293,7 @@ limit 50
STRING, STRING, STRING, STRING, DECIMAL, DECIMAL, DECIMAL, DECIMAL, DECIMAL,
DECIMAL, DECIMAL, DECIMAL, DECIMAL, DECIMAL, DECIMAL, DECIMAL, BIGINT
---- RUNTIME_PROFILE
# Confirm that heaps were not evicted thanks to Small String Optimization.
-row_regex: .*InMemoryHeapsEvicted: 0 \(0\)
+aggregation(SUM, InMemoryHeapsEvicted): 0
====
---- QUERY
# Same as above, but calculate aggregates over all the result columns to
ensure that the right
@@ -395,7 +395,7 @@ limit 50
STRING, STRING, STRING, STRING, DECIMAL, DECIMAL, DECIMAL, DECIMAL, DECIMAL,
DECIMAL, DECIMAL, DECIMAL, DECIMAL, DECIMAL, DECIMAL, DECIMAL, BIGINT
---- RUNTIME_PROFILE
# Confirm that heaps were actually evicted due to memory pressure.
-row_regex: .*InMemoryHeapsEvicted: .* \([1-9][0-9]*\)
+aggregation(SUM, InMemoryHeapsEvicted)> 0
====
---- QUERY
# Same as above with in-memory heaps evicted, but calculate aggregates over
all the result
@@ -424,7 +424,7 @@ where rnk < 700
STRING, STRING, STRING, STRING, DECIMAL, DECIMAL, DECIMAL, DECIMAL, DECIMAL,
DECIMAL, DECIMAL, DECIMAL, DECIMAL, DECIMAL, DECIMAL, DECIMAL
---- RUNTIME_PROFILE
# Confirm that heaps were actually evicted due to memory pressure.
-row_regex: .*InMemoryHeapsEvicted: .* \([1-9][0-9]*\)
+aggregation(SUM, InMemoryHeapsEvicted)> 0
====
---- QUERY
# IMPALA-11230: This is a minimal reproducing case for a crash in
diff --git
a/testdata/workloads/functional-query/queries/QueryTest/basic-spilling.test
b/testdata/workloads/functional-query/queries/QueryTest/basic-spilling.test
index 513ba2cf8..827dbd289 100644
--- a/testdata/workloads/functional-query/queries/QueryTest/basic-spilling.test
+++ b/testdata/workloads/functional-query/queries/QueryTest/basic-spilling.test
@@ -12,5 +12,5 @@ from (select distinct o_orderdate, o_custkey, o_comment
BIGINT
---- RUNTIME_PROFILE
# Verify that spilling was activated.
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
+aggregation(SUM, SpilledPartitions)> 0
====
diff --git
a/testdata/workloads/functional-query/queries/QueryTest/binary-type.test
b/testdata/workloads/functional-query/queries/QueryTest/binary-type.test
index b28abc653..a4afaa4be 100644
--- a/testdata/workloads/functional-query/queries/QueryTest/binary-type.test
+++ b/testdata/workloads/functional-query/queries/QueryTest/binary-type.test
@@ -164,7 +164,7 @@ BIGINT
---- RESULTS
0
---- RUNTIME_PROFILE: table_format=kudu
-!row_regex:.*TotalKuduScanRoundTrips: 1.*
+aggregation(SUM, TotalKuduScanRoundTrips): 0
====
---- QUERY
# Check that filters with constant folding and non ascii (utf8) characters can
@@ -176,7 +176,7 @@ BIGINT
---- RESULTS
0
---- RUNTIME_PROFILE: table_format=kudu
-row_regex:.*TotalKuduScanRoundTrips: 0.*
+aggregation(SUM, TotalKuduScanRoundTrips): 0
====
---- QUERY
# Check that filters with constant folding and not valid utf8 characters can
@@ -188,5 +188,5 @@ BIGINT
---- RESULTS
0
---- RUNTIME_PROFILE: table_format=kudu
-row_regex:.*TotalKuduScanRoundTrips: 0.*
+aggregation(SUM, TotalKuduScanRoundTrips): 0
====
diff --git
a/testdata/workloads/functional-query/queries/QueryTest/full-acid-original-file.test
b/testdata/workloads/functional-query/queries/QueryTest/full-acid-original-file.test
index 7e54bf5af..ee114f0ba 100644
---
a/testdata/workloads/functional-query/queries/QueryTest/full-acid-original-file.test
+++
b/testdata/workloads/functional-query/queries/QueryTest/full-acid-original-file.test
@@ -111,7 +111,7 @@ where id < 10;
---- TYPES
INT, BIGINT, INT, BIGINT, BIGINT, INT
---- RUNTIME_PROFILE
-row_regex: .*NumScannersWithNoReads: [1-9].*
+aggregation(SUM, NumScannersWithNoReads)> 0
====
---- QUERY
set MAX_SCAN_RANGE_LENGTH=1000;
@@ -130,7 +130,7 @@ where id > 990 and id < 1000;
---- TYPES
INT, BIGINT, INT, BIGINT, BIGINT
---- RUNTIME_PROFILE
-row_regex: .*NumScannersWithNoReads: [1-9].*
+aggregation(SUM, NumScannersWithNoReads)> 0
====
---- QUERY
set MAX_SCAN_RANGE_LENGTH=1000;
@@ -149,7 +149,7 @@ where id > 7200 and id < 7210;
---- TYPES
INT, BIGINT, INT, BIGINT, BIGINT
---- RUNTIME_PROFILE
-row_regex: .*NumScannersWithNoReads: [1-9].*
+aggregation(SUM, NumScannersWithNoReads)> 0
====
---- QUERY
set MAX_SCAN_RANGE_LENGTH=1000;
@@ -168,7 +168,7 @@ where row__id.rowid > 1200 and row__id.rowid < 1210;
---- TYPES
INT, BIGINT, INT, BIGINT, BIGINT
---- RUNTIME_PROFILE
-row_regex: .*NumScannersWithNoReads: [1-9].*
+aggregation(SUM, NumScannersWithNoReads)> 0
====
---- QUERY
set MAX_SCAN_RANGE_LENGTH=1000;
@@ -187,7 +187,7 @@ where row__id.rowid > 7200 and row__id.rowid < 7210;
---- TYPES
INT, BIGINT, INT, BIGINT, BIGINT, INT
---- RUNTIME_PROFILE
-row_regex: .*NumScannersWithNoReads: [1-9].*
+aggregation(SUM, NumScannersWithNoReads)> 0
====
---- QUERY
select count(*) from functional_orc_def.alltypes_promoted where id % 2 = 0;
diff --git
a/testdata/workloads/functional-query/queries/QueryTest/runtime_filters_mt_dop.test
b/testdata/workloads/functional-query/queries/QueryTest/runtime_filters_mt_dop.test
index b6fab637d..38299cd45 100644
---
a/testdata/workloads/functional-query/queries/QueryTest/runtime_filters_mt_dop.test
+++
b/testdata/workloads/functional-query/queries/QueryTest/runtime_filters_mt_dop.test
@@ -85,7 +85,7 @@ select STRAIGHT_JOIN count(*) from alltypes a
---- RESULTS
0
---- RUNTIME_PROFILE
-row_regex: .*Files rejected: 0 .*
+aggregation(SUM, Files rejected): 0
---- RUNTIME_PROFILE: table_format=kudu
row_regex: .*RowsRead: 2.43K .*
====
diff --git
a/testdata/workloads/functional-query/queries/QueryTest/runtime_row_filters.test
b/testdata/workloads/functional-query/queries/QueryTest/runtime_row_filters.test
index 317f1ff81..48e9a660a 100644
---
a/testdata/workloads/functional-query/queries/QueryTest/runtime_row_filters.test
+++
b/testdata/workloads/functional-query/queries/QueryTest/runtime_row_filters.test
@@ -370,7 +370,7 @@ select STRAIGHT_JOIN count(a.l_comment)
---- TYPES
BIGINT
---- RUNTIME_PROFILE
-row_regex: .*SpilledPartitions: [1-9]\d* .*
+aggregation(SUM, SpilledPartitions)> 0
row_regex: .*Rows processed: 16.38K.*
aggregation(SUM, Rows rejected): 0
row_regex: .*1 of 1 Runtime Filter Published.*
diff --git
a/testdata/workloads/functional-query/queries/QueryTest/spilling-aggs.test
b/testdata/workloads/functional-query/queries/QueryTest/spilling-aggs.test
index 787773479..6f0e2ecd0 100644
--- a/testdata/workloads/functional-query/queries/QueryTest/spilling-aggs.test
+++ b/testdata/workloads/functional-query/queries/QueryTest/spilling-aggs.test
@@ -20,8 +20,8 @@ order by 1 limit 10
BIGINT, BIGINT
---- RUNTIME_PROFILE
# Verify that spilling and passthrough were activated.
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
-row_regex: .*RowsPassedThrough: .* \([1-9][0-9]*\)
+aggregation(SUM, SpilledPartitions)> 0
+aggregation(SUM, RowsPassedThrough)> 0
====
---- QUERY
# Test query with string grouping column and string agg columns
@@ -38,7 +38,7 @@ order by 1,2 limit 3
---- TYPES
STRING, BIGINT, DECIMAL, STRING
---- RUNTIME_PROFILE
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
+aggregation(SUM, SpilledPartitions)> 0
====
---- QUERY
# Test query with string grouping column
@@ -57,7 +57,7 @@ order by count(*) desc limit 5
---- TYPES
STRING, BIGINT
---- RUNTIME_PROFILE
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
+aggregation(SUM, SpilledPartitions)> 0
====
---- QUERY
# Test query with string grouping column and string agg columns
@@ -75,7 +75,7 @@ order by 1,2 limit 3;
STRING, BIGINT, DECIMAL, STRING
---- RUNTIME_PROFILE
# Verify that spilling happened in the agg.
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
+aggregation(SUM, SpilledPartitions)> 0
====
---- QUERY
# Test with non-scalar intermediate state (avg() uses fixed intermediate
value).
@@ -94,8 +94,8 @@ order by 1 limit 5
BIGINT, DOUBLE
---- RUNTIME_PROFILE
# Verify that passthrough and spilling happened in the pre and merge agg.
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
-row_regex: .*RowsPassedThrough: .* \([1-9][0-9]*\)
+aggregation(SUM, SpilledPartitions)> 0
+aggregation(SUM, RowsPassedThrough)> 0
====
---- QUERY
# Test aggregation spill with group_concat distinct
@@ -119,7 +119,7 @@ order by 1 limit 10
BIGINT, BIGINT, STRING
---- RUNTIME_PROFILE
# Verify that at least one of the aggs spilled.
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
+aggregation(SUM, SpilledPartitions)> 0
====
---- QUERY
# Test aggregation with minimum required reservation to exercise IMPALA-2708.
@@ -134,7 +134,7 @@ BIGINT
---- RESULTS
1500000
---- RUNTIME_PROFILE
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
+aggregation(SUM, SpilledPartitions)> 0
====
---- QUERY
# Multiple distinct
@@ -145,8 +145,8 @@ BIGINT,BIGINT
---- RESULTS
1500000,200000
---- RUNTIME_PROFILE
-row_regex: .*RowsPassedThrough: .* \([1-9][0-9]*\)
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
+aggregation(SUM, RowsPassedThrough)> 0
+aggregation(SUM, SpilledPartitions)> 0
====
---- QUERY
# Multiple distinct with string col and group by
@@ -162,8 +162,8 @@ INT,BIGINT,BIGINT
4,857015,753374
5,643287,574337
---- RUNTIME_PROFILE
-row_regex: .*RowsPassedThrough: .* \([1-9][0-9]*\)
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
+aggregation(SUM, RowsPassedThrough)> 0
+aggregation(SUM, SpilledPartitions)> 0
====
---- QUERY
# Multiple distinct and non-distinct, with an intermediate tuple (avg)
@@ -175,8 +175,8 @@ DOUBLE,BIGINT,DECIMAL,BIGINT
---- RESULTS
2999991.5,200000,240129.67,6001215
---- RUNTIME_PROFILE
-row_regex: .*RowsPassedThrough: .* \([1-9][0-9]*\)
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
+aggregation(SUM, RowsPassedThrough)> 0
+aggregation(SUM, SpilledPartitions)> 0
====
---- QUERY
# Multiple distinct and non-distinct, with a group by
@@ -193,6 +193,6 @@ INT,DOUBLE,BIGINT,DECIMAL,BIGINT
4,3000330.547357981,197222,34279.36,857015
5,2999188.900650876,191905,25745.25,643287
---- RUNTIME_PROFILE
-row_regex: .*RowsPassedThrough: .* \([1-9][0-9]*\)
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
+aggregation(SUM, RowsPassedThrough)> 0
+aggregation(SUM, SpilledPartitions)> 0
====
diff --git
a/testdata/workloads/functional-query/queries/QueryTest/spilling-broadcast-joins.test
b/testdata/workloads/functional-query/queries/QueryTest/spilling-broadcast-joins.test
index ffc4aceea..0de70652e 100644
---
a/testdata/workloads/functional-query/queries/QueryTest/spilling-broadcast-joins.test
+++
b/testdata/workloads/functional-query/queries/QueryTest/spilling-broadcast-joins.test
@@ -35,7 +35,7 @@ limit 20
STRING,BIGINT
---- RUNTIME_PROFILE
# Verify that at least one of the joins was spilled.
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
+aggregation(SUM, SpilledPartitions)> 0
====
---- QUERY
# Spilling broadcast join that will repartition.
@@ -65,8 +65,8 @@ limit 10
BIGINT, BIGINT, STRING, DECIMAL, STRING, STRING, STRING, INT, STRING,
SMALLINT, STRING, STRING
---- RUNTIME_PROFILE
# Verify that at least one of the joins was spilled and repartitioned.
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
-row_regex: .*NumRepartitions: .* \([1-9][0-9]*\)
+aggregation(SUM, SpilledPartitions)> 0
+aggregation(SUM, NumRepartitions)> 0
====
---- QUERY
# Spilling broadcast join with empty probe-side partitions.
@@ -83,8 +83,8 @@ BIGINT
---- RUNTIME_PROFILE
# Verify that at least one of the joins was spilled and that same hash table
builds
# were *not* skipped - that optimization is disabled for shared broadcast
joins.
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
-row_regex: .*NumHashTableBuildsSkipped: 0
+aggregation(SUM, SpilledPartitions)> 0
+aggregation(SUM, NumHashTableBuildsSkipped): 0
====
---- QUERY
# Spilling broadcast join that has some empty build partitions.
@@ -123,5 +123,5 @@ order by count(*) desc, s_name, o_clerk limit 20;
STRING, STRING, BIGINT
---- RUNTIME_PROFILE
# Verify that at least one of the joins was spilled.
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
+aggregation(SUM, SpilledPartitions)> 0
====
diff --git
a/testdata/workloads/functional-query/queries/QueryTest/spilling-query-options.test
b/testdata/workloads/functional-query/queries/QueryTest/spilling-query-options.test
index 5b9a64100..b55d97fa9 100644
---
a/testdata/workloads/functional-query/queries/QueryTest/spilling-query-options.test
+++
b/testdata/workloads/functional-query/queries/QueryTest/spilling-query-options.test
@@ -20,8 +20,8 @@ BIGINT
---- RESULTS
124999
---- RUNTIME_PROFILE
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
-row_regex: .*RowsPassedThrough: .* \([1-9][0-9]*\)
+aggregation(SUM, SpilledPartitions)> 0
+aggregation(SUM, RowsPassedThrough)> 0
====
---- QUERY
# IMPALA-5823: make sure that SET_DENY_RESERVATION_PROBABILITY takes effect on
OPEN.
@@ -34,8 +34,8 @@ BIGINT
---- RESULTS
124999
---- RUNTIME_PROFILE
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
-row_regex: .*RowsPassedThrough: .* \([1-9][0-9]*\)
+aggregation(SUM, SpilledPartitions)> 0
+aggregation(SUM, RowsPassedThrough)> 0
====
---- QUERY
# IMPALA-5823: make sure that SET_DENY_RESERVATION_PROBABILITY takes effect on
GETNEXT.
@@ -50,5 +50,5 @@ BIGINT
---- RESULTS
124999
---- RUNTIME_PROFILE
-row_regex: .*RowsPassedThrough: .* \([1-9][0-9]*\)
+aggregation(SUM, RowsPassedThrough)> 0
====
diff --git
a/testdata/workloads/functional-query/queries/QueryTest/spilling.test
b/testdata/workloads/functional-query/queries/QueryTest/spilling.test
index c99fba79f..f5c296791 100644
--- a/testdata/workloads/functional-query/queries/QueryTest/spilling.test
+++ b/testdata/workloads/functional-query/queries/QueryTest/spilling.test
@@ -19,7 +19,7 @@ l1.l_shipdate = l3.l_shipdate
BIGINT
---- RUNTIME_PROFILE
# Verify that at least one of the joins was spilled.
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
+aggregation(SUM, SpilledPartitions)> 0
====
---- QUERY
set buffer_pool_limit=50m;
@@ -206,7 +206,7 @@ limit 100
string, bigint
---- RUNTIME_PROFILE
# Verify that at least one of the joins was spilled.
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
+aggregation(SUM, SpilledPartitions)> 0
====
---- QUERY
# IMPALA-1346/IMPALA-1546: fix sorter memory management so that it can complete
@@ -242,8 +242,8 @@ limit 20
BIGINT,BIGINT,BIGINT,INT,DECIMAL,DECIMAL,DECIMAL,DECIMAL,STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING,BIGINT,BIGINT,STRING,DECIMAL,STRING,STRING,STRING,INT,STRING
---- RUNTIME_PROFILE
# Verify that the sort and join actually spilled
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
-row_regex: .*TotalMergesPerformed: .* \([1-9][0-9]*\)
+aggregation(SUM, SpilledPartitions)> 0
+aggregation(SUM, TotalMergesPerformed)> 0
====
---- QUERY
# IMPALA-5173: spilling hash join feeding into right side of nested loop join.
@@ -292,7 +292,7 @@ limit 50000000
---- RUNTIME_PROFILE
row_regex: .*Query State: FINISHED.*
row_regex: .*Query Status: OK.*
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
+aggregation(SUM, SpilledPartitions)> 0
====
---- QUERY
# Test spilling join with many duplicates in join key. We don't expect this to
succeed
@@ -368,7 +368,7 @@ BIGINT
# Verify that at least one of the joins was spilled.
# TODO(IMPALA-12549): Make this query spill again after the estimations and
# min reservations are adjusted.
-# row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
+# aggregation(SUM, SpilledPartitions)> 0
====
---- QUERY
# Spilling partitioned top-N.
@@ -433,8 +433,8 @@ order by s_name
STRING,DECIMAL,DECIMAL,DECIMAL,DECIMAL,BIGINT
---- RUNTIME_PROFILE
# Verify that at least one of the Top-N operators spilled.
-row_regex: .*InMemoryHeapsEvicted: .* \([1-9][0-9]*\)
-#row_regex: .*SpilledRuns: .* \([1-9][0-9]*\)
+aggregation(SUM, InMemoryHeapsEvicted)> 0
+# aggregation(SUM, SpilledRuns)> 0
====
---- QUERY
# Test spilling an agg with a LIMIT; see IMPALA-2581
@@ -448,6 +448,6 @@ limit 5
BIGINT
---- RUNTIME_PROFILE
# Verify that spilling was activated.
-row_regex: .*SpilledPartitions: .* \([1-9][0-9]*\)
+aggregation(SUM, SpilledPartitions)> 0
row_regex: .*FastLimitCheckExceededRows: [0-9]+
====
diff --git a/testdata/workloads/tpch/queries/tpch-passthrough-aggregations.test
b/testdata/workloads/tpch/queries/tpch-passthrough-aggregations.test
index 8c25faf47..504196d72 100644
--- a/testdata/workloads/tpch/queries/tpch-passthrough-aggregations.test
+++ b/testdata/workloads/tpch/queries/tpch-passthrough-aggregations.test
@@ -22,7 +22,7 @@ limit 10
bigint,bigint,string,bigint,decimal
---- RUNTIME_PROFILE
# Verify that passthrough was activated.
-row_regex: .*RowsPassedThrough: .* \([1-9][0-9]*\)
+aggregation(SUM, RowsPassedThrough)> 0
====
---- QUERY
# Test for preaggregation passthrough optimization - the group by keys are
nearly unique.
@@ -47,7 +47,7 @@ limit 10;
bigint,bigint,bigint,string
---- RUNTIME_PROFILE
# Verify that passthrough was activated.
-row_regex: .*RowsPassedThrough: .* \([1-9][0-9]*\)
+aggregation(SUM, RowsPassedThrough)> 0
====
---- QUERY
# IMPALA-12960: Test the case of rollup.
@@ -83,7 +83,7 @@ from part
bigint
---- RUNTIME_PROFILE
# Verify that passthrough was activated.
-row_regex: .*RowsPassedThrough: .* \([1-9][0-9]*\)
+aggregation(SUM, RowsPassedThrough)> 0
====
---- QUERY
# Test for preaggregation passthrough optimization: count distinct aggregation
with
@@ -108,7 +108,7 @@ limit 10;
string,string,int,bigint
---- RUNTIME_PROFILE
# Verify that passthrough was activated.
-row_regex: .*RowsPassedThrough: .* \([1-9][0-9]*\)
+aggregation(SUM, RowsPassedThrough)> 0
====
---- QUERY
# Test that, without preagg_bytes_limit, this query does not pass through rows.
@@ -133,5 +133,5 @@ select count(distinct l_orderkey) from tpch_parquet.lineitem
BIGINT
---- RUNTIME_PROFILE
# Verify that passthrough was activated.
-row_regex: .*RowsPassedThrough: .* \([1-9][0-9]*\)
+aggregation(SUM, RowsPassedThrough)> 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q1.test
b/testdata/workloads/tpch/queries/tpch-q1.test
index 94ed5034a..05081d5a1 100644
--- a/testdata/workloads/tpch/queries/tpch-q1.test
+++ b/testdata/workloads/tpch/queries/tpch-q1.test
@@ -30,5 +30,5 @@ order by
---- TYPES
string, string, decimal, decimal, decimal, decimal, decimal, decimal, decimal,
bigint
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q10.test
b/testdata/workloads/tpch/queries/tpch-q10.test
index 2693d1889..511f63419 100644
--- a/testdata/workloads/tpch/queries/tpch-q10.test
+++ b/testdata/workloads/tpch/queries/tpch-q10.test
@@ -60,5 +60,5 @@ limit 20
---- TYPES
bigint, string, decimal, decimal, string, string, string, string
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q11.test
b/testdata/workloads/tpch/queries/tpch-q11.test
index 1d5bfc86e..9202925e1 100644
--- a/testdata/workloads/tpch/queries/tpch-q11.test
+++ b/testdata/workloads/tpch/queries/tpch-q11.test
@@ -1086,5 +1086,5 @@ order by
---- TYPES
BIGINT, decimal
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q12.test
b/testdata/workloads/tpch/queries/tpch-q12.test
index ca86c318f..681c1d324 100644
--- a/testdata/workloads/tpch/queries/tpch-q12.test
+++ b/testdata/workloads/tpch/queries/tpch-q12.test
@@ -35,5 +35,5 @@ order by
---- TYPES
string, bigint, bigint
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q13.test
b/testdata/workloads/tpch/queries/tpch-q13.test
index fc131fc70..569112ca6 100644
--- a/testdata/workloads/tpch/queries/tpch-q13.test
+++ b/testdata/workloads/tpch/queries/tpch-q13.test
@@ -67,5 +67,5 @@ order by
---- TYPES
BIGINT, BIGINT
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q14.test
b/testdata/workloads/tpch/queries/tpch-q14.test
index 29417cc7e..c33023bac 100644
--- a/testdata/workloads/tpch/queries/tpch-q14.test
+++ b/testdata/workloads/tpch/queries/tpch-q14.test
@@ -19,5 +19,5 @@ where
---- TYPES
decimal
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q15.test
b/testdata/workloads/tpch/queries/tpch-q15.test
index b34624925..1657d100f 100644
--- a/testdata/workloads/tpch/queries/tpch-q15.test
+++ b/testdata/workloads/tpch/queries/tpch-q15.test
@@ -36,5 +36,5 @@ order by
---- TYPES
BIGINT, STRING, STRING, STRING, DECIMAL
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q16.test
b/testdata/workloads/tpch/queries/tpch-q16.test
index 0dda01260..c66cba8af 100644
--- a/testdata/workloads/tpch/queries/tpch-q16.test
+++ b/testdata/workloads/tpch/queries/tpch-q16.test
@@ -18349,5 +18349,5 @@ order by
---- TYPES
STRING, STRING, INT, BIGINT
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q17.test
b/testdata/workloads/tpch/queries/tpch-q17.test
index dab9a0e09..5b68c1b11 100644
--- a/testdata/workloads/tpch/queries/tpch-q17.test
+++ b/testdata/workloads/tpch/queries/tpch-q17.test
@@ -23,5 +23,5 @@ where
---- TYPES
decimal
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q18.test
b/testdata/workloads/tpch/queries/tpch-q18.test
index 82629b910..2c4ce56fa 100644
--- a/testdata/workloads/tpch/queries/tpch-q18.test
+++ b/testdata/workloads/tpch/queries/tpch-q18.test
@@ -98,5 +98,5 @@ limit 100
---- TYPES
STRING, BIGINT, BIGINT, STRING, DECIMAL, DECIMAL
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q19.test
b/testdata/workloads/tpch/queries/tpch-q19.test
index caac7a16d..8d342db39 100644
--- a/testdata/workloads/tpch/queries/tpch-q19.test
+++ b/testdata/workloads/tpch/queries/tpch-q19.test
@@ -41,5 +41,5 @@ where
---- TYPES
decimal
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q2.test
b/testdata/workloads/tpch/queries/tpch-q2.test
index 7d40d48c1..ef689880d 100644
--- a/testdata/workloads/tpch/queries/tpch-q2.test
+++ b/testdata/workloads/tpch/queries/tpch-q2.test
@@ -149,5 +149,5 @@ limit 100
---- TYPES
DECIMAL, STRING, STRING, BIGINT, STRING, STRING, STRING, STRING
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q20.test
b/testdata/workloads/tpch/queries/tpch-q20.test
index 69e699485..76fbe0bfd 100644
--- a/testdata/workloads/tpch/queries/tpch-q20.test
+++ b/testdata/workloads/tpch/queries/tpch-q20.test
@@ -227,5 +227,5 @@ order by
---- TYPES
string, string
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q21.test
b/testdata/workloads/tpch/queries/tpch-q21.test
index 486b33ee2..4ee41de96 100644
--- a/testdata/workloads/tpch/queries/tpch-q21.test
+++ b/testdata/workloads/tpch/queries/tpch-q21.test
@@ -145,5 +145,5 @@ limit 100
---- TYPES
string, bigint
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q22.test
b/testdata/workloads/tpch/queries/tpch-q22.test
index 93b00f016..38612b580 100644
--- a/testdata/workloads/tpch/queries/tpch-q22.test
+++ b/testdata/workloads/tpch/queries/tpch-q22.test
@@ -46,5 +46,5 @@ order by
---- TYPES
string, bigint, decimal
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q3.test
b/testdata/workloads/tpch/queries/tpch-q3.test
index f9fc981d1..ac36c7b3e 100644
--- a/testdata/workloads/tpch/queries/tpch-q3.test
+++ b/testdata/workloads/tpch/queries/tpch-q3.test
@@ -40,5 +40,5 @@ limit 10
---- TYPES
BIGINT, DECIMAL, STRING, INT
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q4.test
b/testdata/workloads/tpch/queries/tpch-q4.test
index 69095bad7..9eefe3420 100644
--- a/testdata/workloads/tpch/queries/tpch-q4.test
+++ b/testdata/workloads/tpch/queries/tpch-q4.test
@@ -31,5 +31,5 @@ order by
---- TYPES
string, bigint
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q5.test
b/testdata/workloads/tpch/queries/tpch-q5.test
index 311c8690d..85d77c83c 100644
--- a/testdata/workloads/tpch/queries/tpch-q5.test
+++ b/testdata/workloads/tpch/queries/tpch-q5.test
@@ -34,5 +34,5 @@ order by
---- TYPES
string, decimal
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q6.test
b/testdata/workloads/tpch/queries/tpch-q6.test
index a4cf082dc..692fe824d 100644
--- a/testdata/workloads/tpch/queries/tpch-q6.test
+++ b/testdata/workloads/tpch/queries/tpch-q6.test
@@ -15,5 +15,5 @@ where
---- TYPES
decimal
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q7.test
b/testdata/workloads/tpch/queries/tpch-q7.test
index e596743d6..31e01fb7d 100644
--- a/testdata/workloads/tpch/queries/tpch-q7.test
+++ b/testdata/workloads/tpch/queries/tpch-q7.test
@@ -47,5 +47,5 @@ order by
---- TYPES
STRING, STRING, INT, DECIMAL
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q8.test
b/testdata/workloads/tpch/queries/tpch-q8.test
index 54a53b415..e22feb831 100644
--- a/testdata/workloads/tpch/queries/tpch-q8.test
+++ b/testdata/workloads/tpch/queries/tpch-q8.test
@@ -44,5 +44,5 @@ order by
---- TYPES
int, decimal
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
diff --git a/testdata/workloads/tpch/queries/tpch-q9.test
b/testdata/workloads/tpch/queries/tpch-q9.test
index 8b45bdad5..9b8458196 100644
--- a/testdata/workloads/tpch/queries/tpch-q9.test
+++ b/testdata/workloads/tpch/queries/tpch-q9.test
@@ -211,5 +211,5 @@ order by
---- TYPES
STRING, INT, DECIMAL
---- RUNTIME_PROFILE
-!row_regex: .*CollectionItemsRead: [^0].*
+aggregation(SUM, CollectionItemsRead): 0
====
