Skip to content

Commit 5a53941

Browse files
Updating !current_version in yamsql files to 4.1.9.0
1 parent b81d73b commit 5a53941

18 files changed

+227
-227
lines changed

yaml-tests/src/test/resources/aggregate-index-tests-count.yamsql

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,19 +91,19 @@ test_block:
9191
-
9292
- query: select count(*) from t2 group by col2
9393
# Plan deserialization previously failed : https://github.com/FoundationDB/fdb-record-layer/issues/3214
94-
- supported_version: !current_version
94+
- supported_version: 4.1.9.0
9595
- explain: "ISCAN(MV5 <,>) | MAP (_ AS _0) | AGG (count_star(*) AS _0) GROUP BY (_._0.COL2 AS _0) | MAP (_._1._0 AS _0)"
9696
- result: [{1}, {3}]
9797
-
98-
# Same as above test, but tests serialization upgrades from before !current_version. Can be removed once we no longer
98+
# Same as above test, but tests serialization upgrades from before 4.1.9.0. Can be removed once we no longer
9999
# care about upgrading to that version from older versions
100100
- query: select count(*) from t2 group by col2
101101
- maxRows: 1
102-
- initialVersionLessThan: !current_version
102+
- initialVersionLessThan: 4.1.9.0
103103
- result: [{1}]
104-
- result: [{2}] # Off by one due to: https://github.com/FoundationDB/fdb-record-layer/issues/3097 (also fixed in !current_version)
104+
- result: [{2}] # Off by one due to: https://github.com/FoundationDB/fdb-record-layer/issues/3097 (also fixed in 4.1.9.0)
105105
- error: 'XX000' # plan fails to deserialize on older server
106-
- initialVersionAtLeast: !current_version
106+
- initialVersionAtLeast: 4.1.9.0
107107
# Covered in above test case
108108
-
109109
- query: select count(col1) from t2
@@ -114,18 +114,18 @@ test_block:
114114
-
115115
- query: select count(col1) from t2 group by col2
116116
# Plan deserialization previously failed : https://github.com/FoundationDB/fdb-record-layer/issues/3214
117-
- supported_version: !current_version
117+
- supported_version: 4.1.9.0
118118
- explain: "ISCAN(MV5 <,>) | MAP (_ AS _0) | AGG (count(_._0.COL1) AS _0) GROUP BY (_._0.COL2 AS _0) | MAP (_._1._0 AS _0)"
119119
- result: [{1}, {1}]
120120
-
121-
# Same as above test, but tests serialization upgrades from before !current_version. Can be removed once we no longer
121+
# Same as above test, but tests serialization upgrades from before 4.1.9.0. Can be removed once we no longer
122122
# care about upgrading to that version from older versions
123123
- query: select count(col1) from t2 group by col2
124124
- maxRows: 1
125-
- initialVersionLessThan: !current_version
125+
- initialVersionLessThan: 4.1.9.0
126126
- result: [{1}]
127127
- result: [{1}]
128128
- error: 'XX000' # plan fails to deserialize on older server
129-
- initialVersionAtLeast: !current_version
129+
- initialVersionAtLeast: 4.1.9.0
130130
# Covered in above test case
131131
...

yaml-tests/src/test/resources/aggregate-index-tests.yamsql

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -132,18 +132,18 @@ test_block:
132132
# At some point, should be able to roll up values from the aggregate index. However, even
133133
# controlling for that, it can still use the index
134134
- query: select max(col2) from T1 use index (mv8);
135-
- supported_version: !current_version
135+
- supported_version: 4.1.9.0
136136
- explain: "ISCAN(MV8 <,>) | MAP (_ AS _0) | AGG (max_l(_._0.COL2) AS _0) | ON EMPTY NULL | MAP (_._0._0 AS _0)"
137137
- result: [{!l 13}]
138138
-
139139
- query: select max(col2) from T1 use index (mv8);
140140
- maxRows: 1
141141
# Cannot use FORCE_CONTINUATIONS with older versions due to: https://github.com/FoundationDB/fdb-record-layer/issues/3096
142142
# (Extra values being produced after exhausting source of an aggregate cursor)
143-
# Can remove once we do not care about backwards compatibility before !current_version
144-
- initialVersionLessThan: !current_version
143+
# Can remove once we do not care about backwards compatibility before 4.1.9.0
144+
- initialVersionLessThan: 4.1.9.0
145145
# Different (incorrect) behavior for different past versions
146-
- initialVersionAtLeast: !current_version
146+
- initialVersionAtLeast: 4.1.9.0
147147
- result: [{!l 13}]
148148
- result: []
149149
-
@@ -159,18 +159,18 @@ test_block:
159159
- result: [{!l 5}, {!l 4}, {!l 3}, {!l 2}, {!l 1}]
160160
-
161161
- query: select min(col3) from T2 group by col1, col2;
162-
- supported_version: !current_version
162+
- supported_version: 4.1.9.0
163163
- explain: "ISCAN(MV2 <,>) | MAP (_ AS _0) | AGG (min_l(_._0.COL3) AS _0) GROUP BY (_._0.COL1 AS _0, _._0.COL2 AS _1) | MAP (_._1._0 AS _0)"
164164
- result: [{!l 1}, {!l 2}, {!l 3}]
165165
-
166166
- query: select min(col3) from T2 group by col1, col2;
167167
# Cannot use FORCE_CONTINUATIONS with older versions due to: https://github.com/FoundationDB/fdb-record-layer/issues/3096
168168
# (Extra values being produced after exhausting source of an aggregate cursor)
169-
# Can remove once we do not care about backwards compatibility before !current_version
169+
# Can remove once we do not care about backwards compatibility before 4.1.9.0
170170
- maxRows: 1
171-
- initialVersionLessThan: !current_version
171+
- initialVersionLessThan: 4.1.9.0
172172
# Different (incorrect) behavior for different past versions
173-
- initialVersionAtLeast: !current_version
173+
- initialVersionAtLeast: 4.1.9.0
174174
- result: [{!l 1}]
175175
- result: [{!l 2}]
176176
- result: [{!l 3}]
@@ -179,21 +179,21 @@ test_block:
179179
# this should use the aggregate index in the future, for now, it is using streaming aggregate
180180
# over base table scan.
181181
- query: select max(col2) from t2;
182-
- supported_version: !current_version
182+
- supported_version: 4.1.9.0
183183
- explain: "ISCAN(MV3 <,>) | MAP (_ AS _0) | AGG (max_l(_._0.COL2) AS _0) | ON EMPTY NULL | MAP (_._0._0 AS _0)"
184184
- result: [{!l 2}]
185185
-
186186
- query: select max(col2) from t2;
187187
# Cannot use FORCE_CONTINUATIONS with older versions due to: https://github.com/FoundationDB/fdb-record-layer/issues/3096
188188
# (Extra values being produced after exhausting source of an aggregate cursor)
189-
# Can remove once we do not care about backwards compatibility before !current_version
190-
- supported_version: !current_version
189+
# Can remove once we do not care about backwards compatibility before 4.1.9.0
190+
- supported_version: 4.1.9.0
191191
- maxRows: 1
192-
- initialVersionLessThan: !current_version
192+
- initialVersionLessThan: 4.1.9.0
193193
- result: [{!l 2}]
194194
- result: [{!null _}]
195195
- result: [{!l 2}] # ad infinitum
196-
- initialVersionAtLeast: !current_version
196+
- initialVersionAtLeast: 4.1.9.0
197197
- result: [{!l 2}]
198198
- result: []
199199
-
@@ -249,26 +249,26 @@ test_block:
249249
-
250250
# Permuted max index can also be used to evaluate other aggregate functions via aggregation and roll-up
251251
- query: select col3, sum(col2) as s from t2 use index (mv9) where col1 = 1 group by col1, col3 order by col3 asc;
252-
- supported_version: !current_version
252+
- supported_version: 4.1.9.0
253253
- explain: "ISCAN(MV9 [EQUALS promote(@c20 AS LONG)]) | MAP (_ AS _0) | AGG (sum_l(_._0.COL2) AS _0) GROUP BY (_._0.COL1 AS _0, _._0.COL3 AS _1) | MAP (_._0._1 AS COL3, _._1._0 AS S)"
254254
- result: [{COL3: 1, S: 1}, {COL3: 2, S: 2}, {COL3: 100, S: 1}, {COL3: 200, S: 2}]
255255
-
256256
- query: select col3, sum(col2) as s from t2 use index (mv9) where col1 = 1 group by col1, col3 order by col3 asc;
257257
# Cannot use FORCE_CONTINUATIONS with older versions due to: https://github.com/FoundationDB/fdb-record-layer/issues/3096
258258
# (Extra values being produced after exhausting source of an aggregate cursor)
259-
# Can remove once we do not care about backwards compatibility before !current_version
259+
# Can remove once we do not care about backwards compatibility before 4.1.9.0
260260
- maxRows: 0
261261
- result: [{COL3: 1, S: 1}, {COL3: 2, S: 2}, {COL3: 100, S: 1}, {COL3: 200, S: 2}]
262262
-
263263
- query: select col3, sum(col2) as s from t2 use index (mv9) where col1 = 1 group by col1, col3 order by col3 desc;
264-
- supported_version: !current_version
264+
- supported_version: 4.1.9.0
265265
- explain: "ISCAN(MV9 [EQUALS promote(@c20 AS LONG)] REVERSE) | MAP (_ AS _0) | AGG (sum_l(_._0.COL2) AS _0) GROUP BY (_._0.COL1 AS _0, _._0.COL3 AS _1) | MAP (_._0._1 AS COL3, _._1._0 AS S)"
266266
- result: [{COL3: 200, S: 2}, {COL3: 100, S: 1}, {COL3: 2, S: 2}, {COL3: 1, S: 1}]
267267
-
268268
- query: select col3, sum(col2) as s from t2 use index (mv9) where col1 = 1 group by col1, col3 order by col3 desc;
269269
# Cannot use FORCE_CONTINUATIONS with older versions due to: https://github.com/FoundationDB/fdb-record-layer/issues/3096
270270
# (Extra values being produced after exhausting source of an aggregate cursor)
271-
# Can remove once we do not care about backwards compatibility before !current_version
271+
# Can remove once we do not care about backwards compatibility before 4.1.9.0
272272
- maxRows: 0
273273
- result: [{COL3: 200, S: 2}, {COL3: 100, S: 1}, {COL3: 2, S: 2}, {COL3: 1, S: 1}]
274274
# -

yaml-tests/src/test/resources/bitmap-aggregate-index.yamsql

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ test_block:
6969
{BITMAP: xStartsWith_1250'0400008', 'CATEGORY': 'world', 'OFFSET':0}]
7070
-
7171
- query: SELECT bitmap_construct_agg(bitmap_bit_position(id)) as bitmap, bitmap_bucket_offset(id) as offset FROM T2 GROUP BY bitmap_bucket_offset(id)
72-
- supported_version: !current_version
72+
- supported_version: 4.1.9.0
7373
- explain: "ISCAN(AGG_INDEX_1 <,>) | MAP (_ AS _0) | AGG (bitmap_construct_agg_l((_._0.ID) bitmap_bit_position 10000) AS _0) GROUP BY ((_._0.ID) bitmap_bucket_offset 10000 AS _0) | MAP (_._1._0 AS BITMAP, _._0._0 AS OFFSET)"
7474
- unorderedResult: [{BITMAP: xStartsWith_1250'060000c', 'OFFSET':0}, {BITMAP: xStartsWith_1250'02', 'OFFSET':10000}]
7575
-
@@ -78,23 +78,23 @@ test_block:
7878
# Older versions used to skip over a result here due to an off-by-one error (see: https://github.com/foundationdb/fdb-record-layer/pull/3112)
7979
# Retain this test of older behavior to allow for continuation testing with older versions
8080
# This test can be removed when we no longer care about testing compatibility with older versions
81-
- initialVersionLessThan: !current_version
81+
- initialVersionLessThan: 4.1.9.0
8282
- result: [{BITMAP: xStartsWith_1250'060000c', 'OFFSET':0}]
8383
- result: []
84-
- initialVersionAtLeast: !current_version
84+
- initialVersionAtLeast: 4.1.9.0
8585
- result: [{BITMAP: xStartsWith_1250'060000c', 'OFFSET':0}]
8686
- result: [{BITMAP: xStartsWith_1250'02', 'OFFSET':10000}]
8787
- result: []
8888
-
8989
- query: SELECT bitmap_construct_agg(bitmap_bit_position(id)) as bitmap, category, bitmap_bucket_offset(id) as offset FROM T2 GROUP BY category, bitmap_bucket_offset(id)
90-
- supported_version: !current_version
90+
- supported_version: 4.1.9.0
9191
- explain: "ISCAN(AGG_INDEX_2 <,>) | MAP (_ AS _0) | AGG (bitmap_construct_agg_l((_._0.ID) bitmap_bit_position 10000) AS _0) GROUP BY (_._0.CATEGORY AS _0, (_._0.ID) bitmap_bucket_offset 10000 AS _1) | MAP (_._1._0 AS BITMAP, _._0._0 AS CATEGORY, _._0._1 AS OFFSET)"
9292
- unorderedResult: [{BITMAP: xStartsWith_1250'0200004', 'CATEGORY': 'hello', 'OFFSET':0},
9393
{BITMAP: xStartsWith_1250'02', 'CATEGORY': 'hello', 'OFFSET':10000},
9494
{BITMAP: xStartsWith_1250'0400008', 'CATEGORY': 'world', 'OFFSET':0}]
9595
-
9696
# Copy of the previous query, but disable force_continuations.
97-
# This doesn't work before !current_version because of: https://github.com/FoundationDB/fdb-record-layer/issues/3097
97+
# This doesn't work before 4.1.9.0 because of: https://github.com/FoundationDB/fdb-record-layer/issues/3097
9898
# It's hard to write a test assertion that follows the expected behavior across multiple upgrades,
9999
# but it can end up skipping values when resuming from a continuation
100100
- query: SELECT bitmap_construct_agg(bitmap_bit_position(id)) as bitmap, category, bitmap_bucket_offset(id) as offset FROM T2 GROUP BY category, bitmap_bucket_offset(id)

yaml-tests/src/test/resources/boolean.yamsql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ test_block:
9696
- result: [ { false }, { false }, { false } ]
9797
-
9898
- query: select B AND NULL from lb
99-
- supported_version: !current_version # This fails when running with continuations against older versions due to: https://github.com/FoundationDB/fdb-record-layer/issues/3218
99+
- supported_version: 4.1.9.0 # This fails when running with continuations against older versions due to: https://github.com/FoundationDB/fdb-record-layer/issues/3218
100100
- result: [ { !null }, { false }, { !null } ]
101101
-
102102
- query: select B OR TRUE from lb
@@ -106,7 +106,7 @@ test_block:
106106
- result: [ { true }, { false }, { !null } ]
107107
-
108108
- query: select B OR NULL from lb
109-
- supported_version: !current_version # This fails when running with continuations against older versions due to: https://github.com/FoundationDB/fdb-record-layer/issues/3218
109+
- supported_version: 4.1.9.0 # This fails when running with continuations against older versions due to: https://github.com/FoundationDB/fdb-record-layer/issues/3218
110110
- result: [ { true }, { !null }, { !null } ]
111111
-
112112
- query: select NOT B from lb

yaml-tests/src/test/resources/create-drop.yamsql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
# limitations under the License.
1919
---
2020
options:
21-
# Prior to !current_version, these tests did not work in force_continuations mode due to
21+
# Prior to 4.1.9.0, these tests did not work in force_continuations mode due to
2222
# https://github.com/FoundationDB/fdb-record-layer/pull/3211. This would result in looping
2323
# continuations. We have coverage of similar queries in other files, (see:
2424
# aggregate-index-tests.yamsql, aggregate-empty-count.yamsql, aggregate-empty.yamsql), so for
25-
# this file, just require the version is at least !current_version
26-
supported_version: !current_version
25+
# this file, just require the version is at least 4.1.9.0
26+
supported_version: 4.1.9.0
2727
---
2828
setup:
2929
connect: "jdbc:embed:/__SYS?schema=CATALOG"

yaml-tests/src/test/resources/field-index-tests-proto.yamsql

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,59 +58,59 @@ test_block:
5858
- result: [{ID: !l 5, COL1: !l 10, COL31: !l 5, COL32: !null _, COL2: !l 5}]
5959
-
6060
- query: select count(*) from (select * from (select * from (select * from "MyTable" where ID = 5) as x) as y) as z;
61-
- supported_version: !current_version
61+
- supported_version: 4.1.9.0
6262
- explain: "SCAN([EQUALS promote(@c23 AS LONG)]) | MAP (_ AS _0) | AGG (count_star(*) AS _0) | ON EMPTY NULL | MAP (coalesce_long(_._0._0, promote(0l AS LONG)) AS _0)"
6363
- result: [{!l 1}]
6464
-
65-
# Copy of above query to simulate force continuations mode, which doesn't work prior to !current_version
65+
# Copy of above query to simulate force continuations mode, which doesn't work prior to 4.1.9.0
6666
# due to: https://github.com/FoundationDB/fdb-record-layer/issues/3096
6767
# Can remove when we no longer care about supported mixed mode testing with prior versions
6868
- query: select count(*) from (select * from (select * from (select * from "MyTable" where ID = 5) as x) as y) as z;
6969
- maxRows: 1
70-
- initialVersionLessThan: !current_version
70+
- initialVersionLessThan: 4.1.9.0
7171
- result: [{!l 1}]
7272
- result: [{!l 0}]
7373
- result: [{!l 1}] # ad infinitum
74-
- initialVersionAtLeast: !current_version
74+
- initialVersionAtLeast: 4.1.9.0
7575
- result: [{!l 1}]
7676
- result: []
7777
-
7878
- query: select COL31, COL32 from (select * from (select * from "MyTable") as x) as y where ID = 5;
7979
- result: [{COL31: !l 5, COL32: !null _}]
8080
-
8181
- query: select sum(COL1) from "MyTable";
82-
- supported_version: !current_version
82+
- supported_version: 4.1.9.0
8383
- explain: "SCAN(<,>) | MAP (_ AS _0) | AGG (sum_l(_._0.COL1) AS _0) | ON EMPTY NULL | MAP (_._0._0 AS _0)"
8484
- result: [{!l 210}]
8585
-
86-
# Copy of above query to simulate force continuations mode, which doesn't work prior to !current_version
86+
# Copy of above query to simulate force continuations mode, which doesn't work prior to 4.1.9.0
8787
# due to: https://github.com/FoundationDB/fdb-record-layer/issues/3096
8888
# Can remove when we no longer care about supported mixed mode testing with prior versions
8989
- query: select sum(COL1) from "MyTable";
9090
- maxRows: 1
91-
- initialVersionLessThan: !current_version
91+
- initialVersionLessThan: 4.1.9.0
9292
- result: [{!l 210}]
9393
- result: [{!null _}]
9494
- result: [{!l 210}] # ad infinitum
95-
- initialVersionAtLeast: !current_version
95+
- initialVersionAtLeast: 4.1.9.0
9696
- result: [{!l 210}]
9797
- result: []
9898
-
9999
- query: select count(COL1) from "MyTable";
100-
- supported_version: !current_version
100+
- supported_version: 4.1.9.0
101101
- explain: "SCAN(<,>) | MAP (_ AS _0) | AGG (count(_._0.COL1) AS _0) | ON EMPTY NULL | MAP (coalesce_long(_._0._0, promote(0l AS LONG)) AS _0)"
102102
- result: [{!l 13}]
103103
-
104-
# Copy of above query to simulate force continuations mode, which doesn't work prior to !current_version
104+
# Copy of above query to simulate force continuations mode, which doesn't work prior to 4.1.9.0
105105
# due to: https://github.com/FoundationDB/fdb-record-layer/issues/3096
106106
# Can remove when we no longer care about supported mixed mode testing with prior versions
107107
- query: select count(COL1) from "MyTable";
108108
- maxRows: 1
109-
- initialVersionLessThan: !current_version
109+
- initialVersionLessThan: 4.1.9.0
110110
- result: [{!l 13}]
111111
- result: [{!l 0}]
112112
- result: [{!l 13}] # ad infinitum
113-
- initialVersionAtLeast: !current_version
113+
- initialVersionAtLeast: 4.1.9.0
114114
- result: [{!l 13}]
115115
- result: []
116116
-

yaml-tests/src/test/resources/functions.yamsql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ test_block:
9494
- result: [{_0: 1.0, _1: 1.0}]
9595
-
9696
- query: select coalesce(null, null, 5), coalesce(null, 1, null), coalesce(null, a1, a8) from A
97-
- supported_version: !current_version # Force continuations does not work on older versions due to: https://github.com/FoundationDB/fdb-record-layer/issues/3218
97+
- supported_version: 4.1.9.0 # Force continuations does not work on older versions due to: https://github.com/FoundationDB/fdb-record-layer/issues/3218
9898
- result: [{_0: 5, _1: 1, _2: 1.0}]
9999
-
100100
- query: select b1, b2, coalesce(b1, b2, 42) from B
@@ -126,7 +126,7 @@ test_block:
126126
{!null _}]
127127
-
128128
- query: select coalesce(null, (1, 1.0, 'a', true)) from C
129-
- supported_version: !current_version # Force continuations does not work on older versions due to: https://github.com/FoundationDB/fdb-record-layer/issues/3218
129+
- supported_version: 4.1.9.0 # Force continuations does not work on older versions due to: https://github.com/FoundationDB/fdb-record-layer/issues/3218
130130
- unorderedResult: [
131131
{{ _0: 1, _1: 1.0, _2: 'a', _3: true}},
132132
{{ _0: 1, _1: 1.0, _2: 'a', _3: true}},

0 commit comments

Comments
 (0)