Skip to content

Commit 20cc10b

Browse files
melihmutlupnthao
melihmutlu
and
pnthao
authored
Adjust target lists in cagg tests to use column names (#10181)
Use explicit column names for reading from invalidation_log tables to prevent them from failing due to future cagg related changes. Co-authored-by: Thao Pham <thao@tigerdata.com>
1 parent 1e5f14a commit 20cc10b

13 files changed

Lines changed: 64 additions & 64 deletions

‎tsl/test/expected/cagg.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1465,7 +1465,7 @@ ORDER BY 1;
14651465
_hyper_41_79_chunk | Fri Dec 24 16:00:00 1999 PST | Mon May 22 17:00:00 2000 PDT | t
14661466
_hyper_41_83_chunk | Sun Mar 18 16:00:00 2001 PST | Wed Aug 15 17:00:00 2001 PDT | f
14671467

1468-
SELECT * FROM _timescaledb_catalog.continuous_aggs_materialization_invalidation_log
1468+
SELECT materialization_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_materialization_invalidation_log
14691469
WHERE materialization_id = :'MAT_HTID' ORDER BY 1, 2,3;
14701470
materialization_id | lowest_modified_value | greatest_modified_value
14711471
--------------------+-----------------------+-------------------------

‎tsl/test/expected/cagg_multi.out‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,15 +249,15 @@ insert into continuous_agg_test values( 14, -2, 100);
249249
--add entry [14 15] to mat inv log for cagg_2. (invalidations are expanded to bucket
250250
--boundaries and we have bucket size of 2.
251251
SET ROLE :ROLE_SUPERUSER;
252-
select * from _timescaledb_catalog.continuous_aggs_materialization_invalidation_log order by 1;
252+
select materialization_id, lowest_modified_value, greatest_modified_value from _timescaledb_catalog.continuous_aggs_materialization_invalidation_log order by 1;
253253
materialization_id | lowest_modified_value | greatest_modified_value
254254
--------------------+-----------------------+-------------------------
255255
5 | -9223372036854775808 | -2147483649
256256
5 | 18 | 9223372036854775807
257257
6 | -9223372036854775808 | -2147483649
258258
6 | 14 | 9223372036854775807
259259

260-
select * from _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log order by 1;
260+
select hypertable_id, lowest_modified_value, greatest_modified_value from _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log order by 1;
261261
hypertable_id | lowest_modified_value | greatest_modified_value
262262
---------------+-----------------------+-------------------------
263263
4 | 14 | 14
@@ -286,7 +286,7 @@ select * from _timescaledb_catalog.continuous_aggs_invalidation_threshold order
286286
---------------+-----------
287287
4 | 18
288288

289-
select * from _timescaledb_catalog.continuous_aggs_materialization_invalidation_log order by 1;
289+
select materialization_id, lowest_modified_value, greatest_modified_value from _timescaledb_catalog.continuous_aggs_materialization_invalidation_log order by 1;
290290
materialization_id | lowest_modified_value | greatest_modified_value
291291
--------------------+-----------------------+-------------------------
292292
5 | -9223372036854775808 | -2147483649
@@ -321,7 +321,7 @@ select * from cagg_2 order by 1;
321321
--TEST5 2 inserts with the same value can be copied over to materialization invalidation log
322322
insert into continuous_agg_test values( 18, -2, 100);
323323
insert into continuous_agg_test values( 18, -2, 100);
324-
select * from _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log order by 1;
324+
select hypertable_id, lowest_modified_value, greatest_modified_value from _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log order by 1;
325325
hypertable_id | lowest_modified_value | greatest_modified_value
326326
---------------+-----------------------+-------------------------
327327
4 | 18 | 18
@@ -334,7 +334,7 @@ select * from cagg_1 where timed = 18 ;
334334
18 | 3
335335

336336
--copied over for cagg_2 to process later?
337-
select * from _timescaledb_catalog.continuous_aggs_materialization_invalidation_log order by 1;
337+
select materialization_id, lowest_modified_value, greatest_modified_value from _timescaledb_catalog.continuous_aggs_materialization_invalidation_log order by 1;
338338
materialization_id | lowest_modified_value | greatest_modified_value
339339
--------------------+-----------------------+-------------------------
340340
5 | -9223372036854775808 | -2147483649

‎tsl/test/expected/cagg_query.out‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1861,7 +1861,7 @@ INSERT INTO temperature
18611861
--(which add -infinity, infinity) to the invalidation log, and the fact the the invalidation
18621862
-- cutting during refresh won't merge entries which are not overlapping with its refresh window.
18631863
-- The duplicates will be merged when there is a refresh that overlaps with them.
1864-
SELECT * FROM _timescaledb_catalog.continuous_aggs_materialization_invalidation_log ORDER BY 1, 2, 3;
1864+
SELECT materialization_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_materialization_invalidation_log ORDER BY 1, 2, 3;
18651865
materialization_id | lowest_modified_value | greatest_modified_value
18661866
--------------------+-----------------------+-------------------------
18671867
2 | -9223372036854775808 | -210866803200000001
@@ -1887,7 +1887,7 @@ CREATE MATERIALIZED VIEW cagg_1_year
18871887
FROM temperature
18881888
GROUP BY 1 ORDER BY 1;
18891889
psql:include/cagg_query_common.sql:779: NOTICE: refreshing continuous aggregate "cagg_1_year"
1890-
SELECT * FROM _timescaledb_catalog.continuous_aggs_materialization_invalidation_log ORDER BY 1, 2, 3;
1890+
SELECT materialization_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_materialization_invalidation_log ORDER BY 1, 2, 3;
18911891
materialization_id | lowest_modified_value | greatest_modified_value
18921892
--------------------+-----------------------+-------------------------
18931893
2 | -9223372036854775808 | -210866803200000001
@@ -1913,7 +1913,7 @@ SELECT * FROM _timescaledb_catalog.continuous_aggs_materialization_invalidation_
19131913

19141914
--try a refresh that overlaps with the invalidation log entries to check that they are merged properly
19151915
--in this case, the duplicates at the +infinity end should be merged.
1916-
SELECT * FROM _timescaledb_catalog.continuous_aggs_materialization_invalidation_log
1916+
SELECT materialization_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_materialization_invalidation_log
19171917
WHERE materialization_id IN (SELECT mat_hypertable_id FROM _timescaledb_catalog.continuous_agg
19181918
WHERE user_view_name = 'cagg_4_hours')
19191919
ORDER BY 1, 2, 3;
@@ -1926,7 +1926,7 @@ ORDER BY 1, 2, 3;
19261926
33 | 1577995200000000 | 9223372036854775807
19271927

19281928
CALL refresh_continuous_aggregate('cagg_4_hours', '2000-01-01 00:00:00'::timestamptz, '2020-12-31 23:59:59'::timestamptz, options => '{"buckets_per_batch": 0}'::jsonb);
1929-
SELECT * FROM _timescaledb_catalog.continuous_aggs_materialization_invalidation_log
1929+
SELECT materialization_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_materialization_invalidation_log
19301930
WHERE materialization_id IN (SELECT mat_hypertable_id FROM _timescaledb_catalog.continuous_agg
19311931
WHERE user_view_name = 'cagg_4_hours')
19321932
ORDER BY 1, 2, 3;

‎tsl/test/expected/cagg_query_using_merge.out‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1856,7 +1856,7 @@ INSERT INTO temperature
18561856
--(which add -infinity, infinity) to the invalidation log, and the fact the the invalidation
18571857
-- cutting during refresh won't merge entries which are not overlapping with its refresh window.
18581858
-- The duplicates will be merged when there is a refresh that overlaps with them.
1859-
SELECT * FROM _timescaledb_catalog.continuous_aggs_materialization_invalidation_log ORDER BY 1, 2, 3;
1859+
SELECT materialization_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_materialization_invalidation_log ORDER BY 1, 2, 3;
18601860
materialization_id | lowest_modified_value | greatest_modified_value
18611861
--------------------+-----------------------+-------------------------
18621862
2 | -9223372036854775808 | -210866803200000001
@@ -1882,7 +1882,7 @@ CREATE MATERIALIZED VIEW cagg_1_year
18821882
FROM temperature
18831883
GROUP BY 1 ORDER BY 1;
18841884
psql:include/cagg_query_common.sql:779: NOTICE: refreshing continuous aggregate "cagg_1_year"
1885-
SELECT * FROM _timescaledb_catalog.continuous_aggs_materialization_invalidation_log ORDER BY 1, 2, 3;
1885+
SELECT materialization_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_materialization_invalidation_log ORDER BY 1, 2, 3;
18861886
materialization_id | lowest_modified_value | greatest_modified_value
18871887
--------------------+-----------------------+-------------------------
18881888
2 | -9223372036854775808 | -210866803200000001
@@ -1908,7 +1908,7 @@ SELECT * FROM _timescaledb_catalog.continuous_aggs_materialization_invalidation_
19081908

19091909
--try a refresh that overlaps with the invalidation log entries to check that they are merged properly
19101910
--in this case, the duplicates at the +infinity end should be merged.
1911-
SELECT * FROM _timescaledb_catalog.continuous_aggs_materialization_invalidation_log
1911+
SELECT materialization_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_materialization_invalidation_log
19121912
WHERE materialization_id IN (SELECT mat_hypertable_id FROM _timescaledb_catalog.continuous_agg
19131913
WHERE user_view_name = 'cagg_4_hours')
19141914
ORDER BY 1, 2, 3;
@@ -1921,7 +1921,7 @@ ORDER BY 1, 2, 3;
19211921
33 | 1577995200000000 | 9223372036854775807
19221922

19231923
CALL refresh_continuous_aggregate('cagg_4_hours', '2000-01-01 00:00:00'::timestamptz, '2020-12-31 23:59:59'::timestamptz, options => '{"buckets_per_batch": 0}'::jsonb);
1924-
SELECT * FROM _timescaledb_catalog.continuous_aggs_materialization_invalidation_log
1924+
SELECT materialization_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_materialization_invalidation_log
19251925
WHERE materialization_id IN (SELECT mat_hypertable_id FROM _timescaledb_catalog.continuous_agg
19261926
WHERE user_view_name = 'cagg_4_hours')
19271927
ORDER BY 1, 2, 3;

‎tsl/test/expected/cagg_watermark.out‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ SELECT * FROM _timescaledb_catalog.continuous_aggs_invalidation_threshold ORDER
1919
hypertable_id | watermark
2020
---------------+-----------
2121

22-
SELECT * FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
22+
SELECT hypertable_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
2323
hypertable_id | lowest_modified_value | greatest_modified_value
2424
---------------+-----------------------+-------------------------
2525

@@ -29,7 +29,7 @@ SELECT * FROM _timescaledb_catalog.continuous_aggs_invalidation_threshold ORDER
2929
hypertable_id | watermark
3030
---------------+-----------
3131

32-
SELECT * FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
32+
SELECT hypertable_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
3333
hypertable_id | lowest_modified_value | greatest_modified_value
3434
---------------+-----------------------+-------------------------
3535

@@ -45,7 +45,7 @@ SELECT * FROM _timescaledb_catalog.continuous_aggs_invalidation_threshold ORDER
4545
---------------+-------------
4646
1 | -2147483648
4747

48-
SELECT * FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
48+
SELECT hypertable_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
4949
hypertable_id | lowest_modified_value | greatest_modified_value
5050
---------------+-----------------------+-------------------------
5151

@@ -59,7 +59,7 @@ SELECT * FROM _timescaledb_catalog.continuous_aggs_invalidation_threshold ORDER
5959
---------------+-----------
6060
1 | 15
6161

62-
SELECT * FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
62+
SELECT hypertable_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
6363
hypertable_id | lowest_modified_value | greatest_modified_value
6464
---------------+-----------------------+-------------------------
6565
1 | 10 | 11
@@ -71,7 +71,7 @@ SELECT * FROM _timescaledb_catalog.continuous_aggs_invalidation_threshold ORDER
7171
---------------+-----------
7272
1 | 15
7373

74-
SELECT * FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
74+
SELECT hypertable_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
7575
hypertable_id | lowest_modified_value | greatest_modified_value
7676
---------------+-----------------------+-------------------------
7777
1 | 10 | 11
@@ -83,7 +83,7 @@ SELECT * FROM _timescaledb_catalog.continuous_aggs_invalidation_threshold ORDER
8383
---------------+-----------
8484
1 | 15
8585

86-
SELECT * FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
86+
SELECT hypertable_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
8787
hypertable_id | lowest_modified_value | greatest_modified_value
8888
---------------+-----------------------+-------------------------
8989
1 | 10 | 11
@@ -96,7 +96,7 @@ SELECT * FROM _timescaledb_catalog.continuous_aggs_invalidation_threshold ORDER
9696
---------------+-----------
9797
1 | 15
9898

99-
SELECT * FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
99+
SELECT hypertable_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
100100
hypertable_id | lowest_modified_value | greatest_modified_value
101101
---------------+-----------------------+-------------------------
102102
1 | 1 | 1
@@ -112,7 +112,7 @@ SELECT * FROM _timescaledb_catalog.continuous_aggs_invalidation_threshold ORDER
112112
---------------+-----------
113113
1 | 15
114114

115-
SELECT * FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
115+
SELECT hypertable_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
116116
hypertable_id | lowest_modified_value | greatest_modified_value
117117
---------------+-----------------------+-------------------------
118118
1 | -4 | -1
@@ -127,7 +127,7 @@ SELECT * FROM _timescaledb_catalog.continuous_aggs_invalidation_threshold ORDER
127127
---------------+-----------
128128
1 | 15
129129

130-
SELECT * FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
130+
SELECT hypertable_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
131131
hypertable_id | lowest_modified_value | greatest_modified_value
132132
---------------+-----------------------+-------------------------
133133
1 | -4 | -1
@@ -144,7 +144,7 @@ SELECT * FROM _timescaledb_catalog.continuous_aggs_invalidation_threshold ORDER
144144
---------------+-----------
145145
1 | 15
146146

147-
SELECT * FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
147+
SELECT hypertable_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
148148
hypertable_id | lowest_modified_value | greatest_modified_value
149149
---------------+-----------------------+-------------------------
150150
1 | -7 | -3
@@ -160,7 +160,7 @@ SELECT * FROM _timescaledb_catalog.continuous_aggs_invalidation_threshold ORDER
160160
---------------+-----------
161161
1 | 15
162162

163-
SELECT * FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
163+
SELECT hypertable_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
164164
hypertable_id | lowest_modified_value | greatest_modified_value
165165
---------------+-----------------------+-------------------------
166166
1 | -7 | -3
@@ -204,7 +204,7 @@ SELECT * FROM _timescaledb_catalog.continuous_aggs_invalidation_threshold ORDER
204204
---------------+-------------
205205
3 | -2147483648
206206

207-
SELECT * FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
207+
SELECT hypertable_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
208208
hypertable_id | lowest_modified_value | greatest_modified_value
209209
---------------+-----------------------+-------------------------
210210

@@ -219,7 +219,7 @@ SELECT * FROM _timescaledb_catalog.continuous_aggs_invalidation_threshold ORDER
219219
---------------+-----------
220220
3 | 15
221221

222-
SELECT * FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
222+
SELECT hypertable_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
223223
hypertable_id | lowest_modified_value | greatest_modified_value
224224
---------------+-----------------------+-------------------------
225225
3 | 5 | 9
@@ -231,7 +231,7 @@ SELECT * FROM _timescaledb_catalog.continuous_aggs_invalidation_threshold ORDER
231231
---------------+-----------
232232
3 | 15
233233

234-
SELECT * FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
234+
SELECT hypertable_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
235235
hypertable_id | lowest_modified_value | greatest_modified_value
236236
---------------+-----------------------+-------------------------
237237
3 | 5 | 9
@@ -253,7 +253,7 @@ SELECT * FROM _timescaledb_catalog.continuous_aggs_invalidation_threshold ORDER
253253
---------------+-----------
254254
3 | 15
255255

256-
SELECT * FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
256+
SELECT hypertable_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
257257
hypertable_id | lowest_modified_value | greatest_modified_value
258258
---------------+-----------------------+-------------------------
259259
3 | 5 | 6
@@ -293,7 +293,7 @@ SELECT * FROM _timescaledb_catalog.continuous_aggs_invalidation_threshold ORDER
293293
---------------+-------------
294294
5 | -2147483648
295295

296-
SELECT * FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
296+
SELECT hypertable_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
297297
hypertable_id | lowest_modified_value | greatest_modified_value
298298
---------------+-----------------------+-------------------------
299299

@@ -308,7 +308,7 @@ SELECT * FROM _timescaledb_catalog.continuous_aggs_invalidation_threshold ORDER
308308
---------------+-----------
309309
5 | 2
310310

311-
SELECT * FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
311+
SELECT hypertable_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
312312
hypertable_id | lowest_modified_value | greatest_modified_value
313313
---------------+-----------------------+-------------------------
314314
5 | 1 | 1
@@ -322,7 +322,7 @@ SELECT * FROM _timescaledb_catalog.continuous_aggs_invalidation_threshold ORDER
322322
---------------+-----------
323323
5 | 2
324324

325-
SELECT * FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
325+
SELECT hypertable_id, lowest_modified_value, greatest_modified_value FROM _timescaledb_catalog.continuous_aggs_hypertable_invalidation_log ORDER BY 1,2,3;
326326
hypertable_id | lowest_modified_value | greatest_modified_value
327327
---------------+-----------------------+-------------------------
328328
5 | 1 | 1

0 commit comments

Comments
 (0)