Skip to content

Commit ec7f806

Browse files
authored
[fix](regression) Repair ES source predicate regression cases (apache#70155)
### What problem does this PR solve? Issue Number: N/A Related PR: apache#69672, apache#69723 External ES regression suites fail during setup or retain expectations from the previous indexed-value predicate behavior: - Read the deprecated scanner option through `SELECT @@enable_file_scanner_v2`, whose compatibility name remains valid when SHOW prefixes deprecated names. - On ES 8.3.3, fall back from the specifically unsupported `_source.mode` mapping syntax to `enabled:false`, retaining the disabled-source row and alias checks. Other HTTP failures remain fatal; supporting ES8 versions still exercise the mode syntax. - Compare LIKE, REGEXP, NULL and `level` predicates against unfiltered rows materialized into internal tables, then update only the affected runner-generated golden blocks. - Make the date-string equality test explicitly use source reads, test midnight as the matching value, and retain 08:00 as a negative control. - Check that a residual predicate prevents early termination while a safe numeric docvalue predicate still permits LIMIT pushdown. ### Release note None ### Check List (For Author) - Test - [x] Regression test - [ ] Unit Test - [x] Manual test Validation uses fresh FE and ASAN BE artifacts built from this PR commit (`6386f5f83a51b548c86ab3cff83d53cb48fb18df`) with the standard `./build.sh --fe --be -j64` entry point. The complete build exited successfully, and both finished artifact versions match that commit. No production source is changed by this PR. - On the same fresh binaries and reset ES 5.6.16, 6.8.23, 7.17.5 and 8.3.3 fixtures, the parent suites/golden files reproduced all ten failures; the final PR suites passed all ten in normal comparison, with zero failed, fatal or skipped suites. The passing run executed 2,154 golden checks and 1,798 independent query comparisons, without force-generation or further golden edits. - The complete `test_es_query` passed all four ES versions and both scroll settings, including its unchanged complex-array golden blocks (276 result checks and 20 independent comparisons). - Independent SQLite/Python evaluation of the unchanged raw fixture JSON passed 38 comparisons and covered all 17 changed golden blocks. Real ES requests also confirmed that `ignore_above` omits matching index values while retaining source strings, and that the constant-keyword index matches documents whose source `level` is absent. - Captured ES search requests verified the date modes: the original four-column projection reads source, returns midnight values and rejects the 08:00 predicate. A date-only docvalue projection correctly returns 08:00 in the +08:00 session. The revised test explicitly fixes the source contract and retains the 08:00 negative control. - The complete fallback suite additionally passed normal comparison on ES 8.11.3: 304 golden checks and 304 independent comparisons. The actual mappings and document responses confirmed absent source for both the ES 8.3.3 `enabled:false` fallback and the supported ES 8.11.3 `mode:disabled` branch. - The existing `test_es_file_scanner_v2` compatibility suite also passed on the fresh build across all four fixture versions. The deprecated option is accepted; this does not claim two distinct physical reader implementations on current master. - Direct variable probes confirmed the old exact SHOW name returns no rows, the wildcard SHOW name exposes its deprecated prefix, and the scalar compatibility name remains readable. - `git diff --check` passed. ES9 compatibility is not claimed. - Behavior changed: - [x] No production behavior change; regression fixtures and expectations are corrected. - [ ] Yes. - Does this need documentation? - [x] No. - [ ] Yes. ### Check List (For Reviewer who merge this PR) - [ ] Confirm the release note - [ ] Confirm test cases - [ ] Confirm document - [ ] Add branch pick label
1 parent 035a843 commit ec7f806

13 files changed

Lines changed: 128 additions & 42 deletions

‎regression-test/data/external_table_p2/es/test_es_query.out‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ value1 value2
132132
string1 text#1
133133
string2 text2
134134
string3 text3_4*5
135+
string_ignore_above_10 text_ignore_above_10
135136

136137
-- !sql_5_30 --
137138
string1 text#1
@@ -286,6 +287,7 @@ value1 value2
286287
string1 text#1
287288
string2 text2
288289
string3 text3_4*5
290+
string_ignore_above_10 text_ignore_above_10
289291

290292
-- !sql_6_30 --
291293
string1 text#1
@@ -397,10 +399,6 @@ I'm not null or empty
397399
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] debug \N This string can be quite lengthy string1 2022-08-08T20:10:10 text#1 3.14 2022-08-08T00:00 2022-08-08T12:10:10 1659931810000 2022-08-08T12:10:10 2022-08-08T20:10:10 12345
398400

399401
-- !sql_7_23 --
400-
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] \N \N \N string4 2022-08-08T20:10:10 text3_4*5 6 2022-08-08T00:00 2022-08-11T12:10:10 1660191010000 2022-08-11T12:10:10 2022-08-11T11:10:10 4444
401-
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] \N \N \N string_ignore_above_10 2022-08-08T20:10:10 text_ignore_above_10 6 2022-08-08T00:00 2022-08-11T12:10:10 1660191010000 2022-08-11T12:10:10 2022-08-11T11:10:10 4444
402-
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] \N \N string2 2022-08-08T12:10:10 text2 4 2022-08-08T00:00 2022-08-09T12:10:10 1660018210000 2022-08-09T12:10:10 2022-08-09T12:10:10 2222
403-
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] \N I'm not null or empty \N string3 2022-08-09T00:40:10 text3_4*5 5 2022-08-08T00:00 2022-08-10T12:10:10 1660104610000 2022-08-10T12:10:10 2022-08-10T20:10:10 3333
404402
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] debug \N This string can be quite lengthy string1 2022-08-08T20:10:10 text#1 3.14 2022-08-08T00:00 2022-08-08T12:10:10 1659931810000 2022-08-08T12:10:10 2022-08-08T20:10:10 12345
405403

406404
-- !sql_7_24 --
@@ -480,6 +478,7 @@ string1 text#1
480478
string2 text2
481479
string3 text3_4*5
482480
string4 text3_4*5
481+
string_ignore_above_10 text_ignore_above_10
483482

484483
-- !sql_7_36 --
485484
string1 text#1
@@ -601,10 +600,6 @@ I'm not null or empty
601600
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] debug \N This string can be quite lengthy string1 2022-08-08T20:10:10 text#1 3.14 2022-08-08T00:00 2022-08-08T12:10:10 1659931810000 2022-08-08T12:10:10 2022-08-08T20:10:10 12345
602601

603602
-- !sql_8_21 --
604-
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] \N \N \N string4 2022-08-08T20:10:10 text3_4*5 6 2022-08-08T00:00 2022-08-11T12:10:10 1660191010000 2022-08-11T12:10:10 2022-08-11T11:10:10 4444
605-
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] \N \N \N string_ignore_above_10 2022-08-08T20:10:10 text_ignore_above_10 6 2022-08-08T00:00 2022-08-11T12:10:10 1660191010000 2022-08-11T12:10:10 2022-08-11T11:10:10 4444
606-
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] \N \N string2 2022-08-08T12:10:10 text2 4 2022-08-08T00:00 2022-08-09T12:10:10 1660018210000 2022-08-09T12:10:10 2022-08-09T12:10:10 2222
607-
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] \N I'm not null or empty \N string3 2022-08-09T00:40:10 text3_4*5 5 2022-08-08T00:00 2022-08-10T12:10:10 1660104610000 2022-08-10T12:10:10 2022-08-10T20:10:10 3333
608603
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] debug \N This string can be quite lengthy string1 2022-08-08T20:10:10 text#1 3.14 2022-08-08T00:00 2022-08-08T12:10:10 1659931810000 2022-08-08T12:10:10 2022-08-08T20:10:10 12345
609604

610605
-- !sql_8_22 --
@@ -684,6 +679,7 @@ string1 text#1
684679
string2 text2
685680
string3 text3_4*5
686681
string4 text3_4*5
682+
string_ignore_above_10 text_ignore_above_10
687683

688684
-- !sql_8_34 --
689685
string1 text#1
@@ -842,6 +838,7 @@ value1 value2
842838
string1 text#1
843839
string2 text2
844840
string3 text3_4*5
841+
string_ignore_above_10 text_ignore_above_10
845842

846843
-- !sql_5_30 --
847844
string1 text#1
@@ -996,6 +993,7 @@ value1 value2
996993
string1 text#1
997994
string2 text2
998995
string3 text3_4*5
996+
string_ignore_above_10 text_ignore_above_10
999997

1000998
-- !sql_6_30 --
1001999
string1 text#1
@@ -1107,10 +1105,6 @@ I'm not null or empty
11071105
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] debug \N This string can be quite lengthy string1 2022-08-08T20:10:10 text#1 3.14 2022-08-08T00:00 2022-08-08T12:10:10 1659931810000 2022-08-08T12:10:10 2022-08-08T20:10:10 12345
11081106

11091107
-- !sql_7_23 --
1110-
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] \N \N \N string4 2022-08-08T20:10:10 text3_4*5 6 2022-08-08T00:00 2022-08-11T12:10:10 1660191010000 2022-08-11T12:10:10 2022-08-11T11:10:10 4444
1111-
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] \N \N \N string_ignore_above_10 2022-08-08T20:10:10 text_ignore_above_10 6 2022-08-08T00:00 2022-08-11T12:10:10 1660191010000 2022-08-11T12:10:10 2022-08-11T11:10:10 4444
1112-
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] \N \N string2 2022-08-08T12:10:10 text2 4 2022-08-08T00:00 2022-08-09T12:10:10 1660018210000 2022-08-09T12:10:10 2022-08-09T12:10:10 2222
1113-
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] \N I'm not null or empty \N string3 2022-08-09T00:40:10 text3_4*5 5 2022-08-08T00:00 2022-08-10T12:10:10 1660104610000 2022-08-10T12:10:10 2022-08-10T20:10:10 3333
11141108
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] debug \N This string can be quite lengthy string1 2022-08-08T20:10:10 text#1 3.14 2022-08-08T00:00 2022-08-08T12:10:10 1659931810000 2022-08-08T12:10:10 2022-08-08T20:10:10 12345
11151109

11161110
-- !sql_7_24 --
@@ -1190,6 +1184,7 @@ string1 text#1
11901184
string2 text2
11911185
string3 text3_4*5
11921186
string4 text3_4*5
1187+
string_ignore_above_10 text_ignore_above_10
11931188

11941189
-- !sql_7_36 --
11951190
string1 text#1
@@ -1311,10 +1306,6 @@ I'm not null or empty
13111306
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] debug \N This string can be quite lengthy string1 2022-08-08T20:10:10 text#1 3.14 2022-08-08T00:00 2022-08-08T12:10:10 1659931810000 2022-08-08T12:10:10 2022-08-08T20:10:10 12345
13121307

13131308
-- !sql_8_21 --
1314-
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] \N \N \N string4 2022-08-08T20:10:10 text3_4*5 6 2022-08-08T00:00 2022-08-11T12:10:10 1660191010000 2022-08-11T12:10:10 2022-08-11T11:10:10 4444
1315-
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] \N \N \N string_ignore_above_10 2022-08-08T20:10:10 text_ignore_above_10 6 2022-08-08T00:00 2022-08-11T12:10:10 1660191010000 2022-08-11T12:10:10 2022-08-11T11:10:10 4444
1316-
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] \N \N string2 2022-08-08T12:10:10 text2 4 2022-08-08T00:00 2022-08-09T12:10:10 1660018210000 2022-08-09T12:10:10 2022-08-09T12:10:10 2222
1317-
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] \N I'm not null or empty \N string3 2022-08-09T00:40:10 text3_4*5 5 2022-08-08T00:00 2022-08-10T12:10:10 1660104610000 2022-08-10T12:10:10 2022-08-10T20:10:10 3333
13181309
[1, 0, 1, 1] [1, -2, -3, 4] ["2020-01-01", "2020-01-02"] ["2020-01-01 12:00:00", "2020-01-02 13:01:01"] [1, 2, 3, 4] [1, 1.1, 1.2, 1.3] [1, 2, 3, 4] [32768, 32769, -32769, -32770] ["192.168.0.1", "127.0.0.1"] ["a", "b", "c"] [-1, 0, 1, 2] [{"name":"Andy","age":18},{"name":"Tim","age":28}] [1, 2, 3, 4] [128, 129, -129, -130] ["d", "e", "f"] [0, 1, 2, 3] [{"last":"Smith","first":"John"},{"last":"White","first":"Alice"}] debug \N This string can be quite lengthy string1 2022-08-08T20:10:10 text#1 3.14 2022-08-08T00:00 2022-08-08T12:10:10 1659931810000 2022-08-08T12:10:10 2022-08-08T20:10:10 12345
13191310

13201311
-- !sql_8_22 --
@@ -1394,6 +1385,7 @@ string1 text#1
13941385
string2 text2
13951386
string3 text3_4*5
13961387
string4 text3_4*5
1388+
string_ignore_above_10 text_ignore_above_10
13971389

13981390
-- !sql_8_34 --
13991391
string1 text#1

‎regression-test/data/external_table_p2/es/test_es_query_nereids.out‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ string1 text#1 3.14 2022-08-08T00:00
77
string2 text2 4.0 2022-08-08T00:00
88
string3 text3_4*5 5.0 2022-08-08T00:00
99

10+
-- !source_date_mismatch --
11+
1012
-- !sql64 --
1113
string2 text2 4.0 2022-08-08T00:00
1214

‎regression-test/data/external_table_p2/es/test_es_query_predicate_correctness.out‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ string1
88
string2
99
string3
1010
string4
11+
string_ignore_above_10
1112

1213
-- !es7_regexp_alternation --
1314
string1
@@ -18,6 +19,7 @@ string1
1819
string2
1920
string3
2021
string4
22+
string_ignore_above_10
2123

2224
-- !es7_is_null --
2325
3
@@ -37,6 +39,7 @@ string1
3739
string2
3840
string3
3941
string4
42+
string_ignore_above_10
4043

4144
-- !es8_regexp_alternation --
4245
string1
@@ -47,6 +50,7 @@ string1
4750
string2
4851
string3
4952
string4
53+
string_ignore_above_10
5054

5155
-- !es8_is_null --
5256
3

‎regression-test/suites/external_table_p2/es/test_es_epoch_millis.groovy‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ suite("test_es_epoch_millis", "p2,external") {
7272
(9,'VALUE','1969-12-31 23:59:58'),(10,'VALUE','2023-03-04 02:08:48'),
7373
(11,'VALUE',null),(12,'VALUE','1970-01-01 00:00:00'),(13,'VALUE',null),(14,'VALUE',null)"""
7474
def expected = "internal.${context.dbName}.es_epoch_millis_expected"
75-
def originalV2 = sql("show variables like 'enable_file_scanner_v2'")[0][1]
75+
// SHOW prefixes deprecated variable names; scalar access keeps the compatibility name stable.
76+
def originalV2 = sql("SELECT @@enable_file_scanner_v2")[0][0]
7677
def originalParallel = sql("show variables like 'enable_es_parallel_scroll'")[0][1]
7778
def originalZone = sql("show variables like 'time_zone'")[0][1]
7879
try {

‎regression-test/suites/external_table_p2/es/test_es_mapping_boundaries.groovy‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ suite("test_es_mapping_boundaries", "p2,external") {
9595
"amount > 1 or ${nativeTerm}", "flag = true or ${nativeTerm}",
9696
"not (flag = true or ${nativeTerm})", "event_time = 1700000000000 or ${nativeTerm}",
9797
"not (event_time = 1700000000000 or ${nativeTerm})", "event_time > 1700000000000 or ${nativeTerm}"]
98-
def originalV2 = sql("show variables like 'enable_file_scanner_v2'")[0][1]
98+
// SHOW prefixes deprecated variable names; scalar access keeps the compatibility name stable.
99+
def originalV2 = sql("SELECT @@enable_file_scanner_v2")[0][0]
99100
def originalParallel = sql("show variables like 'enable_es_parallel_scroll'")[0][1]
100101
try {
101102
[true, false].each { docvalues ->

‎regression-test/suites/external_table_p2/es/test_es_numeric_source_semantics.groovy‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ suite("test_es_numeric_source_semantics", "p2,external") {
7575
"c = cast(2.34 as float)", "c = cast(2.33984375 as float)",
7676
"c > cast(2.33984375 as float)", "c in (cast(2.34 as float), cast(-2.34 as float))"]
7777
def nativeTerm = """esquery(b, '{"term":{"b":2.25}}')"""
78-
def originalV2 = sql("show variables like 'enable_file_scanner_v2'")[0][1]
78+
// SHOW prefixes deprecated variable names; scalar access keeps the compatibility name stable.
79+
def originalV2 = sql("SELECT @@enable_file_scanner_v2")[0][0]
7980
def originalParallel = sql("show variables like 'enable_es_parallel_scroll'")[0][1]
8081
try {
8182
["enabled", "disabled", "limited"].each { mode ->

0 commit comments

Comments
 (0)