Skip to content

Commit 708c2c7

Browse files
committed
added calcite AddColTotalsCommandIT and CalciteAddTotalsCommandIT to CalciteNoPushdownIT
Signed-off-by: Asif Bashar <asif.bashar@gmail.com>
1 parent dee3ec5 commit 708c2c7

3 files changed

Lines changed: 22 additions & 10 deletions

File tree

integ-test/src/test/java/org/opensearch/sql/calcite/CalciteNoPushdownIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
@RunWith(Suite.class)
2222
@Suite.SuiteClasses({
2323
CalciteExplainIT.class,
24+
CalciteAddTotalsCommandIT.class,
25+
CalciteAddColTotalsCommandIT.class,
2426
CalciteArrayFunctionIT.class,
2527
CalciteBinCommandIT.class,
2628
CalciteConvertTZFunctionIT.class,

integ-test/src/test/java/org/opensearch/sql/ppl/AddColTotalsCommandIT.java renamed to integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteAddColTotalsCommandIT.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package org.opensearch.sql.ppl;
6+
package org.opensearch.sql.calcite.remote;
77

88
import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
99
import static org.opensearch.sql.util.MatcherUtils.schema;
@@ -14,11 +14,14 @@
1414
import java.util.ArrayList;
1515
import java.util.List;
1616
import org.junit.jupiter.api.Test;
17+
import org.opensearch.sql.ppl.PPLIntegTestCase;
1718

18-
public class AddColTotalsCommandIT extends PPLIntegTestCase {
19+
public class CalciteAddColTotalsCommandIT extends PPLIntegTestCase {
1920

2021
@Override
21-
public void init() throws IOException {
22+
public void init() throws Exception {
23+
super.init();
24+
enableCalcite();
2225
loadIndex(Index.ACCOUNT);
2326
loadIndex(Index.BANK);
2427
}
@@ -89,7 +92,8 @@ public void verifyColTotals(
8992
cColTotals[j] = cColTotals[j].add((BigDecimal) value);
9093

9194
} else if (value instanceof String) {
92-
if (AddColTotalsCommandIT.isNumeric((String) value)) {
95+
if (org.opensearch.sql.calcite.remote.CalciteAddColTotalsCommandIT.isNumeric(
96+
(String) value)) {
9397
cColTotals[j] = cColTotals[j].add(new BigDecimal((String) (value)));
9498
}
9599
}

integ-test/src/test/java/org/opensearch/sql/ppl/AddTotalsCommandIT.java renamed to integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteAddTotalsCommandIT.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
package org.opensearch.sql.ppl;
6+
package org.opensearch.sql.calcite.remote;
77

88
import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_ACCOUNT;
99
import static org.opensearch.sql.util.MatcherUtils.schema;
@@ -14,11 +14,14 @@
1414
import java.util.ArrayList;
1515
import java.util.List;
1616
import org.junit.jupiter.api.Test;
17+
import org.opensearch.sql.ppl.PPLIntegTestCase;
1718

18-
public class AddTotalsCommandIT extends PPLIntegTestCase {
19+
public class CalciteAddTotalsCommandIT extends PPLIntegTestCase {
1920

2021
@Override
21-
public void init() throws IOException {
22+
public void init() throws Exception {
23+
super.init();
24+
enableCalcite();
2225
loadIndex(Index.ACCOUNT);
2326
loadIndex(Index.BANK);
2427
}
@@ -120,7 +123,8 @@ public void compareDataRowTotals(
120123
cRowTotal = cRowTotal.add((BigDecimal) value);
121124

122125
} else if (value instanceof String) {
123-
if (AddTotalsCommandIT.isNumeric((String) value)) {
126+
if (org.opensearch.sql.calcite.remote.CalciteAddTotalsCommandIT.isNumeric(
127+
(String) value)) {
124128
cRowTotal = cRowTotal.add(new BigDecimal((String) (value)));
125129
}
126130
}
@@ -153,7 +157,8 @@ public void verifyColTotals(
153157
cColTotals[j] = cColTotals[j].add((BigDecimal) value);
154158

155159
} else if (value instanceof String) {
156-
if (AddTotalsCommandIT.isNumeric((String) value)) {
160+
if (org.opensearch.sql.calcite.remote.CalciteAddTotalsCommandIT.isNumeric(
161+
(String) value)) {
157162
cColTotals[j] = cColTotals[j].add(new BigDecimal((String) (value)));
158163
}
159164
}
@@ -201,7 +206,8 @@ public void testAddTotalsRowFieldsNonNumeric() throws IOException {
201206
} else if (value instanceof Double) {
202207
cRowTotal = cRowTotal.add(new BigDecimal((Double) (value)));
203208
} else if (value instanceof String) {
204-
if (AddTotalsCommandIT.isNumeric((String) value)) {
209+
if (org.opensearch.sql.calcite.remote.CalciteAddTotalsCommandIT.isNumeric(
210+
(String) value)) {
205211
cRowTotal = cRowTotal.add(new BigDecimal((String) (value)));
206212
}
207213
}

0 commit comments

Comments
 (0)