You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ji...@apache.org on 2023/05/28 01:16:51 UTC
[shardingsphere] branch master updated: Refactor ParseDistSQLHandler (#25915)
This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 06db1c94a5d Refactor ParseDistSQLHandler (#25915)
06db1c94a5d is described below
commit 06db1c94a5d9be4279f62c576ca3eb666dcae0b7
Author: yx9o <ya...@163.com>
AuthorDate: Sun May 28 09:16:35 2023 +0800
Refactor ParseDistSQLHandler (#25915)
---
.../distsql/handler/rul}/RULExecutor.java | 6 ++--
.../distsql/rul/RULBackendHandlerFactory.java | 5 +--
.../handler/distsql/rul/SQLRULBackendHandler.java | 11 +++++--
...a => ConnectionSessionRequiredRULExecutor.java} | 24 ++++----------
.../handler/distsql/rul/sql/FormatSQLExecutor.java | 7 ++--
...stSQLHandler.java => ParseDistSQLExecutor.java} | 33 ++++++++++---------
...shardingsphere.distsql.handler.rul.RULExecutor} | 1 +
.../distsql/rul/sql/FormatSQLExecutorTest.java | 12 +++++--
...dlerTest.java => ParseDistSQLExecutorTest.java} | 38 +++++++++++-----------
9 files changed, 70 insertions(+), 67 deletions(-)
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/executor/RULExecutor.java b/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/rul/RULExecutor.java
similarity index 83%
copy from proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/executor/RULExecutor.java
copy to distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/rul/RULExecutor.java
index 9e3dd0f69d1..10150075453 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/executor/RULExecutor.java
+++ b/distsql/handler/src/main/java/org/apache/shardingsphere/distsql/handler/rul/RULExecutor.java
@@ -15,13 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.proxy.backend.handler.distsql.rul.executor;
+package org.apache.shardingsphere.distsql.handler.rul;
import org.apache.shardingsphere.distsql.parser.statement.rul.RULStatement;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import org.apache.shardingsphere.infra.util.spi.annotation.SingletonSPI;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPI;
-import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import java.util.Collection;
import java.util.Collections;
@@ -44,11 +43,10 @@ public interface RULExecutor<T extends RULStatement> extends TypedSPI {
/**
* Get query result rows.
*
- * @param connectionSession connectionSession connection session
* @param sqlStatement SQL statement
* @return query result rows
*/
- default Collection<LocalDataQueryResultRow> getRows(ConnectionSession connectionSession, T sqlStatement) {
+ default Collection<LocalDataQueryResultRow> getRows(T sqlStatement) {
return Collections.emptyList();
}
}
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/RULBackendHandlerFactory.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/RULBackendHandlerFactory.java
index 367593d23c7..6558e3f378c 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/RULBackendHandlerFactory.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/RULBackendHandlerFactory.java
@@ -19,15 +19,13 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rul;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.distsql.handler.rul.RULExecutor;
import org.apache.shardingsphere.distsql.parser.statement.rul.RULStatement;
-import org.apache.shardingsphere.distsql.parser.statement.rul.sql.ParseStatement;
import org.apache.shardingsphere.distsql.parser.statement.rul.sql.PreviewStatement;
import org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.util.exception.external.sql.type.generic.UnsupportedSQLOperationException;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.proxy.backend.handler.ProxyBackendHandler;
-import org.apache.shardingsphere.proxy.backend.handler.distsql.rul.executor.RULExecutor;
-import org.apache.shardingsphere.proxy.backend.handler.distsql.rul.sql.ParseDistSQLHandler;
import org.apache.shardingsphere.proxy.backend.handler.distsql.rul.sql.PreviewHandler;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
@@ -43,7 +41,6 @@ public final class RULBackendHandlerFactory {
private static final Map<Class<? extends RULStatement>, Class<? extends RULBackendHandler<?>>> HANDLERS = new HashMap<>();
static {
- HANDLERS.put(ParseStatement.class, ParseDistSQLHandler.class);
HANDLERS.put(PreviewStatement.class, PreviewHandler.class);
}
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/SQLRULBackendHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/SQLRULBackendHandler.java
index 89b45576b07..9d463c7dfcb 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/SQLRULBackendHandler.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/SQLRULBackendHandler.java
@@ -17,11 +17,14 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.rul;
+import org.apache.shardingsphere.distsql.handler.rul.RULExecutor;
import org.apache.shardingsphere.distsql.parser.statement.rul.RULStatement;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataMergedResult;
+import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
-import org.apache.shardingsphere.proxy.backend.handler.distsql.rul.executor.RULExecutor;
+import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
+import org.apache.shardingsphere.proxy.backend.handler.distsql.rul.executor.ConnectionSessionRequiredRULExecutor;
import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseCell;
import org.apache.shardingsphere.proxy.backend.response.data.QueryResponseRow;
import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
@@ -58,7 +61,11 @@ public final class SQLRULBackendHandler<T extends RULStatement> extends RULBacke
}
private MergedResult createMergedResult(final RULExecutor<T> executor) {
- return new LocalDataMergedResult(executor.getRows(getConnectionSession(), getSqlStatement()));
+ if (executor instanceof ConnectionSessionRequiredRULExecutor) {
+ ShardingSphereMetaData metaData = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData();
+ return new LocalDataMergedResult(((ConnectionSessionRequiredRULExecutor<T>) executor).getRows(metaData, getConnectionSession(), getSqlStatement()));
+ }
+ return new LocalDataMergedResult(executor.getRows(getSqlStatement()));
}
@Override
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/executor/RULExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/executor/ConnectionSessionRequiredRULExecutor.java
similarity index 69%
rename from proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/executor/RULExecutor.java
rename to proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/executor/ConnectionSessionRequiredRULExecutor.java
index 9e3dd0f69d1..39037dc5ab6 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/executor/RULExecutor.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/executor/ConnectionSessionRequiredRULExecutor.java
@@ -17,38 +17,28 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.rul.executor;
+import org.apache.shardingsphere.distsql.handler.rul.RULExecutor;
import org.apache.shardingsphere.distsql.parser.statement.rul.RULStatement;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
-import org.apache.shardingsphere.infra.util.spi.annotation.SingletonSPI;
-import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPI;
+import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import java.util.Collection;
-import java.util.Collections;
/**
- * RUL executor.
+ * Connection session required RUL executor.
*
- * @param <T> type of RUL statement
+ * @param <T> type of SQL statement
*/
-@SingletonSPI
-public interface RULExecutor<T extends RULStatement> extends TypedSPI {
-
- /**
- * Get column names.
- *
- * @return column names
- */
- Collection<String> getColumnNames();
+public interface ConnectionSessionRequiredRULExecutor<T extends RULStatement> extends RULExecutor<T> {
/**
* Get query result rows.
*
+ * @param metaData ShardingSphere meta data
* @param connectionSession connectionSession connection session
* @param sqlStatement SQL statement
* @return query result rows
*/
- default Collection<LocalDataQueryResultRow> getRows(ConnectionSession connectionSession, T sqlStatement) {
- return Collections.emptyList();
- }
+ Collection<LocalDataQueryResultRow> getRows(ShardingSphereMetaData metaData, ConnectionSession connectionSession, T sqlStatement);
}
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/FormatSQLExecutor.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/FormatSQLExecutor.java
index 8ff2ffc01a4..9f4b069b844 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/FormatSQLExecutor.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/FormatSQLExecutor.java
@@ -19,7 +19,8 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rul.sql;
import org.apache.shardingsphere.distsql.parser.statement.rul.sql.FormatStatement;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
-import org.apache.shardingsphere.proxy.backend.handler.distsql.rul.executor.RULExecutor;
+import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
+import org.apache.shardingsphere.proxy.backend.handler.distsql.rul.executor.ConnectionSessionRequiredRULExecutor;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.sql.parser.api.CacheOption;
import org.apache.shardingsphere.sql.parser.api.SQLFormatEngine;
@@ -31,7 +32,7 @@ import java.util.Properties;
/**
* Format SQL executor.
*/
-public final class FormatSQLExecutor implements RULExecutor<FormatStatement> {
+public final class FormatSQLExecutor implements ConnectionSessionRequiredRULExecutor<FormatStatement> {
@Override
public Collection<String> getColumnNames() {
@@ -39,7 +40,7 @@ public final class FormatSQLExecutor implements RULExecutor<FormatStatement> {
}
@Override
- public Collection<LocalDataQueryResultRow> getRows(final ConnectionSession connectionSession, final FormatStatement sqlStatement) {
+ public Collection<LocalDataQueryResultRow> getRows(final ShardingSphereMetaData metaData, final ConnectionSession connectionSession, final FormatStatement sqlStatement) {
return Collections.singleton(new LocalDataQueryResultRow(formatSQL(sqlStatement.getSql(), connectionSession.getProtocolType().getType())));
}
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLHandler.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLExecutor.java
similarity index 56%
rename from proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLHandler.java
rename to proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLExecutor.java
index 1e8f1697e7c..8ef68676d2c 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLHandler.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLExecutor.java
@@ -20,9 +20,10 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rul.sql;
import com.google.gson.Gson;
import org.apache.shardingsphere.distsql.parser.statement.rul.sql.ParseStatement;
import org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
-import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
-import org.apache.shardingsphere.proxy.backend.handler.distsql.rul.AbstractSQLRULBackendHandler;
+import org.apache.shardingsphere.proxy.backend.handler.distsql.rul.executor.ConnectionSessionRequiredRULExecutor;
+import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.util.Arrays;
@@ -30,28 +31,28 @@ import java.util.Collection;
import java.util.Collections;
/**
- * Parse DistSQL handler.
+ * Parse DistSQL executor.
*/
-public final class ParseDistSQLHandler extends AbstractSQLRULBackendHandler<ParseStatement> {
-
- private static final String PARSED_STATEMENT = "parsed_statement";
-
- private static final String PARSED_STATEMENT_DETAIL = "parsed_statement_detail";
+public final class ParseDistSQLExecutor implements ConnectionSessionRequiredRULExecutor<ParseStatement> {
@Override
- protected Collection<String> getColumnNames() {
- return Arrays.asList(PARSED_STATEMENT, PARSED_STATEMENT_DETAIL);
+ public Collection<String> getColumnNames() {
+ return Arrays.asList("parsed_statement", "parsed_statement_detail");
}
@Override
- protected Collection<LocalDataQueryResultRow> getRows(final ContextManager contextManager) {
- SQLStatement parsedSqlStatement = parseSQL(contextManager);
+ public Collection<LocalDataQueryResultRow> getRows(final ShardingSphereMetaData metaData, final ConnectionSession connectionSession, final ParseStatement sqlStatement) {
+ SQLStatement parsedSqlStatement = parseSQL(metaData, connectionSession, sqlStatement);
return Collections.singleton(new LocalDataQueryResultRow(parsedSqlStatement.getClass().getSimpleName(), new Gson().toJson(parsedSqlStatement)));
}
- private SQLStatement parseSQL(final ContextManager contextManager) {
- SQLParserRule sqlParserRule = contextManager.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
- String databaseType = getConnectionSession().getProtocolType().getType();
- return sqlParserRule.getSQLParserEngine(databaseType).parse(getSqlStatement().getSql(), false);
+ private SQLStatement parseSQL(final ShardingSphereMetaData metaData, final ConnectionSession connectionSession, final ParseStatement sqlStatement) {
+ SQLParserRule sqlParserRule = metaData.getGlobalRuleMetaData().getSingleRule(SQLParserRule.class);
+ return sqlParserRule.getSQLParserEngine(connectionSession.getProtocolType().getType()).parse(sqlStatement.getSql(), false);
+ }
+
+ @Override
+ public String getType() {
+ return ParseStatement.class.getName();
}
}
diff --git a/proxy/backend/core/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.distsql.rul.executor.RULExecutor b/proxy/backend/core/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.rul.RULExecutor
similarity index 91%
rename from proxy/backend/core/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.distsql.rul.executor.RULExecutor
rename to proxy/backend/core/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.rul.RULExecutor
index b03229ac599..b2b6d23bb23 100644
--- a/proxy/backend/core/src/main/resources/META-INF/services/org.apache.shardingsphere.proxy.backend.handler.distsql.rul.executor.RULExecutor
+++ b/proxy/backend/core/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.rul.RULExecutor
@@ -16,3 +16,4 @@
#
org.apache.shardingsphere.proxy.backend.handler.distsql.rul.sql.FormatSQLExecutor
+org.apache.shardingsphere.proxy.backend.handler.distsql.rul.sql.ParseDistSQLExecutor
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/FormatSQLExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/FormatSQLExecutorTest.java
index ebc6a525246..bee560b3d28 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/FormatSQLExecutorTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/FormatSQLExecutorTest.java
@@ -19,12 +19,16 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rul.sql;
import org.apache.shardingsphere.distsql.parser.statement.rul.sql.FormatStatement;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
+import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import org.apache.shardingsphere.proxy.backend.handler.distsql.rul.RULBackendHandler;
import org.apache.shardingsphere.proxy.backend.handler.distsql.rul.SQLRULBackendHandler;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
+import org.apache.shardingsphere.test.mock.AutoMockExtension;
import org.apache.shardingsphere.test.mock.StaticMockSettings;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
import org.mockito.Mock;
import java.sql.SQLException;
@@ -34,19 +38,23 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.when;
+@ExtendWith(AutoMockExtension.class)
@StaticMockSettings(ProxyContext.class)
class FormatSQLExecutorTest {
+ @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+ private ContextManager contextManager;
+
@Mock
private ConnectionSession connectionSession;
@Test
void assertExecute() throws SQLException {
String sql = "SELECT * FROM t_order WHERE order_id=1";
+ when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
when(connectionSession.getProtocolType()).thenReturn(new MySQLDatabaseType());
- FormatStatement statement = new FormatStatement(sql);
RULBackendHandler<FormatStatement> handler = new SQLRULBackendHandler<>();
- handler.init(statement, connectionSession);
+ handler.init(new FormatStatement(sql), connectionSession);
handler.execute();
handler.next();
assertThat(new LinkedList<>(handler.getRowData().getData()).getFirst(), is("SELECT * \n"
diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLHandlerTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLExecutorTest.java
similarity index 72%
rename from proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLHandlerTest.java
rename to proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLExecutorTest.java
index 95968d74072..edf142f565c 100644
--- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLHandlerTest.java
+++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/sql/ParseDistSQLExecutorTest.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.proxy.backend.handler.distsql.rul.sql;
import com.google.gson.Gson;
import com.google.gson.JsonParser;
+import org.apache.shardingsphere.distsql.parser.statement.rul.sql.FormatStatement;
import org.apache.shardingsphere.distsql.parser.statement.rul.sql.ParseStatement;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.infra.database.type.dialect.PostgreSQLDatabaseType;
@@ -27,6 +28,8 @@ import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.parser.rule.SQLParserRule;
import org.apache.shardingsphere.parser.rule.builder.DefaultSQLParserRuleConfigurationBuilder;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
+import org.apache.shardingsphere.proxy.backend.handler.distsql.rul.RULBackendHandler;
+import org.apache.shardingsphere.proxy.backend.handler.distsql.rul.SQLRULBackendHandler;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
import org.apache.shardingsphere.sql.parser.exception.SQLParsingException;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
@@ -49,7 +52,7 @@ import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
@StaticMockSettings(ProxyContext.class)
-class ParseDistSQLHandlerTest {
+class ParseDistSQLExecutorTest {
private final SQLParserRule sqlParserRule = new SQLParserRule(new DefaultSQLParserRuleConfigurationBuilder().build());
@@ -69,36 +72,33 @@ class ParseDistSQLHandlerTest {
void assertGetRowDataForMySQL() throws SQLException {
String sql = "SELECT * FROM t_order";
when(connectionSession.getProtocolType()).thenReturn(new MySQLDatabaseType());
- ParseStatement parseStatement = new ParseStatement(sql);
- ParseDistSQLHandler parseDistSQLHandler = new ParseDistSQLHandler();
- parseDistSQLHandler.init(parseStatement, connectionSession);
- parseDistSQLHandler.execute();
- parseDistSQLHandler.next();
+ RULBackendHandler<FormatStatement> handler = new SQLRULBackendHandler<>();
+ handler.init(new ParseStatement(sql), connectionSession);
+ handler.execute();
+ handler.next();
SQLStatement statement = sqlParserRule.getSQLParserEngine("MySQL").parse(sql, false);
- assertThat(new LinkedList<>(parseDistSQLHandler.getRowData().getData()).getFirst(), is("MySQLSelectStatement"));
- assertThat(JsonParser.parseString(new LinkedList<>(parseDistSQLHandler.getRowData().getData()).getLast().toString()), is(JsonParser.parseString(new Gson().toJson(statement))));
+ assertThat(new LinkedList<>(handler.getRowData().getData()).getFirst(), is("MySQLSelectStatement"));
+ assertThat(JsonParser.parseString(new LinkedList<>(handler.getRowData().getData()).getLast().toString()), is(JsonParser.parseString(new Gson().toJson(statement))));
}
@Test
void assertGetRowDataForPostgreSQL() throws SQLException {
String sql = "SELECT * FROM t_order";
when(connectionSession.getProtocolType()).thenReturn(new PostgreSQLDatabaseType());
- ParseStatement parseStatement = new ParseStatement(sql);
- ParseDistSQLHandler parseDistSQLHandler = new ParseDistSQLHandler();
- parseDistSQLHandler.init(parseStatement, connectionSession);
- parseDistSQLHandler.execute();
- parseDistSQLHandler.next();
+ RULBackendHandler<FormatStatement> handler = new SQLRULBackendHandler<>();
+ handler.init(new ParseStatement(sql), connectionSession);
+ handler.execute();
+ handler.next();
SQLStatement statement = sqlParserRule.getSQLParserEngine("PostgreSQL").parse(sql, false);
- assertThat(JsonParser.parseString(new LinkedList<>(parseDistSQLHandler.getRowData().getData()).getLast().toString()), is(JsonParser.parseString(new Gson().toJson(statement))));
+ assertThat(JsonParser.parseString(new LinkedList<>(handler.getRowData().getData()).getLast().toString()), is(JsonParser.parseString(new Gson().toJson(statement))));
}
@Test
- void assertExecute() throws SQLException {
+ void assertExecute() {
String sql = "wrong sql";
when(connectionSession.getProtocolType()).thenReturn(new MySQLDatabaseType());
- ParseStatement parseStatement = new ParseStatement(sql);
- ParseDistSQLHandler parseDistSQLHandler = new ParseDistSQLHandler();
- parseDistSQLHandler.init(parseStatement, connectionSession);
- assertThrows(SQLParsingException.class, parseDistSQLHandler::execute);
+ RULBackendHandler<FormatStatement> handler = new SQLRULBackendHandler<>();
+ handler.init(new ParseStatement(sql), connectionSession);
+ assertThrows(SQLParsingException.class, handler::execute);
}
}