This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 947ff466aa5 Add ParameterRewritersBuilder (#33615)
947ff466aa5 is described below
commit 947ff466aa56fae155fd3a777de20bbe5b97fe55
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Nov 12 00:22:53 2024 +0800
Add ParameterRewritersBuilder (#33615)
---
.../parameter/EncryptParameterRewriterBuilder.java | 21 ++++------
.../ShardingParameterRewriterBuilder.java | 13 +-----
.../rewriter/ParameterRewritersBuilder.java | 48 ++++++++++++++++++++++
3 files changed, 57 insertions(+), 25 deletions(-)
diff --git
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewriterBuilder.java
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewriterBuilder.java
index 0c9032e4a27..6a523d2b880 100644
---
a/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewriterBuilder.java
+++
b/features/encrypt/core/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/EncryptParameterRewriterBuilder.java
@@ -28,9 +28,9 @@ import org.apache.shardingsphere.encrypt.rule.EncryptRule;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewriter;
import
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewriterBuilder;
+import
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewritersBuilder;
import java.util.Collection;
-import java.util.LinkedList;
/**
* Parameter rewriter builder for encrypt.
@@ -48,18 +48,11 @@ public final class EncryptParameterRewriterBuilder
implements ParameterRewriterB
@Override
public Collection<ParameterRewriter> getParameterRewriters() {
- Collection<ParameterRewriter> result = new LinkedList<>();
- addParameterRewriter(result, new
EncryptAssignmentParameterRewriter(rule, databaseName));
- addParameterRewriter(result, new
EncryptPredicateParameterRewriter(rule, databaseName, encryptConditions));
- addParameterRewriter(result, new
EncryptInsertPredicateParameterRewriter(rule, databaseName, encryptConditions));
- addParameterRewriter(result, new
EncryptInsertValueParameterRewriter(rule, databaseName));
- addParameterRewriter(result, new
EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter(rule, databaseName));
- return result;
- }
-
- private void addParameterRewriter(final Collection<ParameterRewriter>
paramRewriters, final ParameterRewriter toBeAddedParamRewriter) {
- if (toBeAddedParamRewriter.isNeedRewrite(sqlStatementContext)) {
- paramRewriters.add(toBeAddedParamRewriter);
- }
+ return new ParameterRewritersBuilder().build(sqlStatementContext,
+ new EncryptAssignmentParameterRewriter(rule, databaseName),
+ new EncryptPredicateParameterRewriter(rule, databaseName,
encryptConditions),
+ new EncryptInsertPredicateParameterRewriter(rule,
databaseName, encryptConditions),
+ new EncryptInsertValueParameterRewriter(rule, databaseName),
+ new
EncryptInsertOnDuplicateKeyUpdateValueParameterRewriter(rule, databaseName));
}
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewriterBuilder.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewriterBuilder.java
index 1511205dd3c..3f28b69801b 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewriterBuilder.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/parameter/ShardingParameterRewriterBuilder.java
@@ -21,12 +21,12 @@ import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewriter;
import
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewriterBuilder;
+import
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.ParameterRewritersBuilder;
import
org.apache.shardingsphere.infra.rewrite.parameter.rewriter.keygen.GeneratedKeyInsertValueParameterRewriter;
import org.apache.shardingsphere.infra.route.context.RouteContext;
import
org.apache.shardingsphere.sharding.rewrite.parameter.impl.ShardingPaginationParameterRewriter;
import java.util.Collection;
-import java.util.LinkedList;
/**
* Parameter rewriter builder for sharding.
@@ -40,15 +40,6 @@ public final class ShardingParameterRewriterBuilder
implements ParameterRewriter
@Override
public Collection<ParameterRewriter> getParameterRewriters() {
- Collection<ParameterRewriter> result = new LinkedList<>();
- addParameterRewriter(result, new
GeneratedKeyInsertValueParameterRewriter());
- addParameterRewriter(result, new
ShardingPaginationParameterRewriter(routeContext));
- return result;
- }
-
- private void addParameterRewriter(final Collection<ParameterRewriter>
paramRewriters, final ParameterRewriter toBeAddedParamRewriter) {
- if (toBeAddedParamRewriter.isNeedRewrite(sqlStatementContext)) {
- paramRewriters.add(toBeAddedParamRewriter);
- }
+ return new ParameterRewritersBuilder().build(sqlStatementContext, new
GeneratedKeyInsertValueParameterRewriter(), new
ShardingPaginationParameterRewriter(routeContext));
}
}
diff --git
a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewritersBuilder.java
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewritersBuilder.java
new file mode 100644
index 00000000000..d088ce6916c
--- /dev/null
+++
b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/parameter/rewriter/ParameterRewritersBuilder.java
@@ -0,0 +1,48 @@
+/*
+ * 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.infra.rewrite.parameter.rewriter;
+
+import org.apache.shardingsphere.infra.annotation.HighFrequencyInvocation;
+import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
+
+import java.util.Collection;
+import java.util.LinkedList;
+
+/**
+ * Parameter rewriters builder.
+ */
+@HighFrequencyInvocation
+public final class ParameterRewritersBuilder {
+
+ /**
+ * Build parameter rewriters.
+ *
+ * @param sqlStatementContext SQL statement context
+ * @param rewriters parameter rewriters
+ * @return built parameter rewriters
+ */
+ public Collection<ParameterRewriter> build(final SQLStatementContext
sqlStatementContext, final ParameterRewriter... rewriters) {
+ Collection<ParameterRewriter> result = new LinkedList<>();
+ for (ParameterRewriter each : rewriters) {
+ if (each.isNeedRewrite(sqlStatementContext)) {
+ result.add(each);
+ }
+ }
+ return result;
+ }
+}
