You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2021/09/23 14:39:52 UTC
[shardingsphere] branch master updated: Rename SqlNodeConverter to
Rename SQLNodeConverter (#12663)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 512a229 Rename SqlNodeConverter to Rename SQLNodeConverter (#12663)
512a229 is described below
commit 512a229eac18cc39712e675732cce3f81d493f0a
Author: Liang Zhang <te...@163.com>
AuthorDate: Thu Sep 23 22:39:22 2021 +0800
Rename SqlNodeConverter to Rename SQLNodeConverter (#12663)
* Rename FilterableTableScanExecutor
* Rename FederationLogicSchema
* Refactor ShardingSphereOptimizer
* Rename SQLNodeConvertEngine
* Rename SQLNodeConvertEngine
* Rename SQLNodeConvertEngine
* Rename SQLNodeConverter
* For javadoc
* For javadoc
* Add todo
---
.../properties/ConfigurationPropertyKey.java | 2 +-
.../customized/CustomizedFederationExecutor.java | 10 ++++-----
.../original/OriginalFederationExecutor.java | 8 ++++----
...LogicSchema.java => FederationLogicSchema.java} | 11 +++++-----
.../schema/table/AbstractFederationTable.java | 3 ---
.../schema/table/FederationFilterableTable.java | 12 ++++++-----
.../FilterableTableScanExecutor.java} | 14 ++++++-------
.../sql/federate/FederateJDBCExecutorTest.java | 10 ++++-----
.../infra/optimize/ShardingSphereOptimizer.java | 13 ++++++------
...onvertEngine.java => SQLNodeConvertEngine.java} | 21 ++++++++++---------
...SqlNodeConverter.java => SQLNodeConverter.java} | 11 +++++-----
.../convert/converter/SqlNodeConverterUtil.java | 4 ++--
...ter.java => AbstractLimitSQLNodeConverter.java} | 16 ++++++---------
...BinaryOperationExpressionSQLNodeConverter.java} | 8 ++++----
...java => ColumnOrderByItemSQLNodeConverter.java} | 6 +++---
....java => ColumnProjectionSQLNodeConverter.java} | 6 +++---
...eConverter.java => ColumnSQLNodeConverter.java} | 4 ++--
...onverter.java => DistinctSQLNodeConverter.java} | 4 ++--
... => ExpressionOrderByItemSQLNodeConverter.java} | 4 ++--
...a => ExpressionProjectionSQLNodeConverter.java} | 4 ++--
...verter.java => ExpressionSQLNodeConverter.java} | 12 +++++------
...Converter.java => GroupBySQLNodeConverter.java} | 4 ++--
...eConverter.java => HavingSQLNodeConverter.java} | 6 +++---
...nverter.java => JoinTableSQLNodeConverter.java} | 18 ++++++++--------
...er.java => ListExpressionSQLNodeConverter.java} | 6 +++---
...java => LiteralExpressionSQLNodeConverter.java} | 4 ++--
...eConverter.java => OffsetSQLNodeConverter.java} | 6 +++---
...Converter.java => OrderBySQLNodeConverter.java} | 4 ++--
...erter.java => PaginationValueSQLConverter.java} | 4 ++--
...erter.java => ProjectionsSQLNodeConverter.java} | 8 ++++----
...onverter.java => RowCountSQLNodeConverter.java} | 4 ++--
...r.java => SelectStatementSQLNodeConverter.java} | 24 +++++++++++-----------
...erter.java => SimpleTableSQLNodeConverter.java} | 4 ++--
...ter.java => SubqueryTableSQLNodeConverter.java} | 4 ++--
...deConverter.java => TableSQLNodeConverter.java} | 12 +++++------
...deConverter.java => WhereSQLNodeConverter.java} | 6 +++---
...va => SelectStatementSQLNodeConverterTest.java} | 18 ++++++++--------
37 files changed, 156 insertions(+), 159 deletions(-)
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/properties/ConfigurationPropertyKey.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/properties/ConfigurationPropertyKey.java
index 6e91dbe..e9238d1 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/properties/ConfigurationPropertyKey.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/properties/ConfigurationPropertyKey.java
@@ -100,7 +100,7 @@ public enum ConfigurationPropertyKey implements TypedPropertyKey {
CHECK_DUPLICATE_TABLE_ENABLED("check-duplicate-table-enabled", String.valueOf(Boolean.FALSE), boolean.class),
/**
- * Whether enable sql comment parse.
+ * Whether enable SQL comment parse.
*/
SQL_COMMENT_PARSE_ENABLED("sql-comment-parse-enabled", String.valueOf(Boolean.FALSE), boolean.class),
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/execute/customized/CustomizedFederationExecutor.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/execute/customized/CustomizedFederationExecutor.java
index 6dd5753..3e6b52c 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/execute/customized/CustomizedFederationExecutor.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/execute/customized/CustomizedFederationExecutor.java
@@ -58,11 +58,6 @@ public final class CustomizedFederationExecutor implements FederationExecutor {
}
@Override
- public void close() {
- // TODO
- }
-
- @Override
public ResultSet getResultSet() {
return null;
}
@@ -77,6 +72,11 @@ public final class CustomizedFederationExecutor implements FederationExecutor {
return new FederateInterpretableConverter(cluster, cluster.traitSetOf(InterpretableConvention.INSTANCE), bestPlan).bind(new FederateExecuteDataContext(optimizer.getContext()));
}
+ @Override
+ public void close() {
+ // TODO
+ }
+
public static final class FederateInterpretableConverter extends InterpretableConverter {
public FederateInterpretableConverter(final RelOptCluster cluster, final RelTraitSet traits, final RelNode input) {
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/execute/original/OriginalFederationExecutor.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/execute/original/OriginalFederationExecutor.java
index 9c05e18..1f7c290 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/execute/original/OriginalFederationExecutor.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/execute/original/OriginalFederationExecutor.java
@@ -29,8 +29,8 @@ import org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResult;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.impl.driver.jdbc.type.stream.JDBCStreamQueryResult;
import org.apache.shardingsphere.infra.executor.sql.federate.execute.FederationExecutor;
-import org.apache.shardingsphere.infra.executor.sql.federate.schema.FederateLogicSchema;
-import org.apache.shardingsphere.infra.executor.sql.federate.schema.row.FederateRowExecutor;
+import org.apache.shardingsphere.infra.executor.sql.federate.schema.FederationLogicSchema;
+import org.apache.shardingsphere.infra.executor.sql.federate.schema.table.FilterableTableScanExecutor;
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.DriverExecutionPrepareEngine;
import org.apache.shardingsphere.infra.optimize.context.original.OriginalOptimizerContext;
import org.apache.shardingsphere.sql.parser.sql.common.util.SQLUtil;
@@ -97,8 +97,8 @@ public final class OriginalFederationExecutor implements FederationExecutor {
private void addSchema(final CalciteConnection connection, final DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
final JDBCExecutorCallback<? extends ExecuteResult> callback, final ExecutionContext executionContext) throws SQLException {
- FederateRowExecutor executor = new FederateRowExecutor(prepareEngine, jdbcExecutor, callback, props, executionContext, optimizerContext.getDatabaseType().getQuoteCharacter());
- FederateLogicSchema logicSchema = new FederateLogicSchema(optimizerContext.getMetaData().getSchemas().get(schema), executor);
+ FilterableTableScanExecutor executor = new FilterableTableScanExecutor(prepareEngine, jdbcExecutor, callback, props, executionContext, optimizerContext.getDatabaseType().getQuoteCharacter());
+ FederationLogicSchema logicSchema = new FederationLogicSchema(optimizerContext.getMetaData().getSchemas().get(schema), executor);
connection.getRootSchema().add(schema, logicSchema);
connection.setSchema(schema);
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/FederateLogicSchema.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/FederationLogicSchema.java
similarity index 86%
rename from shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/FederateLogicSchema.java
rename to shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/FederationLogicSchema.java
index 8f60ef8..907dd5d 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/FederateLogicSchema.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/FederationLogicSchema.java
@@ -21,30 +21,29 @@ import lombok.Getter;
import org.apache.calcite.schema.Table;
import org.apache.calcite.schema.impl.AbstractSchema;
import org.apache.commons.collections4.map.LinkedMap;
-import org.apache.shardingsphere.infra.executor.sql.federate.schema.row.FederateRowExecutor;
import org.apache.shardingsphere.infra.executor.sql.federate.schema.table.FederationFilterableTable;
+import org.apache.shardingsphere.infra.executor.sql.federate.schema.table.FilterableTableScanExecutor;
import org.apache.shardingsphere.infra.optimize.core.metadata.FederationSchemaMetaData;
import org.apache.shardingsphere.infra.optimize.core.metadata.FederationTableMetaData;
import java.util.Map;
/**
- * Federate logic schema.
- *
+ * Federation logic schema.
*/
@Getter
-public final class FederateLogicSchema extends AbstractSchema {
+public final class FederationLogicSchema extends AbstractSchema {
private final String name;
private final Map<String, Table> tables;
- public FederateLogicSchema(final FederationSchemaMetaData schemaMetaData, final FederateRowExecutor executor) {
+ public FederationLogicSchema(final FederationSchemaMetaData schemaMetaData, final FilterableTableScanExecutor executor) {
name = schemaMetaData.getName();
tables = getTables(schemaMetaData, executor);
}
- private Map<String, Table> getTables(final FederationSchemaMetaData schemaMetaData, final FederateRowExecutor executor) {
+ private Map<String, Table> getTables(final FederationSchemaMetaData schemaMetaData, final FilterableTableScanExecutor executor) {
Map<String, Table> result = new LinkedMap<>(schemaMetaData.getTables().size(), 1);
for (FederationTableMetaData each : schemaMetaData.getTables().values()) {
result.put(each.getName(), new FederationFilterableTable(each, executor));
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/table/AbstractFederationTable.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/table/AbstractFederationTable.java
index db11b86..c1dbcf3 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/table/AbstractFederationTable.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/table/AbstractFederationTable.java
@@ -23,7 +23,6 @@ import lombok.RequiredArgsConstructor;
import org.apache.calcite.rel.type.RelDataType;
import org.apache.calcite.rel.type.RelDataTypeFactory;
import org.apache.calcite.schema.impl.AbstractTable;
-import org.apache.shardingsphere.infra.executor.sql.federate.schema.row.FederateRowExecutor;
import org.apache.shardingsphere.infra.optimize.core.metadata.FederationTableMetaData;
/**
@@ -35,8 +34,6 @@ public abstract class AbstractFederationTable extends AbstractTable {
private final FederationTableMetaData metaData;
- private final FederateRowExecutor executor;
-
@Override
public final RelDataType getRowType(final RelDataTypeFactory typeFactory) {
return metaData.getRelProtoDataType().apply(typeFactory);
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/table/FederationFilterableTable.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/table/FederationFilterableTable.java
index 315e280..da7fafb 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/table/FederationFilterableTable.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/table/FederationFilterableTable.java
@@ -25,7 +25,6 @@ import org.apache.calcite.rex.RexNode;
import org.apache.calcite.schema.ProjectableFilterableTable;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryResult;
import org.apache.shardingsphere.infra.executor.sql.federate.execute.FilterableTableScanContext;
-import org.apache.shardingsphere.infra.executor.sql.federate.schema.row.FederateRowExecutor;
import org.apache.shardingsphere.infra.executor.sql.federate.schema.row.FederationRowEnumerator;
import org.apache.shardingsphere.infra.optimize.core.metadata.FederationTableMetaData;
@@ -33,17 +32,20 @@ import java.util.Collection;
import java.util.List;
/**
- * Federate filterable Table.
+ * Federation filterable Table.
*/
public final class FederationFilterableTable extends AbstractFederationTable implements ProjectableFilterableTable {
- public FederationFilterableTable(final FederationTableMetaData metadata, final FederateRowExecutor executor) {
- super(metadata, executor);
+ private final FilterableTableScanExecutor executor;
+
+ public FederationFilterableTable(final FederationTableMetaData metadata, final FilterableTableScanExecutor executor) {
+ super(metadata);
+ this.executor = executor;
}
@Override
public Enumerable<Object[]> scan(final DataContext root, final List<RexNode> filters, final int[] projects) {
- Collection<QueryResult> queryResults = getExecutor().execute(getMetaData(), new FilterableTableScanContext(root, filters, projects));
+ Collection<QueryResult> queryResults = executor.execute(getMetaData(), new FilterableTableScanContext(root, filters, projects));
return new AbstractEnumerable<Object[]>() {
@Override
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/row/FederateRowExecutor.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/table/FilterableTableScanExecutor.java
similarity index 87%
rename from shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/row/FederateRowExecutor.java
rename to shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/table/FilterableTableScanExecutor.java
index dd15dbc..1aa9d53 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/row/FederateRowExecutor.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/federate/schema/table/FilterableTableScanExecutor.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.executor.sql.federate.schema.row;
+package org.apache.shardingsphere.infra.executor.sql.federate.schema.table;
import org.apache.shardingsphere.infra.config.properties.ConfigurationProperties;
import org.apache.shardingsphere.infra.exception.ShardingSphereException;
@@ -39,9 +39,9 @@ import java.util.Collection;
import java.util.stream.Collectors;
/**
- * Federate row executor.
+ * Filterable table scan executor.
*/
-public final class FederateRowExecutor {
+public final class FilterableTableScanExecutor {
private final DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine;
@@ -53,9 +53,9 @@ public final class FederateRowExecutor {
private final FederateExecutionContextGenerator executionContextGenerator;
- public FederateRowExecutor(final DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
- final JDBCExecutor jdbcExecutor, final JDBCExecutorCallback<? extends ExecuteResult> callback,
- final ConfigurationProperties props, final ExecutionContext routeExecutionContext, final QuoteCharacter quoteCharacter) {
+ public FilterableTableScanExecutor(final DriverExecutionPrepareEngine<JDBCExecutionUnit, Connection> prepareEngine,
+ final JDBCExecutor jdbcExecutor, final JDBCExecutorCallback<? extends ExecuteResult> callback,
+ final ConfigurationProperties props, final ExecutionContext routeExecutionContext, final QuoteCharacter quoteCharacter) {
this.jdbcExecutor = jdbcExecutor;
this.callback = callback;
this.prepareEngine = prepareEngine;
@@ -67,7 +67,7 @@ public final class FederateRowExecutor {
* Execute.
*
* @param tableMetaData federation table meta data
- * @param scanContext rel node scan context
+ * @param scanContext filterable table scan context
* @return query results
*/
public Collection<QueryResult> execute(final FederationTableMetaData tableMetaData, final FilterableTableScanContext scanContext) {
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/federate/FederateJDBCExecutorTest.java b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/federate/FederateJDBCExecutorTest.java
index e63df51..a4f45b6 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/federate/FederateJDBCExecutorTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/federate/FederateJDBCExecutorTest.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.infra.config.properties.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.type.dialect.H2DatabaseType;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
-import org.apache.shardingsphere.infra.executor.sql.federate.schema.FederateLogicSchema;
+import org.apache.shardingsphere.infra.executor.sql.federate.schema.FederationLogicSchema;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.metadata.resource.DataSourcesMetaData;
import org.apache.shardingsphere.infra.metadata.resource.ShardingSphereResource;
@@ -80,9 +80,9 @@ public final class FederateJDBCExecutorTest {
Map<String, List<String>> columnMap = initializeColumnMap();
Map<String, List<String>> tableMap = initializeTableMap();
Map<String, DataSource> actualDataSourceMap = initializeDataSourceMap(schemaName);
- FederateLogicSchema calciteSchema = initializeCalciteSchema(schemaName, columnMap, tableMap);
+ FederationLogicSchema logicSchema = initializeLogicSchema(schemaName, columnMap, tableMap);
OriginalOptimizerContext optimizerContext = OriginalOptimizerContextFactory.create(createMetaDataMap(schemaName, actualDataSourceMap));
- optimizer = new ShardingSphereOptimizer(CustomizedOptimizerContextFactory.create(schemaName, calciteSchema, optimizerContext));
+ optimizer = new ShardingSphereOptimizer(CustomizedOptimizerContextFactory.create(schemaName, logicSchema, optimizerContext));
}
@Test
@@ -136,9 +136,9 @@ public final class FederateJDBCExecutorTest {
return result;
}
- private FederateLogicSchema initializeCalciteSchema(final String schemaName, final Map<String, List<String>> columnMap, final Map<String, List<String>> tableMap) {
+ private FederationLogicSchema initializeLogicSchema(final String schemaName, final Map<String, List<String>> columnMap, final Map<String, List<String>> tableMap) {
FederationSchemaMetaData federationSchemaMetaData = buildSchemaMetaData(schemaName, tableMap.get(schemaName), columnMap);
- return new FederateLogicSchema(federationSchemaMetaData, null);
+ return new FederationLogicSchema(federationSchemaMetaData, null);
}
private FederationSchemaMetaData buildSchemaMetaData(final String schemaName, final List<String> tableNames, final Map<String, List<String>> tableColumns) {
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/ShardingSphereOptimizer.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/ShardingSphereOptimizer.java
index bcc5a20..aae563e 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/ShardingSphereOptimizer.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/ShardingSphereOptimizer.java
@@ -39,7 +39,7 @@ import org.apache.shardingsphere.infra.config.properties.ConfigurationProperties
import org.apache.shardingsphere.infra.database.type.DatabaseTypeRegistry;
import org.apache.shardingsphere.infra.exception.ShardingSphereException;
import org.apache.shardingsphere.infra.optimize.context.customized.CustomizedOptimizerContext;
-import org.apache.shardingsphere.infra.optimize.core.convert.SqlNodeConvertEngine;
+import org.apache.shardingsphere.infra.optimize.core.convert.SQLNodeConvertEngine;
import org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine;
import org.apache.shardingsphere.sql.parser.exception.SQLParsingException;
@@ -51,15 +51,15 @@ import java.util.Properties;
* ShardingSphere optimizer.
*/
@RequiredArgsConstructor
+@Getter
public final class ShardingSphereOptimizer {
- @Getter
private final CustomizedOptimizerContext context;
/**
* Optimize.
*
- * @param sql SQL
+ * @param sql SQL to be optimized
* @return rel node
* @throws SQLParsingException SQL parsing exception
*/
@@ -67,9 +67,10 @@ public final class ShardingSphereOptimizer {
try {
// TODO : Remove the following statement after SqlNodeConvertEngine becomes available.
// SqlNode sqlNode = SqlParser.create(sql, context.getParserConfig()).parseQuery();
- ShardingSphereSQLParserEngine sqlParserEngine = new ShardingSphereSQLParserEngine(DatabaseTypeRegistry.getTrunkDatabaseTypeName(context.getOriginalOptimizerContext().getDatabaseType()),
- new ConfigurationProperties(new Properties()));
- SqlNode sqlNode = SqlNodeConvertEngine.convert(sqlParserEngine.parse(sql, true));
+ ShardingSphereSQLParserEngine sqlParserEngine = new ShardingSphereSQLParserEngine(
+ DatabaseTypeRegistry.getTrunkDatabaseTypeName(context.getOriginalOptimizerContext().getDatabaseType()), new ConfigurationProperties(new Properties()));
+ // TODO cache for every SQL may cause out of memory, should keep consist with statement and prepared statement
+ SqlNode sqlNode = SQLNodeConvertEngine.convert(sqlParserEngine.parse(sql, true));
SqlNode validNode = context.getValidator().validate(sqlNode);
RelDataType resultType = context.getValidator().getValidatedNodeType(sqlNode);
RelNode logicPlan = context.getRelConverter().convertQuery(validNode, false, true).rel;
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/SqlNodeConvertEngine.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/SQLNodeConvertEngine.java
similarity index 73%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/SqlNodeConvertEngine.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/SQLNodeConvertEngine.java
index c1f9a2c..4ef9d85 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/SqlNodeConvertEngine.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/SQLNodeConvertEngine.java
@@ -20,30 +20,31 @@ package org.apache.shardingsphere.infra.optimize.core.convert;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.calcite.sql.SqlNode;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.impl.SelectStatementSqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.impl.SelectStatementSQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement;
import java.util.Optional;
/**
- * SqlNode convert engine.
+ * SQL node convert engine.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class SqlNodeConvertEngine {
+public final class SQLNodeConvertEngine {
/**
- * Convert.
- * @param statement statement
- * @return sqlNode optional
+ * Convert.
+ *
+ * @param statement SQL statement
+ * @return sqlNode converted SQL node
*/
public static SqlNode convert(final SQLStatement statement) {
if (statement instanceof SelectStatement) {
- Optional<SqlNode> selectSqlNode = new SelectStatementSqlNodeConverter().convert((SelectStatement) statement);
- if (selectSqlNode.isPresent()) {
- return selectSqlNode.get();
+ Optional<SqlNode> selectSQLNode = new SelectStatementSQLNodeConverter().convert((SelectStatement) statement);
+ if (selectSQLNode.isPresent()) {
+ return selectSQLNode.get();
}
}
- throw new UnsupportedOperationException("Unsupported sqlNode conversion.");
+ throw new UnsupportedOperationException("Unsupported SQL node conversion.");
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/SqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/SQLNodeConverter.java
similarity index 85%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/SqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/SQLNodeConverter.java
index 97a2529..a5fd087 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/SqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/SQLNodeConverter.java
@@ -23,14 +23,15 @@ import org.apache.shardingsphere.sql.parser.api.visitor.ASTNode;
import java.util.Optional;
/**
- * SqlNode converter.
+ * SQL node converter.
*/
-public interface SqlNodeConverter<T extends ASTNode, R extends SqlNode> {
+public interface SQLNodeConverter<T extends ASTNode, R extends SqlNode> {
/**
- * Convert.
- * @param astNode ast node
- * @return sqlNode optional
+ * Convert.
+ *
+ * @param astNode AST node
+ * @return sqlNode converted SQL node
*/
Optional<R> convert(T astNode);
}
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/SqlNodeConverterUtil.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/SqlNodeConverterUtil.java
index 4535871..f621442 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/SqlNodeConverterUtil.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/SqlNodeConverterUtil.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.optimize.core.convert.converter;
import org.apache.calcite.sql.SqlNode;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.impl.ColumnOrderByItemSqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.impl.ColumnOrderByItemSQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.order.item.ColumnOrderByItemSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.order.item.ExpressionOrderByItemSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.order.item.IndexOrderByItemSegment;
@@ -42,7 +42,7 @@ public final class SqlNodeConverterUtil {
Collection<SqlNode> result = new ArrayList<>(orderByItems.size());
for (OrderByItemSegment each : orderByItems) {
if (each instanceof ColumnOrderByItemSegment) {
- new ColumnOrderByItemSqlNodeConverter().convert((ColumnOrderByItemSegment) each).ifPresent(result::add);
+ new ColumnOrderByItemSQLNodeConverter().convert((ColumnOrderByItemSegment) each).ifPresent(result::add);
} else if (each instanceof ExpressionOrderByItemSegment) {
throw new UnsupportedOperationException("unsupported ExpressionOrderByItemSegment");
} else if (each instanceof IndexOrderByItemSegment) {
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/AbstractLimitSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/AbstractLimitSQLNodeConverter.java
similarity index 74%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/AbstractLimitSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/AbstractLimitSQLNodeConverter.java
index b6e1e80..f5dfa46 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/AbstractLimitSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/AbstractLimitSQLNodeConverter.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.optimize.core.convert.converter.impl;
import org.apache.calcite.sql.SqlNode;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.pagination.PaginationValueSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.pagination.limit.LimitSegment;
@@ -28,11 +28,11 @@ import java.util.function.Function;
/**
* Abstract limit sql node converter.
*/
-public abstract class AbstractLimitSqlNodeConverter implements SqlNodeConverter<LimitSegment, SqlNode> {
-
- private Function<LimitSegment, Optional<PaginationValueSegment>> function;
+public abstract class AbstractLimitSQLNodeConverter implements SQLNodeConverter<LimitSegment, SqlNode> {
+
+ private final Function<LimitSegment, Optional<PaginationValueSegment>> function;
- protected AbstractLimitSqlNodeConverter(final Function<LimitSegment, Optional<PaginationValueSegment>> function) {
+ protected AbstractLimitSQLNodeConverter(final Function<LimitSegment, Optional<PaginationValueSegment>> function) {
this.function = function;
}
@@ -41,10 +41,6 @@ public abstract class AbstractLimitSqlNodeConverter implements SqlNodeConverter<
if (null == limit) {
return Optional.empty();
}
- Optional<PaginationValueSegment> paginationValue = function.apply(limit);
- if (!paginationValue.isPresent()) {
- return Optional.empty();
- }
- return new PaginationValueSqlConverter().convert(paginationValue.get());
+ return function.apply(limit).flatMap(optional -> new PaginationValueSQLConverter().convert(optional));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/BinaryOperationExpressionSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/BinaryOperationExpressionSQLNodeConverter.java
similarity index 87%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/BinaryOperationExpressionSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/BinaryOperationExpressionSQLNodeConverter.java
index 85571c0..db0f065 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/BinaryOperationExpressionSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/BinaryOperationExpressionSQLNodeConverter.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.infra.optimize.core.convert.converter.impl;
import org.apache.calcite.sql.SqlBasicCall;
import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.parser.SqlParserPos;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.infra.optimize.core.operator.BinarySqlOperator;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.BinaryOperationExpression;
@@ -29,12 +29,12 @@ import java.util.Optional;
/**
* Binary operation expression converter.
*/
-public final class BinaryOperationExpressionSqlNodeConverter implements SqlNodeConverter<BinaryOperationExpression, SqlNode> {
+public final class BinaryOperationExpressionSQLNodeConverter implements SQLNodeConverter<BinaryOperationExpression, SqlNode> {
@Override
public Optional<SqlNode> convert(final BinaryOperationExpression binaryOperationExpression) {
- SqlNode left = new ExpressionSqlNodeConverter().convert(binaryOperationExpression.getLeft()).get();
- SqlNode right = new ExpressionSqlNodeConverter().convert(binaryOperationExpression.getRight()).get();
+ SqlNode left = new ExpressionSQLNodeConverter().convert(binaryOperationExpression.getLeft()).get();
+ SqlNode right = new ExpressionSQLNodeConverter().convert(binaryOperationExpression.getRight()).get();
String operator = binaryOperationExpression.getOperator();
BinarySqlOperator binarySqlOperator = BinarySqlOperator.value(operator);
SqlNode sqlNode = new SqlBasicCall(binarySqlOperator.getSqlBinaryOperator(), new SqlNode[] {left, right},
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ColumnOrderByItemSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ColumnOrderByItemSQLNodeConverter.java
similarity index 89%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ColumnOrderByItemSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ColumnOrderByItemSQLNodeConverter.java
index 76d38eb..b2b0abc 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ColumnOrderByItemSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ColumnOrderByItemSQLNodeConverter.java
@@ -21,7 +21,7 @@ import org.apache.calcite.sql.SqlBasicCall;
import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.fun.SqlStdOperatorTable;
import org.apache.calcite.sql.parser.SqlParserPos;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.constant.OrderDirection;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.order.item.ColumnOrderByItemSegment;
@@ -31,11 +31,11 @@ import java.util.Optional;
/**
* Column of order by converter.
*/
-public final class ColumnOrderByItemSqlNodeConverter implements SqlNodeConverter<ColumnOrderByItemSegment, SqlNode> {
+public final class ColumnOrderByItemSQLNodeConverter implements SQLNodeConverter<ColumnOrderByItemSegment, SqlNode> {
@Override
public Optional<SqlNode> convert(final ColumnOrderByItemSegment columnOrderBy) {
- Optional<SqlNode> optional = new ColumnSqlNodeConverter().convert(columnOrderBy.getColumn());
+ Optional<SqlNode> optional = new ColumnSQLNodeConverter().convert(columnOrderBy.getColumn());
if (optional.isPresent() && Objects.equals(OrderDirection.DESC, columnOrderBy.getOrderDirection())) {
optional = Optional.of(new SqlBasicCall(SqlStdOperatorTable.DESC, new SqlNode[] {optional.get()}, SqlParserPos.ZERO));
}
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ColumnProjectionSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ColumnProjectionSQLNodeConverter.java
similarity index 87%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ColumnProjectionSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ColumnProjectionSQLNodeConverter.java
index ac6e671..c97c776 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ColumnProjectionSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ColumnProjectionSQLNodeConverter.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.optimize.core.convert.converter.impl;
import org.apache.calcite.sql.SqlNode;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ColumnProjectionSegment;
@@ -27,11 +27,11 @@ import java.util.Optional;
/**
* Column projection converter.
*/
-public final class ColumnProjectionSqlNodeConverter implements SqlNodeConverter<ColumnProjectionSegment, SqlNode> {
+public final class ColumnProjectionSQLNodeConverter implements SQLNodeConverter<ColumnProjectionSegment, SqlNode> {
@Override
public Optional<SqlNode> convert(final ColumnProjectionSegment columnProjection) {
ColumnSegment column = columnProjection.getColumn();
- return new ColumnSqlNodeConverter().convert(column);
+ return new ColumnSQLNodeConverter().convert(column);
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ColumnSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ColumnSQLNodeConverter.java
similarity index 95%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ColumnSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ColumnSQLNodeConverter.java
index 08f790d..3f4cd77 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ColumnSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ColumnSQLNodeConverter.java
@@ -21,7 +21,7 @@ import com.google.common.collect.ImmutableList;
import org.apache.calcite.sql.SqlIdentifier;
import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.parser.SqlParserPos;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.OwnerSegment;
@@ -30,7 +30,7 @@ import java.util.Optional;
/**
* Column converter.
*/
-public final class ColumnSqlNodeConverter implements SqlNodeConverter<ColumnSegment, SqlNode> {
+public final class ColumnSQLNodeConverter implements SQLNodeConverter<ColumnSegment, SqlNode> {
@Override
public Optional<SqlNode> convert(final ColumnSegment columnSegment) {
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/DistinctSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/DistinctSQLNodeConverter.java
similarity index 94%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/DistinctSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/DistinctSQLNodeConverter.java
index bd041da..3f4e3c6 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/DistinctSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/DistinctSQLNodeConverter.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.infra.optimize.core.convert.converter.impl;
import org.apache.calcite.sql.SqlNodeList;
import org.apache.calcite.sql.SqlSelectKeyword;
import org.apache.calcite.sql.parser.SqlParserPos;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ProjectionsSegment;
import java.util.Collections;
@@ -29,7 +29,7 @@ import java.util.Optional;
/**
* Distinct sql node converter.
*/
-public final class DistinctSqlNodeConverter implements SqlNodeConverter<ProjectionsSegment, SqlNodeList> {
+public final class DistinctSQLNodeConverter implements SQLNodeConverter<ProjectionsSegment, SqlNodeList> {
@Override
public Optional<SqlNodeList> convert(final ProjectionsSegment projectionsSegment) {
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ExpressionOrderByItemSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ExpressionOrderByItemSQLNodeConverter.java
similarity index 89%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ExpressionOrderByItemSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ExpressionOrderByItemSQLNodeConverter.java
index 37b202b..b3d12e5 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ExpressionOrderByItemSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ExpressionOrderByItemSQLNodeConverter.java
@@ -18,12 +18,12 @@
package org.apache.shardingsphere.infra.optimize.core.convert.converter.impl;
import org.apache.calcite.sql.SqlNode;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.order.item.ExpressionOrderByItemSegment;
import java.util.Optional;
-public final class ExpressionOrderByItemSqlNodeConverter implements SqlNodeConverter<ExpressionOrderByItemSegment, SqlNode> {
+public final class ExpressionOrderByItemSQLNodeConverter implements SQLNodeConverter<ExpressionOrderByItemSegment, SqlNode> {
@Override
public Optional<SqlNode> convert(final ExpressionOrderByItemSegment astNode) {
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ExpressionProjectionSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ExpressionProjectionSQLNodeConverter.java
similarity index 91%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ExpressionProjectionSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ExpressionProjectionSQLNodeConverter.java
index 3a4e9c2..3f6d822 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ExpressionProjectionSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ExpressionProjectionSQLNodeConverter.java
@@ -20,12 +20,12 @@ package org.apache.shardingsphere.infra.optimize.core.convert.converter.impl;
import org.apache.calcite.sql.SqlCharStringLiteral;
import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.parser.SqlParserPos;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ExpressionProjectionSegment;
import java.util.Optional;
-public final class ExpressionProjectionSqlNodeConverter implements SqlNodeConverter<ExpressionProjectionSegment, SqlNode> {
+public final class ExpressionProjectionSQLNodeConverter implements SQLNodeConverter<ExpressionProjectionSegment, SqlNode> {
@Override
public Optional<SqlNode> convert(final ExpressionProjectionSegment expressionProjection) {
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ExpressionSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ExpressionSQLNodeConverter.java
similarity index 88%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ExpressionSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ExpressionSQLNodeConverter.java
index c507d22..b476e55 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ExpressionSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ExpressionSQLNodeConverter.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.optimize.core.convert.converter.impl;
import org.apache.calcite.sql.SqlNode;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.column.ColumnSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.BinaryOperationExpression;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.ExpressionSegment;
@@ -31,7 +31,7 @@ import java.util.Optional;
/**
* Expression converter entry.
*/
-public final class ExpressionSqlNodeConverter implements SqlNodeConverter<ExpressionSegment, SqlNode> {
+public final class ExpressionSQLNodeConverter implements SQLNodeConverter<ExpressionSegment, SqlNode> {
@Override
public Optional<SqlNode> convert(final ExpressionSegment expression) {
@@ -39,16 +39,16 @@ public final class ExpressionSqlNodeConverter implements SqlNodeConverter<Expres
return Optional.empty();
}
if (expression instanceof LiteralExpressionSegment) {
- return new LiteralExpressionSqlNodeConverter().convert((LiteralExpressionSegment) expression);
+ return new LiteralExpressionSQLNodeConverter().convert((LiteralExpressionSegment) expression);
} else if (expression instanceof CommonExpressionSegment) {
// TODO
throw new UnsupportedOperationException("unsupported CommonExpressionSegment");
} else if (expression instanceof ListExpression) {
- return new ListExpressionSqlNodeConverter().convert((ListExpression) expression);
+ return new ListExpressionSQLNodeConverter().convert((ListExpression) expression);
} else if (expression instanceof BinaryOperationExpression) {
- return new BinaryOperationExpressionSqlNodeConverter().convert((BinaryOperationExpression) expression);
+ return new BinaryOperationExpressionSQLNodeConverter().convert((BinaryOperationExpression) expression);
} else if (expression instanceof ColumnSegment) {
- return new ColumnSqlNodeConverter().convert((ColumnSegment) expression);
+ return new ColumnSQLNodeConverter().convert((ColumnSegment) expression);
}
throw new UnsupportedOperationException("unsupported TableSegment type: " + expression.getClass());
}
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/GroupBySqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/GroupBySQLNodeConverter.java
similarity index 95%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/GroupBySqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/GroupBySQLNodeConverter.java
index d612934..4433503 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/GroupBySqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/GroupBySQLNodeConverter.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.infra.optimize.core.convert.converter.impl;
import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.SqlNodeList;
import org.apache.calcite.sql.parser.SqlParserPos;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverterUtil;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.order.GroupBySegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.order.item.OrderByItemSegment;
@@ -31,7 +31,7 @@ import java.util.Optional;
/**
* Group by converter.
*/
-public final class GroupBySqlNodeConverter implements SqlNodeConverter<GroupBySegment, SqlNodeList> {
+public final class GroupBySQLNodeConverter implements SQLNodeConverter<GroupBySegment, SqlNodeList> {
@Override
public Optional<SqlNodeList> convert(final GroupBySegment groupBy) {
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/HavingSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/HavingSQLNodeConverter.java
similarity index 89%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/HavingSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/HavingSQLNodeConverter.java
index e9a7dea..d48d3ce 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/HavingSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/HavingSQLNodeConverter.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.optimize.core.convert.converter.impl;
import org.apache.calcite.sql.SqlNode;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.HavingSegment;
import java.util.Optional;
@@ -26,13 +26,13 @@ import java.util.Optional;
/**
* Having converter.
*/
-public final class HavingSqlNodeConverter implements SqlNodeConverter<HavingSegment, SqlNode> {
+public final class HavingSQLNodeConverter implements SQLNodeConverter<HavingSegment, SqlNode> {
@Override
public Optional<SqlNode> convert(final HavingSegment having) {
if (having == null) {
return Optional.empty();
}
- return new ExpressionSqlNodeConverter().convert(having.getExpr());
+ return new ExpressionSQLNodeConverter().convert(having.getExpr());
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/JoinTableSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/JoinTableSQLNodeConverter.java
similarity index 91%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/JoinTableSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/JoinTableSQLNodeConverter.java
index 3d3077f..07276f4 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/JoinTableSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/JoinTableSQLNodeConverter.java
@@ -23,7 +23,7 @@ import org.apache.calcite.sql.SqlJoin;
import org.apache.calcite.sql.SqlLiteral;
import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.parser.SqlParserPos;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.ExpressionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.JoinTableSegment;
@@ -32,22 +32,22 @@ import java.util.Optional;
/**
* Join converter.
*/
-public final class JoinTableSqlNodeConverter implements SqlNodeConverter<JoinTableSegment, SqlNode> {
-
+public final class JoinTableSQLNodeConverter implements SQLNodeConverter<JoinTableSegment, SqlNode> {
+
private static final String JOIN_TYPE_INNER = "INNER";
-
+
private static final String JOIN_TYPE_LEFT = "LEFT";
-
+
private static final String JOIN_TYPE_RIGHT = "RIGHT";
-
+
private static final String JOIN_TYPE_FULL = "FULL";
@Override
public Optional<SqlNode> convert(final JoinTableSegment join) {
- SqlNode left = new TableSqlNodeConverter().convert(join.getLeft()).get();
- SqlNode right = new TableSqlNodeConverter().convert(join.getRight()).get();
+ SqlNode left = new TableSQLNodeConverter().convert(join.getLeft()).get();
+ SqlNode right = new TableSQLNodeConverter().convert(join.getRight()).get();
ExpressionSegment expressionSegment = join.getCondition();
- Optional<SqlNode> condition = new ExpressionSqlNodeConverter().convert(expressionSegment);
+ Optional<SqlNode> condition = new ExpressionSQLNodeConverter().convert(expressionSegment);
SqlLiteral conditionType = condition.isPresent() ? JoinConditionType.ON.symbol(SqlParserPos.ZERO)
: JoinConditionType.NONE.symbol(SqlParserPos.ZERO);
SqlLiteral joinTypeSqlNode = convertJoinType(join.getJoinType());
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ListExpressionSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ListExpressionSQLNodeConverter.java
similarity index 93%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ListExpressionSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ListExpressionSQLNodeConverter.java
index 911ff25..085a95d 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ListExpressionSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ListExpressionSQLNodeConverter.java
@@ -21,7 +21,7 @@ import org.apache.calcite.sql.SqlBasicCall;
import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.fun.SqlStdOperatorTable;
import org.apache.calcite.sql.parser.SqlParserPos;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.ExpressionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.ListExpression;
@@ -31,14 +31,14 @@ import java.util.Optional;
/**
* List expression converter.
*/
-public final class ListExpressionSqlNodeConverter implements SqlNodeConverter<ListExpression, SqlNode> {
+public final class ListExpressionSQLNodeConverter implements SQLNodeConverter<ListExpression, SqlNode> {
@Override
public Optional<SqlNode> convert(final ListExpression expression) {
List<ExpressionSegment> items = expression.getItems();
SqlNode left = null;
for (ExpressionSegment item : items) {
- Optional<SqlNode> optional = new ExpressionSqlNodeConverter().convert(item);
+ Optional<SqlNode> optional = new ExpressionSQLNodeConverter().convert(item);
if (!optional.isPresent()) {
continue;
}
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/LiteralExpressionSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/LiteralExpressionSQLNodeConverter.java
similarity index 92%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/LiteralExpressionSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/LiteralExpressionSQLNodeConverter.java
index fd134bd..eae52ee 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/LiteralExpressionSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/LiteralExpressionSQLNodeConverter.java
@@ -20,12 +20,12 @@ package org.apache.shardingsphere.infra.optimize.core.convert.converter.impl;
import org.apache.calcite.sql.SqlLiteral;
import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.parser.SqlParserPos;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.simple.LiteralExpressionSegment;
import java.util.Optional;
-public final class LiteralExpressionSqlNodeConverter implements SqlNodeConverter<LiteralExpressionSegment, SqlNode> {
+public final class LiteralExpressionSQLNodeConverter implements SQLNodeConverter<LiteralExpressionSegment, SqlNode> {
@Override
public Optional<SqlNode> convert(final LiteralExpressionSegment literalExpression) {
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/OffsetSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/OffsetSQLNodeConverter.java
similarity index 89%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/OffsetSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/OffsetSQLNodeConverter.java
index 0a3df3e..f450c37 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/OffsetSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/OffsetSQLNodeConverter.java
@@ -22,9 +22,9 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.pagination.li
/**
* Offset sql node converter.
*/
-public final class OffsetSqlNodeConverter extends AbstractLimitSqlNodeConverter {
-
- public OffsetSqlNodeConverter() {
+public final class OffsetSQLNodeConverter extends AbstractLimitSQLNodeConverter {
+
+ public OffsetSQLNodeConverter() {
super(LimitSegment::getOffset);
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/OrderBySqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/OrderBySQLNodeConverter.java
similarity index 95%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/OrderBySqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/OrderBySQLNodeConverter.java
index 59b5f16..df73830 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/OrderBySqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/OrderBySQLNodeConverter.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.infra.optimize.core.convert.converter.impl;
import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.SqlNodeList;
import org.apache.calcite.sql.parser.SqlParserPos;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverterUtil;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.order.OrderBySegment;
@@ -30,7 +30,7 @@ import java.util.Optional;
/**
* Order by converter.
*/
-public final class OrderBySqlNodeConverter implements SqlNodeConverter<OrderBySegment, SqlNodeList> {
+public final class OrderBySQLNodeConverter implements SQLNodeConverter<OrderBySegment, SqlNodeList> {
@Override
public Optional<SqlNodeList> convert(final OrderBySegment orderBy) {
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/PaginationValueSqlConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/PaginationValueSQLConverter.java
similarity index 96%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/PaginationValueSqlConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/PaginationValueSQLConverter.java
index 7b5b984..2155e25 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/PaginationValueSqlConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/PaginationValueSQLConverter.java
@@ -21,7 +21,7 @@ import org.apache.calcite.sql.SqlDynamicParam;
import org.apache.calcite.sql.SqlLiteral;
import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.parser.SqlParserPos;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.pagination.NumberLiteralPaginationValueSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.pagination.PaginationValueSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.pagination.limit.ParameterMarkerLimitValueSegment;
@@ -31,7 +31,7 @@ import java.util.Optional;
/**
* Pagination value converter.
*/
-public final class PaginationValueSqlConverter implements SqlNodeConverter<PaginationValueSegment, SqlNode> {
+public final class PaginationValueSQLConverter implements SQLNodeConverter<PaginationValueSegment, SqlNode> {
@Override
public Optional<SqlNode> convert(final PaginationValueSegment paginationValue) {
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ProjectionsSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ProjectionsSQLNodeConverter.java
similarity index 92%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ProjectionsSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ProjectionsSQLNodeConverter.java
index ddd503e..d9a8292 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ProjectionsSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/ProjectionsSQLNodeConverter.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.infra.optimize.core.convert.converter.impl;
import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.SqlNodeList;
import org.apache.calcite.sql.parser.SqlParserPos;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ColumnProjectionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ExpressionProjectionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.item.ProjectionSegment;
@@ -34,7 +34,7 @@ import java.util.Optional;
/**
* Projection converter.
*/
-public final class ProjectionsSqlNodeConverter implements SqlNodeConverter<ProjectionsSegment, SqlNodeList> {
+public final class ProjectionsSQLNodeConverter implements SQLNodeConverter<ProjectionsSegment, SqlNodeList> {
@Override
public Optional<SqlNodeList> convert(final ProjectionsSegment projectionsSegment) {
@@ -43,9 +43,9 @@ public final class ProjectionsSqlNodeConverter implements SqlNodeConverter<Proje
for (ProjectionSegment projection : projections) {
Optional<SqlNode> optional = Optional.empty();
if (projection instanceof ColumnProjectionSegment) {
- optional = new ColumnProjectionSqlNodeConverter().convert((ColumnProjectionSegment) projection);
+ optional = new ColumnProjectionSQLNodeConverter().convert((ColumnProjectionSegment) projection);
} else if (projection instanceof ExpressionProjectionSegment) {
- optional = new ExpressionProjectionSqlNodeConverter().convert((ExpressionProjectionSegment) projection);
+ optional = new ExpressionProjectionSQLNodeConverter().convert((ExpressionProjectionSegment) projection);
}
// TODO other Projection
if (optional.isPresent()) {
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/RowCountSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/RowCountSQLNodeConverter.java
similarity index 89%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/RowCountSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/RowCountSQLNodeConverter.java
index df51290..4729bd4 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/RowCountSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/RowCountSQLNodeConverter.java
@@ -22,9 +22,9 @@ import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.pagination.li
/**
* Row count sql node converter.
*/
-public final class RowCountSqlNodeConverter extends AbstractLimitSqlNodeConverter {
+public final class RowCountSQLNodeConverter extends AbstractLimitSQLNodeConverter {
- public RowCountSqlNodeConverter() {
+ public RowCountSQLNodeConverter() {
super(LimitSegment::getRowCount);
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/SelectStatementSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/SelectStatementSQLNodeConverter.java
similarity index 76%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/SelectStatementSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/SelectStatementSQLNodeConverter.java
index feca3ed..250e45a 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/SelectStatementSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/SelectStatementSQLNodeConverter.java
@@ -21,7 +21,7 @@ import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.SqlNodeList;
import org.apache.calcite.sql.SqlSelect;
import org.apache.calcite.sql.parser.SqlParserPos;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.pagination.limit.LimitSegment;
import org.apache.shardingsphere.sql.parser.sql.common.statement.dml.SelectStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.handler.dml.SelectStatementHandler;
@@ -29,22 +29,22 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.handler.dml.SelectStatem
import java.util.Optional;
/**
- * Select statement sql node converter.
+ * Converter of select statement to SQL node.
*/
-public final class SelectStatementSqlNodeConverter implements SqlNodeConverter<SelectStatement, SqlNode> {
+public final class SelectStatementSQLNodeConverter implements SQLNodeConverter<SelectStatement, SqlNode> {
@Override
public Optional<SqlNode> convert(final SelectStatement selectStatement) {
- Optional<SqlNodeList> distinct = new DistinctSqlNodeConverter().convert(selectStatement.getProjections());
- Optional<SqlNodeList> projections = new ProjectionsSqlNodeConverter().convert(selectStatement.getProjections());
- Optional<SqlNode> from = new TableSqlNodeConverter().convert(selectStatement.getFrom());
- Optional<SqlNode> where = new WhereSqlNodeConverter().convert(selectStatement.getWhere().orElse(null));
- Optional<SqlNodeList> groupBy = new GroupBySqlNodeConverter().convert(selectStatement.getGroupBy().orElse(null));
- Optional<SqlNode> having = new HavingSqlNodeConverter().convert(selectStatement.getHaving().orElse(null));
- Optional<SqlNodeList> orderBy = new OrderBySqlNodeConverter().convert(selectStatement.getOrderBy().orElse(null));
+ Optional<SqlNodeList> distinct = new DistinctSQLNodeConverter().convert(selectStatement.getProjections());
+ Optional<SqlNodeList> projections = new ProjectionsSQLNodeConverter().convert(selectStatement.getProjections());
+ Optional<SqlNode> from = new TableSQLNodeConverter().convert(selectStatement.getFrom());
+ Optional<SqlNode> where = new WhereSQLNodeConverter().convert(selectStatement.getWhere().orElse(null));
+ Optional<SqlNodeList> groupBy = new GroupBySQLNodeConverter().convert(selectStatement.getGroupBy().orElse(null));
+ Optional<SqlNode> having = new HavingSQLNodeConverter().convert(selectStatement.getHaving().orElse(null));
+ Optional<SqlNodeList> orderBy = new OrderBySQLNodeConverter().convert(selectStatement.getOrderBy().orElse(null));
Optional<LimitSegment> limit = SelectStatementHandler.getLimitSegment(selectStatement);
- Optional<SqlNode> offset = new OffsetSqlNodeConverter().convert(limit.orElse(null));
- Optional<SqlNode> rowCount = new RowCountSqlNodeConverter().convert(limit.orElse(null));
+ Optional<SqlNode> offset = new OffsetSQLNodeConverter().convert(limit.orElse(null));
+ Optional<SqlNode> rowCount = new RowCountSQLNodeConverter().convert(limit.orElse(null));
return Optional.of(new SqlSelect(SqlParserPos.ZERO,
distinct.orElse(null),
projections.orElse(null),
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/SimpleTableSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/SimpleTableSQLNodeConverter.java
similarity index 96%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/SimpleTableSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/SimpleTableSQLNodeConverter.java
index bface1a..38a9746 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/SimpleTableSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/SimpleTableSQLNodeConverter.java
@@ -22,7 +22,7 @@ import org.apache.calcite.sql.SqlIdentifier;
import org.apache.calcite.sql.SqlNode;
import org.apache.calcite.sql.fun.SqlStdOperatorTable;
import org.apache.calcite.sql.parser.SqlParserPos;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.SimpleTableSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.TableNameSegment;
@@ -31,7 +31,7 @@ import java.util.Optional;
/**
* Simple table converter.
*/
-public final class SimpleTableSqlNodeConverter implements SqlNodeConverter<SimpleTableSegment, SqlNode> {
+public final class SimpleTableSQLNodeConverter implements SQLNodeConverter<SimpleTableSegment, SqlNode> {
@Override
public Optional<SqlNode> convert(final SimpleTableSegment simpleTable) {
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/SubqueryTableSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/SubqueryTableSQLNodeConverter.java
similarity index 93%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/SubqueryTableSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/SubqueryTableSQLNodeConverter.java
index c265ac3..d1fc45b 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/SubqueryTableSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/SubqueryTableSQLNodeConverter.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.optimize.core.convert.converter.impl;
import org.apache.calcite.sql.SqlNode;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.SubqueryTableSegment;
import java.util.Optional;
@@ -26,7 +26,7 @@ import java.util.Optional;
/**
* Subquery converter.
*/
-public final class SubqueryTableSqlNodeConverter implements SqlNodeConverter<SubqueryTableSegment, SqlNode> {
+public final class SubqueryTableSQLNodeConverter implements SQLNodeConverter<SubqueryTableSegment, SqlNode> {
@Override
public Optional<SqlNode> convert(final SubqueryTableSegment astNode) {
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/TableSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/TableSQLNodeConverter.java
similarity index 82%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/TableSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/TableSQLNodeConverter.java
index ab10513..5f37a3f 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/TableSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/TableSQLNodeConverter.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.optimize.core.convert.converter.impl;
import org.apache.calcite.sql.SqlNode;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.JoinTableSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.SimpleTableSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.generic.table.SubqueryTableSegment;
@@ -29,17 +29,17 @@ import java.util.Optional;
/**
* convert from clause.
*/
-public final class TableSqlNodeConverter implements SqlNodeConverter<TableSegment, SqlNode> {
+public final class TableSQLNodeConverter implements SQLNodeConverter<TableSegment, SqlNode> {
@Override
public Optional<SqlNode> convert(final TableSegment table) {
if (table instanceof SimpleTableSegment) {
- return new SimpleTableSqlNodeConverter().convert((SimpleTableSegment) table);
+ return new SimpleTableSQLNodeConverter().convert((SimpleTableSegment) table);
} else if (table instanceof JoinTableSegment) {
- return new JoinTableSqlNodeConverter().convert((JoinTableSegment) table);
+ return new JoinTableSQLNodeConverter().convert((JoinTableSegment) table);
} else if (table instanceof SubqueryTableSegment) {
- return new SubqueryTableSqlNodeConverter().convert((SubqueryTableSegment) table);
+ return new SubqueryTableSQLNodeConverter().convert((SubqueryTableSegment) table);
}
- throw new UnsupportedOperationException("unsupportd TableSegment type: " + table.getClass());
+ throw new UnsupportedOperationException("Unsupported table segment type: " + table.getClass());
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/WhereSqlNodeConverter.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/WhereSQLNodeConverter.java
similarity index 90%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/WhereSqlNodeConverter.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/WhereSQLNodeConverter.java
index bce5f99..e8c0e6e 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/WhereSqlNodeConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/core/convert/converter/impl/WhereSQLNodeConverter.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.optimize.core.convert.converter.impl;
import org.apache.calcite.sql.SqlNode;
-import org.apache.shardingsphere.infra.optimize.core.convert.converter.SqlNodeConverter;
+import org.apache.shardingsphere.infra.optimize.core.convert.converter.SQLNodeConverter;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.ExpressionSegment;
import org.apache.shardingsphere.sql.parser.sql.common.segment.dml.predicate.WhereSegment;
@@ -27,7 +27,7 @@ import java.util.Optional;
/**
* Where converter.
*/
-public final class WhereSqlNodeConverter implements SqlNodeConverter<WhereSegment, SqlNode> {
+public final class WhereSQLNodeConverter implements SQLNodeConverter<WhereSegment, SqlNode> {
@Override
public Optional<SqlNode> convert(final WhereSegment where) {
@@ -35,6 +35,6 @@ public final class WhereSqlNodeConverter implements SqlNodeConverter<WhereSegmen
return Optional.empty();
}
ExpressionSegment whereExpr = where.getExpr();
- return new ExpressionSqlNodeConverter().convert(whereExpr);
+ return new ExpressionSQLNodeConverter().convert(whereExpr);
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/core/convert/SelectStatementSqlNodeConverterTest.java b/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/core/convert/SelectStatementSQLNodeConverterTest.java
similarity index 93%
rename from shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/core/convert/SelectStatementSqlNodeConverterTest.java
rename to shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/core/convert/SelectStatementSQLNodeConverterTest.java
index 21c5de7..bd22420 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/core/convert/SelectStatementSqlNodeConverterTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/core/convert/SelectStatementSQLNodeConverterTest.java
@@ -45,7 +45,7 @@ import static org.junit.Assert.assertThat;
* result of calcite parser.
* </p>
*/
-public final class SelectStatementSqlNodeConverterTest extends BaseSqlNodeConverterTest {
+public final class SelectStatementSQLNodeConverterTest extends BaseSqlNodeConverterTest {
private ShardingSphereSQLParserEngine sqlStatementParserEngine;
@@ -58,7 +58,7 @@ public final class SelectStatementSqlNodeConverterTest extends BaseSqlNodeConver
public void assertConvertSimpleSelect() {
String sql = "select order_id, user_id from t_order";
SQLStatement sqlStatement = sqlStatementParserEngine.parse(sql.toUpperCase(), false);
- SqlNode sqlNode = SqlNodeConvertEngine.convert(sqlStatement);
+ SqlNode sqlNode = SQLNodeConvertEngine.convert(sqlStatement);
assertThat(sqlNode, instanceOf(SqlSelect.class));
SqlSelect sqlSelect = (SqlSelect) sqlNode;
assertThat(sqlSelect.getSelectList().size(), is(2));
@@ -74,7 +74,7 @@ public final class SelectStatementSqlNodeConverterTest extends BaseSqlNodeConver
public void assertConvertSimpleSelectLimit() {
String sql = "select order_id, user_id from t_order limit 1, 2";
SQLStatement sqlStatement = sqlStatementParserEngine.parse(sql.toUpperCase(), false);
- SqlNode sqlNode = SqlNodeConvertEngine.convert(sqlStatement);
+ SqlNode sqlNode = SQLNodeConvertEngine.convert(sqlStatement);
assertThat(sqlNode, instanceOf(SqlSelect.class));
SqlSelect sqlSelect = (SqlSelect) sqlNode;
assertThat(sqlSelect.getSelectList().size(), is(2));
@@ -90,7 +90,7 @@ public final class SelectStatementSqlNodeConverterTest extends BaseSqlNodeConver
public void assertConvertSimpleSelectRowCount() {
String sql = "select order_id, user_id from t_order limit 2";
SQLStatement sqlStatement = sqlStatementParserEngine.parse(sql.toUpperCase(), false);
- SqlNode sqlNode = SqlNodeConvertEngine.convert(sqlStatement);
+ SqlNode sqlNode = SQLNodeConvertEngine.convert(sqlStatement);
assertThat(sqlNode, instanceOf(SqlSelect.class));
SqlSelect sqlSelect = (SqlSelect) sqlNode;
assertThat(sqlSelect.getSelectList().size(), is(2));
@@ -106,7 +106,7 @@ public final class SelectStatementSqlNodeConverterTest extends BaseSqlNodeConver
public void assertConvertSimpleSelectFilter() {
String sql = "select order_id, user_id from t_order where order_id = 10";
SQLStatement sqlStatement = sqlStatementParserEngine.parse(sql.toUpperCase(), false);
- SqlNode sqlNode = SqlNodeConvertEngine.convert(sqlStatement);
+ SqlNode sqlNode = SQLNodeConvertEngine.convert(sqlStatement);
assertThat(sqlNode, instanceOf(SqlSelect.class));
SqlSelect sqlSelect = (SqlSelect) sqlNode;
assertThat(sqlSelect.getSelectList().size(), is(2));
@@ -120,7 +120,7 @@ public final class SelectStatementSqlNodeConverterTest extends BaseSqlNodeConver
public void assertConvertSimpleSelectFilterGroupBy() {
String sql = "select order_id, user_id from t_order where order_id = 10 group by order_id";
SQLStatement sqlStatement = sqlStatementParserEngine.parse(sql.toUpperCase(), false);
- SqlNode sqlNode = SqlNodeConvertEngine.convert(sqlStatement);
+ SqlNode sqlNode = SQLNodeConvertEngine.convert(sqlStatement);
assertThat(sqlNode, instanceOf(SqlSelect.class));
SqlSelect sqlSelect = (SqlSelect) sqlNode;
assertThat(sqlSelect.getSelectList().size(), is(2));
@@ -135,7 +135,7 @@ public final class SelectStatementSqlNodeConverterTest extends BaseSqlNodeConver
public void assertConvertSimpleSelectFilterOrderBy() {
String sql = "select order_id, user_id from t_order where user_id = 10 order by order_id desc";
SQLStatement sqlStatement = sqlStatementParserEngine.parse(sql.toUpperCase(), false);
- SqlNode sqlNode = SqlNodeConvertEngine.convert(sqlStatement);
+ SqlNode sqlNode = SQLNodeConvertEngine.convert(sqlStatement);
assertThat(sqlNode, instanceOf(SqlSelect.class));
SqlSelect sqlSelect = (SqlSelect) sqlNode;
assertThat(sqlSelect.getSelectList().size(), is(2));
@@ -153,7 +153,7 @@ public final class SelectStatementSqlNodeConverterTest extends BaseSqlNodeConver
+ "o1.order_id desc";
SQLStatement sqlStatement = sqlStatementParserEngine.parse(sql, false);
assertThat(((JoinTableSegment) ((MySQLSelectStatement) sqlStatement).getFrom()).getJoinType(), is("INNER"));
- SqlNode sqlNode = SqlNodeConvertEngine.convert(sqlStatement);
+ SqlNode sqlNode = SQLNodeConvertEngine.convert(sqlStatement);
assertThat(sqlNode, instanceOf(SqlSelect.class));
SqlSelect sqlSelect = (SqlSelect) sqlNode;
assertThat(sqlSelect.getFrom(), instanceOf(SqlJoin.class));
@@ -166,7 +166,7 @@ public final class SelectStatementSqlNodeConverterTest extends BaseSqlNodeConver
+ "o1.order_id = o2.order_id where o1.status='FINISHED' and o2.order_item_id > 1024 and 1=1 order by "
+ "o1.order_id desc";
SQLStatement sqlStatement = sqlStatementParserEngine.parse(sql, false);
- SqlNode sqlNode = SqlNodeConvertEngine.convert(sqlStatement);
+ SqlNode sqlNode = SQLNodeConvertEngine.convert(sqlStatement);
assertThat(sqlNode, instanceOf(SqlSelect.class));
// TODO outer join is not supported by parser of ShardingSphere
}