You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/05/03 07:44:15 UTC
[shardingsphere] branch master updated: Unify return value name as result (#17290)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 b34c423f953 Unify return value name as result (#17290)
b34c423f953 is described below
commit b34c423f9532ffe424ce2dbe6ac258b986bea921
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Tue May 3 15:44:07 2022 +0800
Unify return value name as result (#17290)
---
.../bind/protocol/PostgreSQLByteConverter.java | 14 ++--
.../dal/MergedEncryptColumnsMergedResultTest.java | 6 +-
.../impl/EncryptProjectionTokenGeneratorTest.java | 42 +++++------
.../ShardingSchemaMetaDataBuilderTest.java | 10 +--
.../token/ProjectionsTokenGeneratorTest.java | 54 +++++++-------
.../query/ShowScalingJobStatusQueryResultSet.java | 26 +++----
.../query/ShowScalingListQueryResultSet.java | 16 ++---
.../impl/ExpressionProjectionConverter.java | 8 +--
.../data/pipeline/core/job/FinishedCheckJob.java | 6 +-
.../cluster/etcd/lock/EtcdInternalLockHolder.java | 10 +--
.../lock/ZookeeperInternalLockHolder.java | 20 +++---
.../information/SelectInformationExecutorTest.java | 26 +++----
.../executor/SelectDatabaseExecutorTest.java | 82 +++++++++++-----------
13 files changed, 152 insertions(+), 168 deletions(-)
diff --git a/shardingsphere-db-protocol/shardingsphere-db-protocol-postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLByteConverter.java b/shardingsphere-db-protocol/shardingsphere-db-protocol-postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLByteConverter.java
index 88ac3026128..c814e347c5b 100644
--- a/shardingsphere-db-protocol/shardingsphere-db-protocol-postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLByteConverter.java
+++ b/shardingsphere-db-protocol/shardingsphere-db-protocol-postgresql/src/main/java/org/apache/shardingsphere/db/protocol/postgresql/packet/command/query/extended/bind/protocol/PostgreSQLByteConverter.java
@@ -123,9 +123,9 @@ public final class PostgreSQLByteConverter {
}
private static byte[] initBytesZeroCase(final int scale) {
- final byte[] bytes = new byte[]{0, 0, -1, -1, 0, 0, 0, 0};
- int2(bytes, 6, Math.max(0, scale));
- return bytes;
+ final byte[] result = new byte[]{0, 0, -1, -1, 0, 0, 0, 0};
+ int2(result, 6, Math.max(0, scale));
+ return result;
}
private static int initShortValuesNoneScaled(final PositiveShortStack shortStacks, final BigInteger unscaled, final int weight) {
@@ -148,7 +148,7 @@ public final class PostgreSQLByteConverter {
}
private static int initShortValuesScaled(final PositiveShortStack shortStacks, final BigInteger unscaled, final int scale) {
- int weight = -1;
+ int result = -1;
final BigInteger[] split = unscaled.divideAndRemainder(tenPower(scale));
BigInteger decimal = split[1];
BigInteger wholes = split[0];
@@ -166,7 +166,7 @@ public final class PostgreSQLByteConverter {
--segments;
} while (!BigInteger.ZERO.equals(decimal));
if (BigInteger.ZERO.equals(wholes)) {
- weight -= segments;
+ result -= segments;
} else {
for (int i = 0; i < segments; ++i) {
shortStacks.push((short) 0);
@@ -174,12 +174,12 @@ public final class PostgreSQLByteConverter {
}
}
while (!BigInteger.ZERO.equals(wholes)) {
- ++weight;
+ ++result;
final BigInteger[] pair = wholes.divideAndRemainder(BI_TEN_THOUSAND);
wholes = pair[0];
shortStacks.push(pair[1].shortValue());
}
- return weight;
+ return result;
}
private static byte[] initBytes(final BigDecimal number, final PositiveShortStack shortStacks, final int scale, final int weight) {
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/MergedEncryptColumnsMergedResultTest.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/MergedEncryptColumnsMergedResultTest.java
index 909f29c0676..88e76668337 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/MergedEncryptColumnsMergedResultTest.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/merge/dal/MergedEncryptColumnsMergedResultTest.java
@@ -72,13 +72,13 @@ public final class MergedEncryptColumnsMergedResultTest {
}
private EncryptRule mockEncryptRule() {
- EncryptRule encryptRule = mock(EncryptRule.class);
+ EncryptRule result = mock(EncryptRule.class);
EncryptTable encryptTable = mock(EncryptTable.class);
- when(encryptRule.findEncryptTable("test")).thenReturn(Optional.of(encryptTable));
+ when(result.findEncryptTable("test")).thenReturn(Optional.of(encryptTable));
when(encryptTable.getAssistedQueryColumns()).thenReturn(Collections.singleton("assistedQuery"));
when(encryptTable.isCipherColumn("cipher")).thenReturn(true);
when(encryptTable.getLogicColumn("cipher")).thenReturn("id");
- return encryptRule;
+ return result;
}
@Test
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/impl/EncryptProjectionTokenGeneratorTest.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/impl/EncryptProjectionTokenGeneratorTest.java
index 4fbc370f3ad..e3818ad4233 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/impl/EncryptProjectionTokenGeneratorTest.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/impl/EncryptProjectionTokenGeneratorTest.java
@@ -41,8 +41,6 @@ import org.junit.Test;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Optional;
import static org.hamcrest.CoreMatchers.is;
@@ -58,8 +56,23 @@ public final class EncryptProjectionTokenGeneratorTest {
@Before
public void setup() {
generator = new EncryptProjectionTokenGenerator();
- generator.setEncryptRule(buildEncryptRule());
- generator.setSchemas(mockSchemaMap());
+ generator.setEncryptRule(mockEncryptRule());
+ generator.setSchemas(Collections.singletonMap("test", mock(ShardingSphereSchema.class)));
+ }
+
+ private EncryptRule mockEncryptRule() {
+ EncryptRule result = mock(EncryptRule.class);
+ EncryptTable encryptTable1 = mock(EncryptTable.class);
+ EncryptTable encryptTable2 = mock(EncryptTable.class);
+ when(encryptTable1.getLogicColumns()).thenReturn(Collections.singletonList("mobile"));
+ when(encryptTable2.getLogicColumns()).thenReturn(Collections.singletonList("mobile"));
+ when(result.findPlainColumn("doctor", "mobile")).thenReturn(Optional.of("mobile"));
+ when(result.findPlainColumn("doctor1", "mobile")).thenReturn(Optional.of("Mobile"));
+ when(result.findEncryptTable("doctor")).thenReturn(Optional.of(encryptTable1));
+ when(result.findEncryptTable("doctor1")).thenReturn(Optional.of(encryptTable2));
+ EncryptColumn column = new EncryptColumn(null, "mobile", null, null, null, "mobile", null, null);
+ when(result.findEncryptColumn("doctor", "mobile")).thenReturn(Optional.of(column));
+ return result;
}
@Test
@@ -114,25 +127,4 @@ public final class EncryptProjectionTokenGeneratorTest {
Collection<SubstitutableColumnNameToken> actual = generator.generateSQLTokens(sqlStatementContext);
assertThat(actual.size(), is(1));
}
-
- private EncryptRule buildEncryptRule() {
- EncryptRule encryptRule = mock(EncryptRule.class);
- EncryptTable encryptTable1 = mock(EncryptTable.class);
- EncryptTable encryptTable2 = mock(EncryptTable.class);
- when(encryptTable1.getLogicColumns()).thenReturn(Collections.singletonList("mobile"));
- when(encryptTable2.getLogicColumns()).thenReturn(Collections.singletonList("mobile"));
- when(encryptRule.findPlainColumn("doctor", "mobile")).thenReturn(Optional.of("mobile"));
- when(encryptRule.findPlainColumn("doctor1", "mobile")).thenReturn(Optional.of("Mobile"));
- when(encryptRule.findEncryptTable("doctor")).thenReturn(Optional.of(encryptTable1));
- when(encryptRule.findEncryptTable("doctor1")).thenReturn(Optional.of(encryptTable2));
- EncryptColumn column = new EncryptColumn(null, "mobile", null, null, null, "mobile", null, null);
- when(encryptRule.findEncryptColumn("doctor", "mobile")).thenReturn(Optional.of(column));
- return encryptRule;
- }
-
- private Map<String, ShardingSphereSchema> mockSchemaMap() {
- Map<String, ShardingSphereSchema> result = new HashMap<>(1, 1);
- result.put("test", mock(ShardingSphereSchema.class));
- return result;
- }
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/metadata/ShardingSchemaMetaDataBuilderTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/metadata/ShardingSchemaMetaDataBuilderTest.java
index 12cdada6fcb..44b53cf71d5 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/metadata/ShardingSchemaMetaDataBuilderTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/metadata/ShardingSchemaMetaDataBuilderTest.java
@@ -235,11 +235,11 @@ public class ShardingSchemaMetaDataBuilderTest {
}
private ResultSet createDataTypeResultSet() throws SQLException {
- ResultSet dataTypeResultSet = mock(ResultSet.class);
- when(dataTypeResultSet.next()).thenReturn(true, false);
- when(dataTypeResultSet.getString("TYPE_NAME")).thenReturn("INT");
- when(dataTypeResultSet.getInt("DATA_TYPE")).thenReturn(1);
- return dataTypeResultSet;
+ ResultSet result = mock(ResultSet.class);
+ when(result.next()).thenReturn(true, false);
+ when(result.getString("TYPE_NAME")).thenReturn("INT");
+ when(result.getInt("DATA_TYPE")).thenReturn(1);
+ return result;
}
@Test
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ProjectionsTokenGeneratorTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ProjectionsTokenGeneratorTest.java
index 3038b34f724..02989ebc651 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ProjectionsTokenGeneratorTest.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/test/java/org/apache/shardingsphere/sharding/rewrite/token/ProjectionsTokenGeneratorTest.java
@@ -35,11 +35,13 @@ import org.apache.shardingsphere.sql.parser.sql.common.value.identifier.Identifi
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dml.MySQLSelectStatement;
import org.junit.Before;
import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
-import java.util.List;
import java.util.Optional;
import static org.hamcrest.CoreMatchers.is;
@@ -51,6 +53,7 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+@RunWith(MockitoJUnitRunner.class)
public final class ProjectionsTokenGeneratorTest {
private static final String TEST_AGGREGATION_DISTINCT_PROJECTION_DISTINCT_INNER_EXPRESSION = "TEST_AGGREGATION_DISTINCT_PROJECTION_DISTINCT_INNER_EXPRESSION";
@@ -67,6 +70,7 @@ public final class ProjectionsTokenGeneratorTest {
private static final String TEST_OTHER_DERIVED_PROJECTION_EXPRESSION = "TEST_OTHER_DERIVED_PROJECTION_EXPRESSION";
+ @Mock
private RouteUnit routeUnit;
@Before
@@ -74,25 +78,25 @@ public final class ProjectionsTokenGeneratorTest {
RouteMapper routeMapper = mock(RouteMapper.class);
when(routeMapper.getLogicName()).thenReturn(TEST_LOGIC_TABLE_NAME);
when(routeMapper.getActualName()).thenReturn("TEST_ACTUAL_TABLE_NAME");
- Collection<RouteMapper> routeMapperCollection = new LinkedList<>();
- routeMapperCollection.add(routeMapper);
- routeUnit = mock(RouteUnit.class);
- when(routeUnit.getTableMappers()).thenReturn(routeMapperCollection);
+ when(routeUnit.getTableMappers()).thenReturn(Collections.singleton(routeMapper));
}
@Test
- public void assertIsGenerateSQLToken() {
- ProjectionsTokenGenerator projectionsTokenGenerator = getProjectionsTokenGenerator();
- InsertStatementContext insertStatementContext = mock(InsertStatementContext.class);
- assertFalse(projectionsTokenGenerator.isGenerateSQLToken(insertStatementContext));
+ public void assertIsGenerateInsertToken() {
+ assertFalse(getProjectionsTokenGenerator().isGenerateSQLToken(mock(InsertStatementContext.class)));
+ }
+
+ @Test
+ public void assertIsNotGenerateSelectToken() {
+ assertFalse(getProjectionsTokenGenerator().isGenerateSQLToken(mock(SelectStatementContext.class, RETURNS_DEEP_STUBS)));
+ }
+
+ @Test
+ public void assertIsGenerateSelectToken() {
SelectStatementContext selectStatementContext = mock(SelectStatementContext.class, RETURNS_DEEP_STUBS);
- when(selectStatementContext.getProjectionsContext().getProjections()).thenReturn(Collections.emptyList());
- assertFalse(projectionsTokenGenerator.isGenerateSQLToken(selectStatementContext));
AggregationProjection aggregationProjection = getAggregationProjection();
- Collection<Projection> projectionCollection = new LinkedList<>();
- projectionCollection.add(aggregationProjection);
- when(selectStatementContext.getProjectionsContext().getProjections()).thenReturn(projectionCollection);
- assertTrue(projectionsTokenGenerator.isGenerateSQLToken(selectStatementContext));
+ when(selectStatementContext.getProjectionsContext().getProjections()).thenReturn(Collections.singleton(aggregationProjection));
+ assertTrue(getProjectionsTokenGenerator().isGenerateSQLToken(selectStatementContext));
}
@Test
@@ -117,10 +121,8 @@ public final class ProjectionsTokenGeneratorTest {
}
private ProjectionsTokenGenerator getProjectionsTokenGenerator() {
- Collection<RouteUnit> routeUnitCollection = new LinkedList<>();
- routeUnitCollection.add(routeUnit);
RouteContext routeContext = mock(RouteContext.class);
- when(routeContext.getRouteUnits()).thenReturn(routeUnitCollection);
+ when(routeContext.getRouteUnits()).thenReturn(Collections.singleton(routeUnit));
ProjectionsTokenGenerator result = new ProjectionsTokenGenerator();
result.setRouteContext(routeContext);
return result;
@@ -130,11 +132,9 @@ public final class ProjectionsTokenGeneratorTest {
AggregationDistinctProjection derivedAggregationDistinctProjection = mock(AggregationDistinctProjection.class);
when(derivedAggregationDistinctProjection.getDistinctInnerExpression()).thenReturn(TEST_AGGREGATION_DISTINCT_PROJECTION_DISTINCT_INNER_EXPRESSION);
when(derivedAggregationDistinctProjection.getAlias()).thenReturn(Optional.of(TEST_AGGREGATION_DISTINCT_PROJECTION_ALIAS));
- List<AggregationProjection> derivedAggregationProjectionList = new LinkedList<>();
- derivedAggregationProjectionList.add(derivedAggregationDistinctProjection);
- AggregationProjection aggregationProjection = mock(AggregationProjection.class);
- when(aggregationProjection.getDerivedAggregationProjections()).thenReturn(derivedAggregationProjectionList);
- return aggregationProjection;
+ AggregationProjection result = mock(AggregationProjection.class);
+ when(result.getDerivedAggregationProjections()).thenReturn(Collections.singletonList(derivedAggregationDistinctProjection));
+ return result;
}
private DerivedProjection getDerivedProjection() {
@@ -147,10 +147,10 @@ public final class ProjectionsTokenGeneratorTest {
when(oldColumnOrderByItemSegment.getOrderDirection()).thenReturn(orderDirection);
IdentifierValue oldColumnIdentifierValue = mock(IdentifierValue.class);
when(oldColumnOrderByItemSegment.getColumn().getIdentifier()).thenReturn(oldColumnIdentifierValue);
- DerivedProjection derivedProjection = mock(DerivedProjection.class);
- when(derivedProjection.getAlias()).thenReturn(Optional.of(TEST_DERIVED_PROJECTION_ALIAS));
- when(derivedProjection.getDerivedProjection()).thenReturn(oldColumnOrderByItemSegment);
- return derivedProjection;
+ DerivedProjection result = mock(DerivedProjection.class);
+ when(result.getAlias()).thenReturn(Optional.of(TEST_DERIVED_PROJECTION_ALIAS));
+ when(result.getDerivedProjection()).thenReturn(oldColumnOrderByItemSegment);
+ return result;
}
private DerivedProjection getOtherDerivedProjection() {
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShowScalingJobStatusQueryResultSet.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShowScalingJobStatusQueryResultSet.java
index 4e3df000fef..333d9cf2b97 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShowScalingJobStatusQueryResultSet.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShowScalingJobStatusQueryResultSet.java
@@ -45,23 +45,23 @@ public final class ShowScalingJobStatusQueryResultSet implements DistSQLResultSe
long currentTimeMillis = System.currentTimeMillis();
data = RULE_ALTERED_JOB_API.getProgress(((ShowScalingStatusStatement) sqlStatement).getJobId()).entrySet().stream()
.map(entry -> {
- Collection<Object> list = new LinkedList<>();
- list.add(entry.getKey());
+ Collection<Object> result = new LinkedList<>();
+ result.add(entry.getKey());
if (null != entry.getValue()) {
- list.add(entry.getValue().getDataSource());
- list.add(entry.getValue().getStatus());
- list.add(entry.getValue().isActive() ? Boolean.TRUE.toString() : Boolean.FALSE.toString());
- list.add(entry.getValue().getInventoryFinishedPercentage());
+ result.add(entry.getValue().getDataSource());
+ result.add(entry.getValue().getStatus());
+ result.add(entry.getValue().isActive() ? Boolean.TRUE.toString() : Boolean.FALSE.toString());
+ result.add(entry.getValue().getInventoryFinishedPercentage());
long latestActiveTimeMillis = entry.getValue().getIncrementalLatestActiveTimeMillis();
- list.add(latestActiveTimeMillis > 0 ? TimeUnit.MILLISECONDS.toSeconds(currentTimeMillis - latestActiveTimeMillis) : 0);
+ result.add(latestActiveTimeMillis > 0 ? TimeUnit.MILLISECONDS.toSeconds(currentTimeMillis - latestActiveTimeMillis) : 0);
} else {
- list.add("");
- list.add("");
- list.add("");
- list.add("");
- list.add("");
+ result.add("");
+ result.add("");
+ result.add("");
+ result.add("");
+ result.add("");
}
- return list;
+ return result;
}).collect(Collectors.toList()).iterator();
}
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShowScalingListQueryResultSet.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShowScalingListQueryResultSet.java
index 7ca161d9621..5cc218bbdce 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShowScalingListQueryResultSet.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-distsql/shardingsphere-sharding-distsql-handler/src/main/java/org/apache/shardingsphere/scaling/distsql/handler/query/ShowScalingListQueryResultSet.java
@@ -43,14 +43,14 @@ public final class ShowScalingListQueryResultSet implements DistSQLResultSet {
public void init(final ShardingSphereMetaData metaData, final SQLStatement sqlStatement) {
data = RULE_ALTERED_JOB_API.list().stream()
.map(each -> {
- Collection<Object> list = new LinkedList<>();
- list.add(each.getJobId());
- list.add(each.getTables());
- list.add(each.getShardingTotalCount());
- list.add(each.isActive() ? Boolean.TRUE.toString() : Boolean.FALSE.toString());
- list.add(each.getCreateTime());
- list.add(each.getStopTime());
- return list;
+ Collection<Object> result = new LinkedList<>();
+ result.add(each.getJobId());
+ result.add(each.getTables());
+ result.add(each.getShardingTotalCount());
+ result.add(each.isActive() ? Boolean.TRUE.toString() : Boolean.FALSE.toString());
+ result.add(each.getCreateTime());
+ result.add(each.getStopTime());
+ return result;
}).collect(Collectors.toList()).iterator();
}
diff --git a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/converter/segment/projection/impl/ExpressionProjectionConverter.java b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/converter/segment/projection/impl/ExpressionProjectionConverter.java
index 443bc173bd9..e1e7cba79cb 100644
--- a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/converter/segment/projection/impl/ExpressionProjectionConverter.java
+++ b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/converter/segment/projection/impl/ExpressionProjectionConverter.java
@@ -45,12 +45,12 @@ public final class ExpressionProjectionConverter implements SQLSegmentConverter<
if (null == segment) {
return Optional.empty();
}
- Optional<SqlNode> exprSqlNode = new ExpressionConverter().convertToSQLNode(segment.getExpr());
- if (exprSqlNode.isPresent() && segment.getAlias().isPresent()) {
- return Optional.of(new SqlBasicCall(SqlStdOperatorTable.AS, new SqlNode[]{exprSqlNode.get(),
+ Optional<SqlNode> result = new ExpressionConverter().convertToSQLNode(segment.getExpr());
+ if (result.isPresent() && segment.getAlias().isPresent()) {
+ return Optional.of(new SqlBasicCall(SqlStdOperatorTable.AS, new SqlNode[]{result.get(),
SqlIdentifier.star(Collections.singletonList(segment.getAlias().get()), SqlParserPos.ZERO, Collections.singletonList(SqlParserPos.ZERO))}, SqlParserPos.ZERO));
}
- return exprSqlNode;
+ return result;
}
@Override
diff --git a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/FinishedCheckJob.java b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/FinishedCheckJob.java
index 2106150a548..a644c973252 100644
--- a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/FinishedCheckJob.java
+++ b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/FinishedCheckJob.java
@@ -99,14 +99,12 @@ public final class FinishedCheckJob implements SimpleJob {
private boolean isNotAllowDataCheck(final String jobId) {
Map<Integer, JobProgress> jobProgressMap = ruleAlteredJobAPI.getProgress(jobId);
- boolean flag = false;
for (JobProgress each : jobProgressMap.values()) {
if (null == each || !JobStatus.EXECUTE_INCREMENTAL_TASK.equals(each.getStatus())) {
- flag = true;
- break;
+ return true;
}
}
- return flag;
+ return false;
}
private boolean dataConsistencyCheck(final RuleAlteredJobConfiguration jobConfig) {
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/lock/EtcdInternalLockHolder.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphe [...]
index 02274fb9904..08fb9c8b949 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/lock/EtcdInternalLockHolder.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/lock/EtcdInternalLockHolder.java
@@ -62,12 +62,12 @@ public class EtcdInternalLockHolder {
* @return standard lock
*/
public Lock getStandardLock(final String lockName) {
- EtcdInternalLock lock = locks.get(lockName);
- if (Objects.isNull(lock)) {
- lock = createLock(lockName);
- locks.put(lockName, lock);
+ EtcdInternalLock result = locks.get(lockName);
+ if (Objects.isNull(result)) {
+ result = createLock(lockName);
+ locks.put(lockName, result);
}
- return lock;
+ return result;
}
private EtcdInternalLock createLock(final String lockName) {
diff --git a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/ZookeeperInternalLockHolder.java b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repositor [...]
index e070294f394..3bb8f785cbd 100644
--- a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/ZookeeperInternalLockHolder.java
+++ b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/lock/ZookeeperInternalLockHolder.java
@@ -48,12 +48,12 @@ public class ZookeeperInternalLockHolder {
* @return global lock
*/
public Lock getGlobalLock(final String lockName) {
- ZookeeperInternalLock lock = locks.get(lockName);
- if (Objects.isNull(lock)) {
- lock = new ZookeeperInternalLock(new InterProcessSemaphoreMutex(client, lockName));
- locks.put(lockName, lock);
+ ZookeeperInternalLock result = locks.get(lockName);
+ if (Objects.isNull(result)) {
+ result = new ZookeeperInternalLock(new InterProcessSemaphoreMutex(client, lockName));
+ locks.put(lockName, result);
}
- return lock;
+ return result;
}
/**
@@ -63,12 +63,12 @@ public class ZookeeperInternalLockHolder {
* @return standard lock
*/
public Lock getStandardLock(final String lockName) {
- ZookeeperInternalLock lock = locks.get(lockName);
- if (Objects.isNull(lock)) {
- lock = new ZookeeperInternalLock(new InterProcessMutex(client, lockName));
- locks.put(lockName, lock);
+ ZookeeperInternalLock result = locks.get(lockName);
+ if (Objects.isNull(result)) {
+ result = new ZookeeperInternalLock(new InterProcessMutex(client, lockName));
+ locks.put(lockName, result);
}
- return lock;
+ return result;
}
/**
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/information/SelectInformationExecutorTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/information/SelectInformationExecutorTest.java
index ddb9dd1ba0d..3d38b835ad8 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/information/SelectInformationExecutorTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/executor/information/SelectInformationExecutorTest.java
@@ -89,7 +89,7 @@ public final class SelectInformationExecutorTest {
when(connectionSession.getGrantee()).thenReturn(new Grantee("root", "127.0.0.1"));
}
- private void mockResultSet(final Map<String, String> mockMap, final Boolean... values) throws SQLException {
+ private void mockResultSet(final Map<String, String> mockMap) throws SQLException {
ResultSetMetaData metaData = mock(ResultSetMetaData.class);
List<String> keys = new ArrayList<>(mockMap.keySet());
for (int i = 0; i < keys.size(); i++) {
@@ -121,15 +121,13 @@ public final class SelectInformationExecutorTest {
private Map<String, DataSource> mockDatasourceMap() throws SQLException {
DataSource dataSource = mock(DataSource.class, RETURNS_DEEP_STUBS);
when(dataSource.getConnection().prepareStatement(any(String.class)).executeQuery()).thenReturn(RESULT_SET);
- Map<String, DataSource> dataSourceMap = new HashMap<>();
- dataSourceMap.put("ds_0", dataSource);
- return dataSourceMap;
+ return Collections.singletonMap("ds_0", dataSource);
}
private DataSourcesMetaData mockDataSourcesMetaData() {
- DataSourcesMetaData meta = mock(DataSourcesMetaData.class, RETURNS_DEEP_STUBS);
- when(meta.getDataSourceMetaData("ds_0").getCatalog()).thenReturn("demo_ds_0");
- return meta;
+ DataSourcesMetaData result = mock(DataSourcesMetaData.class, RETURNS_DEEP_STUBS);
+ when(result.getDataSourceMetaData("ds_0").getCatalog()).thenReturn("demo_ds_0");
+ return result;
}
@Test
@@ -140,7 +138,7 @@ public final class SelectInformationExecutorTest {
mockResultSetMap.put("SCHEMA_NAME", "demo_ds_0");
mockResultSetMap.put("DEFAULT_CHARACTER_SET_NAME", "utf8mb4_0900_ai_ci");
mockResultSetMap.put("DEFAULT_COLLATION_NAME", "utf8mb4");
- mockResultSet(mockResultSetMap, true, false);
+ mockResultSet(mockResultSetMap);
Map<String, ShardingSphereMetaData> metaDataMap = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaDataMap();
metaDataMap.put("sharding_db", getMetaData());
metaDataMap.put("test", getEmptyMetaData("test"));
@@ -167,12 +165,12 @@ public final class SelectInformationExecutorTest {
public void assertSelectSchemataInSchemaWithoutDataSourceExecute() throws SQLException {
final String sql = "SELECT SCHEMA_NAME, DEFAULT_CHARACTER_SET_NAME, DEFAULT_COLLATION_NAME, DEFAULT_ENCRYPTION FROM information_schema.SCHEMATA";
final SQLStatement sqlStatement = new ShardingSphereSQLParserEngine("MySQL", parserConfig).parse(sql, false);
- Map<String, String> mockResultSetMap = new HashMap<>();
+ Map<String, String> mockResultSetMap = new HashMap<>(4, 1);
mockResultSetMap.put("SCHEMA_NAME", "demo_ds_0");
mockResultSetMap.put("DEFAULT_CHARACTER_SET_NAME", "utf8mb4_0900_ai_ci");
mockResultSetMap.put("DEFAULT_COLLATION_NAME", "utf8mb4");
mockResultSetMap.put("DEFAULT_ENCRYPTION", "NO");
- mockResultSet(mockResultSetMap, false);
+ mockResultSet(mockResultSetMap);
Map<String, ShardingSphereMetaData> metaDataMap = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaDataMap();
metaDataMap.put("sharding_db", getEmptyMetaData("sharding_db"));
SelectInformationSchemataExecutor selectSchemataExecutor = new SelectInformationSchemataExecutor((SelectStatement) sqlStatement, sql);
@@ -201,7 +199,7 @@ public final class SelectInformationExecutorTest {
Map<String, String> mockResultSetMap = new HashMap<>();
mockResultSetMap.put("sn", "demo_ds_0");
mockResultSetMap.put("DEFAULT_CHARACTER_SET_NAME", "utf8mb4");
- mockResultSet(mockResultSetMap, false);
+ mockResultSet(mockResultSetMap);
Map<String, ShardingSphereMetaData> metaDataMap = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaDataMap();
metaDataMap.put("demo_ds_0", getMetaData());
metaDataMap.put("test", getEmptyMetaData("test"));
@@ -214,14 +212,12 @@ public final class SelectInformationExecutorTest {
@Test
public void assertDefaultExecute() throws SQLException {
final String sql = "SELECT COUNT(*) AS support_ndb FROM information_schema.ENGINES WHERE Engine = 'ndbcluster'";
- Map<String, String> mockMap = new HashMap<>();
- mockMap.put("support_ndb", "0");
- mockResultSet(mockMap, false);
+ mockResultSet(Collections.singletonMap("support_ndb", "0"));
Map<String, ShardingSphereMetaData> metaDataMap = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaDataMap();
metaDataMap.put("sharding_db", getMetaData());
DefaultDatabaseMetadataExecutor defaultSelectMetaDataExecutor = new DefaultDatabaseMetadataExecutor(sql);
defaultSelectMetaDataExecutor.execute(connectionSession);
- assertThat(defaultSelectMetaDataExecutor.getQueryResultMetaData().getColumnCount(), is(mockMap.size()));
+ assertThat(defaultSelectMetaDataExecutor.getQueryResultMetaData().getColumnCount(), is(1));
while (defaultSelectMetaDataExecutor.getMergedResult().next()) {
assertThat(defaultSelectMetaDataExecutor.getMergedResult().getValue(1, String.class), is("0"));
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/executor/SelectDatabaseExecutorTest.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/executor/SelectDatabaseExecutorTest.java
index 35245ce8239..0e66d558e64 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/executor/SelectDatabaseExecutorTest.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/admin/postgresql/executor/SelectDatabaseExecutorTest.java
@@ -81,7 +81,7 @@ public final class SelectDatabaseExecutorTest {
ProxyContext.getInstance().init(contextManager);
}
- private void mockResultSet(final Map<String, String> mockMap, final Boolean... values) throws SQLException {
+ private void mockResultSet(final Map<String, String> mockMap) throws SQLException {
ResultSetMetaData metaData = mock(ResultSetMetaData.class);
List<String> keys = new ArrayList<>(mockMap.keySet());
for (int i = 0; i < keys.size(); i++) {
@@ -111,19 +111,17 @@ public final class SelectDatabaseExecutorTest {
private Map<String, DataSource> mockDatasourceMap() throws SQLException {
DataSource dataSource = mock(DataSource.class, RETURNS_DEEP_STUBS);
when(dataSource.getConnection().prepareStatement(any(String.class)).executeQuery()).thenReturn(RESULT_SET);
- Map<String, DataSource> dataSourceMap = new HashMap<>();
- dataSourceMap.put("ds_0", dataSource);
- return dataSourceMap;
+ return Collections.singletonMap("ds_0", dataSource);
}
private DataSourcesMetaData mockDataSourcesMetaData() {
- DataSourcesMetaData meta = mock(DataSourcesMetaData.class, RETURNS_DEEP_STUBS);
- when(meta.getDataSourceMetaData("ds_0").getCatalog()).thenReturn("demo_ds_0");
- return meta;
+ DataSourcesMetaData result = mock(DataSourcesMetaData.class, RETURNS_DEEP_STUBS);
+ when(result.getDataSourceMetaData("ds_0").getCatalog()).thenReturn("demo_ds_0");
+ return result;
}
@Test
- public void assertSelectSchemataExecute() throws SQLException {
+ public void assertSelectDatabaseExecute() throws SQLException {
final String sql = "SELECT d.oid, d.datname AS databasename, d.datacl, d.datistemplate, d.datallowconn, pg_get_userbyid(d.datdba) AS databaseowner,"
+ " d.datcollate, d.datctype, shobj_description(d.oid, 'pg_database') AS description, d.datconnlimit, t.spcname, d.encoding, pg_encoding_to_char(d.encoding) AS encodingname "
+ "FROM pg_database d LEFT JOIN pg_tablespace t ON d.dattablespace = t.oid;";
@@ -133,22 +131,22 @@ public final class SelectDatabaseExecutorTest {
mockResultSetMap.put("databaseowner", "postgres");
mockResultSetMap.put("datconnlimit", "-1");
mockResultSetMap.put("datctype", "en_US.utf8");
- mockResultSet(mockResultSetMap, true, false);
+ mockResultSet(mockResultSetMap);
Map<String, ShardingSphereMetaData> metaDataMap = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaDataMap();
metaDataMap.put("sharding_db", getMetaData());
metaDataMap.put("test", getEmptyMetaData("test"));
- SelectDatabaseExecutor selectSchemataExecutor = new SelectDatabaseExecutor((SelectStatement) sqlStatement, sql);
- selectSchemataExecutor.execute(mock(ConnectionSession.class));
- assertThat(selectSchemataExecutor.getQueryResultMetaData().getColumnCount(), is(mockResultSetMap.size()));
+ SelectDatabaseExecutor selectDatabaseExecutor = new SelectDatabaseExecutor((SelectStatement) sqlStatement, sql);
+ selectDatabaseExecutor.execute(mock(ConnectionSession.class));
+ assertThat(selectDatabaseExecutor.getQueryResultMetaData().getColumnCount(), is(mockResultSetMap.size()));
int count = 0;
- while (selectSchemataExecutor.getMergedResult().next()) {
+ while (selectDatabaseExecutor.getMergedResult().next()) {
count++;
- if ("sharding_db".equals(selectSchemataExecutor.getMergedResult().getValue(1, String.class))) {
- assertThat(selectSchemataExecutor.getMergedResult().getValue(2, String.class), is("postgres"));
- assertThat(selectSchemataExecutor.getMergedResult().getValue(3, String.class), is("-1"));
- } else if ("test".equals(selectSchemataExecutor.getMergedResult().getValue(1, String.class))) {
- assertThat(selectSchemataExecutor.getMergedResult().getValue(2, String.class), is(""));
- assertThat(selectSchemataExecutor.getMergedResult().getValue(3, String.class), is(""));
+ if ("sharding_db".equals(selectDatabaseExecutor.getMergedResult().getValue(1, String.class))) {
+ assertThat(selectDatabaseExecutor.getMergedResult().getValue(2, String.class), is("postgres"));
+ assertThat(selectDatabaseExecutor.getMergedResult().getValue(3, String.class), is("-1"));
+ } else if ("test".equals(selectDatabaseExecutor.getMergedResult().getValue(1, String.class))) {
+ assertThat(selectDatabaseExecutor.getMergedResult().getValue(2, String.class), is(""));
+ assertThat(selectDatabaseExecutor.getMergedResult().getValue(3, String.class), is(""));
} else {
fail("expected : `sharding_db` or `test`");
}
@@ -157,54 +155,54 @@ public final class SelectDatabaseExecutorTest {
}
@Test
- public void assertSelectSchemataWithoutDataSourceExecute1() throws SQLException {
+ public void assertSelectDatabaseWithoutDataSourceExecute() throws SQLException {
final String sql = "SELECT d.oid, d.datname AS databasename, d.datacl, d.datistemplate, d.datallowconn, pg_get_userbyid(d.datdba) AS databaseowner, "
+ "d.datcollate, d.datctype, shobj_description(d.oid, 'pg_database') AS description, d.datconnlimit, t.spcname, d.encoding, pg_encoding_to_char(d.encoding) AS encodingname "
+ "FROM pg_database d LEFT JOIN pg_tablespace t ON d.dattablespace = t.oid;";
final SQLStatement sqlStatement = new ShardingSphereSQLParserEngine("PostgreSQL", parserConfig).parse(sql, false);
- Map<String, String> mockResultSetMap = new HashMap<>();
+ Map<String, String> mockResultSetMap = new HashMap<>(4, 1);
mockResultSetMap.put("databasename", "demo_ds_0");
mockResultSetMap.put("databaseowner", "postgres");
mockResultSetMap.put("datconnlimit", "-1");
mockResultSetMap.put("datctype", "en_US.utf8");
- mockResultSet(mockResultSetMap, false);
+ mockResultSet(mockResultSetMap);
Map<String, ShardingSphereMetaData> metaDataMap = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaDataMap();
metaDataMap.put("sharding_db", getEmptyMetaData("sharding_db"));
- SelectDatabaseExecutor selectSchemataExecutor = new SelectDatabaseExecutor((SelectStatement) sqlStatement, sql);
- selectSchemataExecutor.execute(mock(ConnectionSession.class));
- while (selectSchemataExecutor.getMergedResult().next()) {
- assertThat(selectSchemataExecutor.getMergedResult().getValue(1, String.class), is("sharding_db"));
+ SelectDatabaseExecutor selectDatabaseExecutor = new SelectDatabaseExecutor((SelectStatement) sqlStatement, sql);
+ selectDatabaseExecutor.execute(mock(ConnectionSession.class));
+ while (selectDatabaseExecutor.getMergedResult().next()) {
+ assertThat(selectDatabaseExecutor.getMergedResult().getValue(1, String.class), is("sharding_db"));
}
}
@Test
- public void assertSelectSchemataWithoutDataSourceExecuteAndWithColumnProjectionSegment() throws SQLException {
+ public void assertSelectDatabaseWithoutDataSourceExecuteAndWithColumnProjectionSegment() throws SQLException {
final String sql = "SELECT d.oid, d.datname AS databasename, d.datacl, d.datistemplate FROM pg_database d LEFT JOIN pg_tablespace t ON d.dattablespace = t.oid;";
final SQLStatement sqlStatement = new ShardingSphereSQLParserEngine("PostgreSQL", parserConfig).parse(sql, false);
- Map<String, String> mockResultSetMap = new HashMap<>();
+ Map<String, String> mockResultSetMap = new HashMap<>(4, 1);
mockResultSetMap.put("databasename", "demo_ds_0");
mockResultSetMap.put("databaseowner", "postgres");
mockResultSetMap.put("datconnlimit", "-1");
mockResultSetMap.put("datctype", "en_US.utf8");
- mockResultSet(mockResultSetMap, false);
+ mockResultSet(mockResultSetMap);
Map<String, ShardingSphereMetaData> metaDataMap = ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaDataMap();
metaDataMap.put("sharding_db", getEmptyMetaData("sharding_db"));
- SelectDatabaseExecutor selectSchemataExecutor = new SelectDatabaseExecutor((SelectStatement) sqlStatement, sql);
- selectSchemataExecutor.execute(mock(ConnectionSession.class));
- while (selectSchemataExecutor.getMergedResult().next()) {
- assertThat(selectSchemataExecutor.getMergedResult().getValue(1, String.class), is(""));
- assertThat(selectSchemataExecutor.getMergedResult().getValue(2, String.class), is("sharding_db"));
- assertThat(selectSchemataExecutor.getMergedResult().getValue(3, String.class), is(""));
- assertThat(selectSchemataExecutor.getMergedResult().getValue(4, String.class), is(""));
+ SelectDatabaseExecutor selectDatabaseExecutor = new SelectDatabaseExecutor((SelectStatement) sqlStatement, sql);
+ selectDatabaseExecutor.execute(mock(ConnectionSession.class));
+ while (selectDatabaseExecutor.getMergedResult().next()) {
+ assertThat(selectDatabaseExecutor.getMergedResult().getValue(1, String.class), is(""));
+ assertThat(selectDatabaseExecutor.getMergedResult().getValue(2, String.class), is("sharding_db"));
+ assertThat(selectDatabaseExecutor.getMergedResult().getValue(3, String.class), is(""));
+ assertThat(selectDatabaseExecutor.getMergedResult().getValue(4, String.class), is(""));
}
}
@Test
- public void assertSelectSchemataInNoSchemaExecute() throws SQLException {
- final String sql = "SELECT d.oid, d.datname AS databasename, d.datacl, d.datistemplate FROM pg_database d LEFT JOIN pg_tablespace t ON d.dattablespace = t.oid;";
- final SQLStatement sqlStatement = new ShardingSphereSQLParserEngine("PostgreSQL", parserConfig).parse(sql, false);
- SelectDatabaseExecutor selectSchemataExecutor = new SelectDatabaseExecutor((SelectStatement) sqlStatement, sql);
- selectSchemataExecutor.execute(mock(ConnectionSession.class));
- assertThat(selectSchemataExecutor.getQueryResultMetaData().getColumnCount(), is(0));
+ public void assertSelectDatabaseInNoSchemaExecute() throws SQLException {
+ String sql = "SELECT d.oid, d.datname AS databasename, d.datacl, d.datistemplate FROM pg_database d LEFT JOIN pg_tablespace t ON d.dattablespace = t.oid;";
+ SQLStatement sqlStatement = new ShardingSphereSQLParserEngine("PostgreSQL", parserConfig).parse(sql, false);
+ SelectDatabaseExecutor selectDatabaseExecutor = new SelectDatabaseExecutor((SelectStatement) sqlStatement, sql);
+ selectDatabaseExecutor.execute(mock(ConnectionSession.class));
+ assertThat(selectDatabaseExecutor.getQueryResultMetaData().getColumnCount(), is(0));
}
}