Skip to content

Commit 535c83d

Browse files
committed
Switch sql dialect to opensearch spark sql dialect (1772/2018)
Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>
1 parent df44585 commit 535c83d

4 files changed

Lines changed: 5 additions & 4 deletions

File tree

api/src/test/java/org/opensearch/sql/api/transpiler/UnifiedQueryTranspilerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import org.junit.Before;
1313
import org.junit.Test;
1414
import org.opensearch.sql.api.UnifiedQueryTestBase;
15-
import org.opensearch.sql.ppl.calcite.OpenSearchSparkSqlDialect;
15+
import org.opensearch.sql.calcite.validate.OpenSearchSparkSqlDialect;
1616

1717
public class UnifiedQueryTranspilerTest extends UnifiedQueryTestBase {
1818

ppl/src/main/java/org/opensearch/sql/ppl/calcite/OpenSearchSparkSqlDialect.java renamed to core/src/main/java/org/opensearch/sql/calcite/validate/OpenSearchSparkSqlDialect.java

Lines changed: 1 addition & 1 deletion
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.calcite;
6+
package org.opensearch.sql.calcite.validate;
77

88
import com.google.common.collect.ImmutableMap;
99
import java.util.Map;

core/src/main/java/org/opensearch/sql/executor/QueryService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.apache.calcite.sql.SqlCall;
3737
import org.apache.calcite.sql.SqlIdentifier;
3838
import org.apache.calcite.sql.SqlNode;
39-
import org.apache.calcite.sql.dialect.SparkSqlDialect;
4039
import org.apache.calcite.sql.fun.SqlCountAggFunction;
4140
import org.apache.calcite.sql.fun.SqlStdOperatorTable;
4241
import org.apache.calcite.sql.parser.SqlParser;
@@ -56,6 +55,7 @@
5655
import org.opensearch.sql.calcite.SysLimit;
5756
import org.opensearch.sql.calcite.plan.LogicalSystemLimit;
5857
import org.opensearch.sql.calcite.plan.LogicalSystemLimit.SystemLimitType;
58+
import org.opensearch.sql.calcite.validate.OpenSearchSparkSqlDialect;
5959
import org.opensearch.sql.calcite.validate.PplConvertletTable;
6060
import org.opensearch.sql.calcite.validate.PplRelToSqlNodeConverter;
6161
import org.opensearch.sql.calcite.validate.PplRelToSqlRelShuttle;
@@ -310,7 +310,7 @@ private RelNode validate(RelNode relNode, CalcitePlanContext context) {
310310
RelNode sqlRelNode = relNode.accept(new PplRelToSqlRelShuttle(context.rexBuilder, true));
311311

312312
// Convert RelNode to SqlNode for validation
313-
RelToSqlConverter rel2sql = new PplRelToSqlNodeConverter(SparkSqlDialect.DEFAULT);
313+
RelToSqlConverter rel2sql = new PplRelToSqlNodeConverter(OpenSearchSparkSqlDialect.DEFAULT);
314314
SqlImplementor.Result result = rel2sql.visitRoot(sqlRelNode);
315315
SqlNode root = result.asStatement();
316316

ppl/src/test/java/org/opensearch/sql/ppl/calcite/CalcitePPLAbstractTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import org.opensearch.sql.calcite.CalcitePlanContext;
4646
import org.opensearch.sql.calcite.CalciteRelNodeVisitor;
4747
import org.opensearch.sql.calcite.SysLimit;
48+
import org.opensearch.sql.calcite.validate.OpenSearchSparkSqlDialect;
4849
import org.opensearch.sql.common.setting.Settings;
4950
import org.opensearch.sql.datasource.DataSourceService;
5051
import org.opensearch.sql.exception.ExpressionEvaluationException;

0 commit comments

Comments
 (0)