Add sharding table check for ShardingSQLRewriteContextDecorator

apache · Nov 15, 2023 · cd71e2d · cd71e2d
1 parent 027a4a8
commit cd71e2d
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 15 deletions.
diff --git a/...rg/apache/shardingsphere/sharding/rewrite/context/ShardingSQLRewriteContextDecorator.java b/...rg/apache/shardingsphere/sharding/rewrite/context/ShardingSQLRewriteContextDecorator.java
@@ -18,14 +18,15 @@
 package org.apache.shardingsphere.sharding.rewrite.context;
 
 import lombok.Setter;
+import org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
 import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
 import org.apache.shardingsphere.infra.rewrite.context.SQLRewriteContext;
 import org.apache.shardingsphere.infra.rewrite.context.SQLRewriteContextDecorator;
 import org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewriter;
 import org.apache.shardingsphere.infra.route.context.RouteContext;
 import org.apache.shardingsphere.sharding.constant.ShardingOrder;
 import org.apache.shardingsphere.sharding.rewrite.parameter.ShardingParameterRewriterBuilder;
-import org.apache.shardingsphere.sharding.rewrite.token.pojo.ShardingTokenGenerateBuilder;
+import org.apache.shardingsphere.sharding.rewrite.token.ShardingTokenGenerateBuilder;
 import org.apache.shardingsphere.sharding.rule.ShardingRule;
 
 import java.util.Collection;
@@ -38,6 +39,9 @@ public final class ShardingSQLRewriteContextDecorator implements SQLRewriteConte
 
     @Override
     public void decorate(final ShardingRule shardingRule, final ConfigurationProperties props, final SQLRewriteContext sqlRewriteContext, final RouteContext routeContext) {
+        if (!containsShardingTable(shardingRule, sqlRewriteContext.getSqlStatementContext())) {
+            return;
+        }
         if (!sqlRewriteContext.getParameters().isEmpty()) {
             Collection<ParameterRewriter> parameterRewriters =
                     new ShardingParameterRewriterBuilder(shardingRule, routeContext, sqlRewriteContext.getDatabase().getSchemas(), sqlRewriteContext.getSqlStatementContext()).getParameterRewriters();
@@ -46,6 +50,15 @@ public void decorate(final ShardingRule shardingRule, final ConfigurationPropert
         sqlRewriteContext.addSQLTokenGenerators(new ShardingTokenGenerateBuilder(shardingRule, routeContext, sqlRewriteContext.getSqlStatementContext()).getSQLTokenGenerators());
     }
 
+    private boolean containsShardingTable(final ShardingRule shardingRule, final SQLStatementContext sqlStatementContext) {
+        for (String each : sqlStatementContext.getTablesContext().getTableNames()) {
+            if (shardingRule.findTableRule(each).isPresent()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private void rewriteParameters(final SQLRewriteContext sqlRewriteContext, final Collection<ParameterRewriter> parameterRewriters) {
         for (ParameterRewriter each : parameterRewriters) {
             each.rewrite(sqlRewriteContext.getParameterBuilder(), sqlRewriteContext.getSqlStatementContext(), sqlRewriteContext.getParameters());

diff --git a/...en/pojo/ShardingTokenGenerateBuilder.java → ...e/token/ShardingTokenGenerateBuilder.java b/...en/pojo/ShardingTokenGenerateBuilder.java → ...e/token/ShardingTokenGenerateBuilder.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.rewrite.token.pojo;
+package org.apache.shardingsphere.sharding.rewrite.token;
 
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;

diff --git a/...ojo/ShardingTokenGenerateBuilderTest.java → ...ken/ShardingTokenGenerateBuilderTest.java b/...ojo/ShardingTokenGenerateBuilderTest.java → ...ken/ShardingTokenGenerateBuilderTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.rewrite.token.pojo;
+package org.apache.shardingsphere.sharding.rewrite.token;
 
 import org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext;
 import org.apache.shardingsphere.infra.rewrite.sql.token.generator.SQLTokenGenerator;

diff --git a/...ggregationDistinctTokenGeneratorTest.java → ...ggregationDistinctTokenGeneratorTest.java b/...ggregationDistinctTokenGeneratorTest.java → ...ggregationDistinctTokenGeneratorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
 
 import org.apache.shardingsphere.infra.binder.context.segment.select.projection.impl.AggregationDistinctProjection;
 import org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext;

diff --git a/...e/token/ConstraintTokenGeneratorTest.java → ...nerator/ConstraintTokenGeneratorTest.java b/...e/token/ConstraintTokenGeneratorTest.java → ...nerator/ConstraintTokenGeneratorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
 
 import org.apache.shardingsphere.infra.binder.context.statement.ddl.AlterTableStatementContext;
 import org.apache.shardingsphere.infra.binder.context.statement.ddl.CreateDatabaseStatementContext;

diff --git a/...write/token/CursorTokenGeneratorTest.java → ...n/generator/CursorTokenGeneratorTest.java b/...write/token/CursorTokenGeneratorTest.java → ...n/generator/CursorTokenGeneratorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
 
 import org.apache.shardingsphere.infra.binder.context.statement.ddl.CloseStatementContext;
 import org.apache.shardingsphere.infra.binder.context.statement.ddl.CursorStatementContext;

diff --git a/...ctProjectionPrefixTokenGeneratorTest.java → ...ctProjectionPrefixTokenGeneratorTest.java b/...ctProjectionPrefixTokenGeneratorTest.java → ...ctProjectionPrefixTokenGeneratorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
 
 import org.apache.shardingsphere.infra.binder.context.segment.select.projection.impl.AggregationDistinctProjection;
 import org.apache.shardingsphere.infra.binder.context.statement.ddl.CreateDatabaseStatementContext;

diff --git a/...ewrite/token/IndexTokenGeneratorTest.java → ...en/generator/IndexTokenGeneratorTest.java b/...ewrite/token/IndexTokenGeneratorTest.java → ...en/generator/IndexTokenGeneratorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
 
 import org.apache.shardingsphere.infra.binder.context.statement.ddl.AlterIndexStatementContext;
 import org.apache.shardingsphere.infra.binder.context.statement.ddl.CreateDatabaseStatementContext;

diff --git a/...write/token/OffsetTokenGeneratorTest.java → ...n/generator/OffsetTokenGeneratorTest.java b/...write/token/OffsetTokenGeneratorTest.java → ...n/generator/OffsetTokenGeneratorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
 
 import org.apache.shardingsphere.infra.binder.context.segment.select.pagination.PaginationContext;
 import org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext;

diff --git a/...rite/token/OrderByTokenGeneratorTest.java → .../generator/OrderByTokenGeneratorTest.java b/...rite/token/OrderByTokenGeneratorTest.java → .../generator/OrderByTokenGeneratorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
 
 import org.apache.shardingsphere.infra.binder.context.segment.select.orderby.OrderByItem;
 import org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext;

diff --git a/.../token/ProjectionsTokenGeneratorTest.java → ...erator/ProjectionsTokenGeneratorTest.java b/.../token/ProjectionsTokenGeneratorTest.java → ...erator/ProjectionsTokenGeneratorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
 
 import org.apache.shardingsphere.infra.binder.context.segment.select.projection.Projection;
 import org.apache.shardingsphere.infra.binder.context.segment.select.projection.impl.AggregationDistinctProjection;

diff --git a/...ite/token/RowCountTokenGeneratorTest.java → ...generator/RowCountTokenGeneratorTest.java b/...ite/token/RowCountTokenGeneratorTest.java → ...generator/RowCountTokenGeneratorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
 
 import org.apache.shardingsphere.infra.binder.context.segment.select.pagination.PaginationContext;
 import org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext;

diff --git a/...ardingInsertValuesTokenGeneratorTest.java → ...ardingInsertValuesTokenGeneratorTest.java b/...ardingInsertValuesTokenGeneratorTest.java → ...ardingInsertValuesTokenGeneratorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
 
 import org.apache.shardingsphere.infra.binder.context.segment.insert.values.InsertValueContext;
 import org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext;

diff --git a/...ken/ShardingRemoveTokenGeneratorTest.java → ...tor/ShardingRemoveTokenGeneratorTest.java b/...ken/ShardingRemoveTokenGeneratorTest.java → ...tor/ShardingRemoveTokenGeneratorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
 
 import org.apache.shardingsphere.infra.binder.context.statement.dml.InsertStatementContext;
 import org.apache.shardingsphere.infra.binder.context.statement.dml.SelectStatementContext;

diff --git a/...ewrite/token/TableTokenGeneratorTest.java → ...en/generator/TableTokenGeneratorTest.java b/...ewrite/token/TableTokenGeneratorTest.java → ...en/generator/TableTokenGeneratorTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.sharding.rewrite.token;
+package org.apache.shardingsphere.sharding.rewrite.token.generator;
 
 import org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
 import org.apache.shardingsphere.infra.binder.context.statement.ddl.CreateDatabaseStatementContext;