You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2024/04/24 00:21:33 UTC
(shardingsphere) branch master updated: Refactor AbstractSQLBuilder to reduce input parameter (#30994)
This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 e680b752225 Refactor AbstractSQLBuilder to reduce input parameter (#30994)
e680b752225 is described below
commit e680b752225cbc84e9979284ebf7579b8c7b734e
Author: Zhengqiang Duan <du...@apache.org>
AuthorDate: Wed Apr 24 08:21:26 2024 +0800
Refactor AbstractSQLBuilder to reduce input parameter (#30994)
---
.../rewrite/engine/GenericSQLRewriteEngine.java | 3 ++-
.../rewrite/engine/RouteSQLRewriteEngine.java | 5 +++--
.../infra/rewrite/sql/impl/AbstractSQLBuilder.java | 24 ++++++++++++----------
.../infra/rewrite/sql/impl/DefaultSQLBuilder.java | 7 ++++---
.../infra/rewrite/sql/impl/RouteSQLBuilder.java | 7 ++++---
.../rewrite/sql/impl/DefaultSQLBuilderTest.java | 13 ++----------
.../rewrite/sql/impl/RouteSQLBuilderTest.java | 13 +++---------
7 files changed, 31 insertions(+), 41 deletions(-)
diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/GenericSQLRewriteEngine.java b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/GenericSQLRewriteEngine.java
index b1685a4a654..178d2ec0185 100644
--- a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/GenericSQLRewriteEngine.java
+++ b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/GenericSQLRewriteEngine.java
@@ -55,7 +55,8 @@ public final class GenericSQLRewriteEngine {
DatabaseType protocolType = database.getProtocolType();
Map<String, StorageUnit> storageUnits = database.getResourceMetaData().getStorageUnits();
DatabaseType storageType = storageUnits.isEmpty() ? protocolType : storageUnits.values().iterator().next().getStorageType();
- SQLTranslatorContext sqlTranslatorContext = translatorRule.translate(new DefaultSQLBuilder(sqlRewriteContext).toSQL(), sqlRewriteContext.getParameterBuilder().getParameters(), queryContext,
+ SQLTranslatorContext sqlTranslatorContext = translatorRule.translate(new DefaultSQLBuilder(sqlRewriteContext.getSql(), sqlRewriteContext.getSqlTokens()).toSQL(),
+ sqlRewriteContext.getParameterBuilder().getParameters(), queryContext,
storageType, database, globalRuleMetaData);
return new GenericSQLRewriteResult(new SQLRewriteUnit(sqlTranslatorContext.getSql(), sqlTranslatorContext.getParameters()));
}
diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java
index 138140f2438..55417b10e97 100644
--- a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java
+++ b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java
@@ -86,7 +86,7 @@ public final class RouteSQLRewriteEngine {
boolean containsDollarMarker = sqlRewriteContext.getSqlStatementContext() instanceof SelectStatementContext
&& ((SelectStatementContext) (sqlRewriteContext.getSqlStatementContext())).isContainsDollarParameterMarker();
for (RouteUnit each : routeUnits) {
- sql.add(SQLUtils.trimSemicolon(new RouteSQLBuilder(sqlRewriteContext, each).toSQL()));
+ sql.add(SQLUtils.trimSemicolon(new RouteSQLBuilder(sqlRewriteContext.getSql(), sqlRewriteContext.getSqlTokens(), each).toSQL()));
if (containsDollarMarker && !params.isEmpty()) {
continue;
}
@@ -98,7 +98,8 @@ public final class RouteSQLRewriteEngine {
private void addSQLRewriteUnits(final Map<RouteUnit, SQLRewriteUnit> sqlRewriteUnits, final SQLRewriteContext sqlRewriteContext,
final RouteContext routeContext, final Collection<RouteUnit> routeUnits) {
for (RouteUnit each : routeUnits) {
- sqlRewriteUnits.put(each, new SQLRewriteUnit(new RouteSQLBuilder(sqlRewriteContext, each).toSQL(), getParameters(sqlRewriteContext.getParameterBuilder(), routeContext, each)));
+ sqlRewriteUnits.put(each, new SQLRewriteUnit(new RouteSQLBuilder(sqlRewriteContext.getSql(), sqlRewriteContext.getSqlTokens(), each).toSQL(),
+ getParameters(sqlRewriteContext.getParameterBuilder(), routeContext, each)));
}
}
diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/AbstractSQLBuilder.java b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/AbstractSQLBuilder.java
index dc517cca1fd..4a8e31d826c 100644
--- a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/AbstractSQLBuilder.java
+++ b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/AbstractSQLBuilder.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.infra.rewrite.sql.impl;
import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.infra.rewrite.context.SQLRewriteContext;
import org.apache.shardingsphere.infra.rewrite.sql.SQLBuilder;
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.SQLToken;
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.Substitutable;
@@ -27,6 +26,7 @@ import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.generic.Substituta
import org.apache.shardingsphere.infra.route.context.RouteUnit;
import java.util.Collections;
+import java.util.List;
/**
* Abstract SQL builder.
@@ -34,19 +34,21 @@ import java.util.Collections;
@RequiredArgsConstructor
public abstract class AbstractSQLBuilder implements SQLBuilder {
- private final SQLRewriteContext context;
+ private final String sql;
+
+ private final List<SQLToken> sqlTokens;
private final RouteUnit routeUnit;
@Override
public final String toSQL() {
- if (context.getSqlTokens().isEmpty()) {
- return context.getSql();
+ if (sqlTokens.isEmpty()) {
+ return sql;
}
- Collections.sort(context.getSqlTokens());
+ Collections.sort(sqlTokens);
StringBuilder result = new StringBuilder();
- result.append(context.getSql(), 0, context.getSqlTokens().get(0).getStartIndex());
- for (SQLToken each : context.getSqlTokens()) {
+ result.append(sql, 0, sqlTokens.get(0).getStartIndex());
+ for (SQLToken each : sqlTokens) {
if (each instanceof ComposableSQLToken) {
result.append(getComposableSQLTokenText((ComposableSQLToken) each));
} else if (each instanceof SubstitutableColumnNameToken) {
@@ -71,16 +73,16 @@ public abstract class AbstractSQLBuilder implements SQLBuilder {
}
private String getConjunctionText(final SQLToken sqlToken) {
- return context.getSql().substring(getStartIndex(sqlToken), getStopIndex(sqlToken));
+ return sql.substring(getStartIndex(sqlToken), getStopIndex(sqlToken));
}
private int getStartIndex(final SQLToken sqlToken) {
int startIndex = sqlToken instanceof Substitutable ? ((Substitutable) sqlToken).getStopIndex() + 1 : sqlToken.getStartIndex();
- return Math.min(startIndex, context.getSql().length());
+ return Math.min(startIndex, sql.length());
}
private int getStopIndex(final SQLToken sqlToken) {
- int currentSQLTokenIndex = context.getSqlTokens().indexOf(sqlToken);
- return context.getSqlTokens().size() - 1 == currentSQLTokenIndex ? context.getSql().length() : context.getSqlTokens().get(currentSQLTokenIndex + 1).getStartIndex();
+ int currentSQLTokenIndex = sqlTokens.indexOf(sqlToken);
+ return sqlTokens.size() - 1 == currentSQLTokenIndex ? sql.length() : sqlTokens.get(currentSQLTokenIndex + 1).getStartIndex();
}
}
diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/DefaultSQLBuilder.java b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/DefaultSQLBuilder.java
index d35d2220870..1bccf5d9949 100644
--- a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/DefaultSQLBuilder.java
+++ b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/DefaultSQLBuilder.java
@@ -17,16 +17,17 @@
package org.apache.shardingsphere.infra.rewrite.sql.impl;
-import org.apache.shardingsphere.infra.rewrite.context.SQLRewriteContext;
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.SQLToken;
+import java.util.List;
+
/**
* Default SQL builder.
*/
public final class DefaultSQLBuilder extends AbstractSQLBuilder {
- public DefaultSQLBuilder(final SQLRewriteContext context) {
- super(context, null);
+ public DefaultSQLBuilder(final String sql, final List<SQLToken> sqlTokens) {
+ super(sql, sqlTokens, null);
}
@Override
diff --git a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/RouteSQLBuilder.java b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/RouteSQLBuilder.java
index 0f08d68e7b3..bf5746d3c4c 100644
--- a/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/RouteSQLBuilder.java
+++ b/infra/rewrite/src/main/java/org/apache/shardingsphere/infra/rewrite/sql/impl/RouteSQLBuilder.java
@@ -17,11 +17,12 @@
package org.apache.shardingsphere.infra.rewrite.sql.impl;
-import org.apache.shardingsphere.infra.rewrite.context.SQLRewriteContext;
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.RouteUnitAware;
import org.apache.shardingsphere.infra.rewrite.sql.token.pojo.SQLToken;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
+import java.util.List;
+
/**
* SQL builder with route.
*/
@@ -29,8 +30,8 @@ public final class RouteSQLBuilder extends AbstractSQLBuilder {
private final RouteUnit routeUnit;
- public RouteSQLBuilder(final SQLRewriteContext context, final RouteUnit routeUnit) {
- super(context, routeUnit);
+ public RouteSQLBuilder(final String sql, final List<SQLToken> sqlTokens, final RouteUnit routeUnit) {
+ super(sql, sqlTokens, routeUnit);
this.routeUnit = routeUnit;
}
diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/impl/DefaultSQLBuilderTest.java b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/impl/DefaultSQLBuilderTest.java
index b78e6759983..9cd50d77704 100644
--- a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/impl/DefaultSQLBuilderTest.java
+++ b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/impl/DefaultSQLBuilderTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.infra.rewrite.sql.impl;
-import org.apache.shardingsphere.infra.rewrite.context.SQLRewriteContext;
import org.apache.shardingsphere.infra.rewrite.sql.fixture.SQLTokenFixture;
import org.junit.jupiter.api.Test;
@@ -25,24 +24,16 @@ import java.util.Collections;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
class DefaultSQLBuilderTest {
@Test
void assertToSQLWithEmptySQLToken() {
- SQLRewriteContext context = mock(SQLRewriteContext.class);
- when(context.getSql()).thenReturn("SELECT * FROM tbl WHERE id=?");
- when(context.getSqlTokens()).thenReturn(Collections.emptyList());
- assertThat(new DefaultSQLBuilder(context).toSQL(), is("SELECT * FROM tbl WHERE id=?"));
+ assertThat(new DefaultSQLBuilder("SELECT * FROM tbl WHERE id=?", Collections.emptyList()).toSQL(), is("SELECT * FROM tbl WHERE id=?"));
}
@Test
void assertToSQLWithSQLToken() {
- SQLRewriteContext context = mock(SQLRewriteContext.class);
- when(context.getSql()).thenReturn("SELECT * FROM tbl WHERE id=?");
- when(context.getSqlTokens()).thenReturn(Collections.singletonList(new SQLTokenFixture(14, 16)));
- assertThat(new DefaultSQLBuilder(context).toSQL(), is("SELECT * FROM XXX WHERE id=?"));
+ assertThat(new DefaultSQLBuilder("SELECT * FROM tbl WHERE id=?", Collections.singletonList(new SQLTokenFixture(14, 16))).toSQL(), is("SELECT * FROM XXX WHERE id=?"));
}
}
diff --git a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/impl/RouteSQLBuilderTest.java b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/impl/RouteSQLBuilderTest.java
index 26382b5f43d..f32872d75e4 100644
--- a/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/impl/RouteSQLBuilderTest.java
+++ b/infra/rewrite/src/test/java/org/apache/shardingsphere/infra/rewrite/sql/impl/RouteSQLBuilderTest.java
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.infra.rewrite.sql.impl;
-import org.apache.shardingsphere.infra.rewrite.context.SQLRewriteContext;
import org.apache.shardingsphere.infra.rewrite.sql.fixture.RouteUnitAwareSQLTokenFixture;
import org.apache.shardingsphere.infra.rewrite.sql.fixture.SQLTokenFixture;
import org.apache.shardingsphere.infra.route.context.RouteMapper;
@@ -29,24 +28,18 @@ import java.util.Collections;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
class RouteSQLBuilderTest {
@Test
void assertToSQLWithNormalSQLToken() {
- SQLRewriteContext context = mock(SQLRewriteContext.class);
- when(context.getSql()).thenReturn("SELECT * FROM tbl WHERE id=?");
- when(context.getSqlTokens()).thenReturn(Collections.singletonList(new SQLTokenFixture(14, 16)));
- assertThat(new RouteSQLBuilder(context, createRouteUnit()).toSQL(), is("SELECT * FROM XXX WHERE id=?"));
+ assertThat(new RouteSQLBuilder("SELECT * FROM tbl WHERE id=?", Collections.singletonList(new SQLTokenFixture(14, 16)), createRouteUnit()).toSQL(), is("SELECT * FROM XXX WHERE id=?"));
}
@Test
void assertToSQLWithRouteUnitAwareSQLToken() {
- SQLRewriteContext context = mock(SQLRewriteContext.class);
- when(context.getSql()).thenReturn("SELECT * FROM tbl WHERE id=?");
- when(context.getSqlTokens()).thenReturn(Collections.singletonList(new RouteUnitAwareSQLTokenFixture(14, 16)));
- assertThat(new RouteSQLBuilder(context, createRouteUnit()).toSQL(), is("SELECT * FROM tbl_0 WHERE id=?"));
+ assertThat(new RouteSQLBuilder("SELECT * FROM tbl WHERE id=?", Collections.singletonList(new RouteUnitAwareSQLTokenFixture(14, 16)), createRouteUnit()).toSQL(),
+ is("SELECT * FROM tbl_0 WHERE id=?"));
}
private RouteUnit createRouteUnit() {