Skip to content

Commit 6559986

Browse files
authored
use existent files in SPQ in ztests (#6339)
Some ztests contain SPQ that refers to nonexistent files. This is fine at present but a planned change to the semantic analyzer will break these tests. Change them to use existent files in preparation.
1 parent c862d1d commit 6559986

File tree

8 files changed

+68
-68
lines changed

8 files changed

+68
-68
lines changed
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
script: |
2-
! super compile -dag 'from x with ordinality'
2+
! super compile -dag 'from /dev/null with ordinality'
33
44
outputs:
55
- name: stderr
66
data: |
7-
WITH ORDINALITY clause is not yet supported at line 1, column 7:
8-
from x with ordinality
9-
~~~~~~~~~~~~~~~~
7+
WITH ORDINALITY clause is not yet supported at line 1, column 15:
8+
from /dev/null with ordinality
9+
~~~~~~~~~~~~~~~~

compiler/sfmt/ztests/parallel.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
script: |
2-
super compile -dag -C 'from bar | ?foo | fork ( count() by x:=this["@foo"] ) ( sum(x) ) ( put a:=b*c ) | cut cake | sort -r x'
2+
super compile -dag -C 'from /dev/null | ?foo | fork ( count() by x:=this["@foo"] ) ( sum(x) ) ( put a:=b*c ) | cut cake | sort -r x'
33
44
outputs:
55
- name: stdout
66
data: |
7-
file bar
7+
file /dev/null
88
| where search("foo")
99
| fork
1010
(

compiler/ztests/merge-filters.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
script: |
2-
super compile -C -O 'from foo | where a | where b'
2+
super compile -C -O 'from /dev/null | where a | where b'
33
echo ===
4-
super compile -C -O 'fork ( from a | where b | where c ) ( from d | where e | where f ) | where g'
4+
super compile -C -O 'fork ( from /dev/null | where b | where c ) ( from /dev/zero | where e | where f ) | where g'
55
echo ===
66
super compile -C -O 'unnest [a] into ( where b | where c )'
77
echo ===
@@ -10,15 +10,15 @@ script: |
1010
outputs:
1111
- name: stdout
1212
data: |
13-
file foo filter (a and b)
13+
file /dev/null filter (a and b)
1414
| output main
1515
===
1616
fork
1717
(
18-
file a unordered filter (b and c and g)
18+
file /dev/null unordered filter (b and c and g)
1919
)
2020
(
21-
file d unordered filter (e and f and g)
21+
file /dev/zero unordered filter (e and f and g)
2222
)
2323
| output main
2424
===

compiler/ztests/pushdown-sort.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
script: |
2-
super compile -C -O 'from file1 | sort'
2+
super compile -C -O 'from /dev/null | sort'
33
echo ===
4-
super compile -C -O 'from file1 | sort | values a'
4+
super compile -C -O 'from /dev/null | sort | values a'
55
echo ===
6-
super compile -C -O 'from file1 | sort a'
6+
super compile -C -O 'from /dev/null | sort a'
77
echo ===
8-
super compile -C -O 'from file1 | sort a | values b'
8+
super compile -C -O 'from /dev/null | sort a | values b'
99
1010
outputs:
1111
- name: stdout
1212
data: |
13-
file file1 unordered
13+
file /dev/null unordered
1414
| sort
1515
| output main
1616
===
17-
file file1 unordered
17+
file /dev/null unordered
1818
| sort
1919
| values a
2020
| output main
2121
===
22-
file file1 unordered
22+
file /dev/null unordered
2323
| sort a asc nulls last
2424
| output main
2525
===
26-
file file1 unordered fields a,b
26+
file /dev/null unordered fields a,b
2727
| sort a asc nulls last
2828
| values b
2929
| output main

compiler/ztests/pushdown-top.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
script: |
2-
super compile -C -O 'from file1 | top'
2+
super compile -C -O 'from /dev/null | top'
33
echo ===
4-
super compile -C -O 'from file1 | top | values a'
4+
super compile -C -O 'from /dev/null | top | values a'
55
echo ===
6-
super compile -C -O 'from file1 | top 2 a'
6+
super compile -C -O 'from /dev/null | top 2 a'
77
echo ===
8-
super compile -C -O 'from file1 | top 2 a | values b'
8+
super compile -C -O 'from /dev/null | top 2 a | values b'
99
1010
outputs:
1111
- name: stdout
1212
data: |
13-
file file1 unordered
13+
file /dev/null unordered
1414
| top 1
1515
| output main
1616
===
17-
file file1 unordered
17+
file /dev/null unordered
1818
| top 1
1919
| values a
2020
| output main
2121
===
22-
file file1 unordered
22+
file /dev/null unordered
2323
| top 2 a asc nulls last
2424
| output main
2525
===
26-
file file1 unordered fields a,b
26+
file /dev/null unordered fields a,b
2727
| top 2 a asc nulls last
2828
| values b
2929
| output main

compiler/ztests/pushdown.yaml

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
script: |
22
echo === debug
3-
super compile -C -O 'from file | debug a | values b'
3+
super compile -C -O 'from /dev/null | debug a | values b'
44
echo === distinct
5-
super compile -C -O 'from file | distinct a | values b'
5+
super compile -C -O 'from /dev/null | distinct a | values b'
66
echo === fork into hash join
7-
super compile -C -O 'fork ( from file1 ) ( from file2 ) | join on right.a=left.b | values left.c,right.d'
7+
super compile -C -O 'fork ( from /dev/null ) ( from /dev/zero ) | join on right.a=left.b | values left.c,right.d'
88
echo === fork into nested loop join
9-
super compile -C -O 'fork ( from file1 ) ( from file2 ) | join on right.a>left.b | values left.c,right.d'
9+
super compile -C -O 'fork ( from /dev/null ) ( from /dev/zero ) | join on right.a>left.b | values left.c,right.d'
1010
echo === hash join
11-
super compile -C -O "from file1 | join (from file2) on left.a=right.b | values left.c,right.d"
11+
super compile -C -O "from /dev/null | join (from /dev/zero) on left.a=right.b | values left.c,right.d"
1212
echo === nested loop join
13-
super compile -C -O "from file1 | join (from file2) on left.a>right.b | values left.c,right.d"
13+
super compile -C -O "from /dev/null | join (from /dev/zero) on left.a>right.b | values left.c,right.d"
1414
echo === switch into hash join
15-
super compile -C -O 'from file | switch a case b ( put x:=c ) case d ( put x:=e ) | join on left.f=right.g | values left.h,right.i'
15+
super compile -C -O 'from /dev/null | switch a case b ( put x:=c ) case d ( put x:=e ) | join on left.f=right.g | values left.h,right.i'
1616
echo === switch into nested loop join
17-
super compile -C -O 'from file | switch a case b ( put x:=c ) case d ( put x:=e ) | join on left.f>right.g | values left.h,right.i'
17+
super compile -C -O 'from /dev/null | switch a case b ( put x:=c ) case d ( put x:=e ) | join on left.f>right.g | values left.h,right.i'
1818
echo === where
19-
super compile -C -O "from file | a==1 or e==2 | values c, b, d"
19+
super compile -C -O "from /dev/null | a==1 or e==2 | values c, b, d"
2020
echo ===
2121
export SUPER_DB=test
2222
super db init -q
@@ -37,7 +37,7 @@ outputs:
3737
- name: stdout
3838
data: |
3939
=== debug
40-
file file fields a,b
40+
file /dev/null fields a,b
4141
| mirror
4242
(
4343
values a
@@ -48,56 +48,56 @@ outputs:
4848
| output main
4949
)
5050
=== distinct
51-
file file unordered fields a,b
51+
file /dev/null unordered fields a,b
5252
| distinct a
5353
| values b
5454
| output main
5555
=== fork into hash join
5656
fork
5757
(
58-
file file1 unordered fields b,c
58+
file /dev/null unordered fields b,c
5959
)
6060
(
61-
file file2 unordered fields a,d
61+
file /dev/zero unordered fields a,d
6262
)
6363
| inner hashjoin as {left,right} on b==a
6464
| values left.c, right.d
6565
| output main
6666
=== fork into nested loop join
6767
fork
6868
(
69-
file file1 unordered fields b,c
69+
file /dev/null unordered fields b,c
7070
)
7171
(
72-
file file2 unordered fields a,d
72+
file /dev/zero unordered fields a,d
7373
)
7474
| inner join as {left,right} on right.a>left.b
7575
| values left.c, right.d
7676
| output main
7777
=== hash join
7878
fork
7979
(
80-
file file1 unordered fields a,c
80+
file /dev/null unordered fields a,c
8181
)
8282
(
83-
file file2 unordered fields b,d
83+
file /dev/zero unordered fields b,d
8484
)
8585
| inner hashjoin as {left,right} on a==b
8686
| values left.c, right.d
8787
| output main
8888
=== nested loop join
8989
fork
9090
(
91-
file file1 unordered fields a,c
91+
file /dev/null unordered fields a,c
9292
)
9393
(
94-
file file2 unordered fields b,d
94+
file /dev/zero unordered fields b,d
9595
)
9696
| inner join as {left,right} on left.a>right.b
9797
| values left.c, right.d
9898
| output main
9999
=== switch into hash join
100-
file file unordered fields a,b,c,d,e,f,g,h,i
100+
file /dev/null unordered fields a,b,c,d,e,f,g,h,i
101101
| switch a
102102
case b (
103103
put x:=c
@@ -109,7 +109,7 @@ outputs:
109109
| values left.h, right.i
110110
| output main
111111
=== switch into nested loop join
112-
file file unordered fields a,b,c,d,e,f,g,h,i
112+
file /dev/null unordered fields a,b,c,d,e,f,g,h,i
113113
| switch a
114114
case b (
115115
put x:=c
@@ -121,7 +121,7 @@ outputs:
121121
| values left.h, right.i
122122
| output main
123123
=== where
124-
file file fields a,b,c,d,e filter (a==1 or e==2)
124+
file /dev/null fields a,b,c,d,e filter (a==1 or e==2)
125125
| values c, b, d
126126
| output main
127127
===
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
script: super compile -O -C 'from foo | x>1 | pass | pass | x>2 | pass'
1+
script: super compile -O -C 'from /dev/null | x>1 | pass | pass | x>2 | pass'
22

33
outputs:
44
- name: stdout
55
data: |
6-
file foo filter (x>1 and x>2)
6+
file /dev/null filter (x>1 and x>2)
77
| output main
Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
script: |
2-
super compile -C -O 'select * from test limit 1'
2+
super compile -C -O 'select * from /dev/null limit 1'
33
echo // ===
4-
super compile -C -O 'select * from test limit all'
4+
super compile -C -O 'select * from /dev/null limit all'
55
echo // ===
6-
super compile -C -O 'select * from test offset 1'
6+
super compile -C -O 'select * from /dev/null offset 1'
77
echo // ===
8-
super compile -C -O 'select * from test limit 1 offset 1'
8+
super compile -C -O 'select * from /dev/null limit 1 offset 1'
99
echo // ===
10-
super compile -C -O 'select * from test offset 1 limit 1'
10+
super compile -C -O 'select * from /dev/null offset 1 limit 1'
1111
echo // ===
12-
! super compile -C -O 'select * from test offset -1 limit "foo"'
12+
! super compile -C -O 'select * from /dev/null offset -1 limit "foo"'
1313
1414
outputs:
1515
- name: stdout
1616
data: |
17-
file test
17+
file /dev/null
1818
| values {in:this,out:{...this}}
1919
| head 1
2020
| values out
2121
| output main
2222
// ===
23-
file test
23+
file /dev/null
2424
| values {...this}
2525
| output main
2626
// ===
27-
file test
27+
file /dev/null
2828
| values {in:this,out:{...this}}
2929
| skip 1
3030
| values out
3131
| output main
3232
// ===
33-
file test
33+
file /dev/null
3434
| values {in:this,out:{...this}}
3535
| skip 1
3636
| head 1
3737
| values out
3838
| output main
3939
// ===
40-
file test
40+
file /dev/null
4141
| values {in:this,out:{...this}}
4242
| skip 1
4343
| head 1
@@ -46,9 +46,9 @@ outputs:
4646
// ===
4747
- name: stderr
4848
data: |
49-
expression value must be a positive integer at line 1, column 27:
50-
select * from test offset -1 limit "foo"
51-
~~
52-
expression value must be an integer value: "foo" at line 1, column 36:
53-
select * from test offset -1 limit "foo"
54-
~~~~~
49+
expression value must be a positive integer at line 1, column 32:
50+
select * from /dev/null offset -1 limit "foo"
51+
~~
52+
expression value must be an integer value: "foo" at line 1, column 41:
53+
select * from /dev/null offset -1 limit "foo"
54+
~~~~~

0 commit comments

Comments
 (0)