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 4dd1d436dca Replace `DefaultSingleTableStorageUnitResultSet` by
`ShowDefaultSingleTableStorageUnitExecutor` (#23750)
4dd1d436dca is described below
commit 4dd1d436dca6af1ceec330d9587fee33e5abb1a4
Author: Zichao <[email protected]>
AuthorDate: Sat Jan 28 16:36:17 2023 +1300
Replace `DefaultSingleTableStorageUnitResultSet` by
`ShowDefaultSingleTableStorageUnitExecutor` (#23750)
---
...ShowDefaultSingleTableStorageUnitExecutor.java} | 30 ++++++++--------------
...hardingsphere.distsql.handler.query.RQLExecutor | 1 +
...here.distsql.handler.resultset.DistSQLResultSet | 1 -
.../handler/ProxyBackendHandlerFactoryTest.java | 4 +--
...DefaultSingleTableStorageUnitExecutorTest.java} | 29 ++++++++++++++-------
.../distsql/rql/ShowSingleTableExecutorTest.java | 1 +
6 files changed, 34 insertions(+), 32 deletions(-)
diff --git
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/SingleTableRuleResultSet.java
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowDefaultSingleTableStorageUnitExecutor.java
similarity index 62%
rename from
proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/SingleTableRuleResultSet.java
rename to
proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowDefaultSingleTableStorageUnitExecutor.java
index 6a6ae6e1600..78d53c930f5 100644
---
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/SingleTableRuleResultSet.java
+++
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/rule/ShowDefaultSingleTableStorageUnitExecutor.java
@@ -17,28 +17,20 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.rql.rule;
+import org.apache.shardingsphere.distsql.handler.query.RQLExecutor;
import
org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowDefaultSingleTableStorageUnitStatement;
-import
org.apache.shardingsphere.distsql.handler.resultset.DatabaseDistSQLResultSet;
+import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.single.rule.SingleRule;
-import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import java.util.Collection;
import java.util.Collections;
-import java.util.Iterator;
+import java.util.LinkedList;
/**
- * Result set for show default single table storage unit.
+ * Show default single table storage unit executor.
*/
-public final class SingleTableRuleResultSet implements
DatabaseDistSQLResultSet {
-
- private Iterator<String> data = Collections.emptyIterator();
-
- @Override
- public void init(final ShardingSphereDatabase database, final SQLStatement
sqlStatement) {
- SingleRule rule =
database.getRuleMetaData().getSingleRule(SingleRule.class);
- data =
Collections.singleton(rule.getConfiguration().getDefaultDataSource().orElse("RANDOM")).iterator();
- }
+public final class ShowDefaultSingleTableStorageUnitExecutor implements
RQLExecutor<ShowDefaultSingleTableStorageUnitStatement> {
@Override
public Collection<String> getColumnNames() {
@@ -46,13 +38,11 @@ public final class SingleTableRuleResultSet implements
DatabaseDistSQLResultSet
}
@Override
- public boolean next() {
- return data.hasNext();
- }
-
- @Override
- public Collection<Object> getRowData() {
- return Collections.singletonList(data.next());
+ public Collection<LocalDataQueryResultRow> getRows(final
ShardingSphereDatabase shardingSphereDatabase, final
ShowDefaultSingleTableStorageUnitStatement sqlStatement) {
+ Collection<LocalDataQueryResultRow> result = new LinkedList<>();
+ SingleRule rule =
shardingSphereDatabase.getRuleMetaData().getSingleRule(SingleRule.class);
+ result.add(new
LocalDataQueryResultRow(rule.getConfiguration().getDefaultDataSource().orElse("RANDOM")));
+ return result;
}
@Override
diff --git
a/proxy/backend/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.query.RQLExecutor
b/proxy/backend/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.query.RQLExecutor
index 2a529fa8a28..802f374e65f 100644
---
a/proxy/backend/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.query.RQLExecutor
+++
b/proxy/backend/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.query.RQLExecutor
@@ -17,3 +17,4 @@
org.apache.shardingsphere.proxy.backend.handler.distsql.rql.storage.unit.ShowStorageUnitExecutor
org.apache.shardingsphere.proxy.backend.handler.distsql.rql.rule.ShowSingleTableExecutor
+org.apache.shardingsphere.proxy.backend.handler.distsql.rql.rule.ShowDefaultSingleTableStorageUnitExecutor
diff --git
a/proxy/backend/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.resultset.DistSQLResultSet
b/proxy/backend/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.resultset.DistSQLResultSet
index 7169937d933..62b2edaa2ee 100644
---
a/proxy/backend/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.resultset.DistSQLResultSet
+++
b/proxy/backend/src/main/resources/META-INF/services/org.apache.shardingsphere.distsql.handler.resultset.DistSQLResultSet
@@ -16,7 +16,6 @@
#
org.apache.shardingsphere.proxy.backend.handler.distsql.rql.rule.LogicalTableResultSet
-org.apache.shardingsphere.proxy.backend.handler.distsql.rql.rule.SingleTableRuleResultSet
org.apache.shardingsphere.proxy.backend.handler.distsql.rql.rule.RulesUsedStorageUnitResultSet
org.apache.shardingsphere.proxy.backend.handler.distsql.rql.rule.CountSingleTableResultSet
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.queryable.ShowMigrationRuleResultSet
diff --git
a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
index afd4ddb8cee..c1ade89344a 100644
---
a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
+++
b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/ProxyBackendHandlerFactoryTest.java
@@ -38,7 +38,7 @@ import
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.QueryableGlob
import
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.QueryableRALBackendHandler;
import
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.hint.HintRALBackendHandler;
import
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.updatable.SetDistVariableHandler;
-import
org.apache.shardingsphere.proxy.backend.handler.distsql.rql.RQLResultSetBackendHandler;
+import
org.apache.shardingsphere.proxy.backend.handler.distsql.rql.RQLBackendHandler;
import
org.apache.shardingsphere.proxy.backend.handler.distsql.rul.SQLRULBackendHandler;
import org.apache.shardingsphere.proxy.backend.handler.skip.SkipBackendHandler;
import
org.apache.shardingsphere.proxy.backend.handler.transaction.TransactionBackendHandler;
@@ -257,7 +257,7 @@ public final class ProxyBackendHandlerFactoryTest extends
ProxyContextRestorer {
when(connectionSession.getTransactionStatus().isInTransaction()).thenReturn(true);
String sql = "SHOW DEFAULT SINGLE TABLE STORAGE UNIT";
ProxyBackendHandler actual =
ProxyBackendHandlerFactory.newInstance(databaseType, sql, connectionSession);
- assertThat(actual, instanceOf(RQLResultSetBackendHandler.class));
+ assertThat(actual, instanceOf(RQLBackendHandler.class));
}
@Test
diff --git
a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/SingleTableRuleResultSetTest.java
b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/ShowDefaultSingleTableStorageUnitExecutorTest.java
similarity index 61%
rename from
proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/SingleTableRuleResultSetTest.java
rename to
proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/ShowDefaultSingleTableStorageUnitExecutorTest.java
index 2a9c986b448..5c79183423b 100644
---
a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/SingleTableRuleResultSetTest.java
+++
b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/ShowDefaultSingleTableStorageUnitExecutorTest.java
@@ -17,11 +17,12 @@
package org.apache.shardingsphere.proxy.backend.handler.distsql.rql;
-import
org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowSingleTableStatement;
-import
org.apache.shardingsphere.distsql.handler.resultset.DatabaseDistSQLResultSet;
+import org.apache.shardingsphere.distsql.handler.query.RQLExecutor;
+import
org.apache.shardingsphere.distsql.parser.statement.rql.show.ShowDefaultSingleTableStorageUnitStatement;
+import
org.apache.shardingsphere.infra.merge.result.impl.local.LocalDataQueryResultRow;
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.metadata.database.rule.ShardingSphereRuleMetaData;
-import
org.apache.shardingsphere.proxy.backend.handler.distsql.rql.rule.SingleTableRuleResultSet;
+import
org.apache.shardingsphere.proxy.backend.handler.distsql.rql.rule.ShowDefaultSingleTableStorageUnitExecutor;
import org.apache.shardingsphere.single.api.config.SingleRuleConfiguration;
import org.apache.shardingsphere.single.rule.SingleRule;
import org.junit.Test;
@@ -35,16 +36,26 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public final class SingleTableRuleResultSetTest {
+public final class ShowDefaultSingleTableStorageUnitExecutorTest {
@Test
public void assertGetRowData() {
- DatabaseDistSQLResultSet resultSet = new SingleTableRuleResultSet();
- resultSet.init(mockDatabase(), mock(ShowSingleTableStatement.class));
- Collection<Object> actual = resultSet.getRowData();
+ RQLExecutor<ShowDefaultSingleTableStorageUnitStatement> executor = new
ShowDefaultSingleTableStorageUnitExecutor();
+ executor.getRows(mockDatabase(),
mock(ShowDefaultSingleTableStorageUnitStatement.class));
+ Collection<LocalDataQueryResultRow> actual =
executor.getRows(mockDatabase(),
mock(ShowDefaultSingleTableStorageUnitStatement.class));
assertThat(actual.size(), is(1));
- Iterator<Object> rowData = actual.iterator();
- assertThat(rowData.next(), is("foo_ds"));
+ Iterator<LocalDataQueryResultRow> rowData = actual.iterator();
+ String defaultSingleTableStorageUnit = (String)
rowData.next().getCell(1);
+ assertThat(defaultSingleTableStorageUnit, is("foo_ds"));
+ }
+
+ @Test
+ public void assertGetColumns() {
+ RQLExecutor<ShowDefaultSingleTableStorageUnitStatement> executor = new
ShowDefaultSingleTableStorageUnitExecutor();
+ Collection<String> columns = executor.getColumnNames();
+ assertThat(columns.size(), is(1));
+ Iterator<String> iterator = columns.iterator();
+ assertThat(iterator.next(), is("storage_unit_name"));
}
private ShardingSphereDatabase mockDatabase() {
diff --git
a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/ShowSingleTableExecutorTest.java
b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/ShowSingleTableExecutorTest.java
index 4032c714e72..2112ee7c157 100644
---
a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/ShowSingleTableExecutorTest.java
+++
b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rql/ShowSingleTableExecutorTest.java
@@ -132,6 +132,7 @@ public final class ShowSingleTableExecutorTest {
public void assertGetColumns() {
RQLExecutor<ShowSingleTableStatement> executor = new
ShowSingleTableExecutor();
Collection<String> columns = executor.getColumnNames();
+ assertThat(columns.size(), is(2));
Iterator<String> iterator = columns.iterator();
assertThat(iterator.next(), is("table_name"));
assertThat(iterator.next(), is("storage_unit_name"));
