You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/11/27 08:50:41 UTC
[shardingsphere] branch master updated: Update the sub class
ShardingCTLShowBackendHandler of TextProtocolBackendHandler (#8289)
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 2498988 Update the sub class ShardingCTLShowBackendHandler of TextProtocolBackendHandler (#8289)
2498988 is described below
commit 2498988471e7d23b54ca589b2d94829af29c7b77
Author: guojia1698 <gu...@sina.com>
AuthorDate: Fri Nov 27 16:50:16 2020 +0800
Update the sub class ShardingCTLShowBackendHandler of TextProtocolBackendHandler (#8289)
* update the sub class ShardingCTLHintBackendHandler of TextProtocolBackendHandler
* Update ShardingCTLHintBackendHandler.java
* Update ShardingCTLHintBackendHandlerTest.java
---
.../sctl/hint/ShardingCTLHintBackendHandler.java | 4 +--
.../hint/ShardingCTLHintBackendHandlerTest.java | 30 +++++++++++-----------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandler.java
index e1cb21e..cf1e3b9 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandler.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.HintComma
import org.apache.shardingsphere.proxy.backend.text.sctl.hint.internal.HintCommandExecutorFactory;
import java.sql.SQLException;
-import java.util.List;
+import java.util.Collection;
import java.util.Optional;
/**
@@ -65,7 +65,7 @@ public final class ShardingCTLHintBackendHandler implements TextProtocolBackendH
}
@Override
- public List<Object> getRowData() throws SQLException {
+ public Collection<Object> getRowData() throws SQLException {
return hintCommandExecutor.getQueryData().getData();
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandlerTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandlerTest.java
index 691a8d3..713ad8a 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandlerTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/sctl/hint/ShardingCTLHintBackendHandlerTest.java
@@ -47,9 +47,9 @@ import org.mockito.junit.MockitoJUnitRunner;
import java.lang.reflect.Field;
import java.sql.SQLException;
import java.util.Collections;
-import java.util.List;
import java.util.Map;
import java.util.Properties;
+import java.util.Iterator;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
@@ -141,9 +141,9 @@ public final class ShardingCTLHintBackendHandlerTest {
assertThat(((QueryResponse) backendResponse).getQueryHeaders().get(0).getColumnLabel(), is("primary_only"));
assertThat(((QueryResponse) backendResponse).getQueryHeaders().get(1).getColumnLabel(), is("sharding_type"));
assertTrue(defaultHintBackendHandler.next());
- List<Object> defaultRowData = defaultHintBackendHandler.getRowData();
- assertThat(defaultRowData.get(0).toString(), is("false"));
- assertThat(defaultRowData.get(1).toString(), is("databases_tables"));
+ Iterator<Object> defaultRowData = defaultHintBackendHandler.getRowData().iterator();
+ assertThat(defaultRowData.next().toString(), is("false"));
+ assertThat(defaultRowData.next().toString(), is("databases_tables"));
assertFalse(defaultHintBackendHandler.next());
String setPrimaryOnlySQL = "sctl:hint set primary_only=true";
String setDatabaseOnlySQL = "sctl:hint set DatabaseShardingValue=100";
@@ -152,9 +152,9 @@ public final class ShardingCTLHintBackendHandlerTest {
ShardingCTLHintBackendHandler updateHintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
updateHintBackendHandler.execute();
assertTrue(updateHintBackendHandler.next());
- List<Object> updateRowData = updateHintBackendHandler.getRowData();
- assertThat(updateRowData.get(0).toString(), is("true"));
- assertThat(updateRowData.get(1).toString(), is("databases_only"));
+ Iterator<Object> updateRowData = updateHintBackendHandler.getRowData().iterator();
+ assertThat(updateRowData.next().toString(), is("true"));
+ assertThat(updateRowData.next().toString(), is("databases_only"));
assertFalse(updateHintBackendHandler.next());
}
@@ -176,10 +176,10 @@ public final class ShardingCTLHintBackendHandlerTest {
assertThat(((QueryResponse) backendResponse).getQueryHeaders().get(1).getColumnLabel(), is("database_sharding_values"));
assertThat(((QueryResponse) backendResponse).getQueryHeaders().get(2).getColumnLabel(), is("table_sharding_values"));
assertTrue(defaultHintBackendHandler.next());
- List<Object> defaultRowData = defaultHintBackendHandler.getRowData();
- assertThat(defaultRowData.get(0).toString(), is("user"));
- assertThat(defaultRowData.get(1).toString(), is(""));
- assertThat(defaultRowData.get(2).toString(), is(""));
+ Iterator<Object> defaultRowData = defaultHintBackendHandler.getRowData().iterator();
+ assertThat(defaultRowData.next().toString(), is("user"));
+ assertThat(defaultRowData.next().toString(), is(""));
+ assertThat(defaultRowData.next().toString(), is(""));
assertFalse(defaultHintBackendHandler.next());
String addDatabaseShardingValueSQL = "sctl:hint addDatabaseshardingvalue user=100";
String addTableShardingValueSQL1 = "sctl:hint addTableshardingvalue user=200";
@@ -190,10 +190,10 @@ public final class ShardingCTLHintBackendHandlerTest {
ShardingCTLHintBackendHandler updateHintBackendHandler = new ShardingCTLHintBackendHandler(sql, backendConnection);
updateHintBackendHandler.execute();
assertTrue(updateHintBackendHandler.next());
- List<Object> updateRowData = updateHintBackendHandler.getRowData();
- assertThat(updateRowData.get(0).toString(), is("user"));
- assertThat(updateRowData.get(1).toString(), is("100"));
- assertThat(updateRowData.get(2).toString(), is("200,300"));
+ Iterator<Object> updateRowData = updateHintBackendHandler.getRowData().iterator();
+ assertThat(updateRowData.next().toString(), is("user"));
+ assertThat(updateRowData.next().toString(), is("100"));
+ assertThat(updateRowData.next().toString(), is("200,300"));
assertFalse(updateHintBackendHandler.next());
}