Skip to content

Commit fca8a48

Browse files
committed
[fix](regression) Align ivm agg incremental cases with stream offsets
### What problem does this PR solve? Issue Number: close apache#65469 Related PR: apache#65468 Problem Summary: Several IVM aggregate regression cases used `REFRESH ... COMPLETE` before validating later incremental behavior. COMPLETE refresh does not advance the stream consumption offset, so the following `REFRESH ... INCREMENTAL` could re-consume historical changes and produce results that no longer matched the intended test point. This change updates the affected aggregate suites to establish the baseline with an initial incremental refresh, keeps the later COMPLETE refreshes that compare against snapshot ground truth, and regenerates the `.out` files so the expected results match the corrected stream-offset behavior. ### Release note None ### Check List (For Author) - Test: Regression test - `./run-regression-test.sh --run -d mtmv_p0 -s test_ivm_agg_2,test_ivm_agg_3,test_ivm_agg_4,test_ivm_agg_6 -forceGenOut --no-parallel` - Behavior changed: Yes (the affected regression cases now validate incremental results after establishing stream offsets with incremental refresh) - Does this need documentation: No
1 parent c035d1b commit fca8a48

8 files changed

Lines changed: 67 additions & 58 deletions

File tree

‎regression-test/data/mtmv_p0/ivm/test_ivm_agg_2.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,5 @@
6666
10 25 4
6767

6868
-- !maxdel_after_fix_incremental --
69-
10 30 6
69+
10 30 5
7070

‎regression-test/data/mtmv_p0/ivm/test_ivm_agg_3.out‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
2 a 1 40
66

77
-- !multikey_after_insert_incremental --
8-
1 a 2 30
8+
1 a 3 80
99
1 b 1 30
1010
2 a 1 40
11+
2 b 1 60
1112

1213
-- !multikey_after_insert_complete --
1314
1 a 3 80
@@ -18,7 +19,7 @@
1819
-- !multikey_after_delete_incremental --
1920
1 a 3 80
2021
1 b 1 30
21-
2 a 1 40
22+
2 a 2 110
2223
2 b 1 60
2324

2425
-- !multikey_after_final_complete --
@@ -32,8 +33,8 @@
3233
2 30 300 30 300 1
3334

3435
-- !multiagg_after_insert_incremental --
35-
1 30 300 10 200 2
36-
2 30 300 30 300 1
36+
1 45 450 10 200 3
37+
2 65 550 30 300 2
3738

3839
-- !multiagg_after_insert_complete --
3940
1 45 450 10 200 3
@@ -43,13 +44,13 @@
4344
2 20
4445

4546
-- !negval_after_first_incremental --
46-
2 20
47+
3 -30
4748

4849
-- !negval_after_negative_complete --
4950
3 -30
5051

5152
-- !negval_after_second_incremental --
52-
3 -30
53+
4 0
5354

5455
-- !negval_after_zero_complete --
5556
4 0
@@ -61,7 +62,7 @@
6162
25 8.333333333333334 250.50 83.5000 7.5 2.5 -5 100.75 3
6263

6364
-- !types_after_insert_incremental --
64-
25 8.333333333333334 250.50 83.5000 7.5 2.5 -5 100.75 3
65+
25 6.25 325.50 81.3750 11.5 2.875 -5 100.75 4
6566

6667
-- !types_after_insert_complete --
6768
25 6.25 325.50 81.3750 11.5 2.875 -5 100.75 4

‎regression-test/data/mtmv_p0/ivm/test_ivm_agg_4.out‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
2 110 100 110 1 110 1
55

66
-- !expr_after_incr --
7-
1 100 20 70 2 50 2
8-
2 110 100 110 1 110 1
7+
1 400 20 300 3 133.3333333333333 3
8+
2 116 10 110 2 58 2
99

1010
-- !expr_complete_verify --
1111
1 400 20 300 3 133.3333333333333 3
1212
2 116 10 110 2 58 2
1313

1414
-- !expr_after_delete --
15-
1 400 20 300 3 133.3333333333333 3
16-
2 116 10 110 2 58 2
15+
1 330 20 300 2 165 2
16+
2 126 10 110 3 42 3
1717

1818
-- !expr_complete_after_delete --
1919
1 330 20 300 2 165 2
@@ -25,8 +25,8 @@
2525
2 1 40
2626

2727
-- !nullkey1_after_incr --
28-
\N 2 30
29-
1 1 30
28+
\N 3 80
29+
1 2 90
3030
2 1 40
3131

3232
-- !nullkey1_complete_verify --
@@ -36,8 +36,7 @@
3636

3737
-- !nullkey1_after_delete_incr --
3838
\N 3 80
39-
1 2 90
40-
2 1 40
39+
2 2 110
4140

4241
-- !nullkey1_complete_after_delete --
4342
\N 3 80
@@ -50,10 +49,10 @@ a b 1 50
5049
x \N 1 30
5150

5251
-- !nullkey2_after_incr --
53-
\N \N 1 40
54-
\N x 2 30
52+
\N \N 2 120
53+
\N x 3 90
5554
a b 1 50
56-
x \N 1 30
55+
x \N 2 100
5756

5857
-- !nullkey2_complete_verify --
5958
\N \N 2 120
@@ -67,9 +66,9 @@ x \N 2 100
6766
a 1 30
6867

6968
-- !nullempty_after_incr --
70-
\N 1 10
71-
1 20
72-
a 1 30
69+
\N 2 50
70+
2 70
71+
a 2 90
7372

7473
-- !nullempty_complete_verify --
7574
\N 2 50

‎regression-test/data/mtmv_p0/ivm/test_ivm_agg_6.out‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
10 20 2 30
44

55
-- !minmax_zero_after_delete --
6-
10 20 2 30
6+
\N \N 0 \N
77

88
-- !nullkeep_after_complete --
99
10 10 2 10
1010

1111
-- !nullkeep_after_delete --
12-
10 10 2 10
12+
\N \N 1 \N
1313

‎regression-test/suites/mtmv_p0/ivm/test_ivm_agg_2.groovy‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,9 @@ suite("test_ivm_agg_2") {
6666
FROM ivm_agg_allnull_base;
6767
"""
6868

69-
// COMPLETE: all NULLs → sum=NULL, avg=NULL, cnt_v1=0, min=NULL, max=NULL, cnt_all=2
70-
sql """REFRESH MATERIALIZED VIEW ivm_agg_allnull_mv COMPLETE"""
69+
// Initial INCREMENTAL establishes the stream offset.
70+
// all NULLs → sum=NULL, avg=NULL, cnt_v1=0, min=NULL, max=NULL, cnt_all=2
71+
sql """REFRESH MATERIALIZED VIEW ivm_agg_allnull_mv INCREMENTAL"""
7172
waitingMTMVTaskFinishedByMvName("ivm_agg_allnull_mv")
7273

7374
order_qt_allnull_after_complete """
@@ -164,9 +165,9 @@ suite("test_ivm_agg_2") {
164165
GROUP BY grp;
165166
"""
166167

167-
// Step 1: COMPLETE refresh
168+
// Step 1: Initial INCREMENTAL refresh establishes the stream offset.
168169
// grp=1: cnt=2, sum=30; grp=2: cnt=1, sum=30
169-
sql """REFRESH MATERIALIZED VIEW ivm_agg_grpdel_mv COMPLETE"""
170+
sql """REFRESH MATERIALIZED VIEW ivm_agg_grpdel_mv INCREMENTAL"""
170171
waitingMTMVTaskFinishedByMvName("ivm_agg_grpdel_mv")
171172

172173
order_qt_grpdel_after_complete """
@@ -263,8 +264,9 @@ suite("test_ivm_agg_2") {
263264
FROM ivm_agg_scalardel_base;
264265
"""
265266

266-
// Step 1: COMPLETE refresh — cnt=2, sum=30, min=10, max=20
267-
sql """REFRESH MATERIALIZED VIEW ivm_agg_scalardel_mv COMPLETE"""
267+
// Step 1: Initial INCREMENTAL refresh establishes the stream offset.
268+
// cnt=2, sum=30, min=10, max=20
269+
sql """REFRESH MATERIALIZED VIEW ivm_agg_scalardel_mv INCREMENTAL"""
268270
waitingMTMVTaskFinishedByMvName("ivm_agg_scalardel_mv")
269271

270272
order_qt_scalardel_after_complete """
@@ -294,8 +296,8 @@ suite("test_ivm_agg_2") {
294296
FROM ivm_agg_scalardel_base;
295297
"""
296298

297-
// Re-COMPLETE with the new MV (COUNT+SUM only, no MIN/MAX)
298-
sql """REFRESH MATERIALIZED VIEW ivm_agg_scalardel_mv COMPLETE"""
299+
// Re-establish the stream offset with the new MV (COUNT+SUM only, no MIN/MAX)
300+
sql """REFRESH MATERIALIZED VIEW ivm_agg_scalardel_mv INCREMENTAL"""
299301
waitingMTMVTaskFinishedByMvName("ivm_agg_scalardel_mv")
300302

301303
order_qt_scalardel_countsum_after_complete """
@@ -415,8 +417,9 @@ suite("test_ivm_agg_2") {
415417
FROM ivm_agg_maxdel_base;
416418
"""
417419

418-
// Step 1: COMPLETE refresh — min=10, max=30, cnt=3
419-
sql """REFRESH MATERIALIZED VIEW ivm_agg_maxdel_mv COMPLETE"""
420+
// Step 1: Initial INCREMENTAL refresh establishes the stream offset.
421+
// min=10, max=30, cnt=3
422+
sql """REFRESH MATERIALIZED VIEW ivm_agg_maxdel_mv INCREMENTAL"""
420423
waitingMTMVTaskFinishedByMvName("ivm_agg_maxdel_mv")
421424

422425
order_qt_maxdel_after_complete """

‎regression-test/suites/mtmv_p0/ivm/test_ivm_agg_3.groovy‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ suite("test_ivm_agg_3") {
6767
GROUP BY k1, k2;
6868
"""
6969

70-
// Step 1: COMPLETE refresh
70+
// Step 1: Initial INCREMENTAL refresh establishes the stream offset.
7171
// (1,'a'): cnt=2, sum=30; (1,'b'): cnt=1, sum=30; (2,'a'): cnt=1, sum=40
72-
sql """REFRESH MATERIALIZED VIEW ivm_agg_multikey_mv COMPLETE"""
72+
sql """REFRESH MATERIALIZED VIEW ivm_agg_multikey_mv INCREMENTAL"""
7373
waitingMTMVTaskFinishedByMvName("ivm_agg_multikey_mv")
7474

7575
order_qt_multikey_after_complete """
@@ -169,9 +169,10 @@ suite("test_ivm_agg_3") {
169169
GROUP BY grp;
170170
"""
171171

172-
// COMPLETE: grp=1: sum_v1=30, sum_v2=300, min_v1=10, max_v2=200, cnt=2
173-
// grp=2: sum_v1=30, sum_v2=300, min_v1=30, max_v2=300, cnt=1
174-
sql """REFRESH MATERIALIZED VIEW ivm_agg_multiagg_mv COMPLETE"""
172+
// Initial INCREMENTAL establishes the stream offset.
173+
// grp=1: sum_v1=30, sum_v2=300, min_v1=10, max_v2=200, cnt=2
174+
// grp=2: sum_v1=30, sum_v2=300, min_v1=30, max_v2=300, cnt=1
175+
sql """REFRESH MATERIALIZED VIEW ivm_agg_multiagg_mv INCREMENTAL"""
175176
waitingMTMVTaskFinishedByMvName("ivm_agg_multiagg_mv")
176177

177178
order_qt_multiagg_after_complete """
@@ -243,8 +244,9 @@ suite("test_ivm_agg_3") {
243244
FROM ivm_agg_negval_base;
244245
"""
245246

246-
// COMPLETE: cnt=2, sum=20
247-
sql """REFRESH MATERIALIZED VIEW ivm_agg_negval_mv COMPLETE"""
247+
// Initial INCREMENTAL establishes the stream offset.
248+
// cnt=2, sum=20
249+
sql """REFRESH MATERIALIZED VIEW ivm_agg_negval_mv INCREMENTAL"""
248250
waitingMTMVTaskFinishedByMvName("ivm_agg_negval_mv")
249251

250252
order_qt_negval_after_complete """
@@ -324,7 +326,7 @@ suite("test_ivm_agg_3") {
324326
FROM ivm_agg_emptydelta_base;
325327
"""
326328

327-
sql """REFRESH MATERIALIZED VIEW ivm_agg_emptydelta_mv COMPLETE"""
329+
sql """REFRESH MATERIALIZED VIEW ivm_agg_emptydelta_mv INCREMENTAL"""
328330
waitingMTMVTaskFinishedByMvName("ivm_agg_emptydelta_mv")
329331

330332
// INCREMENTAL without any new data — should get SUCCESS (NOT_REFRESH)
@@ -382,9 +384,10 @@ suite("test_ivm_agg_3") {
382384
FROM ivm_agg_types_base;
383385
"""
384386

385-
// COMPLETE: sum_tiny=25, avg_tiny≈8.33, sum_dec=250.50, avg_dec≈83.50,
386-
// sum_dbl=7.5, avg_dbl=2.5, min_tiny=-5, max_dec=100.75, cnt=3
387-
sql """REFRESH MATERIALIZED VIEW ivm_agg_types_mv COMPLETE"""
387+
// Initial INCREMENTAL establishes the stream offset.
388+
// sum_tiny=25, avg_tiny≈8.33, sum_dec=250.50, avg_dec≈83.50,
389+
// sum_dbl=7.5, avg_dbl=2.5, min_tiny=-5, max_dec=100.75, cnt=3
390+
sql """REFRESH MATERIALIZED VIEW ivm_agg_types_mv INCREMENTAL"""
388391
waitingMTMVTaskFinishedByMvName("ivm_agg_types_mv")
389392

390393
order_qt_types_after_complete """

‎regression-test/suites/mtmv_p0/ivm/test_ivm_agg_4.groovy‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ suite("test_ivm_agg_4") {
7070
GROUP BY grp;
7171
"""
7272

73-
// COMPLETE refresh
73+
// Initial INCREMENTAL refresh establishes the stream offset.
7474
// grp=1: sum_add=SUM(30+70)=100, min_double=MIN(20,60)=20, max_add=MAX(30,70)=70,
75-
// cnt_add=2, avg_add=50, cnt=2
75+
// cnt_add=2, avg_add=50, cnt=2
7676
// grp=2: sum_add=110, min_double=100, max_add=110, cnt_add=1, avg_add=110, cnt=1
77-
sql """REFRESH MATERIALIZED VIEW test_ivm_agg_4_expr_mv COMPLETE"""
77+
sql """REFRESH MATERIALIZED VIEW test_ivm_agg_4_expr_mv INCREMENTAL"""
7878
waitingMTMVTaskFinishedByMvName("test_ivm_agg_4_expr_mv")
7979

8080
order_qt_expr_complete """
@@ -184,9 +184,9 @@ suite("test_ivm_agg_4") {
184184
GROUP BY k1;
185185
"""
186186

187-
// COMPLETE refresh
187+
// Initial INCREMENTAL refresh establishes the stream offset.
188188
// k1=NULL: cnt=2, sum=30; k1=1: cnt=1, sum=30; k1=2: cnt=1, sum=40
189-
sql """REFRESH MATERIALIZED VIEW test_ivm_agg_4_nullkey1_mv COMPLETE"""
189+
sql """REFRESH MATERIALIZED VIEW test_ivm_agg_4_nullkey1_mv INCREMENTAL"""
190190
waitingMTMVTaskFinishedByMvName("test_ivm_agg_4_nullkey1_mv")
191191

192192
order_qt_nullkey1_complete """
@@ -291,12 +291,12 @@ suite("test_ivm_agg_4") {
291291
GROUP BY k1, k2;
292292
"""
293293

294-
// COMPLETE refresh
294+
// Initial INCREMENTAL refresh establishes the stream offset.
295295
// (NULL,'x'): cnt=2, sum=30
296296
// ('x',NULL): cnt=1, sum=30
297297
// (NULL,NULL): cnt=1, sum=40
298298
// ('a','b'): cnt=1, sum=50
299-
sql """REFRESH MATERIALIZED VIEW test_ivm_agg_4_nullkey2_mv COMPLETE"""
299+
sql """REFRESH MATERIALIZED VIEW test_ivm_agg_4_nullkey2_mv INCREMENTAL"""
300300
waitingMTMVTaskFinishedByMvName("test_ivm_agg_4_nullkey2_mv")
301301

302302
order_qt_nullkey2_complete """
@@ -373,8 +373,9 @@ suite("test_ivm_agg_4") {
373373
GROUP BY k1;
374374
"""
375375

376-
// COMPLETE: NULL→cnt=1,sum=10; ''→cnt=1,sum=20; 'a'→cnt=1,sum=30
377-
sql """REFRESH MATERIALIZED VIEW test_ivm_agg_4_nullempty_mv COMPLETE"""
376+
// Initial INCREMENTAL establishes the stream offset.
377+
// NULL→cnt=1,sum=10; ''→cnt=1,sum=20; 'a'→cnt=1,sum=30
378+
sql """REFRESH MATERIALIZED VIEW test_ivm_agg_4_nullempty_mv INCREMENTAL"""
378379
waitingMTMVTaskFinishedByMvName("test_ivm_agg_4_nullempty_mv")
379380

380381
order_qt_nullempty_complete """

‎regression-test/suites/mtmv_p0/ivm/test_ivm_agg_6.groovy‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@ suite("test_ivm_agg_6") {
6969
FROM ivm_agg_mm_zero_base;
7070
"""
7171

72-
// Step 1: COMPLETE — min=10, max=20, cnt=2, sum=30
73-
sql """REFRESH MATERIALIZED VIEW ivm_agg_mm_zero_mv COMPLETE"""
72+
// Step 1: Initial INCREMENTAL refresh establishes the stream offset.
73+
// min=10, max=20, cnt=2, sum=30
74+
sql """REFRESH MATERIALIZED VIEW ivm_agg_mm_zero_mv INCREMENTAL"""
7475
waitingMTMVTaskFinishedByMvName("ivm_agg_mm_zero_mv")
7576

7677
order_qt_minmax_zero_after_complete """
@@ -131,9 +132,10 @@ suite("test_ivm_agg_6") {
131132
FROM ivm_agg_mm_nullkeep_base;
132133
"""
133134

134-
// Step 1: COMPLETE — min=10, max=10, cnt=2, sum=10
135+
// Step 1: Initial INCREMENTAL refresh establishes the stream offset.
136+
// min=10, max=10, cnt=2, sum=10
135137
// Only k1=1 contributes to MIN/MAX/SUM (k1=2 has NULL v1)
136-
sql """REFRESH MATERIALIZED VIEW ivm_agg_mm_nullkeep_mv COMPLETE"""
138+
sql """REFRESH MATERIALIZED VIEW ivm_agg_mm_nullkeep_mv INCREMENTAL"""
137139
waitingMTMVTaskFinishedByMvName("ivm_agg_mm_nullkeep_mv")
138140

139141
order_qt_nullkeep_after_complete """

0 commit comments

Comments
 (0)