You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by ki...@apache.org on 2020/11/27 17:55:27 UTC
[shardingsphere] branch master updated: Rename QueryResultSet to
ExecuteQueryResult (#8393)
This is an automated email from the ASF dual-hosted git repository.
kimmking 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 655940e Rename QueryResultSet to ExecuteQueryResult (#8393)
655940e is described below
commit 655940e8c62e04cd1395d3de7a9e394f667a934c
Author: Liang Zhang <te...@163.com>
AuthorDate: Sat Nov 28 01:55:00 2020 +0800
Rename QueryResultSet to ExecuteQueryResult (#8393)
---
.../merge/dal/EncryptDALResultDecorator.java | 4 +-
.../dal/impl/MergedEncryptColumnsMergedResult.java | 12 +-
.../merge/dql/EncryptDQLResultDecorator.java | 4 +-
.../dal/MergedEncryptColumnsMergedResultTest.java | 32 ++--
.../merge/dql/EncryptDQLResultDecoratorTest.java | 6 +-
.../merge/dal/ShardingDALResultMerger.java | 8 +-
.../merge/dal/show/LogicTablesMergedResult.java | 8 +-
.../dal/show/ShowCreateTableMergedResult.java | 4 +-
.../merge/dql/ShardingDQLResultMerger.java | 38 ++---
.../dql/groupby/GroupByMemoryMergedResult.java | 34 ++--
.../dql/groupby/GroupByStreamMergedResult.java | 16 +-
.../sharding/merge/dql/groupby/GroupByValue.java | 8 +-
.../dql/iterator/IteratorStreamMergedResult.java | 22 +--
.../dql/orderby/OrderByStreamMergedResult.java | 14 +-
.../sharding/merge/dql/orderby/OrderByValue.java | 12 +-
.../merge/dal/ShardingDALResultMergerTest.java | 14 +-
.../dal/show/ShowCreateTableMergedResultTest.java | 4 +-
.../merge/dal/show/ShowTablesMergedResultTest.java | 4 +-
.../merge/dql/ShardingDQLResultMergerTest.java | 50 +++---
.../dql/groupby/GroupByMemoryMergedResultTest.java | 68 ++++----
.../dql/groupby/GroupByRowComparatorTest.java | 26 +--
.../dql/groupby/GroupByStreamMergedResultTest.java | 84 +++++-----
.../merge/dql/groupby/GroupByValueTest.java | 16 +-
.../iterator/IteratorStreamMergedResultTest.java | 38 ++---
.../dql/orderby/OrderByStreamMergedResultTest.java | 80 +++++-----
.../merge/dql/orderby/OrderByValueTest.java | 38 ++---
.../pagination/LimitDecoratorMergedResultTest.java | 8 +-
.../RowNumberDecoratorMergedResultTest.java | 10 +-
.../TopAndRowNumberDecoratorMergedResultTest.java | 12 +-
.../execute/result/query/ExecuteQueryResult.java | 175 +++++++++++++++++++++
...ResultSet.java => AbstractJDBCQueryResult.java} | 4 +-
...ryResultSet.java => MemoryJDBCQueryResult.java} | 6 +-
...ryResultSet.java => StreamJDBCQueryResult.java} | 6 +-
...{RawQueryResultSet.java => RawQueryResult.java} | 6 +-
.../query/jdbc/AbstractJDBCQueryResultTest.java | 6 +-
.../query/jdbc/MemoryJDBCQueryResultTest.java | 78 ++++-----
.../query/jdbc/StreamJDBCQueryResultTest.java | 96 +++++------
...re.java => AbstractJDBCQueryResultFixture.java} | 6 +-
.../shardingsphere/infra/merge/MergeEngine.java | 18 +--
.../merge/engine/decorator/ResultDecorator.java | 4 +-
.../decorator/impl/TransparentResultDecorator.java | 4 +-
.../infra/merge/engine/merger/ResultMerger.java | 4 +-
.../merger/impl/TransparentResultMerger.java | 4 +-
.../result/impl/memory/MemoryMergedResult.java | 6 +-
.../result/impl/memory/MemoryQueryResultRow.java | 10 +-
.../result/impl/stream/StreamMergedResult.java | 20 +--
.../impl/transparent/TransparentMergedResult.java | 12 +-
.../infra/merge/MergeEngineTest.java | 12 +-
.../impl/TransparentResultDecoratorTest.java | 8 +-
.../merger/impl/TransparentResultMergerTest.java | 6 +-
.../fixture/decorator/ResultDecoratorFixture.java | 8 +-
.../merge/fixture/merger/ResultMergerFixture.java | 8 +-
.../impl/memory/MemoryQueryResultRowTest.java | 8 +-
.../memory/fixture/TestMemoryMergedResult.java | 2 +-
.../result/impl/stream/StreamMergedResultTest.java | 24 +--
.../transparent/TransparentMergedResultTest.java | 24 +--
.../driver/executor/AbstractStatementExecutor.java | 2 +-
.../driver/executor/PreparedStatementExecutor.java | 6 +-
.../driver/executor/StatementExecutor.java | 6 +-
.../statement/ShardingSpherePreparedStatement.java | 20 +--
.../core/statement/ShardingSphereStatement.java | 20 +--
.../executor/PreparedStatementExecutorTest.java | 4 +-
.../driver/executor/StatementExecutorTest.java | 4 +-
.../jdbc/JDBCDatabaseCommunicationEngine.java | 6 +-
.../execute/engine/jdbc/JDBCExecuteEngine.java | 2 +-
.../engine/jdbc/ProxyJDBCExecutorCallback.java | 10 +-
.../backend/response/query/QueryResponse.java | 2 +-
.../text/admin/ShowTablesBackendHandler.java | 10 +-
.../binary/bind/PostgreSQLComBindExecutor.java | 4 +-
.../query/text/PostgreSQLComQueryExecutor.java | 4 +-
70 files changed, 757 insertions(+), 582 deletions(-)
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/EncryptDALResultDecorator.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/EncryptDALResultDecorator.java
index 32e9968..2169c15 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/EncryptDALResultDecorator.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/EncryptDALResultDecorator.java
@@ -35,9 +35,9 @@ import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dal.MySQ
public final class EncryptDALResultDecorator implements ResultDecorator<EncryptRule> {
@Override
- public MergedResult decorate(final ExecuteQueryResult queryResultSet, final SQLStatementContext<?> sqlStatementContext, final EncryptRule rule) {
+ public MergedResult decorate(final ExecuteQueryResult queryResult, final SQLStatementContext<?> sqlStatementContext, final EncryptRule rule) {
return isNeedMergeEncryptColumns(sqlStatementContext.getSqlStatement())
- ? new MergedEncryptColumnsMergedResult(queryResultSet, sqlStatementContext, rule) : new TransparentMergedResult(queryResultSet);
+ ? new MergedEncryptColumnsMergedResult(queryResult, sqlStatementContext, rule) : new TransparentMergedResult(queryResult);
}
@Override
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/impl/MergedEncryptColumnsMergedResult.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/impl/MergedEncryptColumnsMergedResult.java
index afd24ef..ebe8f88 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/impl/MergedEncryptColumnsMergedResult.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/main/java/org/apache/shardingsphere/encrypt/merge/dal/impl/MergedEncryptColumnsMergedResult.java
@@ -28,25 +28,25 @@ import java.sql.SQLException;
*/
public final class MergedEncryptColumnsMergedResult extends EncryptColumnsMergedResult {
- private final ExecuteQueryResult queryResultSet;
+ private final ExecuteQueryResult queryResult;
- public MergedEncryptColumnsMergedResult(final ExecuteQueryResult queryResultSet, final SQLStatementContext sqlStatementContext, final EncryptRule encryptRule) {
+ public MergedEncryptColumnsMergedResult(final ExecuteQueryResult queryResult, final SQLStatementContext sqlStatementContext, final EncryptRule encryptRule) {
super(sqlStatementContext, encryptRule);
- this.queryResultSet = queryResultSet;
+ this.queryResult = queryResult;
}
@Override
protected boolean nextValue() throws SQLException {
- return queryResultSet.next();
+ return queryResult.next();
}
@Override
protected Object getOriginalValue(final int columnIndex, final Class<?> type) throws SQLException {
- return queryResultSet.getValue(columnIndex, type);
+ return queryResult.getValue(columnIndex, type);
}
@Override
public boolean wasNull() throws SQLException {
- return queryResultSet.wasNull();
+ return queryResult.wasNull();
}
}
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/main/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptDQLResultDecorator.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/main/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptDQLResultDecorator.java
index 4ee2a73..eca16da 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/main/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptDQLResultDecorator.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/main/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptDQLResultDecorator.java
@@ -36,8 +36,8 @@ public final class EncryptDQLResultDecorator implements ResultDecorator<EncryptR
private final boolean queryWithCipherColumn;
@Override
- public MergedResult decorate(final ExecuteQueryResult queryResultSet, final SQLStatementContext<?> sqlStatementContext, final EncryptRule rule) {
- return new EncryptMergedResult(metaData, new TransparentMergedResult(queryResultSet), queryWithCipherColumn);
+ public MergedResult decorate(final ExecuteQueryResult queryResult, final SQLStatementContext<?> sqlStatementContext, final EncryptRule rule) {
+ return new EncryptMergedResult(metaData, new TransparentMergedResult(queryResult), queryWithCipherColumn);
}
@Override
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/MergedEncryptColumnsMergedResultTest.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/MergedEncryptColumnsMergedResultTest.java
index c3917dd..26f7cb0 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/MergedEncryptColumnsMergedResultTest.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/MergedEncryptColumnsMergedResultTest.java
@@ -45,30 +45,30 @@ import static org.mockito.Mockito.when;
public final class MergedEncryptColumnsMergedResultTest {
@Mock
- private ExecuteQueryResult queryResultSet;
+ private ExecuteQueryResult queryResult;
@Test
public void assertNextWithNotHasNext() throws SQLException {
- assertFalse(createMergedEncryptColumnsMergedResult(queryResultSet, mock(EncryptRule.class)).next());
+ assertFalse(createMergedEncryptColumnsMergedResult(queryResult, mock(EncryptRule.class)).next());
}
@Test
public void assertNextWithHasNext() throws SQLException {
- when(queryResultSet.next()).thenReturn(true);
- assertTrue(createMergedEncryptColumnsMergedResult(queryResultSet, mock(EncryptRule.class)).next());
+ when(queryResult.next()).thenReturn(true);
+ assertTrue(createMergedEncryptColumnsMergedResult(queryResult, mock(EncryptRule.class)).next());
}
@Test
public void assertNextWithAssistedQuery() throws SQLException {
- when(queryResultSet.next()).thenReturn(true).thenReturn(false);
- when(queryResultSet.getValue(1, String.class)).thenReturn("assistedQuery");
- assertFalse(createMergedEncryptColumnsMergedResult(queryResultSet, mockEncryptRule()).next());
+ when(queryResult.next()).thenReturn(true).thenReturn(false);
+ when(queryResult.getValue(1, String.class)).thenReturn("assistedQuery");
+ assertFalse(createMergedEncryptColumnsMergedResult(queryResult, mockEncryptRule()).next());
}
@Test
public void assertGetValueWithCipherColumn() throws SQLException {
- when(queryResultSet.getValue(1, String.class)).thenReturn("cipher");
- assertThat(createMergedEncryptColumnsMergedResult(queryResultSet, mockEncryptRule()).getValue(1, String.class), is("id"));
+ when(queryResult.getValue(1, String.class)).thenReturn("cipher");
+ assertThat(createMergedEncryptColumnsMergedResult(queryResult, mockEncryptRule()).getValue(1, String.class), is("id"));
}
private EncryptRule mockEncryptRule() {
@@ -83,27 +83,27 @@ public final class MergedEncryptColumnsMergedResultTest {
@Test
public void assertGetValueWithOtherColumn() throws SQLException {
- when(queryResultSet.getValue(1, String.class)).thenReturn("assistedQuery");
- assertThat(createMergedEncryptColumnsMergedResult(queryResultSet, mock(EncryptRule.class)).getValue(1, String.class), is("assistedQuery"));
+ when(queryResult.getValue(1, String.class)).thenReturn("assistedQuery");
+ assertThat(createMergedEncryptColumnsMergedResult(queryResult, mock(EncryptRule.class)).getValue(1, String.class), is("assistedQuery"));
}
@Test
public void assertGetValueWithOtherIndex() throws SQLException {
- when(queryResultSet.getValue(2, String.class)).thenReturn("id");
- assertThat(createMergedEncryptColumnsMergedResult(queryResultSet, mock(EncryptRule.class)).getValue(2, String.class), is("id"));
+ when(queryResult.getValue(2, String.class)).thenReturn("id");
+ assertThat(createMergedEncryptColumnsMergedResult(queryResult, mock(EncryptRule.class)).getValue(2, String.class), is("id"));
}
@Test
public void assertWasNull() throws SQLException {
- assertFalse(createMergedEncryptColumnsMergedResult(queryResultSet, mock(EncryptRule.class)).wasNull());
+ assertFalse(createMergedEncryptColumnsMergedResult(queryResult, mock(EncryptRule.class)).wasNull());
}
- private MergedEncryptColumnsMergedResult createMergedEncryptColumnsMergedResult(final ExecuteQueryResult queryResultSet, final EncryptRule encryptRule) {
+ private MergedEncryptColumnsMergedResult createMergedEncryptColumnsMergedResult(final ExecuteQueryResult queryResult, final EncryptRule encryptRule) {
SelectStatementContext sqlStatementContext = mock(SelectStatementContext.class);
IdentifierValue identifierValue = new IdentifierValue("test");
TableNameSegment tableNameSegment = new TableNameSegment(1, 4, identifierValue);
SimpleTableSegment simpleTableSegment = new SimpleTableSegment(tableNameSegment);
when(sqlStatementContext.getAllTables()).thenReturn(Collections.singletonList(simpleTableSegment));
- return new MergedEncryptColumnsMergedResult(queryResultSet, sqlStatementContext, encryptRule);
+ return new MergedEncryptColumnsMergedResult(queryResult, sqlStatementContext, encryptRule);
}
}
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/test/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptDQLResultDecoratorTest.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/test/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptDQLResultDecoratorTest.java
index 482fb93..5a28be5 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/test/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptDQLResultDecoratorTest.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-merge/src/test/java/org/apache/shardingsphere/encrypt/merge/dql/EncryptDQLResultDecoratorTest.java
@@ -33,10 +33,10 @@ public final class EncryptDQLResultDecoratorTest {
@Test
public void assertDecorateQueryResult() throws SQLException {
- ExecuteQueryResult queryResultSet = mock(ExecuteQueryResult.class);
- when(queryResultSet.next()).thenReturn(true);
+ ExecuteQueryResult queryResult = mock(ExecuteQueryResult.class);
+ when(queryResult.next()).thenReturn(true);
EncryptDQLResultDecorator decorator = new EncryptDQLResultDecorator(mock(EncryptAlgorithmMetaData.class), false);
- MergedResult actual = decorator.decorate(queryResultSet, mock(SQLStatementContext.class), mock(EncryptRule.class));
+ MergedResult actual = decorator.decorate(queryResult, mock(SQLStatementContext.class), mock(EncryptRule.class));
assertTrue(actual.next());
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dal/ShardingDALResultMerger.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dal/ShardingDALResultMerger.java
index 29b2ee8..eed23f5 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dal/ShardingDALResultMerger.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dal/ShardingDALResultMerger.java
@@ -49,17 +49,17 @@ public final class ShardingDALResultMerger implements ResultMerger {
private final ShardingRule shardingRule;
@Override
- public MergedResult merge(final List<ExecuteQueryResult> queryResultSets, final SQLStatementContext<?> sqlStatementContext, final ShardingSphereSchema schema) throws SQLException {
+ public MergedResult merge(final List<ExecuteQueryResult> queryResults, final SQLStatementContext<?> sqlStatementContext, final ShardingSphereSchema schema) throws SQLException {
SQLStatement dalStatement = sqlStatementContext.getSqlStatement();
if (dalStatement instanceof MySQLShowDatabasesStatement) {
return new SingleLocalDataMergedResult(Collections.singletonList(DefaultSchema.LOGIC_NAME));
}
if (dalStatement instanceof MySQLShowTablesStatement || dalStatement instanceof MySQLShowTableStatusStatement || dalStatement instanceof MySQLShowIndexStatement) {
- return new LogicTablesMergedResult(shardingRule, sqlStatementContext, schema, queryResultSets);
+ return new LogicTablesMergedResult(shardingRule, sqlStatementContext, schema, queryResults);
}
if (dalStatement instanceof MySQLShowCreateTableStatement) {
- return new ShowCreateTableMergedResult(shardingRule, sqlStatementContext, schema, queryResultSets);
+ return new ShowCreateTableMergedResult(shardingRule, sqlStatementContext, schema, queryResults);
}
- return new TransparentMergedResult(queryResultSets.get(0));
+ return new TransparentMergedResult(queryResults.get(0));
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/LogicTablesMergedResult.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/LogicTablesMergedResult.java
index 5c69b64..c11a6fa 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/LogicTablesMergedResult.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/LogicTablesMergedResult.java
@@ -38,16 +38,16 @@ import java.util.Set;
public class LogicTablesMergedResult extends MemoryMergedResult<ShardingRule> {
public LogicTablesMergedResult(final ShardingRule shardingRule,
- final SQLStatementContext sqlStatementContext, final ShardingSphereSchema schema, final List<ExecuteQueryResult> queryResultSets) throws SQLException {
- super(shardingRule, schema, sqlStatementContext, queryResultSets);
+ final SQLStatementContext sqlStatementContext, final ShardingSphereSchema schema, final List<ExecuteQueryResult> queryResults) throws SQLException {
+ super(shardingRule, schema, sqlStatementContext, queryResults);
}
@Override
protected final List<MemoryQueryResultRow> init(final ShardingRule shardingRule, final ShardingSphereSchema schema,
- final SQLStatementContext sqlStatementContext, final List<ExecuteQueryResult> queryResultSets) throws SQLException {
+ final SQLStatementContext sqlStatementContext, final List<ExecuteQueryResult> queryResults) throws SQLException {
List<MemoryQueryResultRow> result = new LinkedList<>();
Set<String> tableNames = new HashSet<>();
- for (ExecuteQueryResult each : queryResultSets) {
+ for (ExecuteQueryResult each : queryResults) {
while (each.next()) {
MemoryQueryResultRow memoryResultSetRow = new MemoryQueryResultRow(each);
String actualTableName = memoryResultSetRow.getCell(1).toString();
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResult.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResult.java
index a38b82e..82f05fc 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResult.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResult.java
@@ -32,8 +32,8 @@ import java.util.List;
public final class ShowCreateTableMergedResult extends LogicTablesMergedResult {
public ShowCreateTableMergedResult(final ShardingRule shardingRule,
- final SQLStatementContext sqlStatementContext, final ShardingSphereSchema schema, final List<ExecuteQueryResult> queryResultSets) throws SQLException {
- super(shardingRule, sqlStatementContext, schema, queryResultSets);
+ final SQLStatementContext sqlStatementContext, final ShardingSphereSchema schema, final List<ExecuteQueryResult> queryResults) throws SQLException {
+ super(shardingRule, sqlStatementContext, schema, queryResults);
}
@Override
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/ShardingDQLResultMerger.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/ShardingDQLResultMerger.java
index 9eb3ce0..f4c006a 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/ShardingDQLResultMerger.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/ShardingDQLResultMerger.java
@@ -53,38 +53,38 @@ public final class ShardingDQLResultMerger implements ResultMerger {
private final DatabaseType databaseType;
@Override
- public MergedResult merge(final List<ExecuteQueryResult> queryResultSets, final SQLStatementContext<?> sqlStatementContext, final ShardingSphereSchema schema) throws SQLException {
- if (1 == queryResultSets.size()) {
- return new IteratorStreamMergedResult(queryResultSets);
+ public MergedResult merge(final List<ExecuteQueryResult> queryResults, final SQLStatementContext<?> sqlStatementContext, final ShardingSphereSchema schema) throws SQLException {
+ if (1 == queryResults.size()) {
+ return new IteratorStreamMergedResult(queryResults);
}
- Map<String, Integer> columnLabelIndexMap = getColumnLabelIndexMap(queryResultSets.get(0));
+ Map<String, Integer> columnLabelIndexMap = getColumnLabelIndexMap(queryResults.get(0));
SelectStatementContext selectStatementContext = (SelectStatementContext) sqlStatementContext;
selectStatementContext.setIndexes(columnLabelIndexMap);
- MergedResult mergedResult = build(queryResultSets, selectStatementContext, columnLabelIndexMap, schema);
- return decorate(queryResultSets, selectStatementContext, mergedResult);
+ MergedResult mergedResult = build(queryResults, selectStatementContext, columnLabelIndexMap, schema);
+ return decorate(queryResults, selectStatementContext, mergedResult);
}
- private Map<String, Integer> getColumnLabelIndexMap(final ExecuteQueryResult queryResultSet) throws SQLException {
+ private Map<String, Integer> getColumnLabelIndexMap(final ExecuteQueryResult queryResult) throws SQLException {
Map<String, Integer> result = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
- for (int i = queryResultSet.getColumnCount(); i > 0; i--) {
- result.put(SQLUtil.getExactlyValue(queryResultSet.getColumnLabel(i)), i);
+ for (int i = queryResult.getColumnCount(); i > 0; i--) {
+ result.put(SQLUtil.getExactlyValue(queryResult.getColumnLabel(i)), i);
}
return result;
}
- private MergedResult build(final List<ExecuteQueryResult> queryResultSets, final SelectStatementContext selectStatementContext,
+ private MergedResult build(final List<ExecuteQueryResult> queryResults, final SelectStatementContext selectStatementContext,
final Map<String, Integer> columnLabelIndexMap, final ShardingSphereSchema schema) throws SQLException {
if (isNeedProcessGroupBy(selectStatementContext)) {
- return getGroupByMergedResult(queryResultSets, selectStatementContext, columnLabelIndexMap, schema);
+ return getGroupByMergedResult(queryResults, selectStatementContext, columnLabelIndexMap, schema);
}
if (isNeedProcessDistinctRow(selectStatementContext)) {
setGroupByForDistinctRow(selectStatementContext);
- return getGroupByMergedResult(queryResultSets, selectStatementContext, columnLabelIndexMap, schema);
+ return getGroupByMergedResult(queryResults, selectStatementContext, columnLabelIndexMap, schema);
}
if (isNeedProcessOrderBy(selectStatementContext)) {
- return new OrderByStreamMergedResult(queryResultSets, selectStatementContext, schema);
+ return new OrderByStreamMergedResult(queryResults, selectStatementContext, schema);
}
- return new IteratorStreamMergedResult(queryResultSets);
+ return new IteratorStreamMergedResult(queryResults);
}
private boolean isNeedProcessGroupBy(final SelectStatementContext selectStatementContext) {
@@ -103,20 +103,20 @@ public final class ShardingDQLResultMerger implements ResultMerger {
}
}
- private MergedResult getGroupByMergedResult(final List<ExecuteQueryResult> queryResultSets, final SelectStatementContext selectStatementContext,
+ private MergedResult getGroupByMergedResult(final List<ExecuteQueryResult> queryResults, final SelectStatementContext selectStatementContext,
final Map<String, Integer> columnLabelIndexMap, final ShardingSphereSchema schema) throws SQLException {
return selectStatementContext.isSameGroupByAndOrderByItems()
- ? new GroupByStreamMergedResult(columnLabelIndexMap, queryResultSets, selectStatementContext, schema)
- : new GroupByMemoryMergedResult(queryResultSets, selectStatementContext, schema);
+ ? new GroupByStreamMergedResult(columnLabelIndexMap, queryResults, selectStatementContext, schema)
+ : new GroupByMemoryMergedResult(queryResults, selectStatementContext, schema);
}
private boolean isNeedProcessOrderBy(final SelectStatementContext selectStatementContext) {
return !selectStatementContext.getOrderByContext().getItems().isEmpty();
}
- private MergedResult decorate(final List<ExecuteQueryResult> queryResultSets, final SelectStatementContext selectStatementContext, final MergedResult mergedResult) throws SQLException {
+ private MergedResult decorate(final List<ExecuteQueryResult> queryResults, final SelectStatementContext selectStatementContext, final MergedResult mergedResult) throws SQLException {
PaginationContext paginationContext = selectStatementContext.getPaginationContext();
- if (!paginationContext.isHasPagination() || 1 == queryResultSets.size()) {
+ if (!paginationContext.isHasPagination() || 1 == queryResults.size()) {
return mergedResult;
}
String trunkDatabaseName = DatabaseTypeRegistry.getTrunkDatabaseType(databaseType.getName()).getName();
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResult.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResult.java
index ad56b8a..df3b286 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResult.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResult.java
@@ -51,17 +51,17 @@ import java.util.Map.Entry;
*/
public final class GroupByMemoryMergedResult extends MemoryMergedResult<ShardingRule> {
- public GroupByMemoryMergedResult(final List<ExecuteQueryResult> queryResultSets, final SelectStatementContext selectStatementContext, final ShardingSphereSchema schema) throws SQLException {
- super(null, schema, selectStatementContext, queryResultSets);
+ public GroupByMemoryMergedResult(final List<ExecuteQueryResult> queryResults, final SelectStatementContext selectStatementContext, final ShardingSphereSchema schema) throws SQLException {
+ super(null, schema, selectStatementContext, queryResults);
}
@Override
protected List<MemoryQueryResultRow> init(final ShardingRule shardingRule,
- final ShardingSphereSchema schema, final SQLStatementContext sqlStatementContext, final List<ExecuteQueryResult> queryResultSets) throws SQLException {
+ final ShardingSphereSchema schema, final SQLStatementContext sqlStatementContext, final List<ExecuteQueryResult> queryResults) throws SQLException {
SelectStatementContext selectStatementContext = (SelectStatementContext) sqlStatementContext;
Map<GroupByValue, MemoryQueryResultRow> dataMap = new HashMap<>(1024);
Map<GroupByValue, Map<AggregationProjection, AggregationUnit>> aggregationMap = new HashMap<>(1024);
- for (ExecuteQueryResult each : queryResultSets) {
+ for (ExecuteQueryResult each : queryResults) {
while (each.next()) {
GroupByValue groupByValue = new GroupByValue(each, selectStatementContext.getGroupByContext().getItems());
initForFirstGroupByValue(selectStatementContext, each, groupByValue, dataMap, aggregationMap);
@@ -69,15 +69,15 @@ public final class GroupByMemoryMergedResult extends MemoryMergedResult<Sharding
}
}
setAggregationValueToMemoryRow(selectStatementContext, dataMap, aggregationMap);
- List<Boolean> valueCaseSensitive = queryResultSets.isEmpty() ? Collections.emptyList() : getValueCaseSensitive(queryResultSets.iterator().next(), selectStatementContext, schema);
+ List<Boolean> valueCaseSensitive = queryResults.isEmpty() ? Collections.emptyList() : getValueCaseSensitive(queryResults.iterator().next(), selectStatementContext, schema);
return getMemoryResultSetRows(selectStatementContext, dataMap, valueCaseSensitive);
}
- private void initForFirstGroupByValue(final SelectStatementContext selectStatementContext, final ExecuteQueryResult queryResultSet,
+ private void initForFirstGroupByValue(final SelectStatementContext selectStatementContext, final ExecuteQueryResult queryResult,
final GroupByValue groupByValue, final Map<GroupByValue, MemoryQueryResultRow> dataMap,
final Map<GroupByValue, Map<AggregationProjection, AggregationUnit>> aggregationMap) throws SQLException {
if (!dataMap.containsKey(groupByValue)) {
- dataMap.put(groupByValue, new MemoryQueryResultRow(queryResultSet));
+ dataMap.put(groupByValue, new MemoryQueryResultRow(queryResult));
}
if (!aggregationMap.containsKey(groupByValue)) {
Map<AggregationProjection, AggregationUnit> map = Maps.toMap(selectStatementContext.getProjectionsContext().getAggregationProjections(),
@@ -86,23 +86,23 @@ public final class GroupByMemoryMergedResult extends MemoryMergedResult<Sharding
}
}
- private void aggregate(final SelectStatementContext selectStatementContext, final ExecuteQueryResult queryResultSet,
+ private void aggregate(final SelectStatementContext selectStatementContext, final ExecuteQueryResult queryResult,
final GroupByValue groupByValue, final Map<GroupByValue, Map<AggregationProjection, AggregationUnit>> aggregationMap) throws SQLException {
for (AggregationProjection each : selectStatementContext.getProjectionsContext().getAggregationProjections()) {
List<Comparable<?>> values = new ArrayList<>(2);
if (each.getDerivedAggregationProjections().isEmpty()) {
- values.add(getAggregationValue(queryResultSet, each));
+ values.add(getAggregationValue(queryResult, each));
} else {
for (AggregationProjection derived : each.getDerivedAggregationProjections()) {
- values.add(getAggregationValue(queryResultSet, derived));
+ values.add(getAggregationValue(queryResult, derived));
}
}
aggregationMap.get(groupByValue).get(each).merge(values);
}
}
- private Comparable<?> getAggregationValue(final ExecuteQueryResult queryResultSet, final AggregationProjection aggregationProjection) throws SQLException {
- Object result = queryResultSet.getValue(aggregationProjection.getIndex(), Object.class);
+ private Comparable<?> getAggregationValue(final ExecuteQueryResult queryResult, final AggregationProjection aggregationProjection) throws SQLException {
+ Object result = queryResult.getValue(aggregationProjection.getIndex(), Object.class);
Preconditions.checkState(null == result || result instanceof Comparable, "Aggregation value must implements Comparable");
return (Comparable<?>) result;
}
@@ -116,21 +116,21 @@ public final class GroupByMemoryMergedResult extends MemoryMergedResult<Sharding
}
}
- private List<Boolean> getValueCaseSensitive(final ExecuteQueryResult queryResultSet, final SelectStatementContext selectStatementContext, final ShardingSphereSchema schema) throws SQLException {
+ private List<Boolean> getValueCaseSensitive(final ExecuteQueryResult queryResult, final SelectStatementContext selectStatementContext, final ShardingSphereSchema schema) throws SQLException {
List<Boolean> result = Lists.newArrayList(false);
- for (int columnIndex = 1; columnIndex <= queryResultSet.getColumnCount(); columnIndex++) {
- result.add(getValueCaseSensitiveFromTables(queryResultSet, selectStatementContext, schema, columnIndex));
+ for (int columnIndex = 1; columnIndex <= queryResult.getColumnCount(); columnIndex++) {
+ result.add(getValueCaseSensitiveFromTables(queryResult, selectStatementContext, schema, columnIndex));
}
return result;
}
- private boolean getValueCaseSensitiveFromTables(final ExecuteQueryResult queryResultSet,
+ private boolean getValueCaseSensitiveFromTables(final ExecuteQueryResult queryResult,
final SelectStatementContext selectStatementContext, final ShardingSphereSchema schema, final int columnIndex) throws SQLException {
for (SimpleTableSegment each : selectStatementContext.getSimpleTableSegments()) {
String tableName = each.getTableName().getIdentifier().getValue();
TableMetaData tableMetaData = schema.get(tableName);
Map<String, ColumnMetaData> columns = tableMetaData.getColumns();
- String columnName = queryResultSet.getColumnName(columnIndex);
+ String columnName = queryResult.getColumnName(columnIndex);
if (columns.containsKey(columnName)) {
return columns.get(columnName).isCaseSensitive();
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByStreamMergedResult.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByStreamMergedResult.java
index 283326f..dc0c0d8 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByStreamMergedResult.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByStreamMergedResult.java
@@ -47,13 +47,13 @@ public final class GroupByStreamMergedResult extends OrderByStreamMergedResult {
private List<?> currentGroupByValues;
- public GroupByStreamMergedResult(final Map<String, Integer> labelAndIndexMap, final List<ExecuteQueryResult> queryResultSets,
+ public GroupByStreamMergedResult(final Map<String, Integer> labelAndIndexMap, final List<ExecuteQueryResult> queryResults,
final SelectStatementContext selectStatementContext, final ShardingSphereSchema schema) throws SQLException {
- super(queryResultSets, selectStatementContext, schema);
+ super(queryResults, selectStatementContext, schema);
this.selectStatementContext = selectStatementContext;
currentRow = new ArrayList<>(labelAndIndexMap.size());
currentGroupByValues = getOrderByValuesQueue().isEmpty()
- ? Collections.emptyList() : new GroupByValue(getCurrentQueryResultSet(), selectStatementContext.getGroupByContext().getItems()).getGroupValues();
+ ? Collections.emptyList() : new GroupByValue(getCurrentQueryResult(), selectStatementContext.getGroupByContext().getItems()).getGroupValues();
}
@Override
@@ -66,7 +66,7 @@ public final class GroupByStreamMergedResult extends OrderByStreamMergedResult {
super.next();
}
if (aggregateCurrentGroupByRowAndNext()) {
- currentGroupByValues = new GroupByValue(getCurrentQueryResultSet(), selectStatementContext.getGroupByContext().getItems()).getGroupValues();
+ currentGroupByValues = new GroupByValue(getCurrentQueryResult(), selectStatementContext.getGroupByContext().getItems()).getGroupValues();
}
return true;
}
@@ -75,7 +75,7 @@ public final class GroupByStreamMergedResult extends OrderByStreamMergedResult {
boolean result = false;
Map<AggregationProjection, AggregationUnit> aggregationUnitMap = Maps.toMap(
selectStatementContext.getProjectionsContext().getAggregationProjections(), input -> AggregationUnitFactory.create(input.getType(), input instanceof AggregationDistinctProjection));
- while (currentGroupByValues.equals(new GroupByValue(getCurrentQueryResultSet(), selectStatementContext.getGroupByContext().getItems()).getGroupValues())) {
+ while (currentGroupByValues.equals(new GroupByValue(getCurrentQueryResult(), selectStatementContext.getGroupByContext().getItems()).getGroupValues())) {
aggregate(aggregationUnitMap);
cacheCurrentRow();
result = super.next();
@@ -102,13 +102,13 @@ public final class GroupByStreamMergedResult extends OrderByStreamMergedResult {
}
private void cacheCurrentRow() throws SQLException {
- for (int i = 0; i < getCurrentQueryResultSet().getColumnCount(); i++) {
- currentRow.add(getCurrentQueryResultSet().getValue(i + 1, Object.class));
+ for (int i = 0; i < getCurrentQueryResult().getColumnCount(); i++) {
+ currentRow.add(getCurrentQueryResult().getValue(i + 1, Object.class));
}
}
private Comparable<?> getAggregationValue(final AggregationProjection aggregationProjection) throws SQLException {
- Object result = getCurrentQueryResultSet().getValue(aggregationProjection.getIndex(), Object.class);
+ Object result = getCurrentQueryResult().getValue(aggregationProjection.getIndex(), Object.class);
Preconditions.checkState(null == result || result instanceof Comparable, "Aggregation value must implements Comparable");
return (Comparable<?>) result;
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByValue.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByValue.java
index e268720..70ee2d1 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByValue.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByValue.java
@@ -36,14 +36,14 @@ public final class GroupByValue {
private final List<?> groupValues;
- public GroupByValue(final ExecuteQueryResult queryResultSet, final Collection<OrderByItem> groupByItems) throws SQLException {
- groupValues = getGroupByValues(queryResultSet, groupByItems);
+ public GroupByValue(final ExecuteQueryResult queryResult, final Collection<OrderByItem> groupByItems) throws SQLException {
+ groupValues = getGroupByValues(queryResult, groupByItems);
}
- private List<?> getGroupByValues(final ExecuteQueryResult queryResultSet, final Collection<OrderByItem> groupByItems) throws SQLException {
+ private List<?> getGroupByValues(final ExecuteQueryResult queryResult, final Collection<OrderByItem> groupByItems) throws SQLException {
List<Object> result = new ArrayList<>(groupByItems.size());
for (OrderByItem each : groupByItems) {
- result.add(queryResultSet.getValue(each.getIndex(), Object.class));
+ result.add(queryResult.getValue(each.getIndex(), Object.class));
}
return result;
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/iterator/IteratorStreamMergedResult.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/iterator/IteratorStreamMergedResult.java
index 989b938..23a5f20 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/iterator/IteratorStreamMergedResult.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/iterator/IteratorStreamMergedResult.java
@@ -29,29 +29,29 @@ import java.util.List;
*/
public final class IteratorStreamMergedResult extends StreamMergedResult {
- private final Iterator<ExecuteQueryResult> queryResultSets;
+ private final Iterator<ExecuteQueryResult> queryResults;
- public IteratorStreamMergedResult(final List<ExecuteQueryResult> queryResultSets) {
- this.queryResultSets = queryResultSets.iterator();
- setCurrentQueryResultSet(this.queryResultSets.next());
+ public IteratorStreamMergedResult(final List<ExecuteQueryResult> queryResults) {
+ this.queryResults = queryResults.iterator();
+ setCurrentQueryResult(this.queryResults.next());
}
@Override
public boolean next() throws SQLException {
- if (getCurrentQueryResultSet().next()) {
+ if (getCurrentQueryResult().next()) {
return true;
}
- if (!queryResultSets.hasNext()) {
+ if (!queryResults.hasNext()) {
return false;
}
- setCurrentQueryResultSet(queryResultSets.next());
- boolean hasNext = getCurrentQueryResultSet().next();
+ setCurrentQueryResult(queryResults.next());
+ boolean hasNext = getCurrentQueryResult().next();
if (hasNext) {
return true;
}
- while (!hasNext && queryResultSets.hasNext()) {
- setCurrentQueryResultSet(queryResultSets.next());
- hasNext = getCurrentQueryResultSet().next();
+ while (!hasNext && queryResults.hasNext()) {
+ setCurrentQueryResult(queryResults.next());
+ hasNext = getCurrentQueryResult().next();
}
return hasNext;
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByStreamMergedResult.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByStreamMergedResult.java
index f60163a..264dd91 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByStreamMergedResult.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByStreamMergedResult.java
@@ -44,21 +44,21 @@ public class OrderByStreamMergedResult extends StreamMergedResult {
@Getter(AccessLevel.PROTECTED)
private boolean isFirstNext;
- public OrderByStreamMergedResult(final List<ExecuteQueryResult> queryResultSets, final SelectStatementContext selectStatementContext, final ShardingSphereSchema schema) throws SQLException {
+ public OrderByStreamMergedResult(final List<ExecuteQueryResult> queryResults, final SelectStatementContext selectStatementContext, final ShardingSphereSchema schema) throws SQLException {
orderByItems = selectStatementContext.getOrderByContext().getItems();
- orderByValuesQueue = new PriorityQueue<>(queryResultSets.size());
- orderResultSetsToQueue(queryResultSets, selectStatementContext, schema);
+ orderByValuesQueue = new PriorityQueue<>(queryResults.size());
+ orderResultSetsToQueue(queryResults, selectStatementContext, schema);
isFirstNext = true;
}
- private void orderResultSetsToQueue(final List<ExecuteQueryResult> queryResultSets, final SelectStatementContext selectStatementContext, final ShardingSphereSchema schema) throws SQLException {
- for (ExecuteQueryResult each : queryResultSets) {
+ private void orderResultSetsToQueue(final List<ExecuteQueryResult> queryResults, final SelectStatementContext selectStatementContext, final ShardingSphereSchema schema) throws SQLException {
+ for (ExecuteQueryResult each : queryResults) {
OrderByValue orderByValue = new OrderByValue(each, orderByItems, selectStatementContext, schema);
if (orderByValue.next()) {
orderByValuesQueue.offer(orderByValue);
}
}
- setCurrentQueryResultSet(orderByValuesQueue.isEmpty() ? queryResultSets.get(0) : orderByValuesQueue.peek().getQueryResultSet());
+ setCurrentQueryResult(orderByValuesQueue.isEmpty() ? queryResults.get(0) : orderByValuesQueue.peek().getQueryResult());
}
@Override
@@ -77,7 +77,7 @@ public class OrderByStreamMergedResult extends StreamMergedResult {
if (orderByValuesQueue.isEmpty()) {
return false;
}
- setCurrentQueryResultSet(orderByValuesQueue.peek().getQueryResultSet());
+ setCurrentQueryResult(orderByValuesQueue.peek().getQueryResult());
return true;
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByValue.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByValue.java
index 0fd47f1..1cda71f 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByValue.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/main/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByValue.java
@@ -43,7 +43,7 @@ import java.util.Map;
public final class OrderByValue implements Comparable<OrderByValue> {
@Getter
- private final ExecuteQueryResult queryResultSet;
+ private final ExecuteQueryResult queryResult;
private final Collection<OrderByItem> orderByItems;
@@ -51,9 +51,9 @@ public final class OrderByValue implements Comparable<OrderByValue> {
private List<Comparable<?>> orderValues;
- public OrderByValue(final ExecuteQueryResult queryResultSet, final Collection<OrderByItem> orderByItems,
+ public OrderByValue(final ExecuteQueryResult queryResult, final Collection<OrderByItem> orderByItems,
final SelectStatementContext selectStatementContext, final ShardingSphereSchema schema) throws SQLException {
- this.queryResultSet = queryResultSet;
+ this.queryResult = queryResult;
this.orderByItems = orderByItems;
orderValuesCaseSensitive = getOrderValuesCaseSensitive(selectStatementContext, schema);
}
@@ -80,7 +80,7 @@ public final class OrderByValue implements Comparable<OrderByValue> {
}
} else if (orderByItemSegment instanceof IndexOrderByItemSegment) {
int columnIndex = ((IndexOrderByItemSegment) orderByItemSegment).getColumnIndex();
- String columnName = queryResultSet.getColumnName(columnIndex);
+ String columnName = queryResult.getColumnName(columnIndex);
if (columns.containsKey(columnName)) {
return columns.get(columnName).isCaseSensitive();
}
@@ -98,7 +98,7 @@ public final class OrderByValue implements Comparable<OrderByValue> {
* @throws SQLException SQL Exception
*/
public boolean next() throws SQLException {
- boolean result = queryResultSet.next();
+ boolean result = queryResult.next();
orderValues = result ? getOrderValues() : Collections.emptyList();
return result;
}
@@ -106,7 +106,7 @@ public final class OrderByValue implements Comparable<OrderByValue> {
private List<Comparable<?>> getOrderValues() throws SQLException {
List<Comparable<?>> result = new ArrayList<>(orderByItems.size());
for (OrderByItem each : orderByItems) {
- Object value = queryResultSet.getValue(each.getIndex(), Object.class);
+ Object value = queryResult.getValue(each.getIndex(), Object.class);
Preconditions.checkState(null == value || value instanceof Comparable, "Order by value must implements Comparable");
result.add((Comparable<?>) value);
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dal/ShardingDALResultMergerTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dal/ShardingDALResultMergerTest.java
index ab80d10..2234fb0 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dal/ShardingDALResultMergerTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dal/ShardingDALResultMergerTest.java
@@ -44,11 +44,11 @@ import static org.mockito.Mockito.when;
public final class ShardingDALResultMergerTest {
- private final List<ExecuteQueryResult> queryResultSets = new LinkedList<>();
+ private final List<ExecuteQueryResult> queryResults = new LinkedList<>();
@Before
public void setUp() {
- queryResultSets.add(mock(ExecuteQueryResult.class));
+ queryResults.add(mock(ExecuteQueryResult.class));
}
@Test
@@ -56,7 +56,7 @@ public final class ShardingDALResultMergerTest {
DALStatement dalStatement = new MySQLShowDatabasesStatement();
SQLStatementContext<?> sqlStatementContext = mockSQLStatementContext(dalStatement);
ShardingDALResultMerger resultMerger = new ShardingDALResultMerger(null);
- assertThat(resultMerger.merge(queryResultSets, sqlStatementContext, null), instanceOf(SingleLocalDataMergedResult.class));
+ assertThat(resultMerger.merge(queryResults, sqlStatementContext, null), instanceOf(SingleLocalDataMergedResult.class));
}
@Test
@@ -64,7 +64,7 @@ public final class ShardingDALResultMergerTest {
DALStatement dalStatement = new MySQLShowTablesStatement();
SQLStatementContext<?> sqlStatementContext = mockSQLStatementContext(dalStatement);
ShardingDALResultMerger resultMerger = new ShardingDALResultMerger(null);
- assertThat(resultMerger.merge(queryResultSets, sqlStatementContext, null), instanceOf(LogicTablesMergedResult.class));
+ assertThat(resultMerger.merge(queryResults, sqlStatementContext, null), instanceOf(LogicTablesMergedResult.class));
}
@Test
@@ -72,7 +72,7 @@ public final class ShardingDALResultMergerTest {
DALStatement dalStatement = new MySQLShowCreateTableStatement();
SQLStatementContext<?> sqlStatementContext = mockSQLStatementContext(dalStatement);
ShardingDALResultMerger resultMerger = new ShardingDALResultMerger(null);
- assertThat(resultMerger.merge(queryResultSets, sqlStatementContext, null), instanceOf(ShowCreateTableMergedResult.class));
+ assertThat(resultMerger.merge(queryResults, sqlStatementContext, null), instanceOf(ShowCreateTableMergedResult.class));
}
@Test
@@ -80,7 +80,7 @@ public final class ShardingDALResultMergerTest {
DALStatement dalStatement = new MySQLShowOtherStatement();
SQLStatementContext<?> sqlStatementContext = mockSQLStatementContext(dalStatement);
ShardingDALResultMerger resultMerger = new ShardingDALResultMerger(null);
- assertThat(resultMerger.merge(queryResultSets, sqlStatementContext, null), instanceOf(TransparentMergedResult.class));
+ assertThat(resultMerger.merge(queryResults, sqlStatementContext, null), instanceOf(TransparentMergedResult.class));
}
@Test
@@ -88,7 +88,7 @@ public final class ShardingDALResultMergerTest {
DALStatement dalStatement = new MySQLDescribeStatement();
SQLStatementContext<?> sqlStatementContext = mockSQLStatementContext(dalStatement);
ShardingDALResultMerger resultMerger = new ShardingDALResultMerger(mock(ShardingRule.class));
- assertThat(resultMerger.merge(queryResultSets, sqlStatementContext, null), instanceOf(TransparentMergedResult.class));
+ assertThat(resultMerger.merge(queryResults, sqlStatementContext, null), instanceOf(TransparentMergedResult.class));
}
@SuppressWarnings("unchecked")
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResultTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResultTest.java
index 5593184..ac945d1 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResultTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResultTest.java
@@ -72,10 +72,10 @@ public final class ShowCreateTableMergedResultTest {
@Test
public void assertNextForTableRuleIsPresent() throws SQLException {
- assertTrue(new ShowCreateTableMergedResult(shardingRule, mock(SQLStatementContext.class), schema, Collections.singletonList(mockQueryResultSet())).next());
+ assertTrue(new ShowCreateTableMergedResult(shardingRule, mock(SQLStatementContext.class), schema, Collections.singletonList(mockQueryResult())).next());
}
- private ExecuteQueryResult mockQueryResultSet() throws SQLException {
+ private ExecuteQueryResult mockQueryResult() throws SQLException {
ExecuteQueryResult result = mock(ExecuteQueryResult.class);
when(result.getColumnCount()).thenReturn(2);
when(result.next()).thenReturn(true, false);
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowTablesMergedResultTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowTablesMergedResultTest.java
index ae875dc..e5e3063 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowTablesMergedResultTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowTablesMergedResultTest.java
@@ -65,7 +65,7 @@ public final class ShowTablesMergedResultTest {
return new ShardingSphereSchema(tableMetaDataMap);
}
- private ExecuteQueryResult mockQueryResultSet(final String value) throws SQLException {
+ private ExecuteQueryResult mockQueryResult(final String value) throws SQLException {
ExecuteQueryResult result = mock(ExecuteQueryResult.class);
when(result.next()).thenReturn(true, false);
when(result.getValue(1, Object.class)).thenReturn(value);
@@ -81,7 +81,7 @@ public final class ShowTablesMergedResultTest {
@Test
public void assertNextForActualTableNameInTableRule() throws SQLException {
- LogicTablesMergedResult actual = new LogicTablesMergedResult(shardingRule, mock(SQLStatementContext.class), schema, Collections.singletonList(mockQueryResultSet("table_0")));
+ LogicTablesMergedResult actual = new LogicTablesMergedResult(shardingRule, mock(SQLStatementContext.class), schema, Collections.singletonList(mockQueryResult("table_0")));
assertTrue(actual.next());
}
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/ShardingDQLResultMergerTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/ShardingDQLResultMergerTest.java
index c9510a6..0eb6eac 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/ShardingDQLResultMergerTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/ShardingDQLResultMergerTest.java
@@ -71,7 +71,7 @@ public final class ShardingDQLResultMergerTest {
SelectStatementContext selectStatementContext = new SelectStatementContext(buildSelectStatement(new MySQLSelectStatement()),
new GroupByContext(Collections.emptyList(), 0), new OrderByContext(Collections.emptyList(), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()), new PaginationContext(null, null, Collections.emptyList()));
- assertThat(resultMerger.merge(createQueryResultSets(), selectStatementContext, buildSchema()), instanceOf(IteratorStreamMergedResult.class));
+ assertThat(resultMerger.merge(createQueryResults(), selectStatementContext, buildSchema()), instanceOf(IteratorStreamMergedResult.class));
}
@Test
@@ -81,7 +81,7 @@ public final class ShardingDQLResultMergerTest {
new GroupByContext(Collections.emptyList(), 0), new OrderByContext(Collections.emptyList(), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralLimitValueSegment(0, 0, 1), null, Collections.emptyList()));
- assertThat(resultMerger.merge(Collections.singletonList(createQueryResultSet()), selectStatementContext, buildSchema()), instanceOf(IteratorStreamMergedResult.class));
+ assertThat(resultMerger.merge(Collections.singletonList(createQueryResult()), selectStatementContext, buildSchema()), instanceOf(IteratorStreamMergedResult.class));
}
@Test
@@ -91,7 +91,7 @@ public final class ShardingDQLResultMergerTest {
new GroupByContext(Collections.emptyList(), 0), new OrderByContext(Collections.emptyList(), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralLimitValueSegment(0, 0, 1), null, Collections.emptyList()));
- MergedResult actual = resultMerger.merge(createQueryResultSets(), selectStatementContext, buildSchema());
+ MergedResult actual = resultMerger.merge(createQueryResults(), selectStatementContext, buildSchema());
assertThat(actual, instanceOf(LimitDecoratorMergedResult.class));
assertThat(((LimitDecoratorMergedResult) actual).getMergedResult(), instanceOf(IteratorStreamMergedResult.class));
}
@@ -103,7 +103,7 @@ public final class ShardingDQLResultMergerTest {
new GroupByContext(Collections.emptyList(), 0), new OrderByContext(Collections.emptyList(), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralRowNumberValueSegment(0, 0, 1, true), null, Collections.emptyList()));
- MergedResult actual = resultMerger.merge(createQueryResultSets(), selectStatementContext, buildSchema());
+ MergedResult actual = resultMerger.merge(createQueryResults(), selectStatementContext, buildSchema());
assertThat(actual, instanceOf(RowNumberDecoratorMergedResult.class));
assertThat(((RowNumberDecoratorMergedResult) actual).getMergedResult(), instanceOf(IteratorStreamMergedResult.class));
}
@@ -115,7 +115,7 @@ public final class ShardingDQLResultMergerTest {
new GroupByContext(Collections.emptyList(), 0), new OrderByContext(Collections.emptyList(), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralLimitValueSegment(0, 0, 1), null, Collections.emptyList()));
- MergedResult actual = resultMerger.merge(createQueryResultSets(), selectStatementContext, buildSchema());
+ MergedResult actual = resultMerger.merge(createQueryResults(), selectStatementContext, buildSchema());
assertThat(actual, instanceOf(TopAndRowNumberDecoratorMergedResult.class));
assertThat(((TopAndRowNumberDecoratorMergedResult) actual).getMergedResult(), instanceOf(IteratorStreamMergedResult.class));
}
@@ -127,7 +127,7 @@ public final class ShardingDQLResultMergerTest {
buildSelectStatement(new MySQLSelectStatement()), new GroupByContext(Collections.emptyList(), 0),
new OrderByContext(Collections.singletonList(new OrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.DESC, OrderDirection.ASC))), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()), new PaginationContext(null, null, Collections.emptyList()));
- assertThat(resultMerger.merge(createQueryResultSets(), selectStatementContext, buildSchema()), instanceOf(OrderByStreamMergedResult.class));
+ assertThat(resultMerger.merge(createQueryResults(), selectStatementContext, buildSchema()), instanceOf(OrderByStreamMergedResult.class));
}
@Test
@@ -138,7 +138,7 @@ public final class ShardingDQLResultMergerTest {
new OrderByContext(Collections.singletonList(new OrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.DESC, OrderDirection.ASC))), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralLimitValueSegment(0, 0, 1), null, Collections.emptyList()));
- MergedResult actual = resultMerger.merge(createQueryResultSets(), selectStatementContext, buildSchema());
+ MergedResult actual = resultMerger.merge(createQueryResults(), selectStatementContext, buildSchema());
assertThat(actual, instanceOf(LimitDecoratorMergedResult.class));
assertThat(((LimitDecoratorMergedResult) actual).getMergedResult(), instanceOf(OrderByStreamMergedResult.class));
}
@@ -151,7 +151,7 @@ public final class ShardingDQLResultMergerTest {
new OrderByContext(Collections.singletonList(new OrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.DESC, OrderDirection.ASC))), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralRowNumberValueSegment(0, 0, 1, true), null, Collections.emptyList()));
- MergedResult actual = resultMerger.merge(createQueryResultSets(), selectStatementContext, buildSchema());
+ MergedResult actual = resultMerger.merge(createQueryResults(), selectStatementContext, buildSchema());
assertThat(actual, instanceOf(RowNumberDecoratorMergedResult.class));
assertThat(((RowNumberDecoratorMergedResult) actual).getMergedResult(), instanceOf(OrderByStreamMergedResult.class));
}
@@ -164,7 +164,7 @@ public final class ShardingDQLResultMergerTest {
new OrderByContext(Collections.singletonList(new OrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.DESC, OrderDirection.ASC))), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralRowNumberValueSegment(0, 0, 1, true), null, Collections.emptyList()));
- MergedResult actual = resultMerger.merge(createQueryResultSets(), selectStatementContext, buildSchema());
+ MergedResult actual = resultMerger.merge(createQueryResults(), selectStatementContext, buildSchema());
assertThat(actual, instanceOf(TopAndRowNumberDecoratorMergedResult.class));
assertThat(((TopAndRowNumberDecoratorMergedResult) actual).getMergedResult(), instanceOf(OrderByStreamMergedResult.class));
}
@@ -176,7 +176,7 @@ public final class ShardingDQLResultMergerTest {
new GroupByContext(Collections.singletonList(new OrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.DESC, OrderDirection.ASC))), 0),
new OrderByContext(Collections.singletonList(new OrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.DESC, OrderDirection.ASC))), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()), new PaginationContext(null, null, Collections.emptyList()));
- assertThat(resultMerger.merge(createQueryResultSets(), selectStatementContext, buildSchema()), instanceOf(GroupByStreamMergedResult.class));
+ assertThat(resultMerger.merge(createQueryResults(), selectStatementContext, buildSchema()), instanceOf(GroupByStreamMergedResult.class));
}
@Test
@@ -187,7 +187,7 @@ public final class ShardingDQLResultMergerTest {
new OrderByContext(Collections.singletonList(new OrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.DESC, OrderDirection.ASC))), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralLimitValueSegment(0, 0, 1), null, Collections.emptyList()));
- MergedResult actual = resultMerger.merge(createQueryResultSets(), selectStatementContext, buildSchema());
+ MergedResult actual = resultMerger.merge(createQueryResults(), selectStatementContext, buildSchema());
assertThat(actual, instanceOf(LimitDecoratorMergedResult.class));
assertThat(((LimitDecoratorMergedResult) actual).getMergedResult(), instanceOf(GroupByStreamMergedResult.class));
}
@@ -200,7 +200,7 @@ public final class ShardingDQLResultMergerTest {
new OrderByContext(Collections.singletonList(new OrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.DESC, OrderDirection.ASC))), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralRowNumberValueSegment(0, 0, 1, true), null, Collections.emptyList()));
- MergedResult actual = resultMerger.merge(createQueryResultSets(), selectStatementContext, buildSchema());
+ MergedResult actual = resultMerger.merge(createQueryResults(), selectStatementContext, buildSchema());
assertThat(actual, instanceOf(RowNumberDecoratorMergedResult.class));
assertThat(((RowNumberDecoratorMergedResult) actual).getMergedResult(), instanceOf(GroupByStreamMergedResult.class));
}
@@ -213,7 +213,7 @@ public final class ShardingDQLResultMergerTest {
new OrderByContext(Collections.singletonList(new OrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.DESC, OrderDirection.ASC))), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralRowNumberValueSegment(0, 0, 1, true), null, Collections.emptyList()));
- MergedResult actual = resultMerger.merge(createQueryResultSets(), selectStatementContext, buildSchema());
+ MergedResult actual = resultMerger.merge(createQueryResults(), selectStatementContext, buildSchema());
assertThat(actual, instanceOf(TopAndRowNumberDecoratorMergedResult.class));
assertThat(((TopAndRowNumberDecoratorMergedResult) actual).getMergedResult(), instanceOf(GroupByStreamMergedResult.class));
}
@@ -225,7 +225,7 @@ public final class ShardingDQLResultMergerTest {
new GroupByContext(Collections.singletonList(new OrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.DESC, OrderDirection.ASC))), 0),
new OrderByContext(Collections.emptyList(), false), new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(null, null, Collections.emptyList()));
- assertThat(resultMerger.merge(createQueryResultSets(), selectStatementContext, buildSchema()), instanceOf(GroupByMemoryMergedResult.class));
+ assertThat(resultMerger.merge(createQueryResults(), selectStatementContext, buildSchema()), instanceOf(GroupByMemoryMergedResult.class));
}
@Test
@@ -235,7 +235,7 @@ public final class ShardingDQLResultMergerTest {
new GroupByContext(Collections.singletonList(new OrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.DESC, OrderDirection.ASC))), 0),
new OrderByContext(Collections.emptyList(), false), new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralLimitValueSegment(0, 0, 1), null, Collections.emptyList()));
- MergedResult actual = resultMerger.merge(createQueryResultSets(), selectStatementContext, buildSchema());
+ MergedResult actual = resultMerger.merge(createQueryResults(), selectStatementContext, buildSchema());
assertThat(actual, instanceOf(LimitDecoratorMergedResult.class));
assertThat(((LimitDecoratorMergedResult) actual).getMergedResult(), instanceOf(GroupByMemoryMergedResult.class));
}
@@ -248,7 +248,7 @@ public final class ShardingDQLResultMergerTest {
new OrderByContext(Collections.singletonList(new OrderByItem(new IndexOrderByItemSegment(0, 0, 2, OrderDirection.DESC, OrderDirection.ASC))), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralRowNumberValueSegment(0, 0, 1, true), null, Collections.emptyList()));
- MergedResult actual = resultMerger.merge(createQueryResultSets(), selectStatementContext, buildSchema());
+ MergedResult actual = resultMerger.merge(createQueryResults(), selectStatementContext, buildSchema());
assertThat(actual, instanceOf(RowNumberDecoratorMergedResult.class));
assertThat(((RowNumberDecoratorMergedResult) actual).getMergedResult(), instanceOf(GroupByMemoryMergedResult.class));
}
@@ -262,7 +262,7 @@ public final class ShardingDQLResultMergerTest {
new OrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.ASC, OrderDirection.ASC))), 0), new OrderByContext(Collections.emptyList(), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralRowNumberValueSegment(0, 0, 1, true), null, Collections.emptyList()));
- MergedResult actual = resultMerger.merge(createQueryResultSets(), selectStatementContext, buildSchema());
+ MergedResult actual = resultMerger.merge(createQueryResults(), selectStatementContext, buildSchema());
assertThat(actual, instanceOf(TopAndRowNumberDecoratorMergedResult.class));
assertThat(((TopAndRowNumberDecoratorMergedResult) actual).getMergedResult(), instanceOf(GroupByMemoryMergedResult.class));
}
@@ -275,7 +275,7 @@ public final class ShardingDQLResultMergerTest {
SelectStatementContext selectStatementContext = new SelectStatementContext(
buildSelectStatement(new MySQLSelectStatement()), new GroupByContext(Collections.emptyList(), 0), new OrderByContext(Collections.emptyList(), false),
projectionsContext, new PaginationContext(null, null, Collections.emptyList()));
- assertThat(resultMerger.merge(createQueryResultSets(), selectStatementContext, buildSchema()), instanceOf(GroupByMemoryMergedResult.class));
+ assertThat(resultMerger.merge(createQueryResults(), selectStatementContext, buildSchema()), instanceOf(GroupByMemoryMergedResult.class));
}
@Test
@@ -286,7 +286,7 @@ public final class ShardingDQLResultMergerTest {
SelectStatementContext selectStatementContext = new SelectStatementContext(
buildSelectStatement(new MySQLSelectStatement()), new GroupByContext(Collections.emptyList(), 0), new OrderByContext(Collections.emptyList(), false),
projectionsContext, new PaginationContext(new NumberLiteralLimitValueSegment(0, 0, 1), null, Collections.emptyList()));
- MergedResult actual = resultMerger.merge(createQueryResultSets(), selectStatementContext, buildSchema());
+ MergedResult actual = resultMerger.merge(createQueryResults(), selectStatementContext, buildSchema());
assertThat(actual, instanceOf(LimitDecoratorMergedResult.class));
assertThat(((LimitDecoratorMergedResult) actual).getMergedResult(), instanceOf(GroupByMemoryMergedResult.class));
}
@@ -299,7 +299,7 @@ public final class ShardingDQLResultMergerTest {
SelectStatementContext selectStatementContext = new SelectStatementContext(
buildSelectStatement(new OracleSelectStatement()), new GroupByContext(Collections.emptyList(), 0), new OrderByContext(Collections.emptyList(), false),
projectionsContext, new PaginationContext(new NumberLiteralRowNumberValueSegment(0, 0, 1, true), null, Collections.emptyList()));
- MergedResult actual = resultMerger.merge(createQueryResultSets(), selectStatementContext, buildSchema());
+ MergedResult actual = resultMerger.merge(createQueryResults(), selectStatementContext, buildSchema());
assertThat(actual, instanceOf(RowNumberDecoratorMergedResult.class));
assertThat(((RowNumberDecoratorMergedResult) actual).getMergedResult(), instanceOf(GroupByMemoryMergedResult.class));
}
@@ -312,22 +312,22 @@ public final class ShardingDQLResultMergerTest {
SelectStatementContext selectStatementContext = new SelectStatementContext(
buildSelectStatement(new SQLServerSelectStatement()), new GroupByContext(Collections.emptyList(), 0), new OrderByContext(Collections.emptyList(), false),
projectionsContext, new PaginationContext(new NumberLiteralRowNumberValueSegment(0, 0, 1, true), null, Collections.emptyList()));
- MergedResult actual = resultMerger.merge(createQueryResultSets(), selectStatementContext, buildSchema());
+ MergedResult actual = resultMerger.merge(createQueryResults(), selectStatementContext, buildSchema());
assertThat(actual, instanceOf(TopAndRowNumberDecoratorMergedResult.class));
assertThat(((TopAndRowNumberDecoratorMergedResult) actual).getMergedResult(), instanceOf(GroupByMemoryMergedResult.class));
}
- private List<ExecuteQueryResult> createQueryResultSets() throws SQLException {
+ private List<ExecuteQueryResult> createQueryResults() throws SQLException {
List<ExecuteQueryResult> result = new LinkedList<>();
- ExecuteQueryResult queryResultSet = createQueryResultSet();
- result.add(queryResultSet);
+ ExecuteQueryResult queryResult = createQueryResult();
+ result.add(queryResult);
result.add(mock(ExecuteQueryResult.class));
result.add(mock(ExecuteQueryResult.class));
result.add(mock(ExecuteQueryResult.class));
return result;
}
- private ExecuteQueryResult createQueryResultSet() throws SQLException {
+ private ExecuteQueryResult createQueryResult() throws SQLException {
ExecuteQueryResult result = mock(ExecuteQueryResult.class);
when(result.getColumnCount()).thenReturn(1);
when(result.getColumnLabel(1)).thenReturn("count(*)");
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResultTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResultTest.java
index 30e8c8b..94fa263 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResultTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResultTest.java
@@ -54,7 +54,7 @@ public final class GroupByMemoryMergedResultTest {
@Test
public void assertNextForResultSetsAllEmpty() throws SQLException {
ShardingDQLResultMerger resultMerger = new ShardingDQLResultMerger(DatabaseTypeRegistry.getActualDatabaseType("MySQL"));
- MergedResult actual = resultMerger.merge(Arrays.asList(createQueryResultSet(), createQueryResultSet(), createQueryResultSet()), createSelectStatementContext(), null);
+ MergedResult actual = resultMerger.merge(Arrays.asList(createQueryResult(), createQueryResult(), createQueryResult()), createSelectStatementContext(), null);
assertTrue(actual.next());
assertThat(actual.getValue(1, Object.class), is(0));
assertThat(actual.getValue(2, Object.class), is(nullValue()));
@@ -63,23 +63,23 @@ public final class GroupByMemoryMergedResultTest {
@Test
public void assertNextForSomeResultSetsEmpty() throws SQLException {
- ExecuteQueryResult queryResultSet1 = createQueryResultSet();
- when(queryResultSet1.next()).thenReturn(true, false);
- when(queryResultSet1.getValue(1, Object.class)).thenReturn(20);
- when(queryResultSet1.getValue(2, Object.class)).thenReturn(0);
- when(queryResultSet1.getValue(3, Object.class)).thenReturn(2);
- when(queryResultSet1.getValue(4, Object.class)).thenReturn(2);
- when(queryResultSet1.getValue(5, Object.class)).thenReturn(20);
- ExecuteQueryResult queryResultSet2 = createQueryResultSet();
- ExecuteQueryResult queryResultSet3 = createQueryResultSet();
- when(queryResultSet3.next()).thenReturn(true, true, false);
- when(queryResultSet3.getValue(1, Object.class)).thenReturn(20, 30);
- when(queryResultSet3.getValue(2, Object.class)).thenReturn(0);
- when(queryResultSet3.getValue(3, Object.class)).thenReturn(2, 3);
- when(queryResultSet3.getValue(4, Object.class)).thenReturn(2, 2, 3);
- when(queryResultSet3.getValue(5, Object.class)).thenReturn(20, 20, 30);
+ ExecuteQueryResult queryResult1 = createQueryResult();
+ when(queryResult1.next()).thenReturn(true, false);
+ when(queryResult1.getValue(1, Object.class)).thenReturn(20);
+ when(queryResult1.getValue(2, Object.class)).thenReturn(0);
+ when(queryResult1.getValue(3, Object.class)).thenReturn(2);
+ when(queryResult1.getValue(4, Object.class)).thenReturn(2);
+ when(queryResult1.getValue(5, Object.class)).thenReturn(20);
+ ExecuteQueryResult queryResult2 = createQueryResult();
+ ExecuteQueryResult queryResult3 = createQueryResult();
+ when(queryResult3.next()).thenReturn(true, true, false);
+ when(queryResult3.getValue(1, Object.class)).thenReturn(20, 30);
+ when(queryResult3.getValue(2, Object.class)).thenReturn(0);
+ when(queryResult3.getValue(3, Object.class)).thenReturn(2, 3);
+ when(queryResult3.getValue(4, Object.class)).thenReturn(2, 2, 3);
+ when(queryResult3.getValue(5, Object.class)).thenReturn(20, 20, 30);
ShardingDQLResultMerger resultMerger = new ShardingDQLResultMerger(DatabaseTypeRegistry.getActualDatabaseType("MySQL"));
- MergedResult actual = resultMerger.merge(Arrays.asList(queryResultSet1, queryResultSet2, queryResultSet3), createSelectStatementContext(), null);
+ MergedResult actual = resultMerger.merge(Arrays.asList(queryResult1, queryResult2, queryResult3), createSelectStatementContext(), null);
assertTrue(actual.next());
assertThat(actual.getValue(1, Object.class), is(new BigDecimal(30)));
assertThat(((BigDecimal) actual.getValue(2, Object.class)).intValue(), is(10));
@@ -118,23 +118,23 @@ public final class GroupByMemoryMergedResultTest {
@Test
public void assertNextForAggregationResultSetsEmpty() throws SQLException {
- ExecuteQueryResult queryResultSet1 = createQueryResultSet();
- when(queryResultSet1.next()).thenReturn(true, false);
- when(queryResultSet1.getValue(1, Object.class)).thenReturn(20);
- when(queryResultSet1.getValue(2, Object.class)).thenReturn(0);
- when(queryResultSet1.getValue(3, Object.class)).thenReturn(2);
- when(queryResultSet1.getValue(4, Object.class)).thenReturn(2);
- when(queryResultSet1.getValue(5, Object.class)).thenReturn(20);
- ExecuteQueryResult queryResultSet2 = createQueryResultSet();
- ExecuteQueryResult queryResultSet3 = createQueryResultSet();
- when(queryResultSet3.next()).thenReturn(true, true, false);
- when(queryResultSet3.getValue(1, Object.class)).thenReturn(20, 30);
- when(queryResultSet3.getValue(2, Object.class)).thenReturn(0);
- when(queryResultSet3.getValue(3, Object.class)).thenReturn(2, 3);
- when(queryResultSet3.getValue(4, Object.class)).thenReturn(2, 2, 3);
- when(queryResultSet3.getValue(5, Object.class)).thenReturn(20, 20, 30);
+ ExecuteQueryResult queryResult1 = createQueryResult();
+ when(queryResult1.next()).thenReturn(true, false);
+ when(queryResult1.getValue(1, Object.class)).thenReturn(20);
+ when(queryResult1.getValue(2, Object.class)).thenReturn(0);
+ when(queryResult1.getValue(3, Object.class)).thenReturn(2);
+ when(queryResult1.getValue(4, Object.class)).thenReturn(2);
+ when(queryResult1.getValue(5, Object.class)).thenReturn(20);
+ ExecuteQueryResult queryResult2 = createQueryResult();
+ ExecuteQueryResult queryResult3 = createQueryResult();
+ when(queryResult3.next()).thenReturn(true, true, false);
+ when(queryResult3.getValue(1, Object.class)).thenReturn(20, 30);
+ when(queryResult3.getValue(2, Object.class)).thenReturn(0);
+ when(queryResult3.getValue(3, Object.class)).thenReturn(2, 3);
+ when(queryResult3.getValue(4, Object.class)).thenReturn(2, 2, 3);
+ when(queryResult3.getValue(5, Object.class)).thenReturn(20, 20, 30);
ShardingDQLResultMerger resultMerger = new ShardingDQLResultMerger(DatabaseTypeRegistry.getActualDatabaseType("MySQL"));
- MergedResult actual = resultMerger.merge(Arrays.asList(queryResultSet1, queryResultSet2, queryResultSet3), createSelectStatementContext(), null);
+ MergedResult actual = resultMerger.merge(Arrays.asList(queryResult1, queryResult2, queryResult3), createSelectStatementContext(), null);
assertTrue(actual.next());
assertThat(actual.getValue(1, Object.class), is(new BigDecimal(30)));
assertThat(((BigDecimal) actual.getValue(2, Object.class)).intValue(), is(10));
@@ -156,7 +156,7 @@ public final class GroupByMemoryMergedResultTest {
return result;
}
- private ExecuteQueryResult createQueryResultSet() throws SQLException {
+ private ExecuteQueryResult createQueryResult() throws SQLException {
ExecuteQueryResult result = mock(ExecuteQueryResult.class);
when(result.getColumnCount()).thenReturn(5);
when(result.getColumnLabel(1)).thenReturn("COUNT(*)");
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByRowComparatorTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByRowComparatorTest.java
index 9683331..15f8e83 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByRowComparatorTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByRowComparatorTest.java
@@ -88,8 +88,8 @@ public final class GroupByRowComparatorTest {
createOrderByItem(new IndexOrderByItemSegment(0, 0, 2, OrderDirection.ASC, OrderDirection.ASC))), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()), new PaginationContext(null, null, Collections.emptyList()));
GroupByRowComparator groupByRowComparator = new GroupByRowComparator(selectStatementContext, caseSensitives);
- MemoryQueryResultRow o1 = new MemoryQueryResultRow(mockQueryResultSet("1", "2"));
- MemoryQueryResultRow o2 = new MemoryQueryResultRow(mockQueryResultSet("3", "4"));
+ MemoryQueryResultRow o1 = new MemoryQueryResultRow(mockQueryResult("1", "2"));
+ MemoryQueryResultRow o2 = new MemoryQueryResultRow(mockQueryResult("3", "4"));
assertTrue(groupByRowComparator.compare(o1, o2) < 0);
}
@@ -128,8 +128,8 @@ public final class GroupByRowComparatorTest {
createOrderByItem(new IndexOrderByItemSegment(0, 0, 2, OrderDirection.DESC, OrderDirection.ASC))), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()), new PaginationContext(null, null, Collections.emptyList()));
GroupByRowComparator groupByRowComparator = new GroupByRowComparator(selectStatementContext, caseSensitives);
- MemoryQueryResultRow o1 = new MemoryQueryResultRow(mockQueryResultSet("1", "2"));
- MemoryQueryResultRow o2 = new MemoryQueryResultRow(mockQueryResultSet("3", "4"));
+ MemoryQueryResultRow o1 = new MemoryQueryResultRow(mockQueryResult("1", "2"));
+ MemoryQueryResultRow o2 = new MemoryQueryResultRow(mockQueryResult("3", "4"));
assertTrue(groupByRowComparator.compare(o1, o2) > 0);
}
@@ -168,8 +168,8 @@ public final class GroupByRowComparatorTest {
createOrderByItem(new IndexOrderByItemSegment(0, 0, 2, OrderDirection.DESC, OrderDirection.ASC))), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()), new PaginationContext(null, null, Collections.emptyList()));
GroupByRowComparator groupByRowComparator = new GroupByRowComparator(selectStatementContext, caseSensitives);
- MemoryQueryResultRow o1 = new MemoryQueryResultRow(mockQueryResultSet("1", "2"));
- MemoryQueryResultRow o2 = new MemoryQueryResultRow(mockQueryResultSet("1", "2"));
+ MemoryQueryResultRow o1 = new MemoryQueryResultRow(mockQueryResult("1", "2"));
+ MemoryQueryResultRow o2 = new MemoryQueryResultRow(mockQueryResult("1", "2"));
assertThat(groupByRowComparator.compare(o1, o2), is(0));
}
@@ -205,8 +205,8 @@ public final class GroupByRowComparatorTest {
createOrderByItem(new IndexOrderByItemSegment(0, 0, 2, OrderDirection.ASC, OrderDirection.ASC))), 0), new OrderByContext(Collections.emptyList(), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()), new PaginationContext(null, null, Collections.emptyList()));
GroupByRowComparator groupByRowComparator = new GroupByRowComparator(selectStatementContext, caseSensitives);
- MemoryQueryResultRow o1 = new MemoryQueryResultRow(mockQueryResultSet("1", "2"));
- MemoryQueryResultRow o2 = new MemoryQueryResultRow(mockQueryResultSet("3", "4"));
+ MemoryQueryResultRow o1 = new MemoryQueryResultRow(mockQueryResult("1", "2"));
+ MemoryQueryResultRow o2 = new MemoryQueryResultRow(mockQueryResult("3", "4"));
assertTrue(groupByRowComparator.compare(o1, o2) < 0);
}
@@ -242,8 +242,8 @@ public final class GroupByRowComparatorTest {
createOrderByItem(new IndexOrderByItemSegment(0, 0, 2, OrderDirection.DESC, OrderDirection.ASC))), 0), new OrderByContext(Collections.emptyList(), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()), new PaginationContext(null, null, Collections.emptyList()));
GroupByRowComparator groupByRowComparator = new GroupByRowComparator(selectStatementContext, caseSensitives);
- MemoryQueryResultRow o1 = new MemoryQueryResultRow(mockQueryResultSet("1", "2"));
- MemoryQueryResultRow o2 = new MemoryQueryResultRow(mockQueryResultSet("3", "4"));
+ MemoryQueryResultRow o1 = new MemoryQueryResultRow(mockQueryResult("1", "2"));
+ MemoryQueryResultRow o2 = new MemoryQueryResultRow(mockQueryResult("3", "4"));
assertTrue(groupByRowComparator.compare(o1, o2) > 0);
}
@@ -279,8 +279,8 @@ public final class GroupByRowComparatorTest {
createOrderByItem(new IndexOrderByItemSegment(0, 0, 2, OrderDirection.DESC, OrderDirection.ASC))), 0), new OrderByContext(Collections.emptyList(), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()), new PaginationContext(null, null, Collections.emptyList()));
GroupByRowComparator groupByRowComparator = new GroupByRowComparator(selectStatementContext, caseSensitives);
- MemoryQueryResultRow o1 = new MemoryQueryResultRow(mockQueryResultSet("1", "2"));
- MemoryQueryResultRow o2 = new MemoryQueryResultRow(mockQueryResultSet("1", "2"));
+ MemoryQueryResultRow o1 = new MemoryQueryResultRow(mockQueryResult("1", "2"));
+ MemoryQueryResultRow o2 = new MemoryQueryResultRow(mockQueryResult("1", "2"));
assertThat(groupByRowComparator.compare(o1, o2), is(0));
}
@@ -290,7 +290,7 @@ public final class GroupByRowComparatorTest {
return result;
}
- private ExecuteQueryResult mockQueryResultSet(final Object... values) throws SQLException {
+ private ExecuteQueryResult mockQueryResult(final Object... values) throws SQLException {
ResultSet resultSet = mock(ResultSet.class);
ResultSetMetaData resultSetMetaData = mock(ResultSetMetaData.class);
when(resultSet.getMetaData()).thenReturn(resultSetMetaData);
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByStreamMergedResultTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByStreamMergedResultTest.java
index feeab59..3e60f7e 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByStreamMergedResultTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByStreamMergedResultTest.java
@@ -60,31 +60,31 @@ public final class GroupByStreamMergedResultTest {
@Test
public void assertNextForResultSetsAllEmpty() throws SQLException {
ShardingDQLResultMerger resultMerger = new ShardingDQLResultMerger(DatabaseTypeRegistry.getActualDatabaseType("MySQL"));
- MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet()), createSelectStatementContext(), buildSchema());
+ MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResult(), mockQueryResult(), mockQueryResult()), createSelectStatementContext(), buildSchema());
assertFalse(actual.next());
}
@Test
public void assertNextForSomeResultSetsEmpty() throws SQLException {
- ExecuteQueryResult queryResultSet1 = mockQueryResultSet();
- when(queryResultSet1.next()).thenReturn(true, false);
- when(queryResultSet1.getValue(1, Object.class)).thenReturn(20);
- when(queryResultSet1.getValue(2, Object.class)).thenReturn(0);
- when(queryResultSet1.getValue(3, Object.class)).thenReturn(2);
- when(queryResultSet1.getValue(4, Object.class)).thenReturn(new Date(0L));
- when(queryResultSet1.getValue(5, Object.class)).thenReturn(2);
- when(queryResultSet1.getValue(6, Object.class)).thenReturn(20);
- ExecuteQueryResult queryResultSet2 = mockQueryResultSet();
- ExecuteQueryResult queryResultSet3 = mockQueryResultSet();
- when(queryResultSet3.next()).thenReturn(true, true, false);
- when(queryResultSet3.getValue(1, Object.class)).thenReturn(20, 30);
- when(queryResultSet3.getValue(2, Object.class)).thenReturn(0);
- when(queryResultSet3.getValue(3, Object.class)).thenReturn(2, 2, 3);
- when(queryResultSet3.getValue(4, Object.class)).thenReturn(new Date(0L));
- when(queryResultSet3.getValue(5, Object.class)).thenReturn(2, 2, 3);
- when(queryResultSet3.getValue(6, Object.class)).thenReturn(20, 20, 30);
+ ExecuteQueryResult queryResult1 = mockQueryResult();
+ when(queryResult1.next()).thenReturn(true, false);
+ when(queryResult1.getValue(1, Object.class)).thenReturn(20);
+ when(queryResult1.getValue(2, Object.class)).thenReturn(0);
+ when(queryResult1.getValue(3, Object.class)).thenReturn(2);
+ when(queryResult1.getValue(4, Object.class)).thenReturn(new Date(0L));
+ when(queryResult1.getValue(5, Object.class)).thenReturn(2);
+ when(queryResult1.getValue(6, Object.class)).thenReturn(20);
+ ExecuteQueryResult queryResult2 = mockQueryResult();
+ ExecuteQueryResult queryResult3 = mockQueryResult();
+ when(queryResult3.next()).thenReturn(true, true, false);
+ when(queryResult3.getValue(1, Object.class)).thenReturn(20, 30);
+ when(queryResult3.getValue(2, Object.class)).thenReturn(0);
+ when(queryResult3.getValue(3, Object.class)).thenReturn(2, 2, 3);
+ when(queryResult3.getValue(4, Object.class)).thenReturn(new Date(0L));
+ when(queryResult3.getValue(5, Object.class)).thenReturn(2, 2, 3);
+ when(queryResult3.getValue(6, Object.class)).thenReturn(20, 20, 30);
ShardingDQLResultMerger resultMerger = new ShardingDQLResultMerger(DatabaseTypeRegistry.getActualDatabaseType("MySQL"));
- MergedResult actual = resultMerger.merge(Arrays.asList(queryResultSet1, queryResultSet2, queryResultSet3), createSelectStatementContext(), buildSchema());
+ MergedResult actual = resultMerger.merge(Arrays.asList(queryResult1, queryResult2, queryResult3), createSelectStatementContext(), buildSchema());
assertTrue(actual.next());
assertThat(actual.getValue(1, Object.class), is(new BigDecimal(40)));
assertThat(((BigDecimal) actual.getValue(2, Object.class)).intValue(), is(10));
@@ -104,29 +104,29 @@ public final class GroupByStreamMergedResultTest {
@Test
public void assertNextForMix() throws SQLException {
- ExecuteQueryResult queryResultSet1 = mockQueryResultSet();
- when(queryResultSet1.next()).thenReturn(true, false);
- when(queryResultSet1.getValue(1, Object.class)).thenReturn(20);
- when(queryResultSet1.getValue(2, Object.class)).thenReturn(0);
- when(queryResultSet1.getValue(3, Object.class)).thenReturn(2);
- when(queryResultSet1.getValue(5, Object.class)).thenReturn(2);
- when(queryResultSet1.getValue(6, Object.class)).thenReturn(20);
- ExecuteQueryResult queryResultSet2 = mockQueryResultSet();
- when(queryResultSet2.next()).thenReturn(true, true, true, false);
- when(queryResultSet2.getValue(1, Object.class)).thenReturn(20, 30, 30, 40);
- when(queryResultSet2.getValue(2, Object.class)).thenReturn(0);
- when(queryResultSet2.getValue(3, Object.class)).thenReturn(2, 2, 3, 3, 3, 4);
- when(queryResultSet2.getValue(5, Object.class)).thenReturn(2, 2, 3, 3, 3, 4);
- when(queryResultSet2.getValue(6, Object.class)).thenReturn(20, 20, 30, 30, 30, 40);
- ExecuteQueryResult queryResultSet3 = mockQueryResultSet();
- when(queryResultSet3.next()).thenReturn(true, true, false);
- when(queryResultSet3.getValue(1, Object.class)).thenReturn(10, 30);
- when(queryResultSet3.getValue(2, Object.class)).thenReturn(10);
- when(queryResultSet3.getValue(3, Object.class)).thenReturn(1, 1, 1, 1, 3);
- when(queryResultSet3.getValue(5, Object.class)).thenReturn(1, 1, 3);
- when(queryResultSet3.getValue(6, Object.class)).thenReturn(10, 10, 30);
+ ExecuteQueryResult queryResult1 = mockQueryResult();
+ when(queryResult1.next()).thenReturn(true, false);
+ when(queryResult1.getValue(1, Object.class)).thenReturn(20);
+ when(queryResult1.getValue(2, Object.class)).thenReturn(0);
+ when(queryResult1.getValue(3, Object.class)).thenReturn(2);
+ when(queryResult1.getValue(5, Object.class)).thenReturn(2);
+ when(queryResult1.getValue(6, Object.class)).thenReturn(20);
+ ExecuteQueryResult queryResult2 = mockQueryResult();
+ when(queryResult2.next()).thenReturn(true, true, true, false);
+ when(queryResult2.getValue(1, Object.class)).thenReturn(20, 30, 30, 40);
+ when(queryResult2.getValue(2, Object.class)).thenReturn(0);
+ when(queryResult2.getValue(3, Object.class)).thenReturn(2, 2, 3, 3, 3, 4);
+ when(queryResult2.getValue(5, Object.class)).thenReturn(2, 2, 3, 3, 3, 4);
+ when(queryResult2.getValue(6, Object.class)).thenReturn(20, 20, 30, 30, 30, 40);
+ ExecuteQueryResult queryResult3 = mockQueryResult();
+ when(queryResult3.next()).thenReturn(true, true, false);
+ when(queryResult3.getValue(1, Object.class)).thenReturn(10, 30);
+ when(queryResult3.getValue(2, Object.class)).thenReturn(10);
+ when(queryResult3.getValue(3, Object.class)).thenReturn(1, 1, 1, 1, 3);
+ when(queryResult3.getValue(5, Object.class)).thenReturn(1, 1, 3);
+ when(queryResult3.getValue(6, Object.class)).thenReturn(10, 10, 30);
ShardingDQLResultMerger resultMerger = new ShardingDQLResultMerger(DatabaseTypeRegistry.getActualDatabaseType("MySQL"));
- MergedResult actual = resultMerger.merge(Arrays.asList(queryResultSet1, queryResultSet2, queryResultSet3), createSelectStatementContext(), buildSchema());
+ MergedResult actual = resultMerger.merge(Arrays.asList(queryResult1, queryResult2, queryResult3), createSelectStatementContext(), buildSchema());
assertTrue(actual.next());
assertThat(actual.getValue(1, Object.class), is(new BigDecimal(10)));
assertThat(((BigDecimal) actual.getValue(2, Object.class)).intValue(), is(10));
@@ -185,7 +185,7 @@ public final class GroupByStreamMergedResultTest {
return new ShardingSphereSchema(ImmutableMap.of("tbl", tableMetaData));
}
- private ExecuteQueryResult mockQueryResultSet() throws SQLException {
+ private ExecuteQueryResult mockQueryResult() throws SQLException {
ExecuteQueryResult result = mock(ExecuteQueryResult.class);
when(result.getColumnCount()).thenReturn(6);
when(result.getColumnLabel(1)).thenReturn("COUNT(*)");
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByValueTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByValueTest.java
index e4fab20..be46fbd 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByValueTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByValueTest.java
@@ -40,17 +40,17 @@ import static org.mockito.Mockito.when;
public final class GroupByValueTest {
@Mock
- private ExecuteQueryResult queryResultSet;
+ private ExecuteQueryResult queryResult;
@Before
public void setUp() throws SQLException {
- when(queryResultSet.getValue(1, Object.class)).thenReturn("1");
- when(queryResultSet.getValue(3, Object.class)).thenReturn("3");
+ when(queryResult.getValue(1, Object.class)).thenReturn("1");
+ when(queryResult.getValue(3, Object.class)).thenReturn("3");
}
@Test
public void assertGetGroupByValues() throws SQLException {
- List<?> actual = new GroupByValue(queryResultSet, Arrays.asList(
+ List<?> actual = new GroupByValue(queryResult, Arrays.asList(
createOrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.ASC, OrderDirection.ASC)),
createOrderByItem(new IndexOrderByItemSegment(0, 0, 3, OrderDirection.DESC, OrderDirection.ASC)))).getGroupValues();
List<?> expected = Arrays.asList("1", "3");
@@ -59,10 +59,10 @@ public final class GroupByValueTest {
@Test
public void assertGroupByValueEquals() throws SQLException {
- GroupByValue groupByValue1 = new GroupByValue(queryResultSet, Arrays.asList(
+ GroupByValue groupByValue1 = new GroupByValue(queryResult, Arrays.asList(
createOrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.ASC, OrderDirection.ASC)),
createOrderByItem(new IndexOrderByItemSegment(0, 0, 3, OrderDirection.DESC, OrderDirection.ASC))));
- GroupByValue groupByValue2 = new GroupByValue(queryResultSet, Arrays.asList(
+ GroupByValue groupByValue2 = new GroupByValue(queryResult, Arrays.asList(
createOrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.ASC, OrderDirection.ASC)),
createOrderByItem(new IndexOrderByItemSegment(0, 0, 3, OrderDirection.DESC, OrderDirection.ASC))));
assertThat(groupByValue1, is(groupByValue2));
@@ -72,10 +72,10 @@ public final class GroupByValueTest {
@Test
public void assertGroupByValueNotEquals() throws SQLException {
- GroupByValue groupByValue1 = new GroupByValue(queryResultSet, Arrays.asList(
+ GroupByValue groupByValue1 = new GroupByValue(queryResult, Arrays.asList(
createOrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.ASC, OrderDirection.ASC)),
createOrderByItem(new IndexOrderByItemSegment(0, 0, 3, OrderDirection.DESC, OrderDirection.ASC))));
- GroupByValue groupByValue2 = new GroupByValue(queryResultSet, Arrays.asList(
+ GroupByValue groupByValue2 = new GroupByValue(queryResult, Arrays.asList(
createOrderByItem(new IndexOrderByItemSegment(0, 0, 3, OrderDirection.ASC, OrderDirection.ASC)),
createOrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.DESC, OrderDirection.ASC))));
assertThat(groupByValue1, not(groupByValue2));
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/iterator/IteratorStreamMergedResultTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/iterator/IteratorStreamMergedResultTest.java
index 0bd3357..e600cb3 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/iterator/IteratorStreamMergedResultTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/iterator/IteratorStreamMergedResultTest.java
@@ -53,20 +53,20 @@ public final class IteratorStreamMergedResultTest {
@Test
public void assertNextForResultSetsAllEmpty() throws SQLException {
- List<ExecuteQueryResult> queryResultSets = Arrays.asList(mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
+ List<ExecuteQueryResult> queryResults = Arrays.asList(mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
ShardingDQLResultMerger resultMerger = new ShardingDQLResultMerger(DatabaseTypeRegistry.getActualDatabaseType("MySQL"));
- MergedResult actual = resultMerger.merge(queryResultSets, selectStatementContext, null);
+ MergedResult actual = resultMerger.merge(queryResults, selectStatementContext, null);
assertFalse(actual.next());
}
@Test
public void assertNextForResultSetsAllNotEmpty() throws SQLException {
- List<ExecuteQueryResult> queryResultSets = Arrays.asList(mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
- for (ExecuteQueryResult each : queryResultSets) {
+ List<ExecuteQueryResult> queryResults = Arrays.asList(mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
+ for (ExecuteQueryResult each : queryResults) {
when(each.next()).thenReturn(true, false);
}
ShardingDQLResultMerger resultMerger = new ShardingDQLResultMerger(DatabaseTypeRegistry.getActualDatabaseType("MySQL"));
- MergedResult actual = resultMerger.merge(queryResultSets, selectStatementContext, null);
+ MergedResult actual = resultMerger.merge(queryResults, selectStatementContext, null);
assertTrue(actual.next());
assertTrue(actual.next());
assertTrue(actual.next());
@@ -75,43 +75,43 @@ public final class IteratorStreamMergedResultTest {
@Test
public void assertNextForFirstResultSetsNotEmptyOnly() throws SQLException {
- List<ExecuteQueryResult> queryResultSets = Arrays.asList(mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
- when(queryResultSets.get(0).next()).thenReturn(true, false);
+ List<ExecuteQueryResult> queryResults = Arrays.asList(mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
+ when(queryResults.get(0).next()).thenReturn(true, false);
ShardingDQLResultMerger resultMerger = new ShardingDQLResultMerger(DatabaseTypeRegistry.getActualDatabaseType("MySQL"));
- MergedResult actual = resultMerger.merge(queryResultSets, selectStatementContext, null);
+ MergedResult actual = resultMerger.merge(queryResults, selectStatementContext, null);
assertTrue(actual.next());
assertFalse(actual.next());
}
@Test
public void assertNextForMiddleResultSetsNotEmpty() throws SQLException {
- List<ExecuteQueryResult> queryResultSets = Arrays.asList(mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
- when(queryResultSets.get(1).next()).thenReturn(true, false);
+ List<ExecuteQueryResult> queryResults = Arrays.asList(mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
+ when(queryResults.get(1).next()).thenReturn(true, false);
ShardingDQLResultMerger resultMerger = new ShardingDQLResultMerger(DatabaseTypeRegistry.getActualDatabaseType("MySQL"));
- MergedResult actual = resultMerger.merge(queryResultSets, selectStatementContext, null);
+ MergedResult actual = resultMerger.merge(queryResults, selectStatementContext, null);
assertTrue(actual.next());
assertFalse(actual.next());
}
@Test
public void assertNextForLastResultSetsNotEmptyOnly() throws SQLException {
- List<ExecuteQueryResult> queryResultSets = Arrays.asList(mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
- when(queryResultSets.get(2).next()).thenReturn(true, false);
+ List<ExecuteQueryResult> queryResults = Arrays.asList(mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
+ when(queryResults.get(2).next()).thenReturn(true, false);
ShardingDQLResultMerger resultMerger = new ShardingDQLResultMerger(DatabaseTypeRegistry.getActualDatabaseType("MySQL"));
- MergedResult actual = resultMerger.merge(queryResultSets, selectStatementContext, null);
+ MergedResult actual = resultMerger.merge(queryResults, selectStatementContext, null);
assertTrue(actual.next());
assertFalse(actual.next());
}
@Test
public void assertNextForMix() throws SQLException {
- List<ExecuteQueryResult> queryResultSets = Arrays.asList(mock(ExecuteQueryResult.class),
+ List<ExecuteQueryResult> queryResults = Arrays.asList(mock(ExecuteQueryResult.class),
mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
- when(queryResultSets.get(1).next()).thenReturn(true, false);
- when(queryResultSets.get(3).next()).thenReturn(true, false);
- when(queryResultSets.get(5).next()).thenReturn(true, false);
+ when(queryResults.get(1).next()).thenReturn(true, false);
+ when(queryResults.get(3).next()).thenReturn(true, false);
+ when(queryResults.get(5).next()).thenReturn(true, false);
ShardingDQLResultMerger resultMerger = new ShardingDQLResultMerger(DatabaseTypeRegistry.getActualDatabaseType("MySQL"));
- MergedResult actual = resultMerger.merge(queryResultSets, selectStatementContext, null);
+ MergedResult actual = resultMerger.merge(queryResults, selectStatementContext, null);
assertTrue(actual.next());
assertTrue(actual.next());
assertTrue(actual.next());
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByStreamMergedResultTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByStreamMergedResultTest.java
index dc538c6..45a95a4 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByStreamMergedResultTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByStreamMergedResultTest.java
@@ -72,25 +72,25 @@ public final class OrderByStreamMergedResultTest {
@Test
public void assertNextForResultSetsAllEmpty() throws SQLException {
- List<ExecuteQueryResult> queryResultSets = Arrays.asList(mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
+ List<ExecuteQueryResult> queryResults = Arrays.asList(mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
ShardingDQLResultMerger resultMerger = new ShardingDQLResultMerger(DatabaseTypeRegistry.getActualDatabaseType("MySQL"));
- MergedResult actual = resultMerger.merge(queryResultSets, selectStatementContext, buildSchema());
+ MergedResult actual = resultMerger.merge(queryResults, selectStatementContext, buildSchema());
assertFalse(actual.next());
}
@Test
public void assertNextForSomeResultSetsEmpty() throws SQLException {
- List<ExecuteQueryResult> queryResultSets = Arrays.asList(mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
+ List<ExecuteQueryResult> queryResults = Arrays.asList(mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
for (int i = 0; i < 3; i++) {
- when(queryResultSets.get(i).getColumnName(1)).thenReturn("col1");
- when(queryResultSets.get(i).getColumnName(2)).thenReturn("col2");
+ when(queryResults.get(i).getColumnName(1)).thenReturn("col1");
+ when(queryResults.get(i).getColumnName(2)).thenReturn("col2");
}
ShardingDQLResultMerger resultMerger = new ShardingDQLResultMerger(DatabaseTypeRegistry.getActualDatabaseType("MySQL"));
- when(queryResultSets.get(0).next()).thenReturn(true, false);
- when(queryResultSets.get(0).getValue(1, Object.class)).thenReturn("2");
- when(queryResultSets.get(2).next()).thenReturn(true, true, false);
- when(queryResultSets.get(2).getValue(1, Object.class)).thenReturn("1", "1", "3", "3");
- MergedResult actual = resultMerger.merge(queryResultSets, selectStatementContext, buildSchema());
+ when(queryResults.get(0).next()).thenReturn(true, false);
+ when(queryResults.get(0).getValue(1, Object.class)).thenReturn("2");
+ when(queryResults.get(2).next()).thenReturn(true, true, false);
+ when(queryResults.get(2).getValue(1, Object.class)).thenReturn("1", "1", "3", "3");
+ MergedResult actual = resultMerger.merge(queryResults, selectStatementContext, buildSchema());
assertTrue(actual.next());
assertThat(actual.getValue(1, Object.class).toString(), is("1"));
assertTrue(actual.next());
@@ -102,19 +102,19 @@ public final class OrderByStreamMergedResultTest {
@Test
public void assertNextForMix() throws SQLException {
- List<ExecuteQueryResult> queryResultSets = Arrays.asList(mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
+ List<ExecuteQueryResult> queryResults = Arrays.asList(mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
for (int i = 0; i < 3; i++) {
- when(queryResultSets.get(i).getColumnName(1)).thenReturn("col1");
- when(queryResultSets.get(i).getColumnName(2)).thenReturn("col2");
+ when(queryResults.get(i).getColumnName(1)).thenReturn("col1");
+ when(queryResults.get(i).getColumnName(2)).thenReturn("col2");
}
ShardingDQLResultMerger resultMerger = new ShardingDQLResultMerger(DatabaseTypeRegistry.getActualDatabaseType("MySQL"));
- when(queryResultSets.get(0).next()).thenReturn(true, false);
- when(queryResultSets.get(0).getValue(1, Object.class)).thenReturn("2");
- when(queryResultSets.get(1).next()).thenReturn(true, true, true, false);
- when(queryResultSets.get(1).getValue(1, Object.class)).thenReturn("2", "2", "3", "3", "4", "4");
- when(queryResultSets.get(2).next()).thenReturn(true, true, false);
- when(queryResultSets.get(2).getValue(1, Object.class)).thenReturn("1", "1", "3", "3");
- MergedResult actual = resultMerger.merge(queryResultSets, selectStatementContext, buildSchema());
+ when(queryResults.get(0).next()).thenReturn(true, false);
+ when(queryResults.get(0).getValue(1, Object.class)).thenReturn("2");
+ when(queryResults.get(1).next()).thenReturn(true, true, true, false);
+ when(queryResults.get(1).getValue(1, Object.class)).thenReturn("2", "2", "3", "3", "4", "4");
+ when(queryResults.get(2).next()).thenReturn(true, true, false);
+ when(queryResults.get(2).getValue(1, Object.class)).thenReturn("1", "1", "3", "3");
+ MergedResult actual = resultMerger.merge(queryResults, selectStatementContext, buildSchema());
assertTrue(actual.next());
assertThat(actual.getValue(1, Object.class).toString(), is("1"));
assertTrue(actual.next());
@@ -132,19 +132,19 @@ public final class OrderByStreamMergedResultTest {
@Test
public void assertNextForCaseSensitive() throws SQLException {
- List<ExecuteQueryResult> queryResultSets = Arrays.asList(mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
+ List<ExecuteQueryResult> queryResults = Arrays.asList(mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
for (int i = 0; i < 3; i++) {
- when(queryResultSets.get(i).getColumnName(1)).thenReturn("col1");
- when(queryResultSets.get(i).getColumnName(2)).thenReturn("col2");
+ when(queryResults.get(i).getColumnName(1)).thenReturn("col1");
+ when(queryResults.get(i).getColumnName(2)).thenReturn("col2");
}
- when(queryResultSets.get(0).next()).thenReturn(true, false);
- when(queryResultSets.get(0).getValue(1, Object.class)).thenReturn("b");
- when(queryResultSets.get(1).next()).thenReturn(true, true, false);
- when(queryResultSets.get(1).getValue(1, Object.class)).thenReturn("B", "B", "a", "a");
- when(queryResultSets.get(2).next()).thenReturn(true, false);
- when(queryResultSets.get(2).getValue(1, Object.class)).thenReturn("A");
+ when(queryResults.get(0).next()).thenReturn(true, false);
+ when(queryResults.get(0).getValue(1, Object.class)).thenReturn("b");
+ when(queryResults.get(1).next()).thenReturn(true, true, false);
+ when(queryResults.get(1).getValue(1, Object.class)).thenReturn("B", "B", "a", "a");
+ when(queryResults.get(2).next()).thenReturn(true, false);
+ when(queryResults.get(2).getValue(1, Object.class)).thenReturn("A");
ShardingDQLResultMerger resultMerger = new ShardingDQLResultMerger(DatabaseTypeRegistry.getActualDatabaseType("MySQL"));
- MergedResult actual = resultMerger.merge(queryResultSets, selectStatementContext, buildSchema());
+ MergedResult actual = resultMerger.merge(queryResults, selectStatementContext, buildSchema());
assertTrue(actual.next());
assertThat(actual.getValue(1, Object.class).toString(), is("A"));
assertTrue(actual.next());
@@ -158,19 +158,19 @@ public final class OrderByStreamMergedResultTest {
@Test
public void assertNextForCaseInsensitive() throws SQLException {
- List<ExecuteQueryResult> queryResultSets = Arrays.asList(mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
+ List<ExecuteQueryResult> queryResults = Arrays.asList(mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class), mock(ExecuteQueryResult.class));
for (int i = 0; i < 3; i++) {
- when(queryResultSets.get(i).getColumnName(1)).thenReturn("col1");
- when(queryResultSets.get(i).getColumnName(2)).thenReturn("col2");
+ when(queryResults.get(i).getColumnName(1)).thenReturn("col1");
+ when(queryResults.get(i).getColumnName(2)).thenReturn("col2");
}
- when(queryResultSets.get(0).next()).thenReturn(true, false);
- when(queryResultSets.get(0).getValue(2, Object.class)).thenReturn("b");
- when(queryResultSets.get(1).next()).thenReturn(true, true, false);
- when(queryResultSets.get(1).getValue(2, Object.class)).thenReturn("a", "a", "B", "B");
- when(queryResultSets.get(2).next()).thenReturn(true, false);
- when(queryResultSets.get(2).getValue(2, Object.class)).thenReturn("A");
+ when(queryResults.get(0).next()).thenReturn(true, false);
+ when(queryResults.get(0).getValue(2, Object.class)).thenReturn("b");
+ when(queryResults.get(1).next()).thenReturn(true, true, false);
+ when(queryResults.get(1).getValue(2, Object.class)).thenReturn("a", "a", "B", "B");
+ when(queryResults.get(2).next()).thenReturn(true, false);
+ when(queryResults.get(2).getValue(2, Object.class)).thenReturn("A");
ShardingDQLResultMerger resultMerger = new ShardingDQLResultMerger(DatabaseTypeRegistry.getActualDatabaseType("MySQL"));
- MergedResult actual = resultMerger.merge(queryResultSets, selectStatementContext, buildSchema());
+ MergedResult actual = resultMerger.merge(queryResults, selectStatementContext, buildSchema());
assertTrue(actual.next());
assertThat(actual.getValue(2, Object.class).toString(), is("a"));
assertTrue(actual.next());
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByValueTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByValueTest.java
index 477950f..6fcdd3d 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByValueTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/orderby/OrderByValueTest.java
@@ -87,23 +87,23 @@ public final class OrderByValueTest {
SelectStatementContext selectStatementContext = new SelectStatementContext(
selectStatement, new GroupByContext(Collections.emptyList(), 0), createOrderBy(), createProjectionsContext(), null);
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
- ExecuteQueryResult queryResultSet1 = createQueryResultSet("1", "2");
- OrderByValue orderByValue1 = new OrderByValue(queryResultSet1, Arrays.asList(
+ ExecuteQueryResult queryResult1 = createQueryResult("1", "2");
+ OrderByValue orderByValue1 = new OrderByValue(queryResult1, Arrays.asList(
createOrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.ASC, OrderDirection.ASC)),
createOrderByItem(new IndexOrderByItemSegment(0, 0, 2, OrderDirection.ASC, OrderDirection.ASC))),
selectStatementContext, schema);
FieldSetter.setField(orderByValue1, OrderByValue.class.getDeclaredField("orderValuesCaseSensitive"), Arrays.asList(false, false));
assertTrue(orderByValue1.next());
- ExecuteQueryResult queryResultSet2 = createQueryResultSet("3", "4");
- OrderByValue orderByValue2 = new OrderByValue(queryResultSet2, Arrays.asList(
+ ExecuteQueryResult queryResult2 = createQueryResult("3", "4");
+ OrderByValue orderByValue2 = new OrderByValue(queryResult2, Arrays.asList(
createOrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.ASC, OrderDirection.ASC)),
createOrderByItem(new IndexOrderByItemSegment(0, 0, 2, OrderDirection.ASC, OrderDirection.ASC))),
selectStatementContext, schema);
FieldSetter.setField(orderByValue2, OrderByValue.class.getDeclaredField("orderValuesCaseSensitive"), Arrays.asList(false, false));
assertTrue(orderByValue2.next());
assertTrue(orderByValue1.compareTo(orderByValue2) < 0);
- assertFalse(orderByValue1.getQueryResultSet().next());
- assertFalse(orderByValue2.getQueryResultSet().next());
+ assertFalse(orderByValue1.getQueryResult().next());
+ assertFalse(orderByValue2.getQueryResult().next());
}
@Test
@@ -137,23 +137,23 @@ public final class OrderByValueTest {
SelectStatementContext selectStatementContext = new SelectStatementContext(
selectStatement, new GroupByContext(Collections.emptyList(), 0), createOrderBy(), createProjectionsContext(), null);
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
- ExecuteQueryResult queryResultSet1 = createQueryResultSet("1", "2");
- OrderByValue orderByValue1 = new OrderByValue(queryResultSet1, Arrays.asList(
+ ExecuteQueryResult queryResult1 = createQueryResult("1", "2");
+ OrderByValue orderByValue1 = new OrderByValue(queryResult1, Arrays.asList(
createOrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.DESC, OrderDirection.ASC)),
createOrderByItem(new IndexOrderByItemSegment(0, 0, 2, OrderDirection.DESC, OrderDirection.ASC))),
selectStatementContext, schema);
FieldSetter.setField(orderByValue1, OrderByValue.class.getDeclaredField("orderValuesCaseSensitive"), Arrays.asList(false, false));
assertTrue(orderByValue1.next());
- ExecuteQueryResult queryResultSet2 = createQueryResultSet("3", "4");
- OrderByValue orderByValue2 = new OrderByValue(queryResultSet2, Arrays.asList(
+ ExecuteQueryResult queryResult2 = createQueryResult("3", "4");
+ OrderByValue orderByValue2 = new OrderByValue(queryResult2, Arrays.asList(
createOrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.DESC, OrderDirection.ASC)),
createOrderByItem(new IndexOrderByItemSegment(0, 0, 2, OrderDirection.DESC, OrderDirection.ASC))),
selectStatementContext, schema);
FieldSetter.setField(orderByValue2, OrderByValue.class.getDeclaredField("orderValuesCaseSensitive"), Arrays.asList(false, false));
assertTrue(orderByValue2.next());
assertTrue(orderByValue1.compareTo(orderByValue2) > 0);
- assertFalse(orderByValue1.getQueryResultSet().next());
- assertFalse(orderByValue2.getQueryResultSet().next());
+ assertFalse(orderByValue1.getQueryResult().next());
+ assertFalse(orderByValue2.getQueryResult().next());
}
@Test
@@ -187,26 +187,26 @@ public final class OrderByValueTest {
SelectStatementContext selectStatementContext = new SelectStatementContext(
selectStatement, new GroupByContext(Collections.emptyList(), 0), createOrderBy(), createProjectionsContext(), null);
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
- ExecuteQueryResult queryResultSet1 = createQueryResultSet("1", "2");
- OrderByValue orderByValue1 = new OrderByValue(queryResultSet1, Arrays.asList(
+ ExecuteQueryResult queryResult1 = createQueryResult("1", "2");
+ OrderByValue orderByValue1 = new OrderByValue(queryResult1, Arrays.asList(
createOrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.ASC, OrderDirection.ASC)),
createOrderByItem(new IndexOrderByItemSegment(0, 0, 2, OrderDirection.DESC, OrderDirection.ASC))),
selectStatementContext, schema);
FieldSetter.setField(orderByValue1, OrderByValue.class.getDeclaredField("orderValuesCaseSensitive"), Arrays.asList(false, false));
assertTrue(orderByValue1.next());
- ExecuteQueryResult queryResultSet2 = createQueryResultSet("1", "2");
- OrderByValue orderByValue2 = new OrderByValue(queryResultSet2, Arrays.asList(
+ ExecuteQueryResult queryResult2 = createQueryResult("1", "2");
+ OrderByValue orderByValue2 = new OrderByValue(queryResult2, Arrays.asList(
createOrderByItem(new IndexOrderByItemSegment(0, 0, 1, OrderDirection.ASC, OrderDirection.ASC)),
createOrderByItem(new IndexOrderByItemSegment(0, 0, 2, OrderDirection.DESC, OrderDirection.ASC))),
selectStatementContext, schema);
FieldSetter.setField(orderByValue2, OrderByValue.class.getDeclaredField("orderValuesCaseSensitive"), Arrays.asList(false, false));
assertTrue(orderByValue2.next());
assertThat(orderByValue1.compareTo(orderByValue2), is(0));
- assertFalse(orderByValue1.getQueryResultSet().next());
- assertFalse(orderByValue2.getQueryResultSet().next());
+ assertFalse(orderByValue1.getQueryResult().next());
+ assertFalse(orderByValue2.getQueryResult().next());
}
- private ExecuteQueryResult createQueryResultSet(final String... values) throws SQLException {
+ private ExecuteQueryResult createQueryResult(final String... values) throws SQLException {
ExecuteQueryResult result = mock(ExecuteQueryResult.class);
when(result.next()).thenReturn(true, false);
for (int i = 0; i < values.length; i++) {
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/pagination/LimitDecoratorMergedResultTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/pagination/LimitDecoratorMergedResultTest.java
index ce26b1e..354642f 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/pagination/LimitDecoratorMergedResultTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/pagination/LimitDecoratorMergedResultTest.java
@@ -48,7 +48,7 @@ public final class LimitDecoratorMergedResultTest {
new GroupByContext(Collections.emptyList(), 0), new OrderByContext(Collections.emptyList(), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralLimitValueSegment(0, 0, Integer.MAX_VALUE), null, Collections.emptyList()));
- MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet()), selectStatementContext, null);
+ MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResult(), mockQueryResult(), mockQueryResult(), mockQueryResult()), selectStatementContext, null);
assertFalse(actual.next());
}
@@ -59,7 +59,7 @@ public final class LimitDecoratorMergedResultTest {
new GroupByContext(Collections.emptyList(), 0), new OrderByContext(Collections.emptyList(), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralLimitValueSegment(0, 0, 2), null, Collections.emptyList()));
- MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet()), selectStatementContext, null);
+ MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResult(), mockQueryResult(), mockQueryResult(), mockQueryResult()), selectStatementContext, null);
for (int i = 0; i < 6; i++) {
assertTrue(actual.next());
}
@@ -73,13 +73,13 @@ public final class LimitDecoratorMergedResultTest {
new GroupByContext(Collections.emptyList(), 0), new OrderByContext(Collections.emptyList(), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralLimitValueSegment(0, 0, 2), new NumberLiteralLimitValueSegment(0, 0, 2), Collections.emptyList()));
- MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet()), selectStatementContext, null);
+ MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResult(), mockQueryResult(), mockQueryResult(), mockQueryResult()), selectStatementContext, null);
assertTrue(actual.next());
assertTrue(actual.next());
assertFalse(actual.next());
}
- private ExecuteQueryResult mockQueryResultSet() throws SQLException {
+ private ExecuteQueryResult mockQueryResult() throws SQLException {
ExecuteQueryResult result = mock(ExecuteQueryResult.class);
when(result.next()).thenReturn(true, true, false);
return result;
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/pagination/RowNumberDecoratorMergedResultTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/pagination/RowNumberDecoratorMergedResultTest.java
index e361ba7..4af643c 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/pagination/RowNumberDecoratorMergedResultTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/pagination/RowNumberDecoratorMergedResultTest.java
@@ -48,7 +48,7 @@ public final class RowNumberDecoratorMergedResultTest {
new GroupByContext(Collections.emptyList(), 0), new OrderByContext(Collections.emptyList(), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralRowNumberValueSegment(0, 0, Integer.MAX_VALUE, true), null, Collections.emptyList()));
- MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet()), selectStatementContext, null);
+ MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResult(), mockQueryResult(), mockQueryResult(), mockQueryResult()), selectStatementContext, null);
assertFalse(actual.next());
}
@@ -58,7 +58,7 @@ public final class RowNumberDecoratorMergedResultTest {
SelectStatementContext selectStatementContext = new SelectStatementContext(new OracleSelectStatement(),
new GroupByContext(Collections.emptyList(), 0), new OrderByContext(Collections.emptyList(), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()), new PaginationContext(null, null, Collections.emptyList()));
- MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet()), selectStatementContext, null);
+ MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResult(), mockQueryResult(), mockQueryResult(), mockQueryResult()), selectStatementContext, null);
for (int i = 0; i < 8; i++) {
assertTrue(actual.next());
}
@@ -72,7 +72,7 @@ public final class RowNumberDecoratorMergedResultTest {
new GroupByContext(Collections.emptyList(), 0), new OrderByContext(Collections.emptyList(), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralRowNumberValueSegment(0, 0, 2, true), new NumberLiteralRowNumberValueSegment(0, 0, 4, false), Collections.emptyList()));
- MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet()), selectStatementContext, null);
+ MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResult(), mockQueryResult(), mockQueryResult(), mockQueryResult()), selectStatementContext, null);
assertTrue(actual.next());
assertTrue(actual.next());
assertFalse(actual.next());
@@ -85,14 +85,14 @@ public final class RowNumberDecoratorMergedResultTest {
new GroupByContext(Collections.emptyList(), 0), new OrderByContext(Collections.emptyList(), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralRowNumberValueSegment(0, 0, 2, true), new NumberLiteralRowNumberValueSegment(0, 0, 4, true), Collections.emptyList()));
- MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet()), selectStatementContext, null);
+ MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResult(), mockQueryResult(), mockQueryResult(), mockQueryResult()), selectStatementContext, null);
assertTrue(actual.next());
assertTrue(actual.next());
assertTrue(actual.next());
assertFalse(actual.next());
}
- private ExecuteQueryResult mockQueryResultSet() throws SQLException {
+ private ExecuteQueryResult mockQueryResult() throws SQLException {
ExecuteQueryResult result = mock(ExecuteQueryResult.class);
when(result.next()).thenReturn(true, true, false);
return result;
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/pagination/TopAndRowNumberDecoratorMergedResultTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/pagination/TopAndRowNumberDecoratorMergedResultTest.java
index 74be512..acdb0db 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/pagination/TopAndRowNumberDecoratorMergedResultTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-merge/src/test/java/org/apache/shardingsphere/sharding/merge/dql/pagination/TopAndRowNumberDecoratorMergedResultTest.java
@@ -49,7 +49,7 @@ public final class TopAndRowNumberDecoratorMergedResultTest {
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralRowNumberValueSegment(0, 0, Integer.MAX_VALUE, true), null, Collections.emptyList()));
ShardingDQLResultMerger resultMerger = new ShardingDQLResultMerger(DatabaseTypeRegistry.getActualDatabaseType("SQLServer"));
- MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet()), selectStatementContext, null);
+ MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResult(), mockQueryResult(), mockQueryResult(), mockQueryResult()), selectStatementContext, null);
assertFalse(actual.next());
}
@@ -60,7 +60,7 @@ public final class TopAndRowNumberDecoratorMergedResultTest {
new GroupByContext(Collections.emptyList(), 0), new OrderByContext(Collections.emptyList(), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(null, new NumberLiteralLimitValueSegment(0, 0, 5), Collections.emptyList()));
- MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet()), selectStatementContext, null);
+ MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResult(), mockQueryResult(), mockQueryResult(), mockQueryResult()), selectStatementContext, null);
for (int i = 0; i < 5; i++) {
assertTrue(actual.next());
}
@@ -74,7 +74,7 @@ public final class TopAndRowNumberDecoratorMergedResultTest {
new GroupByContext(Collections.emptyList(), 0), new OrderByContext(Collections.emptyList(), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralRowNumberValueSegment(0, 0, 2, true), null, Collections.emptyList()));
- MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet()), selectStatementContext, null);
+ MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResult(), mockQueryResult(), mockQueryResult(), mockQueryResult()), selectStatementContext, null);
for (int i = 0; i < 7; i++) {
assertTrue(actual.next());
}
@@ -88,7 +88,7 @@ public final class TopAndRowNumberDecoratorMergedResultTest {
new GroupByContext(Collections.emptyList(), 0), new OrderByContext(Collections.emptyList(), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralRowNumberValueSegment(0, 0, 2, false), new NumberLiteralLimitValueSegment(0, 0, 4), Collections.emptyList()));
- MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet()), selectStatementContext, null);
+ MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResult(), mockQueryResult(), mockQueryResult(), mockQueryResult()), selectStatementContext, null);
assertTrue(actual.next());
assertTrue(actual.next());
assertFalse(actual.next());
@@ -101,14 +101,14 @@ public final class TopAndRowNumberDecoratorMergedResultTest {
new GroupByContext(Collections.emptyList(), 0), new OrderByContext(Collections.emptyList(), false),
new ProjectionsContext(0, 0, false, Collections.emptyList()),
new PaginationContext(new NumberLiteralRowNumberValueSegment(0, 0, 2, true), new NumberLiteralLimitValueSegment(0, 0, 4), Collections.emptyList()));
- MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet(), mockQueryResultSet()), selectStatementContext, null);
+ MergedResult actual = resultMerger.merge(Arrays.asList(mockQueryResult(), mockQueryResult(), mockQueryResult(), mockQueryResult()), selectStatementContext, null);
assertTrue(actual.next());
assertTrue(actual.next());
assertTrue(actual.next());
assertFalse(actual.next());
}
- private ExecuteQueryResult mockQueryResultSet() throws SQLException {
+ private ExecuteQueryResult mockQueryResult() throws SQLException {
ExecuteQueryResult result = mock(ExecuteQueryResult.class);
when(result.next()).thenReturn(true, true, false);
return result;
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/ExecuteQueryResult.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/ExecuteQueryResult.java
new file mode 100644
index 0000000..8a04745
--- /dev/null
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/ExecuteQueryResult.java
@@ -0,0 +1,175 @@
+/*
+ * 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.executor.sql.execute.result.query;
+
+import org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
+
+import java.io.InputStream;
+import java.sql.SQLException;
+import java.util.Calendar;
+
+/**
+ * Execute query result.
+ */
+public interface ExecuteQueryResult extends ExecuteResult {
+
+ /**
+ * Iterate next data.
+ *
+ * @return has next data
+ * @throws SQLException SQL Exception
+ */
+ boolean next() throws SQLException;
+
+ /**
+ * Get data value.
+ *
+ * @param columnIndex column index
+ * @param type class type of data value
+ * @return data value
+ * @throws SQLException SQL Exception
+ */
+ Object getValue(int columnIndex, Class<?> type) throws SQLException;
+
+ /**
+ * Get calendar value.
+ *
+ * @param columnIndex column index
+ * @param type class type of data value
+ * @param calendar calendar
+ * @return calendar value
+ * @throws SQLException SQL Exception
+ */
+ Object getCalendarValue(int columnIndex, Class<?> type, Calendar calendar) throws SQLException;
+
+ /**
+ * Get InputStream.
+ *
+ * @param columnIndex column index
+ * @param type class type of data value
+ * @return InputStream
+ * @throws SQLException SQL Exception
+ */
+ InputStream getInputStream(int columnIndex, String type) throws SQLException;
+
+ /**
+ * Judge ResultSet is null or not.
+ *
+ * @return ResultSet is null or not
+ * @throws SQLException SQL Exception
+ */
+ boolean wasNull() throws SQLException;
+
+ /**
+ * Get column count.
+ *
+ * @return column count
+ * @throws SQLException SQL Exception
+ */
+ int getColumnCount() throws SQLException;
+
+ /**
+ * Get table name.
+ *
+ * @param columnIndex column index
+ * @return table name
+ * @throws SQLException SQL Exception
+ */
+ String getTableName(int columnIndex) throws SQLException;
+
+ /**
+ * Get column name.
+ *
+ * @param columnIndex column index
+ * @return column name
+ * @throws SQLException SQL Exception
+ */
+ String getColumnName(int columnIndex) throws SQLException;
+
+ /**
+ * Get column label.
+ *
+ * @param columnIndex column index
+ * @return column label
+ * @throws SQLException SQL Exception
+ */
+ String getColumnLabel(int columnIndex) throws SQLException;
+
+ /**
+ * Get column type.
+ *
+ * @param columnIndex column index
+ * @return column type
+ * @throws SQLException SQL Exception
+ */
+ int getColumnType(int columnIndex) throws SQLException;
+
+ /**
+ * Get column type name.
+ *
+ * @param columnIndex column index
+ * @return column type name
+ * @throws SQLException SQL Exception
+ */
+ String getColumnTypeName(int columnIndex) throws SQLException;
+
+ /**
+ * Get column length.
+ *
+ * @param columnIndex column index
+ * @return column length
+ * @throws SQLException SQL Exception
+ */
+ int getColumnLength(int columnIndex) throws SQLException;
+
+ /**
+ * Get decimals.
+ *
+ * @param columnIndex column index
+ * @return decimals
+ * @throws SQLException SQL Exception
+ */
+ int getDecimals(int columnIndex) throws SQLException;
+
+ /**
+ * Is signed.
+ *
+ * @param columnIndex column index
+ * @return signed or not
+ * @throws SQLException SQL Exception
+ */
+ boolean isSigned(int columnIndex) throws SQLException;
+
+ /**
+ * Is not null.
+ *
+ * @param columnIndex column index
+ * @return not null or null
+ * @throws SQLException SQL Exception
+ */
+ boolean isNotNull(int columnIndex) throws SQLException;
+
+ /**
+ * Is auto increment.
+ *
+ * @param columnIndex column index
+ * @return auto increment or not
+ * @throws SQLException SQL Exception
+ */
+ boolean isAutoIncrement(int columnIndex) throws SQLException;
+}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/AbstractJDBCQueryResultSet.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/AbstractJDBCQueryResult.java
similarity index 96%
rename from shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/AbstractJDBCQueryResultSet.java
rename to shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/AbstractJDBCQueryResult.java
index 03aaba0..5d69ef7 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/AbstractJDBCQueryResultSet.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/AbstractJDBCQueryResult.java
@@ -24,10 +24,10 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException;
/**
- * Abstract JDBC query result set.
+ * Abstract JDBC query result.
*/
@RequiredArgsConstructor
-public abstract class AbstractJDBCQueryResultSet implements ExecuteQueryResult {
+public abstract class AbstractJDBCQueryResult implements ExecuteQueryResult {
private final ResultSetMetaData resultSetMetaData;
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/MemoryJDBCQueryResultSet.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/MemoryJDBCQueryResult.java
similarity index 96%
rename from shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/MemoryJDBCQueryResultSet.java
rename to shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/MemoryJDBCQueryResult.java
index f621f32..5fbf319 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/MemoryJDBCQueryResultSet.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/MemoryJDBCQueryResult.java
@@ -37,15 +37,15 @@ import java.util.LinkedList;
import java.util.List;
/**
- * JDBC query result set for memory loading.
+ * JDBC query result for memory loading.
*/
-public final class MemoryJDBCQueryResultSet extends AbstractJDBCQueryResultSet {
+public final class MemoryJDBCQueryResult extends AbstractJDBCQueryResult {
private final Iterator<List<Object>> rows;
private List<Object> currentRow;
- public MemoryJDBCQueryResultSet(final ResultSet resultSet) throws SQLException {
+ public MemoryJDBCQueryResult(final ResultSet resultSet) throws SQLException {
super(resultSet.getMetaData());
rows = loadRows(resultSet);
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/StreamJDBCQueryResultSet.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/StreamJDBCQueryResult.java
similarity index 95%
rename from shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/StreamJDBCQueryResultSet.java
rename to shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/StreamJDBCQueryResult.java
index c19fd8c..203ca7c 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/StreamJDBCQueryResultSet.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/StreamJDBCQueryResult.java
@@ -30,13 +30,13 @@ import java.sql.Timestamp;
import java.util.Calendar;
/**
- * JDBC query result set for stream loading.
+ * JDBC query result for stream loading.
*/
-public final class StreamJDBCQueryResultSet extends AbstractJDBCQueryResultSet {
+public final class StreamJDBCQueryResult extends AbstractJDBCQueryResult {
private final ResultSet resultSet;
- public StreamJDBCQueryResultSet(final ResultSet resultSet) throws SQLException {
+ public StreamJDBCQueryResult(final ResultSet resultSet) throws SQLException {
super(resultSet.getMetaData());
this.resultSet = resultSet;
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/raw/RawQueryResultSet.java b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/raw/RawQueryResult.java
similarity index 95%
rename from shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/raw/RawQueryResultSet.java
rename to shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/raw/RawQueryResult.java
index 3925b7c..c8c436f 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/raw/RawQueryResultSet.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/raw/RawQueryResult.java
@@ -31,9 +31,9 @@ import java.util.Iterator;
import java.util.List;
/**
- * Raw query result set.
+ * Raw query result.
*/
-public final class RawQueryResultSet implements ExecuteQueryResult {
+public final class RawQueryResult implements ExecuteQueryResult {
private final QueryResultMetaData metaData;
@@ -41,7 +41,7 @@ public final class RawQueryResultSet implements ExecuteQueryResult {
private QueryResultRow currentRow;
- public RawQueryResultSet(final QueryResultMetaData metaData, final List<QueryResultRow> rows) {
+ public RawQueryResult(final QueryResultMetaData metaData, final List<QueryResultRow> rows) {
this.metaData = metaData;
this.rows = rows.iterator();
}
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/AbstractJDBCQueryResultTest.java b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/AbstractJDBCQueryResultTest.java
index 7d2fe26..291afb2 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/AbstractJDBCQueryResultTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/AbstractJDBCQueryResultTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc;
-import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.fixture.AbstractJDBCQueryResultSetFixture;
+import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.fixture.AbstractJDBCQueryResultFixture;
import org.junit.Before;
import org.junit.Test;
@@ -31,11 +31,11 @@ import static org.mockito.Mockito.when;
public final class AbstractJDBCQueryResultTest {
- private AbstractJDBCQueryResultSetFixture queryResult;
+ private AbstractJDBCQueryResultFixture queryResult;
@Before
public void setUp() throws SQLException {
- queryResult = new AbstractJDBCQueryResultSetFixture(mockResultSetMetaData());
+ queryResult = new AbstractJDBCQueryResultFixture(mockResultSetMetaData());
}
private ResultSetMetaData mockResultSetMetaData() throws SQLException {
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/MemoryJDBCQueryResultTest.java b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/MemoryJDBCQueryResultTest.java
index cb8292c..71543b4 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/MemoryJDBCQueryResultTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/MemoryJDBCQueryResultTest.java
@@ -53,14 +53,14 @@ public final class MemoryJDBCQueryResultTest {
public void assertConstructorWithSqlException() throws SQLException {
ResultSet resultSet = mockResultSet();
when(resultSet.next()).thenThrow(new SQLException(""));
- new MemoryJDBCQueryResultSet(resultSet);
+ new MemoryJDBCQueryResult(resultSet);
}
@Test
public void assertNext() throws SQLException {
- MemoryJDBCQueryResultSet queryResultSet = new MemoryJDBCQueryResultSet(mockResultSet());
- assertTrue(queryResultSet.next());
- assertFalse(queryResultSet.next());
+ MemoryJDBCQueryResult queryResult = new MemoryJDBCQueryResult(mockResultSet());
+ assertTrue(queryResult.next());
+ assertFalse(queryResult.next());
}
@Test
@@ -71,7 +71,7 @@ public final class MemoryJDBCQueryResultTest {
ResultSetMetaData resultSetMetaData = mock(ResultSetMetaData.class);
when(resultSetMetaData.getColumnCount()).thenReturn(1);
when(resultSet.getMetaData()).thenReturn(resultSetMetaData);
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertNull(actual.getValue(1, boolean.class));
assertFalse(actual.next());
@@ -81,7 +81,7 @@ public final class MemoryJDBCQueryResultTest {
public void assertGetValueByBoolean() throws SQLException {
ResultSet resultSet = getMockedResultSet(Types.BOOLEAN);
when(resultSet.getBoolean(1)).thenReturn(true);
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertTrue((boolean) actual.getValue(1, boolean.class));
assertFalse(actual.next());
@@ -91,7 +91,7 @@ public final class MemoryJDBCQueryResultTest {
public void assertGetValueByTinyInt() throws SQLException {
ResultSet resultSet = getMockedResultSet(Types.TINYINT);
when(resultSet.getInt(1)).thenReturn(1);
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, int.class), is(1));
assertFalse(actual.next());
@@ -101,7 +101,7 @@ public final class MemoryJDBCQueryResultTest {
public void assertGetValueBySmallInt() throws SQLException {
ResultSet resultSet = getMockedResultSet(Types.SMALLINT);
when(resultSet.getInt(1)).thenReturn(1);
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, int.class), is(1));
assertFalse(actual.next());
@@ -112,7 +112,7 @@ public final class MemoryJDBCQueryResultTest {
ResultSet resultSet = getMockedResultSet(Types.INTEGER);
when(resultSet.getInt(1)).thenReturn(1);
when(resultSet.getMetaData().isSigned(1)).thenReturn(true);
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, int.class), is(1));
assertFalse(actual.next());
@@ -123,7 +123,7 @@ public final class MemoryJDBCQueryResultTest {
ResultSet resultSet = getMockedResultSet(Types.INTEGER);
when(resultSet.getLong(1)).thenReturn(1L);
when(resultSet.getMetaData().isSigned(1)).thenReturn(false);
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, int.class), is(1L));
assertFalse(actual.next());
@@ -134,7 +134,7 @@ public final class MemoryJDBCQueryResultTest {
ResultSet resultSet = getMockedResultSet(Types.BIGINT);
when(resultSet.getLong(1)).thenReturn(1L);
when(resultSet.getMetaData().isSigned(1)).thenReturn(true);
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, long.class), is(1L));
assertFalse(actual.next());
@@ -145,7 +145,7 @@ public final class MemoryJDBCQueryResultTest {
ResultSet resultSet = getMockedResultSet(Types.BIGINT);
when(resultSet.getBigDecimal(1)).thenReturn(new BigDecimal("1"));
when(resultSet.getMetaData().isSigned(1)).thenReturn(false);
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, long.class), is(new BigDecimal("1").toBigInteger()));
assertFalse(actual.next());
@@ -155,7 +155,7 @@ public final class MemoryJDBCQueryResultTest {
public void assertGetValueByNumeric() throws SQLException {
ResultSet resultSet = getMockedResultSet(Types.NUMERIC);
when(resultSet.getBigDecimal(1)).thenReturn(new BigDecimal("1"));
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, BigDecimal.class), is(new BigDecimal("1")));
assertFalse(actual.next());
@@ -165,7 +165,7 @@ public final class MemoryJDBCQueryResultTest {
public void assertGetValueByDecimal() throws SQLException {
ResultSet resultSet = getMockedResultSet(Types.DECIMAL);
when(resultSet.getBigDecimal(1)).thenReturn(new BigDecimal("1"));
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, BigDecimal.class), is(new BigDecimal("1")));
assertFalse(actual.next());
@@ -175,7 +175,7 @@ public final class MemoryJDBCQueryResultTest {
public void assertGetValueByFloat() throws SQLException {
ResultSet resultSet = getMockedResultSet(Types.FLOAT);
when(resultSet.getDouble(1)).thenReturn(1.0D);
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, double.class), is(1.0D));
assertFalse(actual.next());
@@ -185,7 +185,7 @@ public final class MemoryJDBCQueryResultTest {
public void assertGetValueByDouble() throws SQLException {
ResultSet resultSet = getMockedResultSet(Types.DOUBLE);
when(resultSet.getDouble(1)).thenReturn(1.0D);
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, double.class), is(1.0D));
assertFalse(actual.next());
@@ -195,7 +195,7 @@ public final class MemoryJDBCQueryResultTest {
public void assertGetValueByChar() throws SQLException {
ResultSet resultSet = getMockedResultSet(Types.CHAR);
when(resultSet.getString(1)).thenReturn("value");
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, String.class), is("value"));
assertFalse(actual.next());
@@ -205,7 +205,7 @@ public final class MemoryJDBCQueryResultTest {
public void assertGetValueByVarchar() throws SQLException {
ResultSet resultSet = getMockedResultSet(Types.VARCHAR);
when(resultSet.getString(1)).thenReturn("value");
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, String.class), is("value"));
assertFalse(actual.next());
@@ -215,7 +215,7 @@ public final class MemoryJDBCQueryResultTest {
public void assertGetValueByLongVarchar() throws SQLException {
ResultSet resultSet = getMockedResultSet(Types.LONGVARCHAR);
when(resultSet.getString(1)).thenReturn("value");
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, String.class), is("value"));
assertFalse(actual.next());
@@ -225,7 +225,7 @@ public final class MemoryJDBCQueryResultTest {
public void assertGetValueByDate() throws SQLException {
ResultSet resultSet = getMockedResultSet(Types.DATE);
when(resultSet.getDate(1)).thenReturn(new Date(0L));
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, Date.class), is(new Date(0L)));
assertFalse(actual.next());
@@ -235,7 +235,7 @@ public final class MemoryJDBCQueryResultTest {
public void assertGetValueByTime() throws SQLException {
ResultSet resultSet = getMockedResultSet(Types.TIME);
when(resultSet.getTime(1)).thenReturn(new Time(0L));
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, Time.class), is(new Time(0L)));
assertFalse(actual.next());
@@ -245,7 +245,7 @@ public final class MemoryJDBCQueryResultTest {
public void assertGetValueByTimestamp() throws SQLException {
ResultSet resultSet = getMockedResultSet(Types.TIMESTAMP);
when(resultSet.getTimestamp(1)).thenReturn(new Timestamp(0L));
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, Timestamp.class), is(new Timestamp(0L)));
assertFalse(actual.next());
@@ -256,7 +256,7 @@ public final class MemoryJDBCQueryResultTest {
ResultSet resultSet = getMockedResultSet(Types.CLOB);
Clob value = mock(Clob.class);
when(resultSet.getClob(1)).thenReturn(value);
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, Clob.class), is(value));
assertFalse(actual.next());
@@ -267,7 +267,7 @@ public final class MemoryJDBCQueryResultTest {
ResultSet resultSet = getMockedResultSet(Types.BLOB);
Blob value = mock(Blob.class);
when(resultSet.getBlob(1)).thenReturn(value);
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, Blob.class), is(value));
assertFalse(actual.next());
@@ -278,7 +278,7 @@ public final class MemoryJDBCQueryResultTest {
ResultSet resultSet = getMockedResultSet(Types.BINARY);
Blob value = mock(Blob.class);
when(resultSet.getBlob(1)).thenReturn(value);
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, Blob.class), is(value));
assertFalse(actual.next());
@@ -289,7 +289,7 @@ public final class MemoryJDBCQueryResultTest {
ResultSet resultSet = getMockedResultSet(Types.VARBINARY);
Blob value = mock(Blob.class);
when(resultSet.getBlob(1)).thenReturn(value);
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, Blob.class), is(value));
assertFalse(actual.next());
@@ -300,7 +300,7 @@ public final class MemoryJDBCQueryResultTest {
ResultSet resultSet = getMockedResultSet(Types.LONGVARBINARY);
Blob value = mock(Blob.class);
when(resultSet.getBlob(1)).thenReturn(value);
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, Blob.class), is(value));
assertFalse(actual.next());
@@ -311,7 +311,7 @@ public final class MemoryJDBCQueryResultTest {
ResultSet resultSet = getMockedResultSet(Types.ARRAY);
Array value = mock(Array.class);
when(resultSet.getArray(1)).thenReturn(value);
- MemoryJDBCQueryResultSet actual = new MemoryJDBCQueryResultSet(resultSet);
+ MemoryJDBCQueryResult actual = new MemoryJDBCQueryResult(resultSet);
assertTrue(actual.next());
assertThat(actual.getValue(1, Array.class), is(value));
assertFalse(actual.next());
@@ -329,16 +329,16 @@ public final class MemoryJDBCQueryResultTest {
@Test
public void assertGetCalendarValue() throws SQLException {
- MemoryJDBCQueryResultSet queryResultSet = new MemoryJDBCQueryResultSet(mockResultSet());
- queryResultSet.next();
- assertThat(queryResultSet.getCalendarValue(1, Integer.class, Calendar.getInstance()), Is.is(1));
+ MemoryJDBCQueryResult queryResult = new MemoryJDBCQueryResult(mockResultSet());
+ queryResult.next();
+ assertThat(queryResult.getCalendarValue(1, Integer.class, Calendar.getInstance()), Is.is(1));
}
@Test
public void assertGetInputStream() throws SQLException, IOException {
- MemoryJDBCQueryResultSet queryResultSet = new MemoryJDBCQueryResultSet(mockResultSet());
- queryResultSet.next();
- InputStream inputStream = queryResultSet.getInputStream(1, "Unicode");
+ MemoryJDBCQueryResult queryResult = new MemoryJDBCQueryResult(mockResultSet());
+ queryResult.next();
+ InputStream inputStream = queryResult.getInputStream(1, "Unicode");
assertThat(inputStream.read(), is(getInputStream(1).read()));
}
@@ -353,11 +353,11 @@ public final class MemoryJDBCQueryResultTest {
@Test
public void assertWasNull() throws SQLException {
- MemoryJDBCQueryResultSet queryResultSet = new MemoryJDBCQueryResultSet(mockResultSet());
- queryResultSet.next();
- assertFalse(queryResultSet.wasNull());
- queryResultSet.next();
- assertTrue(queryResultSet.wasNull());
+ MemoryJDBCQueryResult queryResult = new MemoryJDBCQueryResult(mockResultSet());
+ queryResult.next();
+ assertFalse(queryResult.wasNull());
+ queryResult.next();
+ assertTrue(queryResult.wasNull());
}
private ResultSet mockResultSet() throws SQLException {
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/StreamJDBCQueryResultTest.java b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/StreamJDBCQueryResultTest.java
index 863ebf6..bea1706 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/StreamJDBCQueryResultTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/StreamJDBCQueryResultTest.java
@@ -42,72 +42,72 @@ public final class StreamJDBCQueryResultTest {
@Test
public void assertNext() throws SQLException {
- StreamJDBCQueryResultSet queryResultSet = new StreamJDBCQueryResultSet(getResultSet());
- assertTrue(queryResultSet.next());
- assertFalse(queryResultSet.next());
+ StreamJDBCQueryResult queryResult = new StreamJDBCQueryResult(getResultSet());
+ assertTrue(queryResult.next());
+ assertFalse(queryResult.next());
}
@Test
public void assertGetValueByBoolean() throws SQLException {
ResultSet resultSet = mock(ResultSet.class);
when(resultSet.getBoolean(1)).thenReturn(true);
- assertTrue((boolean) new StreamJDBCQueryResultSet(resultSet).getValue(1, boolean.class));
+ assertTrue((boolean) new StreamJDBCQueryResult(resultSet).getValue(1, boolean.class));
}
@Test
public void assertGetValueByByte() throws SQLException {
ResultSet resultSet = mock(ResultSet.class);
when(resultSet.getByte(1)).thenReturn((byte) 0x00);
- assertThat(new StreamJDBCQueryResultSet(resultSet).getValue(1, byte.class), is((byte) 0x00));
+ assertThat(new StreamJDBCQueryResult(resultSet).getValue(1, byte.class), is((byte) 0x00));
}
@Test
public void assertGetValueByShort() throws SQLException {
ResultSet resultSet = mock(ResultSet.class);
when(resultSet.getShort(1)).thenReturn((short) 1);
- assertThat(new StreamJDBCQueryResultSet(resultSet).getValue(1, short.class), is((short) 1));
+ assertThat(new StreamJDBCQueryResult(resultSet).getValue(1, short.class), is((short) 1));
}
@Test
public void assertGetValueByInt() throws SQLException {
ResultSet resultSet = mock(ResultSet.class);
when(resultSet.getInt(1)).thenReturn(1);
- assertThat(new StreamJDBCQueryResultSet(resultSet).getValue(1, int.class), is(1));
+ assertThat(new StreamJDBCQueryResult(resultSet).getValue(1, int.class), is(1));
}
@Test
public void assertGetValueByLong() throws SQLException {
ResultSet resultSet = mock(ResultSet.class);
when(resultSet.getLong(1)).thenReturn(1L);
- assertThat(new StreamJDBCQueryResultSet(resultSet).getValue(1, long.class), is(1L));
+ assertThat(new StreamJDBCQueryResult(resultSet).getValue(1, long.class), is(1L));
}
@Test
public void assertGetValueByFloat() throws SQLException {
ResultSet resultSet = mock(ResultSet.class);
when(resultSet.getFloat(1)).thenReturn(1.0F);
- assertThat(new StreamJDBCQueryResultSet(resultSet).getValue(1, float.class), is(1.0F));
+ assertThat(new StreamJDBCQueryResult(resultSet).getValue(1, float.class), is(1.0F));
}
@Test
public void assertGetValueByDouble() throws SQLException {
ResultSet resultSet = mock(ResultSet.class);
when(resultSet.getDouble(1)).thenReturn(1.0D);
- assertThat(new StreamJDBCQueryResultSet(resultSet).getValue(1, double.class), is(1.0D));
+ assertThat(new StreamJDBCQueryResult(resultSet).getValue(1, double.class), is(1.0D));
}
@Test
public void assertGetValueByString() throws SQLException {
ResultSet resultSet = mock(ResultSet.class);
when(resultSet.getString(1)).thenReturn("value");
- assertThat(new StreamJDBCQueryResultSet(resultSet).getValue(1, String.class), is("value"));
+ assertThat(new StreamJDBCQueryResult(resultSet).getValue(1, String.class), is("value"));
}
@Test
public void assertGetValueByBigDecimal() throws SQLException {
ResultSet resultSet = mock(ResultSet.class);
when(resultSet.getBigDecimal(1)).thenReturn(new BigDecimal("0"));
- assertThat(new StreamJDBCQueryResultSet(resultSet).getValue(1, BigDecimal.class), is(new BigDecimal("0")));
+ assertThat(new StreamJDBCQueryResult(resultSet).getValue(1, BigDecimal.class), is(new BigDecimal("0")));
}
@Test
@@ -115,21 +115,21 @@ public final class StreamJDBCQueryResultTest {
ResultSet resultSet = mock(ResultSet.class);
byte[] value = {1};
when(resultSet.getBytes(1)).thenReturn(value);
- assertThat(new StreamJDBCQueryResultSet(resultSet).getValue(1, byte[].class), is(value));
+ assertThat(new StreamJDBCQueryResult(resultSet).getValue(1, byte[].class), is(value));
}
@Test
public void assertGetValueByDate() throws SQLException {
ResultSet resultSet = mock(ResultSet.class);
when(resultSet.getDate(1)).thenReturn(new Date(0L));
- assertThat(new StreamJDBCQueryResultSet(resultSet).getValue(1, Date.class), is(new Date(0L)));
+ assertThat(new StreamJDBCQueryResult(resultSet).getValue(1, Date.class), is(new Date(0L)));
}
@Test
public void assertGetValueByTime() throws SQLException {
ResultSet resultSet = mock(ResultSet.class);
when(resultSet.getTime(1)).thenReturn(new Time(0L));
- assertThat(new StreamJDBCQueryResultSet(resultSet).getValue(1, Time.class), is(new Time(0L)));
+ assertThat(new StreamJDBCQueryResult(resultSet).getValue(1, Time.class), is(new Time(0L)));
}
@Test
@@ -137,7 +137,7 @@ public final class StreamJDBCQueryResultTest {
ResultSet resultSet = mock(ResultSet.class);
Blob value = mock(Blob.class);
when(resultSet.getBlob(1)).thenReturn(value);
- assertThat(new StreamJDBCQueryResultSet(resultSet).getValue(1, Blob.class), is(value));
+ assertThat(new StreamJDBCQueryResult(resultSet).getValue(1, Blob.class), is(value));
}
@Test
@@ -145,7 +145,7 @@ public final class StreamJDBCQueryResultTest {
ResultSet resultSet = mock(ResultSet.class);
Clob value = mock(Clob.class);
when(resultSet.getClob(1)).thenReturn(value);
- assertThat(new StreamJDBCQueryResultSet(resultSet).getValue(1, Clob.class), is(value));
+ assertThat(new StreamJDBCQueryResult(resultSet).getValue(1, Clob.class), is(value));
}
@Test
@@ -153,23 +153,23 @@ public final class StreamJDBCQueryResultTest {
ResultSet resultSet = mock(ResultSet.class);
Array value = mock(Array.class);
when(resultSet.getArray(1)).thenReturn(value);
- assertThat(new StreamJDBCQueryResultSet(resultSet).getValue(1, Array.class), is(value));
+ assertThat(new StreamJDBCQueryResult(resultSet).getValue(1, Array.class), is(value));
}
@Test
public void assertGetValueByTimestamp() throws SQLException {
ResultSet resultSet = mock(ResultSet.class);
when(resultSet.getTimestamp(1)).thenReturn(new Timestamp(0L));
- assertThat(new StreamJDBCQueryResultSet(resultSet).getValue(1, Timestamp.class), is(new Timestamp(0L)));
+ assertThat(new StreamJDBCQueryResult(resultSet).getValue(1, Timestamp.class), is(new Timestamp(0L)));
}
@Test
public void assertGetCalendarValueWithDate() throws SQLException {
ResultSet result = getResultSet();
Calendar calendar = Calendar.getInstance();
- StreamJDBCQueryResultSet queryResultSet = new StreamJDBCQueryResultSet(result);
- queryResultSet.next();
- queryResultSet.getCalendarValue(1, Date.class, calendar);
+ StreamJDBCQueryResult queryResult = new StreamJDBCQueryResult(result);
+ queryResult.next();
+ queryResult.getCalendarValue(1, Date.class, calendar);
verify(result).getDate(1, calendar);
}
@@ -177,9 +177,9 @@ public final class StreamJDBCQueryResultTest {
public void assertGetCalendarValueWithTime() throws SQLException {
ResultSet resultSet = getResultSet();
Calendar calendar = Calendar.getInstance();
- StreamJDBCQueryResultSet queryResultSet = new StreamJDBCQueryResultSet(resultSet);
- queryResultSet.next();
- queryResultSet.getCalendarValue(1, Time.class, calendar);
+ StreamJDBCQueryResult queryResult = new StreamJDBCQueryResult(resultSet);
+ queryResult.next();
+ queryResult.getCalendarValue(1, Time.class, calendar);
verify(resultSet).getTime(1, calendar);
}
@@ -187,25 +187,25 @@ public final class StreamJDBCQueryResultTest {
public void assertGetCalendarValueWithTimestamp() throws SQLException {
ResultSet resultSet = getResultSet();
Calendar calendar = Calendar.getInstance();
- StreamJDBCQueryResultSet queryResultSet = new StreamJDBCQueryResultSet(resultSet);
- queryResultSet.next();
- queryResultSet.getCalendarValue(1, Timestamp.class, calendar);
+ StreamJDBCQueryResult queryResult = new StreamJDBCQueryResult(resultSet);
+ queryResult.next();
+ queryResult.getCalendarValue(1, Timestamp.class, calendar);
verify(resultSet).getTimestamp(1, calendar);
}
@Test(expected = SQLException.class)
public void assertGetCalendarValueWithUnsupportedType() throws SQLException {
- StreamJDBCQueryResultSet queryResultSet = new StreamJDBCQueryResultSet(getResultSet());
- queryResultSet.next();
- queryResultSet.getCalendarValue(1, Object.class, Calendar.getInstance());
+ StreamJDBCQueryResult queryResult = new StreamJDBCQueryResult(getResultSet());
+ queryResult.next();
+ queryResult.getCalendarValue(1, Object.class, Calendar.getInstance());
}
@Test
public void assertGetInputStreamWithAscii() throws SQLException {
ResultSet resultSet = getResultSet();
- StreamJDBCQueryResultSet queryResultSet = new StreamJDBCQueryResultSet(resultSet);
- queryResultSet.next();
- queryResultSet.getInputStream(1, "Ascii");
+ StreamJDBCQueryResult queryResult = new StreamJDBCQueryResult(resultSet);
+ queryResult.next();
+ queryResult.getInputStream(1, "Ascii");
verify(resultSet).getAsciiStream(1);
}
@@ -213,35 +213,35 @@ public final class StreamJDBCQueryResultTest {
@Test
public void assertGetInputStreamWithUnicode() throws SQLException {
ResultSet resultSet = getResultSet();
- StreamJDBCQueryResultSet queryResultSet = new StreamJDBCQueryResultSet(resultSet);
- queryResultSet.next();
- queryResultSet.getInputStream(1, "Unicode");
+ StreamJDBCQueryResult queryResult = new StreamJDBCQueryResult(resultSet);
+ queryResult.next();
+ queryResult.getInputStream(1, "Unicode");
verify(resultSet).getUnicodeStream(1);
}
@Test
public void assertGetInputStreamWithBinary() throws SQLException {
ResultSet resultSet = getResultSet();
- StreamJDBCQueryResultSet queryResultSet = new StreamJDBCQueryResultSet(resultSet);
- queryResultSet.next();
- queryResultSet.getInputStream(1, "Binary");
+ StreamJDBCQueryResult queryResult = new StreamJDBCQueryResult(resultSet);
+ queryResult.next();
+ queryResult.getInputStream(1, "Binary");
verify(resultSet).getBinaryStream(1);
}
@Test(expected = SQLException.class)
public void assertGetInputStreamWithUnsupportedType() throws SQLException {
- StreamJDBCQueryResultSet queryResultSet = new StreamJDBCQueryResultSet(getResultSet());
- queryResultSet.next();
- queryResultSet.getInputStream(1, "Unsupported Type");
+ StreamJDBCQueryResult queryResult = new StreamJDBCQueryResult(getResultSet());
+ queryResult.next();
+ queryResult.getInputStream(1, "Unsupported Type");
}
@Test
public void assertWasNull() throws SQLException {
- StreamJDBCQueryResultSet queryResultSet = new StreamJDBCQueryResultSet(getResultSet());
- queryResultSet.next();
- assertFalse(queryResultSet.wasNull());
- queryResultSet.next();
- assertTrue(queryResultSet.wasNull());
+ StreamJDBCQueryResult queryResult = new StreamJDBCQueryResult(getResultSet());
+ queryResult.next();
+ assertFalse(queryResult.wasNull());
+ queryResult.next();
+ assertTrue(queryResult.wasNull());
}
private ResultSet getResultSet() throws SQLException {
diff --git a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/fixture/AbstractJDBCQueryResultSetFixture.java b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/fixture/AbstractJDBCQueryResultFixture.java
similarity index 88%
rename from shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/fixture/AbstractJDBCQueryResultSetFixture.java
rename to shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/fixture/AbstractJDBCQueryResultFixture.java
index a04560a..24028e9 100644
--- a/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/fixture/AbstractJDBCQueryResultSetFixture.java
+++ b/shardingsphere-infra/shardingsphere-infra-executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/execute/result/query/jdbc/fixture/AbstractJDBCQueryResultFixture.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.fixture;
-import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.AbstractJDBCQueryResultSet;
+import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.AbstractJDBCQueryResult;
import java.io.InputStream;
import java.sql.ResultSetMetaData;
@@ -26,9 +26,9 @@ import java.util.Date;
import static org.mockito.Mockito.mock;
-public final class AbstractJDBCQueryResultSetFixture extends AbstractJDBCQueryResultSet {
+public final class AbstractJDBCQueryResultFixture extends AbstractJDBCQueryResult {
- public AbstractJDBCQueryResultSetFixture(final ResultSetMetaData resultSetMetaData) {
+ public AbstractJDBCQueryResultFixture(final ResultSetMetaData resultSetMetaData) {
super(resultSetMetaData);
}
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/MergeEngine.java b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/MergeEngine.java
index 6aac8d1..2850d4d 100644
--- a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/MergeEngine.java
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/MergeEngine.java
@@ -68,23 +68,23 @@ public final class MergeEngine {
/**
* Merge.
*
- * @param queryResultSets query result sets
+ * @param queryResults query results
* @param sqlStatementContext SQL statement context
* @return merged result
* @throws SQLException SQL exception
*/
- public MergedResult merge(final List<ExecuteQueryResult> queryResultSets, final SQLStatementContext<?> sqlStatementContext) throws SQLException {
- Optional<MergedResult> mergedResult = executeMerge(queryResultSets, sqlStatementContext);
- Optional<MergedResult> result = mergedResult.isPresent() ? Optional.of(decorate(mergedResult.get(), sqlStatementContext)) : decorate(queryResultSets.get(0), sqlStatementContext);
- return result.orElseGet(() -> new TransparentMergedResult(queryResultSets.get(0)));
+ public MergedResult merge(final List<ExecuteQueryResult> queryResults, final SQLStatementContext<?> sqlStatementContext) throws SQLException {
+ Optional<MergedResult> mergedResult = executeMerge(queryResults, sqlStatementContext);
+ Optional<MergedResult> result = mergedResult.isPresent() ? Optional.of(decorate(mergedResult.get(), sqlStatementContext)) : decorate(queryResults.get(0), sqlStatementContext);
+ return result.orElseGet(() -> new TransparentMergedResult(queryResults.get(0)));
}
@SuppressWarnings({"unchecked", "rawtypes"})
- private Optional<MergedResult> executeMerge(final List<ExecuteQueryResult> queryResultSets, final SQLStatementContext<?> sqlStatementContext) throws SQLException {
+ private Optional<MergedResult> executeMerge(final List<ExecuteQueryResult> queryResults, final SQLStatementContext<?> sqlStatementContext) throws SQLException {
for (Entry<ShardingSphereRule, ResultProcessEngine> entry : engines.entrySet()) {
if (entry.getValue() instanceof ResultMergerEngine) {
ResultMerger resultMerger = ((ResultMergerEngine) entry.getValue()).newInstance(databaseType, entry.getKey(), props, sqlStatementContext);
- return Optional.of(resultMerger.merge(queryResultSets, sqlStatementContext, schema));
+ return Optional.of(resultMerger.merge(queryResults, sqlStatementContext, schema));
}
}
return Optional.empty();
@@ -103,12 +103,12 @@ public final class MergeEngine {
}
@SuppressWarnings({"unchecked", "rawtypes"})
- private Optional<MergedResult> decorate(final ExecuteQueryResult queryResultSet, final SQLStatementContext<?> sqlStatementContext) throws SQLException {
+ private Optional<MergedResult> decorate(final ExecuteQueryResult queryResult, final SQLStatementContext<?> sqlStatementContext) throws SQLException {
MergedResult result = null;
for (Entry<ShardingSphereRule, ResultProcessEngine> entry : engines.entrySet()) {
if (entry.getValue() instanceof ResultDecoratorEngine) {
ResultDecorator resultDecorator = ((ResultDecoratorEngine) entry.getValue()).newInstance(databaseType, schema, entry.getKey(), props, sqlStatementContext);
- result = null == result ? resultDecorator.decorate(queryResultSet, sqlStatementContext, entry.getKey()) : resultDecorator.decorate(result, sqlStatementContext, entry.getKey());
+ result = null == result ? resultDecorator.decorate(queryResult, sqlStatementContext, entry.getKey()) : resultDecorator.decorate(result, sqlStatementContext, entry.getKey());
}
}
return Optional.ofNullable(result);
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/engine/decorator/ResultDecorator.java b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/engine/decorator/ResultDecorator.java
index 9aa4f66..177f55c 100644
--- a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/engine/decorator/ResultDecorator.java
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/engine/decorator/ResultDecorator.java
@@ -34,13 +34,13 @@ public interface ResultDecorator<T extends ShardingSphereRule> {
/**
* Decorate query result.
*
- * @param queryResultSet query result set
+ * @param queryResult query result
* @param sqlStatementContext SQL statement context
* @param rule ShardingSphere rule
* @return merged result
* @throws SQLException SQL exception
*/
- MergedResult decorate(ExecuteQueryResult queryResultSet, SQLStatementContext<?> sqlStatementContext, T rule) throws SQLException;
+ MergedResult decorate(ExecuteQueryResult queryResult, SQLStatementContext<?> sqlStatementContext, T rule) throws SQLException;
/**
* Decorate merged result.
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/engine/decorator/impl/TransparentResultDecorator.java b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/engine/decorator/impl/TransparentResultDecorator.java
index 8b2af29..f089e5f 100644
--- a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/engine/decorator/impl/TransparentResultDecorator.java
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/engine/decorator/impl/TransparentResultDecorator.java
@@ -29,8 +29,8 @@ import org.apache.shardingsphere.infra.merge.result.impl.transparent.Transparent
public final class TransparentResultDecorator implements ResultDecorator<TransparentRule> {
@Override
- public MergedResult decorate(final ExecuteQueryResult queryResultSet, final SQLStatementContext<?> sqlStatementContext, final TransparentRule rule) {
- return new TransparentMergedResult(queryResultSet);
+ public MergedResult decorate(final ExecuteQueryResult queryResult, final SQLStatementContext<?> sqlStatementContext, final TransparentRule rule) {
+ return new TransparentMergedResult(queryResult);
}
@Override
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/engine/merger/ResultMerger.java b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/engine/merger/ResultMerger.java
index 1493ec1..7efb48c 100644
--- a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/engine/merger/ResultMerger.java
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/engine/merger/ResultMerger.java
@@ -33,11 +33,11 @@ public interface ResultMerger {
/**
* Merge query results.
*
- * @param queryResultSets query result sets
+ * @param queryResults query results
* @param sqlStatementContext SQL statement context
* @param schema ShardingSphere schema
* @return merged result
* @throws SQLException SQL exception
*/
- MergedResult merge(List<ExecuteQueryResult> queryResultSets, SQLStatementContext<?> sqlStatementContext, ShardingSphereSchema schema) throws SQLException;
+ MergedResult merge(List<ExecuteQueryResult> queryResults, SQLStatementContext<?> sqlStatementContext, ShardingSphereSchema schema) throws SQLException;
}
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/engine/merger/impl/TransparentResultMerger.java b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/engine/merger/impl/TransparentResultMerger.java
index 6f282aa..ab28d0c 100644
--- a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/engine/merger/impl/TransparentResultMerger.java
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/engine/merger/impl/TransparentResultMerger.java
@@ -32,7 +32,7 @@ import java.util.List;
public final class TransparentResultMerger implements ResultMerger {
@Override
- public MergedResult merge(final List<ExecuteQueryResult> queryResultSets, final SQLStatementContext<?> sqlStatementContext, final ShardingSphereSchema schema) {
- return new TransparentMergedResult(queryResultSets.get(0));
+ public MergedResult merge(final List<ExecuteQueryResult> queryResults, final SQLStatementContext<?> sqlStatementContext, final ShardingSphereSchema schema) {
+ return new TransparentMergedResult(queryResults.get(0));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/memory/MemoryMergedResult.java b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/memory/MemoryMergedResult.java
index 94318aa..bba5615 100644
--- a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/memory/MemoryMergedResult.java
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/memory/MemoryMergedResult.java
@@ -47,15 +47,15 @@ public abstract class MemoryMergedResult<T extends ShardingSphereRule> implement
private boolean wasNull;
- protected MemoryMergedResult(final T rule, final ShardingSphereSchema schema, final SQLStatementContext sqlStatementContext, final List<ExecuteQueryResult> queryResultSets) throws SQLException {
- List<MemoryQueryResultRow> memoryQueryResultRowList = init(rule, schema, sqlStatementContext, queryResultSets);
+ protected MemoryMergedResult(final T rule, final ShardingSphereSchema schema, final SQLStatementContext sqlStatementContext, final List<ExecuteQueryResult> queryResults) throws SQLException {
+ List<MemoryQueryResultRow> memoryQueryResultRowList = init(rule, schema, sqlStatementContext, queryResults);
memoryResultSetRows = memoryQueryResultRowList.iterator();
if (!memoryQueryResultRowList.isEmpty()) {
currentResultSetRow = memoryQueryResultRowList.get(0);
}
}
- protected abstract List<MemoryQueryResultRow> init(T rule, ShardingSphereSchema schema, SQLStatementContext sqlStatementContext, List<ExecuteQueryResult> queryResultSets) throws SQLException;
+ protected abstract List<MemoryQueryResultRow> init(T rule, ShardingSphereSchema schema, SQLStatementContext sqlStatementContext, List<ExecuteQueryResult> queryResults) throws SQLException;
@Override
public final boolean next() {
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/memory/MemoryQueryResultRow.java b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/memory/MemoryQueryResultRow.java
index cfdfb1c..3ba8544 100644
--- a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/memory/MemoryQueryResultRow.java
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/memory/MemoryQueryResultRow.java
@@ -31,15 +31,15 @@ public final class MemoryQueryResultRow {
private final Object[] data;
- public MemoryQueryResultRow(final ExecuteQueryResult queryResultSet) throws SQLException {
- data = load(queryResultSet);
+ public MemoryQueryResultRow(final ExecuteQueryResult queryResult) throws SQLException {
+ data = load(queryResult);
}
- private Object[] load(final ExecuteQueryResult queryResultSet) throws SQLException {
- int columnCount = queryResultSet.getColumnCount();
+ private Object[] load(final ExecuteQueryResult queryResult) throws SQLException {
+ int columnCount = queryResult.getColumnCount();
Object[] result = new Object[columnCount];
for (int i = 0; i < columnCount; i++) {
- result[i] = queryResultSet.getValue(i + 1, Object.class);
+ result[i] = queryResult.getValue(i + 1, Object.class);
}
return result;
}
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/stream/StreamMergedResult.java b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/stream/StreamMergedResult.java
index 5f8944a..a2827a4 100644
--- a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/stream/StreamMergedResult.java
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/stream/StreamMergedResult.java
@@ -31,35 +31,35 @@ import java.util.Calendar;
@Setter
public abstract class StreamMergedResult implements MergedResult {
- private ExecuteQueryResult currentQueryResultSet;
+ private ExecuteQueryResult currentQueryResult;
private boolean wasNull;
- protected final ExecuteQueryResult getCurrentQueryResultSet() throws SQLException {
- if (null == currentQueryResultSet) {
+ protected final ExecuteQueryResult getCurrentQueryResult() throws SQLException {
+ if (null == currentQueryResult) {
throw new SQLException("Current ResultSet is null, ResultSet perhaps end of next.");
}
- return currentQueryResultSet;
+ return currentQueryResult;
}
@Override
public Object getValue(final int columnIndex, final Class<?> type) throws SQLException {
- Object result = getCurrentQueryResultSet().getValue(columnIndex, type);
- wasNull = getCurrentQueryResultSet().wasNull();
+ Object result = getCurrentQueryResult().getValue(columnIndex, type);
+ wasNull = getCurrentQueryResult().wasNull();
return result;
}
@Override
public Object getCalendarValue(final int columnIndex, final Class<?> type, final Calendar calendar) throws SQLException {
- Object result = getCurrentQueryResultSet().getCalendarValue(columnIndex, type, calendar);
- wasNull = getCurrentQueryResultSet().wasNull();
+ Object result = getCurrentQueryResult().getCalendarValue(columnIndex, type, calendar);
+ wasNull = getCurrentQueryResult().wasNull();
return result;
}
@Override
public final InputStream getInputStream(final int columnIndex, final String type) throws SQLException {
- InputStream result = getCurrentQueryResultSet().getInputStream(columnIndex, type);
- wasNull = getCurrentQueryResultSet().wasNull();
+ InputStream result = getCurrentQueryResult().getInputStream(columnIndex, type);
+ wasNull = getCurrentQueryResult().wasNull();
return result;
}
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/transparent/TransparentMergedResult.java b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/transparent/TransparentMergedResult.java
index 3967046..b0b23f2 100644
--- a/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/transparent/TransparentMergedResult.java
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/main/java/org/apache/shardingsphere/infra/merge/result/impl/transparent/TransparentMergedResult.java
@@ -31,30 +31,30 @@ import java.util.Calendar;
@RequiredArgsConstructor
public final class TransparentMergedResult implements MergedResult {
- private final ExecuteQueryResult queryResultSet;
+ private final ExecuteQueryResult queryResult;
@Override
public boolean next() throws SQLException {
- return queryResultSet.next();
+ return queryResult.next();
}
@Override
public Object getValue(final int columnIndex, final Class<?> type) throws SQLException {
- return queryResultSet.getValue(columnIndex, type);
+ return queryResult.getValue(columnIndex, type);
}
@Override
public Object getCalendarValue(final int columnIndex, final Class<?> type, final Calendar calendar) throws SQLException {
- return queryResultSet.getCalendarValue(columnIndex, type, calendar);
+ return queryResult.getCalendarValue(columnIndex, type, calendar);
}
@Override
public InputStream getInputStream(final int columnIndex, final String type) throws SQLException {
- return queryResultSet.getInputStream(columnIndex, type);
+ return queryResult.getInputStream(columnIndex, type);
}
@Override
public boolean wasNull() throws SQLException {
- return queryResultSet.wasNull();
+ return queryResult.wasNull();
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/MergeEngineTest.java b/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/MergeEngineTest.java
index a5187bf..7aaf3a2 100644
--- a/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/MergeEngineTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/MergeEngineTest.java
@@ -52,37 +52,37 @@ public final class MergeEngineTest {
private ConfigurationProperties props;
@Mock
- private ExecuteQueryResult queryResultSet;
+ private ExecuteQueryResult queryResult;
@Mock
private SQLStatementContext<?> sqlStatementContext;
@Test
public void assertMergeWithIndependentRule() throws SQLException {
- when(queryResultSet.getValue(1, String.class)).thenReturn("test");
+ when(queryResult.getValue(1, String.class)).thenReturn("test");
MergeEngine mergeEngine = new MergeEngine(databaseType, schema, props, Collections.singletonList(new IndependentRuleFixture()));
- MergedResult actual = mergeEngine.merge(Collections.singletonList(queryResultSet), sqlStatementContext);
+ MergedResult actual = mergeEngine.merge(Collections.singletonList(queryResult), sqlStatementContext);
assertThat(actual.getValue(1, String.class), is("test"));
}
@Test
public void assertMergeWithMergerRuleOnly() throws SQLException {
MergeEngine mergeEngine = new MergeEngine(databaseType, schema, props, Collections.singletonList(new MergerRuleFixture()));
- MergedResult actual = mergeEngine.merge(Collections.singletonList(queryResultSet), sqlStatementContext);
+ MergedResult actual = mergeEngine.merge(Collections.singletonList(queryResult), sqlStatementContext);
assertThat(actual.getValue(1, String.class), is("merged_value"));
}
@Test
public void assertMergeWithDecoratorRuleOnly() throws SQLException {
MergeEngine mergeEngine = new MergeEngine(databaseType, schema, props, Collections.singletonList(new DecoratorRuleFixture()));
- MergedResult actual = mergeEngine.merge(Collections.singletonList(queryResultSet), sqlStatementContext);
+ MergedResult actual = mergeEngine.merge(Collections.singletonList(queryResult), sqlStatementContext);
assertThat(actual.getValue(1, String.class), is("decorated_value"));
}
@Test
public void assertMergeWithMergerRuleAndDecoratorRuleTogether() throws SQLException {
MergeEngine mergeEngine = new MergeEngine(databaseType, schema, props, Arrays.asList(new MergerRuleFixture(), new DecoratorRuleFixture()));
- MergedResult actual = mergeEngine.merge(Collections.singletonList(queryResultSet), sqlStatementContext);
+ MergedResult actual = mergeEngine.merge(Collections.singletonList(queryResult), sqlStatementContext);
assertThat(actual.getValue(1, String.class), is("decorated_merged_value"));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/engine/decorator/impl/TransparentResultDecoratorTest.java b/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/engine/decorator/impl/TransparentResultDecoratorTest.java
index d50cd83..5c8961d 100644
--- a/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/engine/decorator/impl/TransparentResultDecoratorTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/engine/decorator/impl/TransparentResultDecoratorTest.java
@@ -31,11 +31,11 @@ import static org.mockito.Mockito.when;
public final class TransparentResultDecoratorTest {
@Test
- public void assertDecorateQueryResultSet() throws SQLException {
- ExecuteQueryResult queryResultSet = mock(ExecuteQueryResult.class);
- when(queryResultSet.next()).thenReturn(true);
+ public void assertDecorateQueryResult() throws SQLException {
+ ExecuteQueryResult queryResult = mock(ExecuteQueryResult.class);
+ when(queryResult.next()).thenReturn(true);
TransparentResultDecorator decorator = new TransparentResultDecorator();
- MergedResult actual = decorator.decorate(queryResultSet, mock(SQLStatementContext.class), new TransparentRule());
+ MergedResult actual = decorator.decorate(queryResult, mock(SQLStatementContext.class), new TransparentRule());
assertTrue(actual.next());
}
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/engine/merger/impl/TransparentResultMergerTest.java b/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/engine/merger/impl/TransparentResultMergerTest.java
index 897a266..e851012 100644
--- a/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/engine/merger/impl/TransparentResultMergerTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/engine/merger/impl/TransparentResultMergerTest.java
@@ -34,10 +34,10 @@ public final class TransparentResultMergerTest {
@Test
public void assertMerge() throws SQLException {
- ExecuteQueryResult queryResultSet = mock(ExecuteQueryResult.class);
- when(queryResultSet.next()).thenReturn(true);
+ ExecuteQueryResult queryResult = mock(ExecuteQueryResult.class);
+ when(queryResult.next()).thenReturn(true);
TransparentResultMerger merger = new TransparentResultMerger();
- MergedResult actual = merger.merge(Collections.singletonList(queryResultSet), mock(SQLStatementContext.class), mock(ShardingSphereSchema.class));
+ MergedResult actual = merger.merge(Collections.singletonList(queryResult), mock(SQLStatementContext.class), mock(ShardingSphereSchema.class));
assertTrue(actual.next());
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/fixture/decorator/ResultDecoratorFixture.java b/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/fixture/decorator/ResultDecoratorFixture.java
index 71f1fa8..0e96285 100644
--- a/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/fixture/decorator/ResultDecoratorFixture.java
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/fixture/decorator/ResultDecoratorFixture.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.infra.merge.fixture.decorator;
import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.ExecuteQueryResult;
-import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.StreamJDBCQueryResultSet;
+import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.StreamJDBCQueryResult;
import org.apache.shardingsphere.infra.merge.engine.decorator.ResultDecorator;
import org.apache.shardingsphere.infra.merge.fixture.rule.DecoratorRuleFixture;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
@@ -34,16 +34,16 @@ import static org.mockito.Mockito.when;
public final class ResultDecoratorFixture implements ResultDecorator<DecoratorRuleFixture> {
@Override
- public MergedResult decorate(final ExecuteQueryResult queryResultSet, final SQLStatementContext<?> sqlStatementContext, final DecoratorRuleFixture rule) throws SQLException {
+ public MergedResult decorate(final ExecuteQueryResult queryResult, final SQLStatementContext<?> sqlStatementContext, final DecoratorRuleFixture rule) throws SQLException {
ResultSet resultSet = mock(ResultSet.class);
when(resultSet.getString(1)).thenReturn("decorated_value");
- return new TransparentMergedResult(new StreamJDBCQueryResultSet(resultSet));
+ return new TransparentMergedResult(new StreamJDBCQueryResult(resultSet));
}
@Override
public MergedResult decorate(final MergedResult mergedResult, final SQLStatementContext<?> sqlStatementContext, final DecoratorRuleFixture rule) throws SQLException {
ResultSet resultSet = mock(ResultSet.class);
when(resultSet.getString(1)).thenReturn("decorated_merged_value");
- return new TransparentMergedResult(new StreamJDBCQueryResultSet(resultSet));
+ return new TransparentMergedResult(new StreamJDBCQueryResult(resultSet));
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/fixture/merger/ResultMergerFixture.java b/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/fixture/merger/ResultMergerFixture.java
index 9706050..1323fe8 100644
--- a/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/fixture/merger/ResultMergerFixture.java
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/fixture/merger/ResultMergerFixture.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.merge.fixture.merger;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.ExecuteQueryResult;
-import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.StreamJDBCQueryResultSet;
+import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.StreamJDBCQueryResult;
import org.apache.shardingsphere.infra.merge.engine.merger.ResultMerger;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
import org.apache.shardingsphere.infra.merge.result.impl.transparent.TransparentMergedResult;
@@ -35,10 +35,10 @@ import static org.mockito.Mockito.when;
public final class ResultMergerFixture implements ResultMerger {
@Override
- public MergedResult merge(final List<ExecuteQueryResult> queryResultSets, final SQLStatementContext<?> sqlStatementContext, final ShardingSphereSchema schema) throws SQLException {
+ public MergedResult merge(final List<ExecuteQueryResult> queryResults, final SQLStatementContext<?> sqlStatementContext, final ShardingSphereSchema schema) throws SQLException {
ResultSet resultSet = mock(ResultSet.class);
when(resultSet.getString(1)).thenReturn("merged_value");
- ExecuteQueryResult queryResultSet = new StreamJDBCQueryResultSet(resultSet);
- return new TransparentMergedResult(queryResultSet);
+ ExecuteQueryResult queryResult = new StreamJDBCQueryResult(resultSet);
+ return new TransparentMergedResult(queryResult);
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/result/impl/memory/MemoryQueryResultRowTest.java b/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/result/impl/memory/MemoryQueryResultRowTest.java
index 4085064..92b9dc2 100644
--- a/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/result/impl/memory/MemoryQueryResultRowTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/result/impl/memory/MemoryQueryResultRowTest.java
@@ -34,10 +34,10 @@ public final class MemoryQueryResultRowTest {
@Before
public void setUp() throws SQLException {
- ExecuteQueryResult queryResultSet = mock(ExecuteQueryResult.class);
- when(queryResultSet.getColumnCount()).thenReturn(1);
- when(queryResultSet.getValue(1, Object.class)).thenReturn("value");
- memoryResultSetRow = new MemoryQueryResultRow(queryResultSet);
+ ExecuteQueryResult queryResult = mock(ExecuteQueryResult.class);
+ when(queryResult.getColumnCount()).thenReturn(1);
+ when(queryResult.getValue(1, Object.class)).thenReturn("value");
+ memoryResultSetRow = new MemoryQueryResultRow(queryResult);
}
@Test
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/result/impl/memory/fixture/TestMemoryMergedResult.java b/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/result/impl/memory/fixture/TestMemoryMergedResult.java
index 78d4421..84b5d28 100644
--- a/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/result/impl/memory/fixture/TestMemoryMergedResult.java
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/result/impl/memory/fixture/TestMemoryMergedResult.java
@@ -42,7 +42,7 @@ public final class TestMemoryMergedResult extends MemoryMergedResult<Independent
@Override
protected List<MemoryQueryResultRow> init(final IndependentRuleFixture rule,
- final ShardingSphereSchema schema, final SQLStatementContext sqlStatementContext, final List<ExecuteQueryResult> queryResultSets) {
+ final ShardingSphereSchema schema, final SQLStatementContext sqlStatementContext, final List<ExecuteQueryResult> queryResults) {
memoryQueryResultRow = mock(MemoryQueryResultRow.class);
return Collections.singletonList(memoryQueryResultRow);
}
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/result/impl/stream/StreamMergedResultTest.java b/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/result/impl/stream/StreamMergedResultTest.java
index 7baf96f..919b954 100644
--- a/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/result/impl/stream/StreamMergedResultTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/result/impl/stream/StreamMergedResultTest.java
@@ -38,39 +38,39 @@ public final class StreamMergedResultTest {
@Test(expected = SQLException.class)
public void assertGetCurrentQueryResultIfNull() throws SQLException {
- streamMergedResult.getCurrentQueryResultSet();
+ streamMergedResult.getCurrentQueryResult();
}
@Test
public void assertGetValue() throws SQLException {
- ExecuteQueryResult queryResultSet = mock(ExecuteQueryResult.class);
- when(queryResultSet.getValue(1, Object.class)).thenReturn("1");
- streamMergedResult.setCurrentQueryResultSet(queryResultSet);
+ ExecuteQueryResult queryResult = mock(ExecuteQueryResult.class);
+ when(queryResult.getValue(1, Object.class)).thenReturn("1");
+ streamMergedResult.setCurrentQueryResult(queryResult);
assertThat(streamMergedResult.getValue(1, Object.class).toString(), is("1"));
}
@Test
public void assertGetCalendarValue() throws SQLException {
- ExecuteQueryResult queryResultSet = mock(ExecuteQueryResult.class);
+ ExecuteQueryResult queryResult = mock(ExecuteQueryResult.class);
Calendar calendar = Calendar.getInstance();
- when(queryResultSet.getCalendarValue(1, Date.class, calendar)).thenReturn(new Date(0L));
- streamMergedResult.setCurrentQueryResultSet(queryResultSet);
+ when(queryResult.getCalendarValue(1, Date.class, calendar)).thenReturn(new Date(0L));
+ streamMergedResult.setCurrentQueryResult(queryResult);
assertThat(streamMergedResult.getCalendarValue(1, Date.class, calendar), is(new Date(0L)));
}
@Test
public void assertGetInputStream() throws SQLException {
- ExecuteQueryResult queryResultSet = mock(ExecuteQueryResult.class);
+ ExecuteQueryResult queryResult = mock(ExecuteQueryResult.class);
InputStream value = mock(InputStream.class);
- when(queryResultSet.getInputStream(1, "Ascii")).thenReturn(value);
- streamMergedResult.setCurrentQueryResultSet(queryResultSet);
+ when(queryResult.getInputStream(1, "Ascii")).thenReturn(value);
+ streamMergedResult.setCurrentQueryResult(queryResult);
assertThat(streamMergedResult.getInputStream(1, "Ascii"), is(value));
}
@Test
public void assertWasNull() {
- ExecuteQueryResult queryResultSet = mock(ExecuteQueryResult.class);
- streamMergedResult.setCurrentQueryResultSet(queryResultSet);
+ ExecuteQueryResult queryResult = mock(ExecuteQueryResult.class);
+ streamMergedResult.setCurrentQueryResult(queryResult);
assertFalse(streamMergedResult.wasNull());
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/result/impl/transparent/TransparentMergedResultTest.java b/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/result/impl/transparent/TransparentMergedResultTest.java
index 399f461..4337ef6 100644
--- a/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/result/impl/transparent/TransparentMergedResultTest.java
+++ b/shardingsphere-infra/shardingsphere-infra-merge/src/test/java/org/apache/shardingsphere/infra/merge/result/impl/transparent/TransparentMergedResultTest.java
@@ -38,35 +38,35 @@ public final class TransparentMergedResultTest {
@Test
public void assertNext() throws SQLException {
- ExecuteQueryResult queryResultSet = mock(ExecuteQueryResult.class);
- when(queryResultSet.next()).thenReturn(true, false);
- TransparentMergedResult actual = new TransparentMergedResult(queryResultSet);
+ ExecuteQueryResult queryResult = mock(ExecuteQueryResult.class);
+ when(queryResult.next()).thenReturn(true, false);
+ TransparentMergedResult actual = new TransparentMergedResult(queryResult);
assertTrue(actual.next());
assertFalse(actual.next());
}
@Test
public void assertGetValue() throws SQLException {
- ExecuteQueryResult queryResultSet = mock(ExecuteQueryResult.class);
- when(queryResultSet.getValue(1, Object.class)).thenReturn("1");
- TransparentMergedResult actual = new TransparentMergedResult(queryResultSet);
+ ExecuteQueryResult queryResult = mock(ExecuteQueryResult.class);
+ when(queryResult.getValue(1, Object.class)).thenReturn("1");
+ TransparentMergedResult actual = new TransparentMergedResult(queryResult);
assertThat(actual.getValue(1, Object.class).toString(), is("1"));
}
@Test
public void assertGetCalendarValue() throws SQLException {
- ExecuteQueryResult queryResultSet = mock(ExecuteQueryResult.class);
- when(queryResultSet.getCalendarValue(1, Date.class, null)).thenReturn(new Date(0L));
- TransparentMergedResult actual = new TransparentMergedResult(queryResultSet);
+ ExecuteQueryResult queryResult = mock(ExecuteQueryResult.class);
+ when(queryResult.getCalendarValue(1, Date.class, null)).thenReturn(new Date(0L));
+ TransparentMergedResult actual = new TransparentMergedResult(queryResult);
assertThat(actual.getCalendarValue(1, Date.class, null), is(new Date(0L)));
}
@Test
public void assertGetInputStream() throws SQLException {
- ExecuteQueryResult queryResultSet = mock(ExecuteQueryResult.class);
+ ExecuteQueryResult queryResult = mock(ExecuteQueryResult.class);
InputStream value = mock(InputStream.class);
- when(queryResultSet.getInputStream(1, "Ascii")).thenReturn(value);
- TransparentMergedResult actual = new TransparentMergedResult(queryResultSet);
+ when(queryResult.getInputStream(1, "Ascii")).thenReturn(value);
+ TransparentMergedResult actual = new TransparentMergedResult(queryResult);
assertThat(actual.getInputStream(1, "Ascii"), is(value));
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/AbstractStatementExecutor.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/AbstractStatementExecutor.java
index 5f991f8..f739112 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/AbstractStatementExecutor.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/AbstractStatementExecutor.java
@@ -114,7 +114,7 @@ public abstract class AbstractStatementExecutor {
* Execute query.
*
* @param executionGroups execution groups
- * @return query result set list
+ * @return query results
* @throws SQLException SQL exception
*/
public abstract List<ExecuteQueryResult> executeQuery(Collection<ExecutionGroup<JDBCExecutionUnit>> executionGroups) throws SQLException;
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/PreparedStatementExecutor.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/PreparedStatementExecutor.java
index a77211f..66eba4e 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/PreparedStatementExecutor.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/PreparedStatementExecutor.java
@@ -26,8 +26,8 @@ import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.J
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutor;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.ExecuteQueryResult;
-import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.MemoryJDBCQueryResultSet;
-import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.StreamJDBCQueryResultSet;
+import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.MemoryJDBCQueryResult;
+import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.StreamJDBCQueryResult;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
import org.apache.shardingsphere.infra.rule.type.DataNodeContainedRule;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
@@ -69,7 +69,7 @@ public final class PreparedStatementExecutor extends AbstractStatementExecutor {
private ExecuteQueryResult createQueryResult(final Statement statement, final ConnectionMode connectionMode) throws SQLException {
PreparedStatement preparedStatement = (PreparedStatement) statement;
ResultSet resultSet = preparedStatement.executeQuery();
- return ConnectionMode.MEMORY_STRICTLY == connectionMode ? new StreamJDBCQueryResultSet(resultSet) : new MemoryJDBCQueryResultSet(resultSet);
+ return ConnectionMode.MEMORY_STRICTLY == connectionMode ? new StreamJDBCQueryResult(resultSet) : new MemoryJDBCQueryResult(resultSet);
}
};
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/StatementExecutor.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/StatementExecutor.java
index 59eecfe..3874ff1 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/StatementExecutor.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/StatementExecutor.java
@@ -26,8 +26,8 @@ import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.J
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutor;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.ExecuteQueryResult;
-import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.MemoryJDBCQueryResultSet;
-import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.StreamJDBCQueryResultSet;
+import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.MemoryJDBCQueryResult;
+import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.StreamJDBCQueryResult;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
import org.apache.shardingsphere.infra.rule.type.DataNodeContainedRule;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
@@ -62,7 +62,7 @@ public final class StatementExecutor extends AbstractStatementExecutor {
private ExecuteQueryResult createQueryResult(final String sql, final Statement statement, final ConnectionMode connectionMode) throws SQLException {
ResultSet resultSet = statement.executeQuery(sql);
- return ConnectionMode.MEMORY_STRICTLY == connectionMode ? new StreamJDBCQueryResultSet(resultSet) : new MemoryJDBCQueryResultSet(resultSet);
+ return ConnectionMode.MEMORY_STRICTLY == connectionMode ? new StreamJDBCQueryResult(resultSet) : new MemoryJDBCQueryResult(resultSet);
}
};
return getJdbcExecutor().execute(executionGroups, jdbcExecutorCallback);
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
index d1d0ffa..ab64fd8 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSpherePreparedStatement.java
@@ -47,7 +47,7 @@ import org.apache.shardingsphere.infra.executor.sql.execute.engine.raw.RawExecut
import org.apache.shardingsphere.infra.executor.sql.execute.engine.raw.RawSQLExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.raw.callback.RawSQLExecutorCallback;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.ExecuteQueryResult;
-import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.StreamJDBCQueryResultSet;
+import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.StreamJDBCQueryResult;
import org.apache.shardingsphere.infra.executor.sql.log.SQLLogger;
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.DriverExecutionPrepareEngine;
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.StatementOption;
@@ -157,16 +157,16 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
try {
clearPrevious();
executionContext = createExecutionContext();
- List<ExecuteQueryResult> queryResultSets;
+ List<ExecuteQueryResult> queryResults;
if (metaDataContexts.getDefaultMetaData().getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
- queryResultSets = rawExecutor.executeQuery(createRawExecutionGroups(), new RawSQLExecutorCallback());
+ queryResults = rawExecutor.executeQuery(createRawExecutionGroups(), new RawSQLExecutorCallback());
} else {
Collection<ExecutionGroup<JDBCExecutionUnit>> executionGroups = createExecutionGroups();
cacheStatements(executionGroups);
reply();
- queryResultSets = preparedStatementExecutor.executeQuery(executionGroups);
+ queryResults = preparedStatementExecutor.executeQuery(executionGroups);
}
- MergedResult mergedResult = mergeQuery(queryResultSets);
+ MergedResult mergedResult = mergeQuery(queryResults);
result = new ShardingSphereResultSet(statements.stream().map(this::getResultSet).collect(Collectors.toList()), mergedResult, this, executionContext);
} finally {
clearBatch();
@@ -230,7 +230,7 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
}
if (executionContext.getSqlStatementContext() instanceof SelectStatementContext || executionContext.getSqlStatementContext().getSqlStatement() instanceof DALStatement) {
List<ResultSet> resultSets = getResultSets();
- MergedResult mergedResult = mergeQuery(getQueryResultSets(resultSets));
+ MergedResult mergedResult = mergeQuery(getQueryResults(resultSets));
currentResultSet = new ShardingSphereResultSet(resultSets, mergedResult, this, executionContext);
}
return currentResultSet;
@@ -252,11 +252,11 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
return result;
}
- private List<ExecuteQueryResult> getQueryResultSets(final List<ResultSet> resultSets) throws SQLException {
+ private List<ExecuteQueryResult> getQueryResults(final List<ResultSet> resultSets) throws SQLException {
List<ExecuteQueryResult> result = new ArrayList<>(resultSets.size());
for (ResultSet each : resultSets) {
if (null != each) {
- result.add(new StreamJDBCQueryResultSet(each));
+ result.add(new StreamJDBCQueryResult(each));
}
}
return result;
@@ -277,10 +277,10 @@ public final class ShardingSpherePreparedStatement extends AbstractPreparedState
return new LogicSQL(sqlStatementContext, sql, parameters);
}
- private MergedResult mergeQuery(final List<ExecuteQueryResult> queryResultSets) throws SQLException {
+ private MergedResult mergeQuery(final List<ExecuteQueryResult> queryResults) throws SQLException {
ShardingSphereMetaData metaData = metaDataContexts.getDefaultMetaData();
MergeEngine mergeEngine = new MergeEngine(metaDataContexts.getDatabaseType(), metaData.getSchema(), metaDataContexts.getProps(), metaData.getRuleMetaData().getRules());
- return mergeEngine.merge(queryResultSets, executionContext.getSqlStatementContext());
+ return mergeEngine.merge(queryResults, executionContext.getSqlStatementContext());
}
private void reply() {
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
index 5cb8715..efc7e2d 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/statement/ShardingSphereStatement.java
@@ -45,7 +45,7 @@ import org.apache.shardingsphere.infra.executor.sql.execute.engine.raw.RawExecut
import org.apache.shardingsphere.infra.executor.sql.execute.engine.raw.RawSQLExecutionUnit;
import org.apache.shardingsphere.infra.executor.sql.execute.engine.raw.callback.RawSQLExecutorCallback;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.ExecuteQueryResult;
-import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.StreamJDBCQueryResultSet;
+import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.StreamJDBCQueryResult;
import org.apache.shardingsphere.infra.executor.sql.log.SQLLogger;
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.DriverExecutionPrepareEngine;
import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.StatementOption;
@@ -126,15 +126,15 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
ResultSet result;
try {
executionContext = createExecutionContext(sql);
- List<ExecuteQueryResult> queryResultSets;
+ List<ExecuteQueryResult> queryResults;
if (metaDataContexts.getDefaultMetaData().getRuleMetaData().getRules().stream().anyMatch(each -> each instanceof RawExecutionRule)) {
- queryResultSets = rawExecutor.executeQuery(createRawExecutionGroups(), new RawSQLExecutorCallback());
+ queryResults = rawExecutor.executeQuery(createRawExecutionGroups(), new RawSQLExecutorCallback());
} else {
Collection<ExecutionGroup<JDBCExecutionUnit>> executionGroups = createExecutionGroups();
cacheStatements(executionGroups);
- queryResultSets = statementExecutor.executeQuery(executionGroups);
+ queryResults = statementExecutor.executeQuery(executionGroups);
}
- MergedResult mergedResult = mergeQuery(queryResultSets);
+ MergedResult mergedResult = mergeQuery(queryResults);
result = new ShardingSphereResultSet(statements.stream().map(this::getResultSet).collect(Collectors.toList()), mergedResult, this, executionContext);
} finally {
currentResultSet = null;
@@ -333,7 +333,7 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
}
if (executionContext.getSqlStatementContext() instanceof SelectStatementContext || executionContext.getSqlStatementContext().getSqlStatement() instanceof DALStatement) {
List<ResultSet> resultSets = getResultSets();
- MergedResult mergedResult = mergeQuery(getQueryResultSets(resultSets));
+ MergedResult mergedResult = mergeQuery(getQueryResults(resultSets));
currentResultSet = new ShardingSphereResultSet(resultSets, mergedResult, this, executionContext);
}
return currentResultSet;
@@ -355,20 +355,20 @@ public final class ShardingSphereStatement extends AbstractStatementAdapter {
return result;
}
- private List<ExecuteQueryResult> getQueryResultSets(final List<ResultSet> resultSets) throws SQLException {
+ private List<ExecuteQueryResult> getQueryResults(final List<ResultSet> resultSets) throws SQLException {
List<ExecuteQueryResult> result = new ArrayList<>(resultSets.size());
for (ResultSet each : resultSets) {
if (null != each) {
- result.add(new StreamJDBCQueryResultSet(each));
+ result.add(new StreamJDBCQueryResult(each));
}
}
return result;
}
- private MergedResult mergeQuery(final List<ExecuteQueryResult> queryResultSets) throws SQLException {
+ private MergedResult mergeQuery(final List<ExecuteQueryResult> queryResults) throws SQLException {
ShardingSphereMetaData metaData = metaDataContexts.getDefaultMetaData();
MergeEngine mergeEngine = new MergeEngine(metaDataContexts.getDatabaseType(), metaData.getSchema(), metaDataContexts.getProps(), metaData.getRuleMetaData().getRules());
- return mergeEngine.merge(queryResultSets, executionContext.getSqlStatementContext());
+ return mergeEngine.merge(queryResults, executionContext.getSqlStatementContext());
}
@SuppressWarnings("MagicConstant")
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/PreparedStatementExecutorTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/PreparedStatementExecutorTest.java
index 6bbcdd1..3cbc989 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/PreparedStatementExecutorTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/PreparedStatementExecutorTest.java
@@ -128,8 +128,8 @@ public final class PreparedStatementExecutorTest extends AbstractBaseExecutorTes
SQLException ex = new SQLException("");
when(preparedStatement1.executeQuery()).thenThrow(ex);
when(preparedStatement2.executeQuery()).thenThrow(ex);
- List<ExecuteQueryResult> actualQueryResultSets = actual.executeQuery(getExecutionGroups(Arrays.asList(preparedStatement1, preparedStatement2), true));
- assertThat(actualQueryResultSets, is(Arrays.asList((ExecuteQueryResult) null, null)));
+ List<ExecuteQueryResult> actualQueryResults = actual.executeQuery(getExecutionGroups(Arrays.asList(preparedStatement1, preparedStatement2), true));
+ assertThat(actualQueryResults, is(Arrays.asList((ExecuteQueryResult) null, null)));
verify(preparedStatement1).executeQuery();
verify(preparedStatement2).executeQuery();
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/StatementExecutorTest.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/StatementExecutorTest.java
index d3be924..8b43027 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/StatementExecutorTest.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/test/java/org/apache/shardingsphere/driver/executor/StatementExecutorTest.java
@@ -131,8 +131,8 @@ public final class StatementExecutorTest extends AbstractBaseExecutorTest {
SQLException ex = new SQLException("");
when(statement1.executeQuery(DQL_SQL)).thenThrow(ex);
when(statement2.executeQuery(DQL_SQL)).thenThrow(ex);
- List<ExecuteQueryResult> actualQueryResultSets = actual.executeQuery(createExecutionGroups(Arrays.asList(statement1, statement2), true));
- assertThat(actualQueryResultSets, is(Arrays.asList((ExecuteQueryResult) null, null)));
+ List<ExecuteQueryResult> actualQueryResults = actual.executeQuery(createExecutionGroups(Arrays.asList(statement1, statement2), true));
+ assertThat(actualQueryResults, is(Arrays.asList((ExecuteQueryResult) null, null)));
verify(statement1).executeQuery(DQL_SQL);
verify(statement2).executeQuery(DQL_SQL);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java
index ae518d7..8c6c789 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/JDBCDatabaseCommunicationEngine.java
@@ -119,7 +119,7 @@ public final class JDBCDatabaseCommunicationEngine implements DatabaseCommunicat
mergeUpdateCount(sqlStatementContext);
return response;
}
- mergedResult = mergeQuery(sqlStatementContext, ((QueryResponse) response).getQueryResultSets());
+ mergedResult = mergeQuery(sqlStatementContext, ((QueryResponse) response).getQueryResults());
return response;
}
@@ -135,10 +135,10 @@ public final class JDBCDatabaseCommunicationEngine implements DatabaseCommunicat
return dataNodeContainedRule.isPresent() && dataNodeContainedRule.get().isNeedAccumulate(sqlStatementContext.getTablesContext().getTableNames());
}
- private MergedResult mergeQuery(final SQLStatementContext<?> sqlStatementContext, final List<ExecuteQueryResult> queryResultSets) throws SQLException {
+ private MergedResult mergeQuery(final SQLStatementContext<?> sqlStatementContext, final List<ExecuteQueryResult> queryResults) throws SQLException {
MergeEngine mergeEngine = new MergeEngine(ProxyContext.getInstance().getMetaDataContexts().getDatabaseType(),
metaData.getSchema(), ProxyContext.getInstance().getMetaDataContexts().getProps(), metaData.getRuleMetaData().getRules());
- return mergeEngine.merge(queryResultSets, sqlStatementContext);
+ return mergeEngine.merge(queryResults, sqlStatementContext);
}
@Override
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/engine/jdbc/JDBCExecuteEngine.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/engine/jdbc/JDBCExecuteEngine.java
index 8591ad8..42804b5 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/engine/jdbc/JDBCExecuteEngine.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/engine/jdbc/JDBCExecuteEngine.java
@@ -169,7 +169,7 @@ public final class JDBCExecuteEngine implements SQLExecuteEngine {
private BackendResponse getExecuteQueryResponse(final List<QueryHeader> queryHeaders, final Collection<ExecuteResult> executeResults) {
QueryResponse result = new QueryResponse(queryHeaders);
for (ExecuteResult each : executeResults) {
- result.getQueryResultSets().add((ExecuteQueryResult) each);
+ result.getQueryResults().add((ExecuteQueryResult) each);
}
return result;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/engine/jdbc/ProxyJDBCExecutorCallback.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/engine/jdbc/ProxyJDBCExecutorCallback.java
index 75a3591..b506251 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/engine/jdbc/ProxyJDBCExecutorCallback.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/execute/engine/jdbc/ProxyJDBCExecutorCallback.java
@@ -22,8 +22,8 @@ import org.apache.shardingsphere.infra.executor.sql.execute.engine.ConnectionMod
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback;
import org.apache.shardingsphere.infra.executor.sql.execute.result.ExecuteResult;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.ExecuteQueryResult;
-import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.MemoryJDBCQueryResultSet;
-import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.StreamJDBCQueryResultSet;
+import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.MemoryJDBCQueryResult;
+import org.apache.shardingsphere.infra.executor.sql.execute.result.query.jdbc.StreamJDBCQueryResult;
import org.apache.shardingsphere.infra.executor.sql.execute.result.update.ExecuteUpdateResult;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.statement.accessor.JDBCAccessor;
@@ -70,13 +70,13 @@ public final class ProxyJDBCExecutorCallback extends JDBCExecutorCallback<Execut
if (accessor.execute(statement, sql, isReturnGeneratedKeys)) {
ResultSet resultSet = statement.getResultSet();
backendConnection.add(resultSet);
- return createQueryResultSet(resultSet, connectionMode);
+ return createQueryResult(resultSet, connectionMode);
}
return new ExecuteUpdateResult(statement.getUpdateCount(), isReturnGeneratedKeys ? getGeneratedKey(statement) : 0L);
}
- private ExecuteQueryResult createQueryResultSet(final ResultSet resultSet, final ConnectionMode connectionMode) throws SQLException {
- return connectionMode == ConnectionMode.MEMORY_STRICTLY ? new StreamJDBCQueryResultSet(resultSet) : new MemoryJDBCQueryResultSet(resultSet);
+ private ExecuteQueryResult createQueryResult(final ResultSet resultSet, final ConnectionMode connectionMode) throws SQLException {
+ return connectionMode == ConnectionMode.MEMORY_STRICTLY ? new StreamJDBCQueryResult(resultSet) : new MemoryJDBCQueryResult(resultSet);
}
private long getGeneratedKey(final Statement statement) throws SQLException {
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/query/QueryResponse.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/query/QueryResponse.java
index e38ce15..2376917 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/query/QueryResponse.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/response/query/QueryResponse.java
@@ -35,5 +35,5 @@ public final class QueryResponse implements BackendResponse {
private final List<QueryHeader> queryHeaders;
- private final List<ExecuteQueryResult> queryResultSets = new LinkedList<>();
+ private final List<ExecuteQueryResult> queryResults = new LinkedList<>();
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/ShowTablesBackendHandler.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/ShowTablesBackendHandler.java
index 380a494..33ac155 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/ShowTablesBackendHandler.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/ShowTablesBackendHandler.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.proxy.backend.text.admin;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.ExecuteQueryResult;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.raw.QueryResultRow;
-import org.apache.shardingsphere.infra.executor.sql.execute.result.query.raw.RawQueryResultSet;
+import org.apache.shardingsphere.infra.executor.sql.execute.result.query.raw.RawQueryResult;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.raw.metadata.QueryResultMetaData;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.raw.metadata.QueryResultRowMetaData;
import org.apache.shardingsphere.infra.executor.sql.execute.result.query.QueryHeader;
@@ -58,8 +58,8 @@ public final class ShowTablesBackendHandler implements TextProtocolBackendHandle
null, result.getQueryHeaders().get(0).getColumnName(), result.getQueryHeaders().get(0).getColumnLabel(), Types.VARCHAR, "VARCHAR", 255, 0, false, false, false)));
Collection<String> allTableNames = ProxyContext.getInstance().getMetaData(backendConnection.getSchemaName()).getSchema().getAllTableNames();
List<QueryResultRow> rows = allTableNames.stream().map(each -> new QueryResultRow(Collections.singletonList(each))).collect(Collectors.toList());
- ExecuteQueryResult queryResultSet = new RawQueryResultSet(metaData, rows);
- result.getQueryResultSets().add(queryResultSet);
+ ExecuteQueryResult queryResult = new RawQueryResult(metaData, rows);
+ result.getQueryResults().add(queryResult);
queryResponse = result;
return result;
}
@@ -71,14 +71,14 @@ public final class ShowTablesBackendHandler implements TextProtocolBackendHandle
@Override
public boolean next() throws SQLException {
- return null != queryResponse && queryResponse.getQueryResultSets().get(0).next();
+ return null != queryResponse && queryResponse.getQueryResults().get(0).next();
}
@Override
public Collection<Object> getRowData() throws SQLException {
Collection<Object> result = new LinkedList<>();
for (int columnIndex = 1; columnIndex <= queryResponse.getQueryHeaders().size(); columnIndex++) {
- result.add(queryResponse.getQueryResultSets().get(0).getValue(columnIndex, Object.class));
+ result.add(queryResponse.getQueryResults().get(0).getValue(columnIndex, Object.class));
}
return result;
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/binary/bind/PostgreSQLComBindExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/binary/bind/PostgreSQLComBindExecutor.java
index 286db17..0aa81f0 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/binary/bind/PostgreSQLComBindExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/binary/bind/PostgreSQLComBindExecutor.java
@@ -107,10 +107,10 @@ public final class PostgreSQLComBindExecutor implements QueryCommandExecutor {
private Collection<PostgreSQLColumnDescription> createColumnDescriptions(final QueryResponse queryResponse) throws SQLException {
Collection<PostgreSQLColumnDescription> result = new LinkedList<>();
- List<ExecuteQueryResult> queryResultSets = queryResponse.getQueryResultSets();
+ List<ExecuteQueryResult> queryResults = queryResponse.getQueryResults();
int columnIndex = 0;
for (QueryHeader each : queryResponse.getQueryHeaders()) {
- String columnTypeName = queryResultSets.isEmpty() ? null : queryResultSets.get(0).getColumnTypeName(columnIndex + 1);
+ String columnTypeName = queryResults.isEmpty() ? null : queryResults.get(0).getColumnTypeName(columnIndex + 1);
result.add(new PostgreSQLColumnDescription(each.getColumnName(), ++columnIndex, each.getColumnType(), each.getColumnLength(), columnTypeName));
}
return result;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/text/PostgreSQLComQueryExecutor.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/text/PostgreSQLComQueryExecutor.java
index 9b91a42..3eb8c73 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/text/PostgreSQLComQueryExecutor.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/text/PostgreSQLComQueryExecutor.java
@@ -82,10 +82,10 @@ public final class PostgreSQLComQueryExecutor implements QueryCommandExecutor {
private Collection<PostgreSQLColumnDescription> createColumnDescriptions(final QueryResponse queryResponse) throws SQLException {
Collection<PostgreSQLColumnDescription> result = new LinkedList<>();
- List<ExecuteQueryResult> queryResultSets = queryResponse.getQueryResultSets();
+ List<ExecuteQueryResult> queryResults = queryResponse.getQueryResults();
int columnIndex = 0;
for (QueryHeader each : queryResponse.getQueryHeaders()) {
- String columnTypeName = queryResultSets.isEmpty() ? null : queryResultSets.get(0).getColumnTypeName(columnIndex + 1);
+ String columnTypeName = queryResults.isEmpty() ? null : queryResults.get(0).getColumnTypeName(columnIndex + 1);
result.add(new PostgreSQLColumnDescription(each.getColumnName(), ++columnIndex, each.getColumnType(), each.getColumnLength(), columnTypeName));
}
return result;