Skip to content

Commit e91cc49

Browse files
def-def-
committed
tests: Fix nightly for new EXPLAIN TIMESTAMP output
Follow-up to MaterializeInc#27815 Failure seen in https://buildkite.com/materialize/nightly/builds/11639
1 parent 8375f41 commit e91cc49

File tree

5 files changed

+17
-11
lines changed

5 files changed

+17
-11
lines changed

‎misc/python/materialize/checks/all_checks/materialized_views.py‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,13 +318,19 @@ def validate(self) -> Testdrive:
318318
319319
$ set-regex match=(s\\d+|\\d{13}|[ ]{12}0|u\\d{1,3}|\\(\\d+-\\d\\d-\\d\\d\\s\\d\\d:\\d\\d:\\d\\d\\.\\d\\d\\d\\)|\\(\\d+\\)) replacement=<>
320320
321-
> EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_1
321+
>[version<13900] EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_1
322+
" query timestamp: <> <>\\n oracle read timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: false\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.refresh_view_late_1 (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n"
323+
>[version>=13900] EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_1
322324
" query timestamp: <> <>\\n oracle read timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: false\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.refresh_view_late_1 (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n\\nbinding constraints:\\nlower:\\n (StorageInput([User<>])): [<> <>]\\n"
323325
324-
> EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_2
326+
>[version<13900] EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_2
327+
" query timestamp: <> <>\\n oracle read timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: false\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.refresh_view_late_2 (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n"
328+
>[version>=13900] EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_2
325329
" query timestamp: <> <>\\n oracle read timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: false\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.refresh_view_late_2 (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n\\nbinding constraints:\\nlower:\\n (StorageInput([User<>])): [<> <>]\\n"
326330
327-
> EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_3
331+
>[version<13900] EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_3
332+
" query timestamp: <> <>\\n oracle read timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: false\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.refresh_view_late_3 (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n"
333+
>[version>=13900] EXPLAIN TIMESTAMP FOR SELECT * FROM refresh_view_late_3
328334
" query timestamp: <> <>\\n oracle read timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: false\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.refresh_view_late_3 (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n\\nbinding constraints:\\nlower:\\n (StorageInput([User<>])): [<> <>]\\n"
329335
"""
330336
)

‎test/0dt/mzcompose.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ def workflow_read_only(c: Composition) -> None:
279279
$ set-regex match=(s\\d+|\\d{{13}}|[ ]{{12}}0|u\\d{{1,3}}|\\(\\d+-\\d\\d-\\d\\d\\s\\d\\d:\\d\\d:\\d\\d\\.\\d\\d\\d\\)) replacement=<>
280280
281281
> EXPLAIN TIMESTAMP FOR SELECT * FROM mv;
282-
" query timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: true\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.mv (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n"
282+
" query timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: true\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.mv (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n\\nbinding constraints:\\nlower:\\n (StorageInput([User(6)])): [<> <>]\\n"
283283
284284
> SELECT * FROM kafka_source_tbl
285285
key1A key1B value1A value1B
@@ -580,7 +580,7 @@ def workflow_basic(c: Composition) -> None:
580580
$ set-regex match=(s\\d+|\\d{{13}}|[ ]{{12}}0|u\\d{{1,3}}|\\(\\d+-\\d\\d-\\d\\d\\s\\d\\d:\\d\\d:\\d\\d\\.\\d\\d\\d\\)) replacement=<>
581581
582582
> EXPLAIN TIMESTAMP FOR SELECT * FROM mv;
583-
" query timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: true\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.mv (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n"
583+
" query timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: true\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.mv (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n\\nbinding constraints:\\nlower:\\n (StorageInput([User(6)])): [<> <>]\\n"
584584
585585
> SELECT * FROM kafka_source_tbl
586586
key1A key1B value1A value1B
@@ -651,7 +651,7 @@ def workflow_basic(c: Composition) -> None:
651651
$ set-regex match=(s\\d+|\\d{{13}}|[ ]{{12}}0|u\\d{{1,3}}|\\(\\d+-\\d\\d-\\d\\d\\s\\d\\d:\\d\\d:\\d\\d\\.\\d\\d\\d\\)) replacement=<>
652652
653653
> EXPLAIN TIMESTAMP FOR SELECT * FROM mv;
654-
" query timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: true\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.mv (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n"
654+
" query timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: true\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.mv (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n\\nbinding constraints:\\nlower:\\n (StorageInput([User(6)])): [<> <>]\\n"
655655
656656
> SELECT * FROM kafka_source_tbl
657657
key1A key1B value1A value1B
@@ -1823,7 +1823,7 @@ def workflow_ddl(c: Composition) -> None:
18231823
$ set-regex match=(s\\d+|\\d{{13}}|[ ]{{12}}0|u\\d{{1,3}}|\\(\\d+-\\d\\d-\\d\\d\\s\\d\\d:\\d\\d:\\d\\d\\.\\d\\d\\d\\)) replacement=<>
18241824
18251825
> EXPLAIN TIMESTAMP FOR SELECT * FROM mv;
1826-
" query timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: true\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.mv (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n"
1826+
" query timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: true\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.mv (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n\\nbinding constraints:\\nlower:\\n (StorageInput([User(6)])): [<> <>]\\n"
18271827
18281828
> SELECT * FROM kafka_source_tbl
18291829
key1A key1B value1A value1B
@@ -1898,7 +1898,7 @@ def workflow_ddl(c: Composition) -> None:
18981898
$ set-regex match=(s\\d+|\\d{{13}}|[ ]{{12}}0|u\\d{{1,3}}|\\(\\d+-\\d\\d-\\d\\d\\s\\d\\d:\\d\\d:\\d\\d\\.\\d\\d\\d\\)) replacement=<>
18991899
19001900
> EXPLAIN TIMESTAMP FOR SELECT * FROM mv;
1901-
" query timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: true\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.mv (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n"
1901+
" query timestamp: <> <>\\nlargest not in advance of upper: <> <>\\n upper:[<> <>]\\n since:[<> <>]\\n can respond immediately: true\\n timeline: Some(EpochMilliseconds)\\n session wall time: <> <>\\n\\nsource materialize.public.mv (<>, storage):\\n read frontier:[<> <>]\\n write frontier:[<> <>]\\n\\nbinding constraints:\\nlower:\\n (StorageInput([User(6)])): [<> <>]\\n"
19021902
19031903
> SELECT * FROM kafka_source_tbl
19041904
key1A key1B value1A value1B

‎test/pg-cdc-old-syntax/pg-cdc.td‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ true
383383
# Ensure we report the write frontier of the progress subsource
384384
$ set-regex match=(\s{12}0|\d{13,20}|u\d{1,5}|\(\d+-\d\d-\d\d\s\d\d:\d\d:\d\d\.\d\d\d\)|true|false) replacement=<>
385385
> EXPLAIN TIMESTAMP FOR SELECT * FROM mz_source_progress
386-
" query timestamp: <> <>\n oracle read timestamp: <> <>\nlargest not in advance of upper: <> <>\n upper:[<> <>]\n since:[<> <>]\n can respond immediately: <>\n timeline: Some(EpochMilliseconds)\n session wall time: <> <>\n\nsource materialize.public.mz_source_progress (<>, storage):\n read frontier:[<> <>]\n write frontier:[<> <>]\n"
386+
" query timestamp: <> <>\n oracle read timestamp: <> <>\nlargest not in advance of upper: <> <>\n upper:[<> <>]\n since:[<> <>]\n can respond immediately: <>\n timeline: Some(EpochMilliseconds)\n session wall time: <> <>\n\nsource materialize.public.mz_source_progress (<>, storage):\n read frontier:[<> <>]\n write frontier:[<> <>]\n\nbinding constraints:\nlower:\n (IsolationLevel(StrictSerializable)): [<> <>]\n"
387387

388388
$ set-regex match=[0-9]+|_[a-f0-9]+ replacement=<SUPPRESSED>
389389

‎test/testdrive-old-kafka-src-syntax/kafka-progress.td‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ running
3737
# Ensure we report the write frontier of the progress subsource
3838
$ set-regex match=(\s{12}0|\d{13,20}|u\d{1,5}|\(\d+-\d\d-\d\d\s\d\d:\d\d:\d\d\.\d\d\d\)|true|false) replacement=<>
3939
> EXPLAIN TIMESTAMP FOR SELECT * FROM data_progress
40-
" query timestamp: <> <>\n oracle read timestamp: <> <>\nlargest not in advance of upper: <> <>\n upper:[<> <>]\n since:[<> <>]\n can respond immediately: <>\n timeline: Some(EpochMilliseconds)\n session wall time: <> <>\n\nsource materialize.public.data_progress (<>, storage):\n read frontier:[<> <>]\n write frontier:[<> <>]\n"
40+
" query timestamp: <> <>\n oracle read timestamp: <> <>\nlargest not in advance of upper: <> <>\n upper:[<> <>]\n since:[<> <>]\n can respond immediately: <>\n timeline: Some(EpochMilliseconds)\n session wall time: <> <>\n\nsource materialize.public.data_progress (<>, storage):\n read frontier:[<> <>]\n write frontier:[<> <>]\n\nbinding constraints:\nlower:\n (IsolationLevel(StrictSerializable)): [<> <>]\n"
4141

4242
> CREATE SOURCE d
4343
IN CLUSTER ${arg.single-replica-cluster}

‎test/testdrive-old-kafka-src-syntax/load-generator.td‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ $ set-regex match=\d+ replacement=<NUMBER>
186186
# Ensure we report the write frontier of the progress subsource
187187
$ set-regex match=(\s{12}0|\d{13,20}|u\d{1,5}|\(\d+-\d\d-\d\d\s\d\d:\d\d:\d\d\.\d\d\d\)|true|false) replacement=<>
188188
> EXPLAIN TIMESTAMP FOR SELECT * FROM another.auction_house_progress
189-
" query timestamp: <> <>\n oracle read timestamp: <> <>\nlargest not in advance of upper: <> <>\n upper:[<> <>]\n since:[<> <>]\n can respond immediately: <>\n timeline: Some(EpochMilliseconds)\n session wall time: <> <>\n\nsource materialize.another.auction_house_progress (<>, storage):\n read frontier:[<> <>]\n write frontier:[<> <>]\n"
189+
" query timestamp: <> <>\n oracle read timestamp: <> <>\nlargest not in advance of upper: <> <>\n upper:[<> <>]\n since:[<> <>]\n can respond immediately: <>\n timeline: Some(EpochMilliseconds)\n session wall time: <> <>\n\nsource materialize.another.auction_house_progress (<>, storage):\n read frontier:[<> <>]\n write frontier:[<> <>]\n\nbinding constraints:\nlower:\n (IsolationLevel(StrictSerializable)): [<> <>]\n"
190190

191191
> DROP SOURCE auction_house CASCADE
192192
> DROP SOURCE another.auction_house CASCADE

0 commit comments

Comments
 (0)