Skip to content

Commit 41f121e

Browse files
committed
refactor and ppl rewriting
Signed-off-by: Lantao Jin <ltjin@amazon.com>
1 parent 0c5cb73 commit 41f121e

81 files changed

Lines changed: 388 additions & 170 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

integ-test/src/test/java/org/opensearch/sql/calcite/big5/CalcitePPLBig5IT.java

Lines changed: 70 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,12 @@
66
package org.opensearch.sql.calcite.big5;
77

88
import java.io.IOException;
9+
import org.junit.FixMethodOrder;
910
import org.junit.Ignore;
10-
import org.junit.jupiter.api.Test;
11+
import org.junit.Test;
12+
import org.junit.runners.MethodSorters;
1113

14+
@FixMethodOrder(MethodSorters.JVM)
1215
public class CalcitePPLBig5IT extends PPLBig5IT {
1316
private boolean initialized = false;
1417

@@ -19,41 +22,94 @@ public void init() throws Exception {
1922
disallowCalciteFallback();
2023
// warm-up
2124
if (!initialized) {
25+
executeQuery("source=big5");
26+
executeQuery("source=big5 | join on 1=1 big5"); // trigger non-pushdown
2227
executeQuery("source=big5");
2328
initialized = true;
2429
}
2530
}
2631

32+
@Ignore("Cannot resolve function: MATCH")
2733
@Override
28-
@Ignore("Relevance fields expression is unsupported in Calcite")
29-
public void testTQ2() throws IOException {}
34+
@Test
35+
public void asc_sort_timestamp_can_match_shortcut() throws IOException {
36+
super.asc_sort_timestamp_can_match_shortcut();
37+
}
3038

39+
@Ignore("Cannot resolve function: MATCH")
3140
@Override
41+
@Test
42+
public void asc_sort_timestamp_no_can_match_shortcut() throws IOException {
43+
super.asc_sort_timestamp_no_can_match_shortcut();
44+
}
45+
46+
@Ignore("Cannot resolve function: MATCH")
47+
@Override
48+
@Test
49+
public void desc_sort_timestamp_can_match_shortcut() throws IOException {
50+
super.desc_sort_timestamp_can_match_shortcut();
51+
}
52+
53+
@Ignore("Cannot resolve function: MATCH")
54+
@Override
55+
@Test
56+
public void desc_sort_timestamp_no_can_match_shortcut() throws IOException {
57+
super.desc_sort_timestamp_no_can_match_shortcut();
58+
}
59+
60+
@Ignore("Cannot resolve function: MATCH")
61+
@Override
62+
@Test
63+
public void keyword_in_range() throws IOException {
64+
super.keyword_in_range();
65+
}
66+
3267
@Ignore("Relevance fields expression is unsupported in Calcite")
33-
public void testTQ3() throws IOException {}
68+
@Override
69+
@Test
70+
public void query_string_on_message() throws IOException {
71+
super.query_string_on_message();
72+
}
3473

74+
@Ignore("Relevance fields expression is unsupported in Calcite")
3575
@Override
76+
@Test
77+
public void query_string_on_message_filtered() throws IOException {
78+
super.query_string_on_message_filtered();
79+
}
80+
3681
@Ignore("Relevance fields expression is unsupported in Calcite")
37-
public void testTQ4() throws IOException {}
82+
@Override
83+
@Test
84+
public void query_string_on_message_filtered_sorted_num() throws IOException {
85+
super.query_string_on_message_filtered_sorted_num();
86+
}
87+
88+
@Ignore("Cannot resolve function: MATCH")
89+
@Override
90+
@Test
91+
public void sort_keyword_can_match_shortcut() throws IOException {
92+
super.sort_keyword_can_match_shortcut();
93+
}
3894

95+
@Ignore("Cannot resolve function: MATCH")
3996
@Override
4097
@Test
41-
public void testSQ1() throws IOException {
42-
String ppl = sanitize(loadFromFile("big5/queries/SQ1.ppl"));
43-
timing("SQ1", ppl);
98+
public void sort_keyword_no_can_match_shortcut() throws IOException {
99+
super.sort_keyword_no_can_match_shortcut();
44100
}
45101

102+
@Ignore("Cannot resolve function: MATCH")
46103
@Override
47104
@Test
48-
public void testJ1() throws IOException {
49-
String ppl = sanitize(loadFromFile("big5/queries/J1.ppl"));
50-
timing("J1", ppl);
105+
public void sort_numeric_asc_with_match() throws IOException {
106+
super.sort_numeric_asc_with_match();
51107
}
52108

109+
@Ignore("Cannot resolve function: MATCH")
53110
@Override
54111
@Test
55-
public void testJ2() throws IOException {
56-
String ppl = sanitize(loadFromFile("big5/queries/J2.ppl"));
57-
timing("J2", ppl);
112+
public void sort_numeric_desc_with_match() throws IOException {
113+
super.sort_numeric_desc_with_match();
58114
}
59115
}

0 commit comments

Comments
 (0)