From c2ff73cedceb90901b0fd30feb68af3cacb65a87 Mon Sep 17 00:00:00 2001 From: Liang Zhang Date: Wed, 19 Feb 2020 18:19:03 +0800 Subject: [PATCH] decouple find RemoveAvailable with SQLStatement (#4370) --- .../dialect/mysql/ShowColumnsStatement.java | 15 ++++++- .../mysql/ShowTableStatusStatement.java | 15 +++++++ .../dialect/mysql/ShowTablesStatement.java | 15 +++++++ .../core/filler/dal/FromSchemaFiller.java | 44 +++++++++++++++++++ .../parser/visitor/impl/MySQLDALVisitor.java | 3 ++ .../mysql/filler-rule-definition.xml | 1 + .../generic/RemoveTokenGenerator.java | 37 +++++++++++++--- 7 files changed, 122 insertions(+), 8 deletions(-) create mode 100644 shardingsphere-sql-parser/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/core/filler/dal/FromSchemaFiller.java diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dal/dialect/mysql/ShowColumnsStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dal/dialect/mysql/ShowColumnsStatement.java index 00dc10441d..7d963a2c14 100644 --- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dal/dialect/mysql/ShowColumnsStatement.java +++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dal/dialect/mysql/ShowColumnsStatement.java @@ -17,8 +17,10 @@ package org.apache.shardingsphere.sql.parser.sql.statement.dal.dialect.mysql; +import com.google.common.base.Optional; import lombok.Getter; import lombok.Setter; +import org.apache.shardingsphere.sql.parser.sql.segment.generic.RemoveAvailable; import org.apache.shardingsphere.sql.parser.sql.segment.generic.TableSegment; import org.apache.shardingsphere.sql.parser.sql.statement.dal.DALStatement; import org.apache.shardingsphere.sql.parser.sql.statement.generic.TableSegmentAvailable; @@ -26,9 +28,20 @@ import org.apache.shardingsphere.sql.parser.sql.statement.generic.TableSegmentAv /** * Show columns statement. */ -@Setter @Getter +@Setter public final class ShowColumnsStatement extends DALStatement implements TableSegmentAvailable { private TableSegment table; + + private RemoveAvailable fromSchema; + + /** + * Get from schema. + * + * @return from schema + */ + public Optional getFromSchema() { + return Optional.fromNullable(fromSchema); + } } diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dal/dialect/mysql/ShowTableStatusStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dal/dialect/mysql/ShowTableStatusStatement.java index 20c2173032..4594c94ce6 100644 --- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dal/dialect/mysql/ShowTableStatusStatement.java +++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dal/dialect/mysql/ShowTableStatusStatement.java @@ -17,10 +17,25 @@ package org.apache.shardingsphere.sql.parser.sql.statement.dal.dialect.mysql; +import com.google.common.base.Optional; +import lombok.Setter; +import org.apache.shardingsphere.sql.parser.sql.segment.generic.RemoveAvailable; import org.apache.shardingsphere.sql.parser.sql.statement.dal.DALStatement; /** * Show table status statement. */ +@Setter public final class ShowTableStatusStatement extends DALStatement { + + private RemoveAvailable fromSchema; + + /** + * Get from schema. + * + * @return from schema + */ + public Optional getFromSchema() { + return Optional.fromNullable(fromSchema); + } } diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dal/dialect/mysql/ShowTablesStatement.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dal/dialect/mysql/ShowTablesStatement.java index 8ec6b4e29b..0f9c92c95d 100644 --- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dal/dialect/mysql/ShowTablesStatement.java +++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/src/main/java/org/apache/shardingsphere/sql/parser/sql/statement/dal/dialect/mysql/ShowTablesStatement.java @@ -17,10 +17,25 @@ package org.apache.shardingsphere.sql.parser.sql.statement.dal.dialect.mysql; +import com.google.common.base.Optional; +import lombok.Setter; +import org.apache.shardingsphere.sql.parser.sql.segment.generic.RemoveAvailable; import org.apache.shardingsphere.sql.parser.sql.statement.dal.DALStatement; /** * Show tables statement. */ +@Setter public final class ShowTablesStatement extends DALStatement { + + private RemoveAvailable fromSchema; + + /** + * Get from schema. + * + * @return from schema + */ + public Optional getFromSchema() { + return Optional.fromNullable(fromSchema); + } } diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/core/filler/dal/FromSchemaFiller.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/core/filler/dal/FromSchemaFiller.java new file mode 100644 index 0000000000..4a280a0ce2 --- /dev/null +++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/core/filler/dal/FromSchemaFiller.java @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.shardingsphere.sql.parser.core.filler.dal; + +import org.apache.shardingsphere.sql.parser.core.filler.SQLSegmentFiller; +import org.apache.shardingsphere.sql.parser.sql.segment.dal.FromSchemaSegment; +import org.apache.shardingsphere.sql.parser.sql.statement.SQLStatement; +import org.apache.shardingsphere.sql.parser.sql.statement.dal.dialect.mysql.ShowColumnsStatement; +import org.apache.shardingsphere.sql.parser.sql.statement.dal.dialect.mysql.ShowTableStatusStatement; +import org.apache.shardingsphere.sql.parser.sql.statement.dal.dialect.mysql.ShowTablesStatement; + +/** + * From schema filler. + */ +public final class FromSchemaFiller implements SQLSegmentFiller { + + @Override + public void fill(final FromSchemaSegment sqlSegment, final SQLStatement sqlStatement) { + if (sqlStatement instanceof ShowTablesStatement) { + ((ShowTablesStatement) sqlStatement).setFromSchema(sqlSegment); + } + if (sqlStatement instanceof ShowTableStatusStatement) { + ((ShowTableStatusStatement) sqlStatement).setFromSchema(sqlSegment); + } + if (sqlStatement instanceof ShowColumnsStatement) { + ((ShowColumnsStatement) sqlStatement).setFromSchema(sqlSegment); + } + } +} diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/MySQLDALVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/MySQLDALVisitor.java index ba937ea155..2e4aaabf21 100644 --- a/shardingsphere-sql-parser/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/MySQLDALVisitor.java +++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/visitor/impl/MySQLDALVisitor.java @@ -89,6 +89,7 @@ public final class MySQLDALVisitor extends MySQLVisitor { if (null != ctx.fromSchema()) { FromSchemaSegment fromSchemaSegment = (FromSchemaSegment) visit(ctx.fromSchema()); result.getAllSQLSegments().add(fromSchemaSegment); + result.setFromSchema(fromSchemaSegment); } if (null != ctx.showLike()) { ShowLikeSegment showLikeSegment = (ShowLikeSegment) visit(ctx.showLike()); @@ -103,6 +104,7 @@ public final class MySQLDALVisitor extends MySQLVisitor { if (null != ctx.fromSchema()) { FromSchemaSegment fromSchemaSegment = (FromSchemaSegment) visit(ctx.fromSchema()); result.getAllSQLSegments().add(fromSchemaSegment); + result.setFromSchema(fromSchemaSegment); } if (null != ctx.showLike()) { ShowLikeSegment showLikeSegment = (ShowLikeSegment) visit(ctx.showLike()); @@ -123,6 +125,7 @@ public final class MySQLDALVisitor extends MySQLVisitor { if (null != ctx.fromSchema()) { FromSchemaSegment fromSchemaSegment = (FromSchemaSegment) visit(ctx.fromSchema()); result.getAllSQLSegments().add(fromSchemaSegment); + result.setFromSchema(fromSchemaSegment); } return result; } diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-mysql/src/main/resources/META-INF/parsing-rule-definition/mysql/filler-rule-definition.xml b/shardingsphere-sql-parser/shardingsphere-sql-parser-mysql/src/main/resources/META-INF/parsing-rule-definition/mysql/filler-rule-definition.xml index ba0f0aed75..37cd1e7f7c 100644 --- a/shardingsphere-sql-parser/shardingsphere-sql-parser-mysql/src/main/resources/META-INF/parsing-rule-definition/mysql/filler-rule-definition.xml +++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-mysql/src/main/resources/META-INF/parsing-rule-definition/mysql/filler-rule-definition.xml @@ -18,4 +18,5 @@ + diff --git a/shardingsphere-underlying/shardingsphere-rewrite/shardingsphere-rewrite-engine/src/main/java/org/apache/shardingsphere/underlying/rewrite/sql/token/generator/generic/RemoveTokenGenerator.java b/shardingsphere-underlying/shardingsphere-rewrite/shardingsphere-rewrite-engine/src/main/java/org/apache/shardingsphere/underlying/rewrite/sql/token/generator/generic/RemoveTokenGenerator.java index c76e3b2397..8672adbc86 100644 --- a/shardingsphere-underlying/shardingsphere-rewrite/shardingsphere-rewrite-engine/src/main/java/org/apache/shardingsphere/underlying/rewrite/sql/token/generator/generic/RemoveTokenGenerator.java +++ b/shardingsphere-underlying/shardingsphere-rewrite/shardingsphere-rewrite-engine/src/main/java/org/apache/shardingsphere/underlying/rewrite/sql/token/generator/generic/RemoveTokenGenerator.java @@ -17,14 +17,17 @@ package org.apache.shardingsphere.underlying.rewrite.sql.token.generator.generic; +import com.google.common.base.Preconditions; import org.apache.shardingsphere.sql.parser.relation.statement.SQLStatementContext; -import org.apache.shardingsphere.sql.parser.sql.segment.SQLSegment; import org.apache.shardingsphere.sql.parser.sql.segment.generic.RemoveAvailable; +import org.apache.shardingsphere.sql.parser.sql.statement.dal.dialect.mysql.ShowColumnsStatement; +import org.apache.shardingsphere.sql.parser.sql.statement.dal.dialect.mysql.ShowTableStatusStatement; +import org.apache.shardingsphere.sql.parser.sql.statement.dal.dialect.mysql.ShowTablesStatement; import org.apache.shardingsphere.underlying.rewrite.sql.token.generator.CollectionSQLTokenGenerator; import org.apache.shardingsphere.underlying.rewrite.sql.token.pojo.generic.RemoveToken; import java.util.Collection; -import java.util.LinkedList; +import java.util.Collections; /** * Remove token generator. @@ -33,15 +36,35 @@ public final class RemoveTokenGenerator implements CollectionSQLTokenGenerator { @Override public boolean isGenerateSQLToken(final SQLStatementContext sqlStatementContext) { - return !sqlStatementContext.getSqlStatement().findSQLSegments(RemoveAvailable.class).isEmpty(); + if (sqlStatementContext.getSqlStatement() instanceof ShowTablesStatement) { + return ((ShowTablesStatement) sqlStatementContext.getSqlStatement()).getFromSchema().isPresent(); + } + if (sqlStatementContext.getSqlStatement() instanceof ShowTableStatusStatement) { + return ((ShowTableStatusStatement) sqlStatementContext.getSqlStatement()).getFromSchema().isPresent(); + } + if (sqlStatementContext.getSqlStatement() instanceof ShowColumnsStatement) { + return ((ShowColumnsStatement) sqlStatementContext.getSqlStatement()).getFromSchema().isPresent(); + } + return false; } @Override public Collection generateSQLTokens(final SQLStatementContext sqlStatementContext) { - Collection result = new LinkedList<>(); - for (SQLSegment each : sqlStatementContext.getSqlStatement().findSQLSegments(RemoveAvailable.class)) { - result.add(new RemoveToken(each.getStartIndex(), each.getStopIndex())); + if (sqlStatementContext.getSqlStatement() instanceof ShowTablesStatement) { + Preconditions.checkState(((ShowTablesStatement) sqlStatementContext.getSqlStatement()).getFromSchema().isPresent()); + RemoveAvailable removeAvailable = ((ShowTablesStatement) sqlStatementContext.getSqlStatement()).getFromSchema().get(); + return Collections.singletonList(new RemoveToken(removeAvailable.getStartIndex(), removeAvailable.getStopIndex())); + } + if (sqlStatementContext.getSqlStatement() instanceof ShowTableStatusStatement) { + Preconditions.checkState(((ShowTableStatusStatement) sqlStatementContext.getSqlStatement()).getFromSchema().isPresent()); + RemoveAvailable removeAvailable = ((ShowTableStatusStatement) sqlStatementContext.getSqlStatement()).getFromSchema().get(); + return Collections.singletonList(new RemoveToken(removeAvailable.getStartIndex(), removeAvailable.getStopIndex())); + } + if (sqlStatementContext.getSqlStatement() instanceof ShowColumnsStatement) { + Preconditions.checkState(((ShowColumnsStatement) sqlStatementContext.getSqlStatement()).getFromSchema().isPresent()); + RemoveAvailable removeAvailable = ((ShowColumnsStatement) sqlStatementContext.getSqlStatement()).getFromSchema().get(); + return Collections.singletonList(new RemoveToken(removeAvailable.getStartIndex(), removeAvailable.getStopIndex())); } - return result; + return Collections.emptyList(); } } -- GitLab