This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 8aae72a2975 Refactor Fix code inspection for proxy module (#31213)
8aae72a2975 is described below
commit 8aae72a29751302d08eaa7f9c4a5f200a93f29ab
Author: Liang Zhang <[email protected]>
AuthorDate: Sun May 12 12:02:30 2024 +0800
Refactor Fix code inspection for proxy module (#31213)
---
.../proxy/backend/config/ProxyConfigurationLoader.java | 7 ++++---
.../distsql/ral/queryable/ExportMetaDataExecutor.java | 5 +++--
.../distsql/ral/queryable/ExportStorageNodesExecutor.java | 2 +-
.../backend/response/header/update/UpdateResponseHeader.java | 6 +++---
.../connector/ProxyDatabaseConnectionManagerTest.java | 6 +++---
.../handler/distsql/ral/QueryableRALBackendHandlerTest.java | 5 +----
.../queryable/ExportDatabaseConfigurationExecutorTest.java | 2 +-
.../distsql/ral/queryable/ExportMetaDataExecutorTest.java | 2 +-
.../ral/queryable/ExportStorageNodesExecutorTest.java | 3 +--
.../distsql/ral/queryable/ShowTableMetaDataExecutorTest.java | 5 +----
.../proxy/backend/hbase/result/query/HBaseGetResultSet.java | 2 +-
.../backend/hbase/result/update/HBaseDeleteUpdater.java | 4 ++--
.../backend/hbase/result/update/HBaseInsertUpdater.java | 2 +-
.../hbase/result/update/HBaseRegionReloadUpdater.java | 2 +-
.../backend/hbase/result/update/HBaseUpdateUpdater.java | 4 ++--
.../proxy/backend/hbase/util/HBaseHeterogeneousUtils.java | 2 +-
.../backend/hbase/result/HBaseSupportedSQLStatement.java | 2 +-
.../hbase/result/update/HBaseBackendUpdateHandlerTest.java | 6 +++---
.../connector/sane/MySQLDialectSaneQueryResultEngine.java | 2 +-
.../handler/admin/executor/ShowFunctionStatusExecutor.java | 2 +-
.../handler/admin/executor/ShowProcedureStatusExecutor.java | 2 +-
.../sane/MySQLDialectSaneQueryResultEngineTest.java | 12 ++++++------
.../admin/executor/MySQLSetVariableAdminExecutorTest.java | 2 +-
.../handler/admin/executor/ShowCurrentUserExecutorTest.java | 3 +--
.../admin/OpenGaussSystemCatalogAdminQueryExecutorTest.java | 8 ++++----
.../admin/executor/PostgreSQLShowVariableExecutor.java | 2 +-
.../handler/admin/PostgreSQLAdminExecutorCreatorTest.java | 2 +-
.../admin/executor/PostgreSQLShowVariableExecutorTest.java | 2 +-
.../main/java/org/apache/shardingsphere/proxy/Bootstrap.java | 2 +-
.../org/apache/shardingsphere/proxy/frontend/CDCServer.java | 4 ++--
.../shardingsphere/proxy/frontend/ShardingSphereProxy.java | 2 +-
.../apache/shardingsphere/proxy/frontend/ssl/SSLUtils.java | 4 ++--
.../shardingsphere/proxy/frontend/ssl/SSLUtilsTest.java | 2 +-
.../binary/prepare/MySQLComStmtPrepareExecutorTest.java | 2 +-
.../MySQLComStmtPrepareParameterMarkerExtractorTest.java | 2 +-
.../command/query/simple/OpenGaussComQueryExecutor.java | 2 +-
.../authentication/OpenGaussAuthenticationEngineTest.java | 2 +-
.../postgresql/command/PostgreSQLCommandExecuteEngine.java | 4 ++--
.../frontend/postgresql/command/query/extended/Portal.java | 4 ++--
.../command/query/simple/PostgreSQLComQueryExecutor.java | 2 +-
.../authentication/PostgreSQLAuthenticationEngineTest.java | 11 +++++------
.../extended/PostgreSQLBatchedStatementsExecutorTest.java | 2 +-
42 files changed, 71 insertions(+), 78 deletions(-)
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoader.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoader.java
index be77581eec9..abe47a5a9f5 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoader.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/config/ProxyConfigurationLoader.java
@@ -135,9 +135,10 @@ public final class ProxyConfigurationLoader {
}
private static Collection<YamlProxyDatabaseConfiguration>
loadDatabaseConfigurations(final File configPath) throws IOException {
- Collection<String> loadedDatabaseNames = new HashSet<>();
+ File[] ruleConfigFiles = findRuleConfigurationFiles(configPath);
+ Collection<String> loadedDatabaseNames = new
HashSet<>(ruleConfigFiles.length);
Collection<YamlProxyDatabaseConfiguration> result = new LinkedList<>();
- for (File each : findRuleConfigurationFiles(configPath)) {
+ for (File each : ruleConfigFiles) {
loadDatabaseConfiguration(each).ifPresent(optional -> {
Preconditions.checkState(loadedDatabaseNames.add(optional.getDatabaseName()),
"Database name `%s` must unique at all database configurations.",
optional.getDatabaseName());
result.add(optional);
@@ -162,7 +163,7 @@ public final class ProxyConfigurationLoader {
}
Map<Class<? extends RuleConfiguration>, Long> ruleConfigTypeCountMap =
ruleConfigs.stream()
.collect(Collectors.groupingBy(YamlRuleConfiguration::getRuleConfigurationType,
Collectors.counting()));
- Optional<Entry<Class<? extends RuleConfiguration>, Long>>
duplicateRuleConfig = ruleConfigTypeCountMap.entrySet().stream().filter(each ->
each.getValue() > 1).findFirst();
+ Optional<Entry<Class<? extends RuleConfiguration>, Long>>
duplicateRuleConfig = ruleConfigTypeCountMap.entrySet().stream().filter(each ->
each.getValue() > 1L).findFirst();
if (duplicateRuleConfig.isPresent()) {
throw new IllegalStateException(String.format("Duplicate rule tag
`!%s` in file `%s`",
getDuplicateRuleTagName(duplicateRuleConfig.get().getKey()),
yamlFile.getName()));
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutor.java
index 79c51c83488..bd7cbeb1805 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutor.java
@@ -83,8 +83,9 @@ public final class ExportMetaDataExecutor implements
DistSQLQueryExecutor<Export
}
private Map<String, String> getDatabases(final ProxyContext proxyContext) {
- Map<String, String> result = new LinkedHashMap<>();
- proxyContext.getAllDatabaseNames().forEach(each -> {
+ Collection<String> databaseNames = proxyContext.getAllDatabaseNames();
+ Map<String, String> result = new LinkedHashMap<>(databaseNames.size(),
1F);
+ databaseNames.forEach(each -> {
ShardingSphereDatabase database =
proxyContext.getContextManager().getDatabase(each);
if
(database.getResourceMetaData().getAllInstanceDataSourceNames().isEmpty()) {
return;
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutor.java
index a04e2d45b8d..195056c402a 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutor.java
@@ -89,7 +89,7 @@ public final class ExportStorageNodesExecutor implements
DistSQLQueryExecutor<Ex
}
private Map<String, Collection<ExportedStorageNode>>
generateDatabaseExportStorageNodesData(final ShardingSphereDatabase database) {
- Map<String, ExportedStorageNode> storageNodes = new LinkedHashMap<>();
+ Map<String, ExportedStorageNode> storageNodes = new
LinkedHashMap<>(database.getResourceMetaData().getStorageUnits().size(), 1F);
for (Entry<String, StorageUnit> entry :
database.getResourceMetaData().getStorageUnits().entrySet()) {
ConnectionProperties connectionProps =
database.getResourceMetaData().getStorageUnits().get(entry.getKey()).getConnectionProperties();
String databaseInstanceIp = getDatabaseInstanceIp(connectionProps);
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/update/UpdateResponseHeader.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/update/UpdateResponseHeader.java
index aa524faa90d..9b0fe59ead9 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/update/UpdateResponseHeader.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/response/header/update/UpdateResponseHeader.java
@@ -64,7 +64,7 @@ public final class UpdateResponseHeader implements
ResponseHeader {
private long getLastInsertId(final Collection<UpdateResult> updateResults,
final Collection<Comparable<?>> autoIncrementGeneratedValues) {
List<Long> lastInsertIds = new ArrayList<>(updateResults.size() +
autoIncrementGeneratedValues.size());
for (UpdateResult each : updateResults) {
- if (each.getLastInsertId() > 0) {
+ if (each.getLastInsertId() > 0L) {
lastInsertIds.add(each.getLastInsertId());
}
}
@@ -73,7 +73,7 @@ public final class UpdateResponseHeader implements
ResponseHeader {
lastInsertIds.add(((Number) each).longValue());
}
}
- return lastInsertIds.isEmpty() ? 0 : getMinLastInsertId(lastInsertIds);
+ return lastInsertIds.isEmpty() ? 0L :
getMinLastInsertId(lastInsertIds);
}
private long getMinLastInsertId(final List<Long> lastInsertIds) {
@@ -85,7 +85,7 @@ public final class UpdateResponseHeader implements
ResponseHeader {
* Merge updated counts.
*/
public void mergeUpdateCount() {
- updateCount = 0;
+ updateCount = 0L;
for (int each : updateCounts) {
updateCount += each;
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManagerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManagerTest.java
index a46b0ef54b1..71b3be94d8d 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManagerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/ProxyDatabaseConnectionManagerTest.java
@@ -255,7 +255,7 @@ class ProxyDatabaseConnectionManagerTest {
void assertGetConnectionsAndFailedToReplaySessionVariables() throws
SQLException {
connectionSession.getRequiredSessionVariableRecorder().setVariable("key",
"value");
Connection connection = null;
- SQLException expectedException = new SQLException();
+ SQLException expectedException = new SQLException("");
try {
connection = mock(Connection.class, RETURNS_DEEP_STUBS);
when(connection.getMetaData().getDatabaseProductName()).thenReturn("PostgreSQL");
@@ -437,7 +437,7 @@ class ProxyDatabaseConnectionManagerTest {
void assertCloseConnectionsAndFailedToGetDatabaseType() throws
SQLException {
connectionSession.getRequiredSessionVariableRecorder().setVariable("key",
"default");
Connection connection = mock(Connection.class, RETURNS_DEEP_STUBS);
- SQLException expectedException = new SQLException();
+ SQLException expectedException = new SQLException("");
when(connection.getMetaData().getDatabaseProductName()).thenThrow(expectedException);
databaseConnectionManager.getCachedConnections().put("", connection);
Collection<SQLException> actualExceptions =
databaseConnectionManager.closeConnections(false);
@@ -449,7 +449,7 @@ class ProxyDatabaseConnectionManagerTest {
connectionSession.getRequiredSessionVariableRecorder().setVariable("key",
"default");
Connection connection = mock(Connection.class, RETURNS_DEEP_STUBS);
when(connection.getMetaData().getDatabaseProductName()).thenReturn("PostgreSQL");
- SQLException expectedException = new SQLException();
+ SQLException expectedException = new SQLException("");
when(connection.createStatement()).thenThrow(expectedException);
databaseConnectionManager.getCachedConnections().put("", connection);
Collection<SQLException> actualExceptions =
databaseConnectionManager.closeConnections(false);
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandlerTest.java
index 1024d18affb..7133beeaefe 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/QueryableRALBackendHandlerTest.java
@@ -47,7 +47,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Map;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
@@ -93,11 +92,9 @@ class QueryableRALBackendHandlerTest {
}
private Map<String, ShardingSphereTable> createTableMap() {
- Map<String, ShardingSphereTable> result = new HashMap<>();
Collection<ShardingSphereColumn> columns =
Collections.singletonList(new ShardingSphereColumn("order_id", 0, false, false,
false, true, false, false));
Collection<ShardingSphereIndex> indexes =
Collections.singletonList(new ShardingSphereIndex("primary"));
- result.put("t_order", new ShardingSphereTable("t_order", columns,
indexes, Collections.emptyList()));
- return result;
+ return Collections.singletonMap("t_order", new
ShardingSphereTable("t_order", columns, indexes, Collections.emptyList()));
}
private ShowTableMetaDataStatement createSqlStatement() {
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutorTest.java
index 3393f7e8b04..a7f6aa475be 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutorTest.java
@@ -78,7 +78,7 @@ class ExportDatabaseConfigurationExecutorTest {
private Map<String, StorageUnit> createStorageUnits() {
Map<String, DataSourcePoolProperties> propsMap =
createDataSourceMap().entrySet().stream()
.collect(Collectors.toMap(Entry::getKey, entry ->
DataSourcePoolPropertiesCreator.create(entry.getValue()), (oldValue,
currentValue) -> oldValue, LinkedHashMap::new));
- Map<String, StorageUnit> result = new LinkedHashMap<>();
+ Map<String, StorageUnit> result = new LinkedHashMap<>(propsMap.size(),
1F);
for (Entry<String, DataSourcePoolProperties> entry :
propsMap.entrySet()) {
StorageUnit storageUnit = mock(StorageUnit.class,
RETURNS_DEEP_STUBS);
when(storageUnit.getDataSourcePoolProperties()).thenReturn(entry.getValue());
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java
index df626041056..39245132fea 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java
@@ -153,7 +153,7 @@ class ExportMetaDataExecutorTest {
private Map<String, StorageUnit> createStorageUnits() {
Map<String, DataSourcePoolProperties> propsMap =
createDataSourceMap().entrySet().stream()
.collect(Collectors.toMap(Entry::getKey, entry ->
DataSourcePoolPropertiesCreator.create(entry.getValue()), (oldValue,
currentValue) -> oldValue, LinkedHashMap::new));
- Map<String, StorageUnit> result = new LinkedHashMap<>();
+ Map<String, StorageUnit> result = new LinkedHashMap<>(propsMap.size(),
1F);
for (Entry<String, DataSourcePoolProperties> entry :
propsMap.entrySet()) {
StorageUnit storageUnit = mock(StorageUnit.class,
RETURNS_DEEP_STUBS);
when(storageUnit.getDataSourcePoolProperties()).thenReturn(entry.getValue());
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutorTest.java
index 7e651739b84..c8e8ccc0791 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutorTest.java
@@ -60,7 +60,6 @@ import java.io.FileReader;
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Objects;
@@ -109,7 +108,7 @@ class ExportStorageNodesExecutorTest {
private ContextManager mockEmptyContextManager() {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
- MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class), new
ShardingSphereMetaData(new HashMap<>(),
+ MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class), new
ShardingSphereMetaData(Collections.emptyMap(),
new ResourceMetaData(Collections.emptyMap()), new
RuleMetaData(Collections.emptyList()), new ConfigurationProperties(new
Properties())));
when(result.getMetaDataContexts()).thenReturn(metaDataContexts);
return result;
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutorTest.java
index a6b147790eb..93cb6afc86a 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutorTest.java
@@ -37,7 +37,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -83,11 +82,9 @@ class ShowTableMetaDataExecutorTest {
}
private Map<String, ShardingSphereTable> createTableMap() {
- Map<String, ShardingSphereTable> result = new HashMap<>();
Collection<ShardingSphereColumn> columns =
Collections.singletonList(new ShardingSphereColumn("order_id", 0, false, false,
false, true, false, false));
Collection<ShardingSphereIndex> indexes =
Collections.singletonList(new ShardingSphereIndex("primary"));
- result.put("t_order", new ShardingSphereTable("t_order", columns,
indexes, Collections.emptyList()));
- return result;
+ return Collections.singletonMap("t_order", new
ShardingSphereTable("t_order", columns, indexes, Collections.emptyList()));
}
private ShowTableMetaDataStatement createSqlStatement() {
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseGetResultSet.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseGetResultSet.java
index 0a4062b52ea..65d78af3cff 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseGetResultSet.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/query/HBaseGetResultSet.java
@@ -103,7 +103,7 @@ public final class HBaseGetResultSet implements
HBaseQueryResultSet {
}
private void initResultNum(final SQLStatementContext sqlStatementContext) {
- resultNum = 0;
+ resultNum = 0L;
maxLimitResultSize =
HBaseContext.getInstance().getProps().<Long>getValue(HBasePropertyKey.MAX_SCAN_LIMIT_SIZE);
Optional<PaginationValueSegment> paginationSegment =
((MySQLSelectStatement)
sqlStatementContext.getSqlStatement()).getLimit().flatMap(LimitSegment::getRowCount);
paginationSegment.ifPresent(optional -> maxLimitResultSize =
Math.min(maxLimitResultSize, ((NumberLiteralLimitValueSegment)
optional).getValue()));
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseDeleteUpdater.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseDeleteUpdater.java
index 345ffa86340..963e98090db 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseDeleteUpdater.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseDeleteUpdater.java
@@ -38,10 +38,10 @@ public final class HBaseDeleteUpdater implements
HBaseUpdater {
if (operation.getOperation() instanceof HBaseDeleteOperation) {
int deleteAffectedSize = ((HBaseDeleteOperation)
operation.getOperation()).getDeletes().size();
HBaseExecutor.executeUpdate(operation.getTableName(), table ->
table.delete(((HBaseDeleteOperation) operation.getOperation()).getDeletes()));
- return Collections.singleton(new UpdateResult(deleteAffectedSize,
0));
+ return Collections.singleton(new UpdateResult(deleteAffectedSize,
0L));
}
HBaseExecutor.executeUpdate(operation.getTableName(), table ->
table.delete((Delete) operation.getOperation()));
- return Collections.singleton(new UpdateResult(1, 0));
+ return Collections.singleton(new UpdateResult(1, 0L));
}
@Override
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseInsertUpdater.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseInsertUpdater.java
index 6e0dcbc2e2f..41ded020666 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseInsertUpdater.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseInsertUpdater.java
@@ -38,7 +38,7 @@ public final class HBaseInsertUpdater implements HBaseUpdater
{
public Collection<UpdateResult> executeUpdate(final HBaseOperation
operation) throws SQLException {
List<Put> puts = ((HBaseInsertOperation)
operation.getOperation()).getPuts();
HBaseExecutor.executeUpdate(operation.getTableName(), table ->
table.put(puts));
- return Collections.singleton(new UpdateResult(puts.size(), 0));
+ return Collections.singleton(new UpdateResult(puts.size(), 0L));
}
@Override
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseRegionReloadUpdater.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseRegionReloadUpdater.java
index e842bfeb80d..5cb3a9d40f9 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseRegionReloadUpdater.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseRegionReloadUpdater.java
@@ -48,7 +48,7 @@ public final class HBaseRegionReloadUpdater implements
HBaseUpdater {
HBaseRegionWarmUpContext.getInstance().loadRegionInfo(each,
HBaseContext.getInstance().getConnection(each));
}
}
- return Collections.singleton(new UpdateResult(updateCount.get(), 0));
+ return Collections.singleton(new UpdateResult(updateCount.get(), 0L));
}
private void checkTableExists(final String tableName) {
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseUpdateUpdater.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseUpdateUpdater.java
index 8465a9a8b8d..ae006cd965b 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseUpdateUpdater.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseUpdateUpdater.java
@@ -37,10 +37,10 @@ public final class HBaseUpdateUpdater implements
HBaseUpdater {
public Collection<UpdateResult> executeUpdate(final HBaseOperation
operation) throws SQLException {
if (operation.getOperation() instanceof HBaseUpdateOperation) {
HBaseExecutor.executeUpdate(operation.getTableName(), table ->
table.put(((HBaseUpdateOperation) operation.getOperation()).getPuts()));
- return Collections.singleton(new
UpdateResult(((HBaseUpdateOperation)
operation.getOperation()).getPuts().size(), 0));
+ return Collections.singleton(new
UpdateResult(((HBaseUpdateOperation)
operation.getOperation()).getPuts().size(), 0L));
}
HBaseExecutor.executeUpdate(operation.getTableName(), table ->
table.put((Put) operation.getOperation()));
- return Collections.singleton(new UpdateResult(1, 0));
+ return Collections.singleton(new UpdateResult(1, 0L));
}
@Override
diff --git
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/util/HBaseHeterogeneousUtils.java
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/util/HBaseHeterogeneousUtils.java
index 2c463c28700..e2b7a1b2cdc 100644
---
a/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/util/HBaseHeterogeneousUtils.java
+++
b/proxy/backend/type/hbase/src/main/java/org/apache/shardingsphere/proxy/backend/hbase/util/HBaseHeterogeneousUtils.java
@@ -73,7 +73,7 @@ public final class HBaseHeterogeneousUtils {
}
/**
- * Return true if use * in SELECT statement.
+ * Return true if using * in SELECT statement.
*
* @param statementContext select statement context
* @return is use shorthand projection
diff --git
a/proxy/backend/type/hbase/src/test/java/org/apache/shardingsphere/proxy/backend/hbase/result/HBaseSupportedSQLStatement.java
b/proxy/backend/type/hbase/src/test/java/org/apache/shardingsphere/proxy/backend/hbase/result/HBaseSupportedSQLStatement.java
index 79c88adb1b6..ffde9b3ae63 100644
---
a/proxy/backend/type/hbase/src/test/java/org/apache/shardingsphere/proxy/backend/hbase/result/HBaseSupportedSQLStatement.java
+++
b/proxy/backend/type/hbase/src/test/java/org/apache/shardingsphere/proxy/backend/hbase/result/HBaseSupportedSQLStatement.java
@@ -52,7 +52,7 @@ public final class HBaseSupportedSQLStatement {
* @return SQL statement
*/
public static SQLStatement parseSQLStatement(final String sql) {
- return new SQLStatementVisitorEngine("MySQL").visit(new
SQLParserEngine("MySQL", new CacheOption(128, 4)).parse(sql, false));
+ return new SQLStatementVisitorEngine("MySQL").visit(new
SQLParserEngine("MySQL", new CacheOption(128, 4L)).parse(sql, false));
}
/**
diff --git
a/proxy/backend/type/hbase/src/test/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseBackendUpdateHandlerTest.java
b/proxy/backend/type/hbase/src/test/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseBackendUpdateHandlerTest.java
index 9dca9263467..3732d996e32 100644
---
a/proxy/backend/type/hbase/src/test/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseBackendUpdateHandlerTest.java
+++
b/proxy/backend/type/hbase/src/test/java/org/apache/shardingsphere/proxy/backend/hbase/result/update/HBaseBackendUpdateHandlerTest.java
@@ -39,7 +39,7 @@ class HBaseBackendUpdateHandlerTest {
@Test
void assertExecuteDeleteStatement() throws SQLException {
HBaseDeleteUpdater updater = mock(HBaseDeleteUpdater.class);
-
when(updater.executeUpdate(any())).thenReturn(Collections.singletonList(new
UpdateResult(1, 0)));
+
when(updater.executeUpdate(any())).thenReturn(Collections.singletonList(new
UpdateResult(1, 0L)));
SQLStatement sqlStatement =
HBaseSupportedSQLStatement.parseSQLStatement(HBaseSupportedSQLStatement.getDeleteStatement());
HBaseBackendUpdateHandler handler = new
HBaseBackendUpdateHandler(sqlStatement, updater);
assertUpdateResponseHeader(sqlStatement, handler.execute());
@@ -48,7 +48,7 @@ class HBaseBackendUpdateHandlerTest {
@Test
void assertExecuteUpdateStatement() throws SQLException {
HBaseUpdateUpdater updater = mock(HBaseUpdateUpdater.class);
-
when(updater.executeUpdate(any())).thenReturn(Collections.singletonList(new
UpdateResult(1, 0)));
+
when(updater.executeUpdate(any())).thenReturn(Collections.singletonList(new
UpdateResult(1, 0L)));
SQLStatement sqlStatement =
HBaseSupportedSQLStatement.parseSQLStatement(HBaseSupportedSQLStatement.getUpdateStatement());
HBaseBackendUpdateHandler handler = new
HBaseBackendUpdateHandler(sqlStatement, updater);
assertUpdateResponseHeader(sqlStatement, handler.execute());
@@ -57,7 +57,7 @@ class HBaseBackendUpdateHandlerTest {
@Test
void assertFlushTableStatement() throws SQLException {
HBaseRegionReloadUpdater updater =
mock(HBaseRegionReloadUpdater.class);
-
when(updater.executeUpdate(any())).thenReturn(Collections.singletonList(new
UpdateResult(1, 0)));
+
when(updater.executeUpdate(any())).thenReturn(Collections.singletonList(new
UpdateResult(1, 0L)));
SQLStatement sqlStatement =
HBaseSupportedSQLStatement.parseSQLStatement(HBaseSupportedSQLStatement.getFlushTablesStatement());
HBaseBackendUpdateHandler handler = new
HBaseBackendUpdateHandler(sqlStatement, updater);
assertUpdateResponseHeader(sqlStatement, handler.execute());
diff --git
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/connector/sane/MySQLDialectSaneQueryResultEngine.java
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/connector/sane/MySQLDialectSaneQueryResultEngine.java
index 812494c57c1..19320cb2f9f 100644
---
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/connector/sane/MySQLDialectSaneQueryResultEngine.java
+++
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/connector/sane/MySQLDialectSaneQueryResultEngine.java
@@ -60,7 +60,7 @@ public final class MySQLDialectSaneQueryResultEngine
implements DialectSaneQuery
return Optional.of(createQueryResult());
}
if (sqlStatement instanceof MySQLSetStatement) {
- return Optional.of(new UpdateResult(0, 0));
+ return Optional.of(new UpdateResult(0, 0L));
}
return Optional.empty();
}
diff --git
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowFunctionStatusExecutor.java
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowFunctionStatusExecutor.java
index ccb4be4209e..e7a82ef7b90 100644
---
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowFunctionStatusExecutor.java
+++
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowFunctionStatusExecutor.java
@@ -59,7 +59,7 @@ public final class ShowFunctionStatusExecutor implements
DatabaseAdminQueryExecu
}
private QueryResultMetaData createQueryResultMetaData() {
- List<RawQueryResultColumnMetaData> columns = new ArrayList<>();
+ List<RawQueryResultColumnMetaData> columns = new ArrayList<>(11);
columns.add(new RawQueryResultColumnMetaData("", "Db", "Db",
Types.VARCHAR, "VARCHAR", 255, 0));
columns.add(new RawQueryResultColumnMetaData("", "Name", "Name",
Types.VARCHAR, "VARCHAR", 255, 0));
columns.add(new RawQueryResultColumnMetaData("", "Type", "Type",
Types.VARCHAR, "VARCHAR", 64, 0));
diff --git
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcedureStatusExecutor.java
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcedureStatusExecutor.java
index 02c0bf09f58..f0432b561ba 100644
---
a/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcedureStatusExecutor.java
+++
b/proxy/backend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowProcedureStatusExecutor.java
@@ -59,7 +59,7 @@ public final class ShowProcedureStatusExecutor implements
DatabaseAdminQueryExec
}
private QueryResultMetaData createQueryResultMetaData() {
- List<RawQueryResultColumnMetaData> columns = new ArrayList<>();
+ List<RawQueryResultColumnMetaData> columns = new ArrayList<>(11);
columns.add(new RawQueryResultColumnMetaData("", "Db", "Db",
Types.VARCHAR, "VARCHAR", 255, 0));
columns.add(new RawQueryResultColumnMetaData("", "Name", "Name",
Types.VARCHAR, "VARCHAR", 255, 0));
columns.add(new RawQueryResultColumnMetaData("", "Type", "Type",
Types.VARCHAR, "VARCHAR", 64, 0));
diff --git
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/connector/sane/MySQLDialectSaneQueryResultEngineTest.java
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/connector/sane/MySQLDialectSaneQueryResultEngineTest.java
index a42e4cd2c4b..b648ae499ff 100644
---
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/connector/sane/MySQLDialectSaneQueryResultEngineTest.java
+++
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/connector/sane/MySQLDialectSaneQueryResultEngineTest.java
@@ -53,7 +53,7 @@ class MySQLDialectSaneQueryResultEngineTest {
void assertGetSaneQueryResultForSelectStatementWithFrom() {
MySQLSelectStatement selectStatement = new MySQLSelectStatement();
selectStatement.setFrom(new SimpleTableSegment(new TableNameSegment(0,
0, new IdentifierValue("t"))));
- assertThat(new
MySQLDialectSaneQueryResultEngine().getSaneQueryResult(selectStatement, new
SQLException()), is(Optional.empty()));
+ assertThat(new
MySQLDialectSaneQueryResultEngine().getSaneQueryResult(selectStatement, new
SQLException("")), is(Optional.empty()));
}
@Test
@@ -62,7 +62,7 @@ class MySQLDialectSaneQueryResultEngineTest {
selectStatement.setProjections(new ProjectionsSegment(0, 0));
selectStatement.getProjections().getProjections().add(new
ExpressionProjectionSegment(0, 0, "@@session.transaction_read_only", new
VariableSegment(0, 0, "transaction_read_only")));
selectStatement.getProjections().getProjections().add(new
ExpressionProjectionSegment(0, 0, "unknown_variable"));
- Optional<ExecuteResult> actual = new
MySQLDialectSaneQueryResultEngine().getSaneQueryResult(selectStatement, new
SQLException());
+ Optional<ExecuteResult> actual = new
MySQLDialectSaneQueryResultEngine().getSaneQueryResult(selectStatement, new
SQLException(""));
assertTrue(actual.isPresent());
assertThat(actual.get(), instanceOf(RawMemoryQueryResult.class));
RawMemoryQueryResult actualResult = (RawMemoryQueryResult)
actual.get();
@@ -77,19 +77,19 @@ class MySQLDialectSaneQueryResultEngineTest {
void assertGetSaneQueryResultForSelectNoProjectionsStatementWithoutFrom() {
MySQLSelectStatement selectStatement = new MySQLSelectStatement();
selectStatement.setProjections(new ProjectionsSegment(0, 0));
- assertThat(new
MySQLDialectSaneQueryResultEngine().getSaneQueryResult(selectStatement, new
SQLException()), is(Optional.empty()));
+ assertThat(new
MySQLDialectSaneQueryResultEngine().getSaneQueryResult(selectStatement, new
SQLException("")), is(Optional.empty()));
}
@Test
void assertGetSaneQueryResultForSetStatement() {
- Optional<ExecuteResult> actual = new
MySQLDialectSaneQueryResultEngine().getSaneQueryResult(new MySQLSetStatement(),
new SQLException());
+ Optional<ExecuteResult> actual = new
MySQLDialectSaneQueryResultEngine().getSaneQueryResult(new MySQLSetStatement(),
new SQLException(""));
assertTrue(actual.isPresent());
assertThat(actual.get(), instanceOf(UpdateResult.class));
}
@Test
void assertGetSaneQueryResultForShowOtherStatement() {
- Optional<ExecuteResult> actual = new
MySQLDialectSaneQueryResultEngine().getSaneQueryResult(new
MySQLShowOtherStatement(), new SQLException());
+ Optional<ExecuteResult> actual = new
MySQLDialectSaneQueryResultEngine().getSaneQueryResult(new
MySQLShowOtherStatement(), new SQLException(""));
assertTrue(actual.isPresent());
assertThat(actual.get(), instanceOf(RawMemoryQueryResult.class));
RawMemoryQueryResult actualResult = (RawMemoryQueryResult)
actual.get();
@@ -101,7 +101,7 @@ class MySQLDialectSaneQueryResultEngineTest {
@Test
void assertGetSaneQueryResultForOtherStatements() {
- assertThat(new
MySQLDialectSaneQueryResultEngine().getSaneQueryResult(new
MySQLInsertStatement(), new SQLException()), is(Optional.empty()));
+ assertThat(new
MySQLDialectSaneQueryResultEngine().getSaneQueryResult(new
MySQLInsertStatement(), new SQLException("")), is(Optional.empty()));
}
@Test
diff --git
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLSetVariableAdminExecutorTest.java
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLSetVariableAdminExecutorTest.java
index 0d69a6e01a1..aad1bd2ff4d 100644
---
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLSetVariableAdminExecutorTest.java
+++
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/MySQLSetVariableAdminExecutorTest.java
@@ -97,7 +97,7 @@ class MySQLSetVariableAdminExecutorTest {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
when(result.getMetaDataContexts().getMetaData().getDatabase("foo_db")).thenReturn(mock(ShardingSphereDatabase.class));
when(result.getMetaDataContexts().getMetaData().getGlobalRuleMetaData())
- .thenReturn(new RuleMetaData(Collections.singleton(new
SQLParserRule(new SQLParserRuleConfiguration(new CacheOption(1, 1), new
CacheOption(1, 1))))));
+ .thenReturn(new RuleMetaData(Collections.singleton(new
SQLParserRule(new SQLParserRuleConfiguration(new CacheOption(1, 1L), new
CacheOption(1, 1L))))));
return result;
}
diff --git
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowCurrentUserExecutorTest.java
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowCurrentUserExecutorTest.java
index 5265909ac26..fa5e4804bcd 100644
---
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowCurrentUserExecutorTest.java
+++
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/handler/admin/executor/ShowCurrentUserExecutorTest.java
@@ -36,7 +36,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
import java.sql.SQLException;
import java.util.Collections;
-import java.util.HashMap;
import java.util.Optional;
import java.util.Properties;
@@ -67,7 +66,7 @@ class ShowCurrentUserExecutorTest {
private ContextManager mockContextManager() {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
MetaDataContexts metaDataContexts = new
MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(new HashMap<>(),
mock(ResourceMetaData.class), mockRuleMetaData(), new
ConfigurationProperties(new Properties())));
+ new ShardingSphereMetaData(Collections.emptyMap(),
mock(ResourceMetaData.class), mockRuleMetaData(), new
ConfigurationProperties(new Properties())));
when(result.getMetaDataContexts()).thenReturn(metaDataContexts);
return result;
}
diff --git
a/proxy/backend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussSystemCatalogAdminQueryExecutorTest.java
b/proxy/backend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussSystemCatalogAdminQueryExecutorTest.java
index c57834e57c2..1ef53688ec5 100644
---
a/proxy/backend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussSystemCatalogAdminQueryExecutorTest.java
+++
b/proxy/backend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/OpenGaussSystemCatalogAdminQueryExecutorTest.java
@@ -82,7 +82,7 @@ class OpenGaussSystemCatalogAdminQueryExecutorTest {
ConnectionSession connectionSession = mock(ConnectionSession.class);
when(connectionSession.getProtocolType()).thenReturn(TypedSPILoader.getService(DatabaseType.class,
"openGauss"));
Map<String, ShardingSphereDatabase> databases =
createShardingSphereDatabaseMap();
- SQLFederationRule sqlFederationRule = new SQLFederationRule(new
SQLFederationRuleConfiguration(false, false, new CacheOption(1, 1)), databases);
+ SQLFederationRule sqlFederationRule = new SQLFederationRule(new
SQLFederationRuleConfiguration(false, false, new CacheOption(1, 1L)),
databases);
when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(mock(RuleMetaData.class));
OpenGaussSelectStatement sqlStatement =
createSelectStatementForPgDatabase();
ShardingSphereMetaData metaData =
@@ -146,7 +146,7 @@ class OpenGaussSystemCatalogAdminQueryExecutorTest {
ConfigurationProperties props = new ConfigurationProperties(new
Properties());
when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps()).thenReturn(props);
Map<String, ShardingSphereDatabase> databases =
createShardingSphereDatabaseMap();
- SQLFederationRule sqlFederationRule = new SQLFederationRule(new
SQLFederationRuleConfiguration(false, false, new CacheOption(1, 1)), databases);
+ SQLFederationRule sqlFederationRule = new SQLFederationRule(new
SQLFederationRuleConfiguration(false, false, new CacheOption(1, 1L)),
databases);
OpenGaussSelectStatement sqlStatement =
createSelectStatementForVersion();
ShardingSphereMetaData metaData =
new ShardingSphereMetaData(databases,
mock(ResourceMetaData.class, RETURNS_DEEP_STUBS), new
RuleMetaData(Collections.singletonList(sqlFederationRule)), props);
@@ -180,7 +180,7 @@ class OpenGaussSystemCatalogAdminQueryExecutorTest {
ConfigurationProperties props = new ConfigurationProperties(new
Properties());
when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps()).thenReturn(props);
Map<String, ShardingSphereDatabase> databases =
createShardingSphereDatabaseMap();
- SQLFederationRule sqlFederationRule = new SQLFederationRule(new
SQLFederationRuleConfiguration(false, false, new CacheOption(1, 1)), databases);
+ SQLFederationRule sqlFederationRule = new SQLFederationRule(new
SQLFederationRuleConfiguration(false, false, new CacheOption(1, 1L)),
databases);
OpenGaussSelectStatement sqlStatement =
createSelectStatementForGsPasswordDeadlineAndIntervalToNum();
ShardingSphereMetaData metaData =
new ShardingSphereMetaData(databases,
mock(ResourceMetaData.class, RETURNS_DEEP_STUBS), new
RuleMetaData(Collections.singletonList(sqlFederationRule)), props);
@@ -216,7 +216,7 @@ class OpenGaussSystemCatalogAdminQueryExecutorTest {
ConfigurationProperties props = new ConfigurationProperties(new
Properties());
when(ProxyContext.getInstance().getContextManager().getMetaDataContexts().getMetaData().getProps()).thenReturn(props);
Map<String, ShardingSphereDatabase> databases =
createShardingSphereDatabaseMap();
- SQLFederationRule sqlFederationRule = new SQLFederationRule(new
SQLFederationRuleConfiguration(false, false, new CacheOption(1, 1)), databases);
+ SQLFederationRule sqlFederationRule = new SQLFederationRule(new
SQLFederationRuleConfiguration(false, false, new CacheOption(1, 1L)),
databases);
OpenGaussSelectStatement sqlStatement =
createSelectStatementForGsPasswordNotifyTime();
ShardingSphereMetaData metaData =
new ShardingSphereMetaData(databases,
mock(ResourceMetaData.class, RETURNS_DEEP_STUBS), new
RuleMetaData(Collections.singletonList(sqlFederationRule)), props);
diff --git
a/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/PostgreSQLShowVariableExecutor.java
b/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/PostgreSQLShowVariableExecutor.java
index d1cb726792f..2eb026cde2b 100644
---
a/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/PostgreSQLShowVariableExecutor.java
+++
b/proxy/backend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/PostgreSQLShowVariableExecutor.java
@@ -44,7 +44,7 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
public final class PostgreSQLShowVariableExecutor implements
DatabaseAdminQueryExecutor {
- private static final Map<String, VariableRowDataGenerator>
VARIABLE_ROW_DATA_GENERATORS = new LinkedHashMap<>(7, 1);
+ private static final Map<String, VariableRowDataGenerator>
VARIABLE_ROW_DATA_GENERATORS = new LinkedHashMap<>(7, 1F);
static {
VARIABLE_ROW_DATA_GENERATORS.put("application_name", connectionSession
-> new String[]{"application_name", "PostgreSQL", "Sets the application name to
be reported in statistics and logs."});
diff --git
a/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/PostgreSQLAdminExecutorCreatorTest.java
b/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/PostgreSQLAdminExecutorCreatorTest.java
index 54d0b613bb8..8118a075c8a 100644
---
a/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/PostgreSQLAdminExecutorCreatorTest.java
+++
b/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/PostgreSQLAdminExecutorCreatorTest.java
@@ -132,7 +132,7 @@ class PostgreSQLAdminExecutorCreatorTest {
}
private SQLStatement parseSQL(final String sql) {
- CacheOption cacheOption = new CacheOption(0, 0);
+ CacheOption cacheOption = new CacheOption(0, 0L);
SQLParserRule sqlParserRule = new SQLParserRule(new
SQLParserRuleConfiguration(cacheOption, cacheOption));
return
sqlParserRule.getSQLParserEngine(TypedSPILoader.getService(DatabaseType.class,
"PostgreSQL")).parse(sql, false);
}
diff --git
a/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/PostgreSQLShowVariableExecutorTest.java
b/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/PostgreSQLShowVariableExecutorTest.java
index c23abfa4b3a..aad466262f7 100644
---
a/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/PostgreSQLShowVariableExecutorTest.java
+++
b/proxy/backend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/handler/admin/executor/PostgreSQLShowVariableExecutorTest.java
@@ -48,7 +48,7 @@ class PostgreSQLShowVariableExecutorTest {
assertThat(actualMetaData.getColumnLabel(2), is("setting"));
assertThat(actualMetaData.getColumnLabel(3), is("description"));
MergedResult actualResult = executor.getMergedResult();
- Map<String, String> expected = new LinkedHashMap<>();
+ Map<String, String> expected = new LinkedHashMap<>(7, 1F);
expected.put("application_name", "PostgreSQL");
expected.put("client_encoding", "UTF8");
expected.put("integer_datetimes", "on");
diff --git
a/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/Bootstrap.java
b/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/Bootstrap.java
index 620a6b5a042..93b3eedbe6a 100644
---
a/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/Bootstrap.java
+++
b/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/Bootstrap.java
@@ -54,7 +54,7 @@ public final class Bootstrap {
List<String> addresses = bootstrapArgs.getAddresses();
new BootstrapInitializer().init(yamlConfig, port,
bootstrapArgs.isForce());
Optional.ofNullable((Integer)
yamlConfig.getServerConfiguration().getProps().get(ConfigurationPropertyKey.CDC_SERVER_PORT.getKey()))
- .ifPresent(optional -> new CDCServer(addresses,
optional).start());
+ .ifPresent(optional -> new Thread(new CDCServer(addresses,
optional)).start());
ProxySSLContext.init();
ShardingSphereProxy proxy = new ShardingSphereProxy();
bootstrapArgs.getSocketPath().ifPresent(proxy::start);
diff --git
a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/CDCServer.java
b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/CDCServer.java
index 0e2c9f645b0..a59c39d1463 100644
---
a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/CDCServer.java
+++
b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/CDCServer.java
@@ -40,7 +40,7 @@ import java.util.List;
* CDC server.
*/
@RequiredArgsConstructor
-public final class CDCServer extends Thread {
+public final class CDCServer implements Runnable {
private final List<String> addressed;
@@ -76,7 +76,7 @@ public final class CDCServer extends Thread {
.childOption(ChannelOption.TCP_NODELAY, true)
.handler(new LoggingHandler(LogLevel.INFO))
.childHandler(new CDCServerHandlerInitializer());
- List<ChannelFuture> result = new ArrayList<>();
+ List<ChannelFuture> result = new ArrayList<>(addresses.size());
for (String each : addresses) {
result.add(bootstrap.bind(each, port).sync());
}
diff --git
a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/ShardingSphereProxy.java
b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/ShardingSphereProxy.java
index 5dd39ef6a3e..9a91a863080 100644
---
a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/ShardingSphereProxy.java
+++
b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/ShardingSphereProxy.java
@@ -104,7 +104,7 @@ public final class ShardingSphereProxy {
private List<ChannelFuture> startInternal(final int port, final
List<String> addresses) throws InterruptedException {
ServerBootstrap bootstrap = new ServerBootstrap();
initServerBootstrap(bootstrap);
- List<ChannelFuture> result = new ArrayList<>();
+ List<ChannelFuture> result = new ArrayList<>(addresses.size());
for (String each : addresses) {
result.add(bootstrap.bind(each, port).sync());
}
diff --git
a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/ssl/SSLUtils.java
b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/ssl/SSLUtils.java
index c31dde13fa4..ae29ca085f6 100644
---
a/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/ssl/SSLUtils.java
+++
b/proxy/frontend/core/src/main/java/org/apache/shardingsphere/proxy/frontend/ssl/SSLUtils.java
@@ -76,12 +76,12 @@ public final class SSLUtils {
@SneakyThrows({OperatorCreationException.class,
CertificateException.class})
public static X509Certificate generateSelfSignedX509Certificate(final
KeyPair keyPair) {
long now = System.currentTimeMillis();
- Date startDate =
Date.from(LocalDateTime.ofInstant(Instant.ofEpochMilli(now -
TimeUnit.DAYS.toMillis(1)),
ZoneId.systemDefault()).atZone(ZoneId.systemDefault()).toInstant());
+ Date startDate =
Date.from(LocalDateTime.ofInstant(Instant.ofEpochMilli(now -
TimeUnit.DAYS.toMillis(1L)),
ZoneId.systemDefault()).atZone(ZoneId.systemDefault()).toInstant());
X500Name dnName = new X500NameBuilder(BCStyle.INSTANCE)
.addRDN(BCStyle.CN, "").addRDN(BCStyle.OU,
"").addRDN(BCStyle.O, "").addRDN(BCStyle.L, "").addRDN(BCStyle.ST,
"").addRDN(BCStyle.C, "").addRDN(BCStyle.E, "").build();
BigInteger certSerialNumber = new BigInteger(Long.toString(now));
Date endDate = Date.from(
-
LocalDateTime.ofInstant(Instant.ofEpochMilli(startDate.getTime() +
TimeUnit.DAYS.toMillis(365 * 100L)),
ZoneId.systemDefault()).atZone(ZoneId.systemDefault()).toInstant());
+
LocalDateTime.ofInstant(Instant.ofEpochMilli(startDate.getTime() +
TimeUnit.DAYS.toMillis(365L * 100L)),
ZoneId.systemDefault()).atZone(ZoneId.systemDefault()).toInstant());
ContentSigner contentSigner = new
JcaContentSignerBuilder("SHA256WithRSA").build(keyPair.getPrivate());
return new JcaX509CertificateConverter().getCertificate(new
JcaX509v3CertificateBuilder(dnName, certSerialNumber, startDate, endDate,
dnName, keyPair.getPublic()).build(contentSigner));
}
diff --git
a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/ssl/SSLUtilsTest.java
b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/ssl/SSLUtilsTest.java
index 92157e4c646..52a26026f55 100644
---
a/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/ssl/SSLUtilsTest.java
+++
b/proxy/frontend/core/src/test/java/org/apache/shardingsphere/proxy/frontend/ssl/SSLUtilsTest.java
@@ -47,7 +47,7 @@ class SSLUtilsTest {
KeyPair keyPair = SSLUtils.generateRSAKeyPair();
X509Certificate actual =
SSLUtils.generateSelfSignedX509Certificate(keyPair);
actual.checkValidity(new Date());
-
actual.checkValidity(Date.from(Instant.ofEpochMilli(System.currentTimeMillis()
+ TimeUnit.DAYS.toMillis(365 * 99))));
+
actual.checkValidity(Date.from(Instant.ofEpochMilli(System.currentTimeMillis()
+ TimeUnit.DAYS.toMillis(365L * 99L))));
actual.verify(keyPair.getPublic());
assertThrows(SignatureException.class, () ->
actual.verify(SSLUtils.generateRSAKeyPair().getPublic()));
}
diff --git
a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutorTest.java
b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutorTest.java
index 8b49959b8e0..86972df45ac 100644
---
a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutorTest.java
+++
b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareExecutorTest.java
@@ -223,7 +223,7 @@ class MySQLComStmtPrepareExecutorTest {
private ContextManager mockContextManager() {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
when(result.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(mock(RuleMetaData.class));
- CacheOption cacheOption = new CacheOption(1024, 1024);
+ CacheOption cacheOption = new CacheOption(1024, 1024L);
when(result.getMetaDataContexts().getMetaData().getGlobalRuleMetaData().getSingleRule(SQLParserRule.class))
.thenReturn(new SQLParserRule(new
SQLParserRuleConfiguration(cacheOption, cacheOption)));
when(result.getMetaDataContexts().getMetaData().getDatabase(connectionSession.getDatabaseName()).getProtocolType()).thenReturn(TypedSPILoader.getService(DatabaseType.class,
"MySQL"));
diff --git
a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareParameterMarkerExtractorTest.java
b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareParameterMarkerExtractorTest.java
index 5608c80a2e6..fcb8a65eab3 100644
---
a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareParameterMarkerExtractorTest.java
+++
b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/command/query/binary/prepare/MySQLComStmtPrepareParameterMarkerExtractorTest.java
@@ -38,7 +38,7 @@ class MySQLComStmtPrepareParameterMarkerExtractorTest {
@Test
void assertFindColumnsOfParameterMarkersForInsertStatement() {
String sql = "insert into user (id, name, age) values (1, ?, ?), (?,
'bar', ?)";
- SQLStatement sqlStatement = new
ShardingSphereSQLParserEngine(TypedSPILoader.getService(DatabaseType.class,
"MySQL"), new CacheOption(0, 0), new CacheOption(0, 0)).parse(sql, false);
+ SQLStatement sqlStatement = new
ShardingSphereSQLParserEngine(TypedSPILoader.getService(DatabaseType.class,
"MySQL"), new CacheOption(0, 0L), new CacheOption(0, 0L)).parse(sql, false);
ShardingSphereSchema schema = prepareSchema();
List<ShardingSphereColumn> actual =
MySQLComStmtPrepareParameterMarkerExtractor.findColumnsOfParameterMarkers(sqlStatement,
schema);
assertThat(actual.get(0),
is(schema.getTable("user").getColumn("name")));
diff --git
a/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutor.java
b/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutor.java
index 2fced913b4e..8143215e117 100644
---
a/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutor.java
+++
b/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/simple/OpenGaussComQueryExecutor.java
@@ -112,7 +112,7 @@ public final class OpenGaussComQueryExecutor implements
QueryCommandExecutor {
private Collection<DatabasePacket> createParameterStatusResponse(final
SetStatement sqlStatement) {
Collection<DatabasePacket> result = new ArrayList<>(2);
- result.add(new PostgreSQLCommandCompletePacket("SET", 0));
+ result.add(new PostgreSQLCommandCompletePacket("SET", 0L));
for (VariableAssignSegment each : sqlStatement.getVariableAssigns()) {
result.add(new
PostgreSQLParameterStatusPacket(each.getVariable().getVariable(),
IdentifierValue.getQuotedContent(each.getAssignValue())));
}
diff --git
a/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationEngineTest.java
b/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationEngineTest.java
index 4b879a6fd14..9c948d7190a 100644
---
a/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationEngineTest.java
+++
b/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/authentication/OpenGaussAuthenticationEngineTest.java
@@ -130,7 +130,7 @@ class OpenGaussAuthenticationEngineTest {
setAlreadyReceivedStartupMessage(authenticationEngine);
PostgreSQLPacketPayload payload = new
PostgreSQLPacketPayload(createByteBuf(8, 16), StandardCharsets.UTF_8);
payload.writeInt1('F');
- payload.writeInt8(0);
+ payload.writeInt8(0L);
ContextManager contextManager = mockContextManager();
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
assertThrows(ProtocolViolationException.class, () ->
authenticationEngine.authenticate(channelHandlerContext, payload));
diff --git
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngine.java
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngine.java
index 516d9808719..3ac5579faee 100644
---
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngine.java
+++
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngine.java
@@ -79,7 +79,7 @@ public final class PostgreSQLCommandExecuteEngine implements
CommandExecuteEngin
public void writeQueryData(final ChannelHandlerContext context,
final ProxyDatabaseConnectionManager
databaseConnectionManager, final QueryCommandExecutor queryCommandExecutor,
final int headerPackagesCount) throws SQLException {
if (ResponseType.QUERY == queryCommandExecutor.getResponseType() &&
!context.channel().isActive()) {
- context.write(new
PostgreSQLCommandCompletePacket(PostgreSQLCommand.SELECT.name(), 0));
+ context.write(new
PostgreSQLCommandCompletePacket(PostgreSQLCommand.SELECT.name(), 0L));
return;
}
processSimpleQuery(context, databaseConnectionManager,
queryCommandExecutor);
@@ -102,7 +102,7 @@ public final class PostgreSQLCommandExecuteEngine
implements CommandExecuteEngin
private long writeDataPackets(final ChannelHandlerContext context, final
ProxyDatabaseConnectionManager databaseConnectionManager,
final QueryCommandExecutor
queryCommandExecutor) throws SQLException {
- long dataRows = 0;
+ long dataRows = 0L;
int flushCount = 0;
int proxyFrontendFlushThreshold = ProxyContext.getInstance()
.getContextManager().getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_FRONTEND_FLUSH_THRESHOLD);
diff --git
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/Portal.java
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/Portal.java
index 91c9daeeb80..e9dd7fd6718 100644
---
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/Portal.java
+++
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/Portal.java
@@ -159,7 +159,7 @@ public final class Portal {
private List<PostgreSQLPacket> createParameterStatusResponse(final
SetStatement sqlStatement) {
List<PostgreSQLPacket> result = new ArrayList<>(2);
- result.add(new PostgreSQLCommandCompletePacket("SET", 0));
+ result.add(new PostgreSQLCommandCompletePacket("SET", 0L));
for (VariableAssignSegment each : sqlStatement.getVariableAssigns()) {
result.add(new
PostgreSQLParameterStatusPacket(each.getVariable().getVariable(),
IdentifierValue.getQuotedContent(each.getAssignValue())));
}
@@ -220,7 +220,7 @@ public final class Portal {
}
private long getUpdateCount() {
- return responseHeader instanceof UpdateResponseHeader ?
((UpdateResponseHeader) responseHeader).getUpdateCount() : 0;
+ return responseHeader instanceof UpdateResponseHeader ?
((UpdateResponseHeader) responseHeader).getUpdateCount() : 0L;
}
/**
diff --git
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutor.java
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutor.java
index a1b6457d5c2..08a314e61b0 100644
---
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutor.java
+++
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/simple/PostgreSQLComQueryExecutor.java
@@ -112,7 +112,7 @@ public final class PostgreSQLComQueryExecutor implements
QueryCommandExecutor {
private Collection<DatabasePacket> createParameterStatusResponse(final
SetStatement sqlStatement) {
Collection<DatabasePacket> result = new ArrayList<>(2);
- result.add(new PostgreSQLCommandCompletePacket("SET", 0));
+ result.add(new PostgreSQLCommandCompletePacket("SET", 0L));
for (VariableAssignSegment each : sqlStatement.getVariableAssigns()) {
result.add(new
PostgreSQLParameterStatusPacket(each.getVariable().getVariable(),
IdentifierValue.getQuotedContent(each.getAssignValue())));
}
diff --git
a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationEngineTest.java
b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationEngineTest.java
index 49c2b6bc72c..bca3b6afc07 100644
---
a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationEngineTest.java
+++
b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/authentication/PostgreSQLAuthenticationEngineTest.java
@@ -24,6 +24,7 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.ssl.SslHandler;
import io.netty.util.Attribute;
import lombok.SneakyThrows;
+import org.apache.shardingsphere.authentication.result.AuthenticationResult;
import org.apache.shardingsphere.authority.config.AuthorityRuleConfiguration;
import org.apache.shardingsphere.authority.rule.AuthorityRule;
import org.apache.shardingsphere.authority.rule.builder.AuthorityRuleBuilder;
@@ -33,11 +34,11 @@ import
org.apache.shardingsphere.db.protocol.postgresql.packet.handshake.Postgre
import
org.apache.shardingsphere.db.protocol.postgresql.packet.handshake.PostgreSQLSSLWillingPacket;
import
org.apache.shardingsphere.db.protocol.postgresql.packet.handshake.authentication.PostgreSQLMD5PasswordAuthenticationPacket;
import
org.apache.shardingsphere.db.protocol.postgresql.payload.PostgreSQLPacketPayload;
+import
org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
+import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import
org.apache.shardingsphere.infra.exception.postgresql.exception.authority.EmptyUsernameException;
import
org.apache.shardingsphere.infra.exception.postgresql.exception.authority.InvalidPasswordException;
import
org.apache.shardingsphere.infra.exception.postgresql.exception.protocol.ProtocolViolationException;
-import
org.apache.shardingsphere.infra.algorithm.core.config.AlgorithmConfiguration;
-import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
import
org.apache.shardingsphere.infra.metadata.database.resource.ResourceMetaData;
import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
@@ -46,7 +47,6 @@ import
org.apache.shardingsphere.metadata.persist.MetaDataPersistService;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import org.apache.shardingsphere.authentication.result.AuthenticationResult;
import
org.apache.shardingsphere.proxy.frontend.postgresql.authentication.authenticator.impl.PostgreSQLMD5PasswordAuthenticator;
import org.apache.shardingsphere.proxy.frontend.ssl.ProxySSLContext;
import org.apache.shardingsphere.test.mock.AutoMockExtension;
@@ -61,7 +61,6 @@ import org.mockito.internal.configuration.plugins.Plugins;
import java.nio.charset.StandardCharsets;
import java.util.Collections;
-import java.util.LinkedHashMap;
import java.util.Properties;
import static org.hamcrest.CoreMatchers.is;
@@ -136,7 +135,7 @@ class PostgreSQLAuthenticationEngineTest {
setAlreadyReceivedStartupMessage(authenticationEngine);
PostgreSQLPacketPayload payload = new
PostgreSQLPacketPayload(createByteBuf(8, 16), StandardCharsets.UTF_8);
payload.writeInt1('F');
- payload.writeInt8(0);
+ payload.writeInt8(0L);
ContextManager contextManager = mockContextManager();
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
assertThrows(ProtocolViolationException.class, () ->
authenticationEngine.authenticate(channelHandlerContext, payload));
@@ -200,7 +199,7 @@ class PostgreSQLAuthenticationEngineTest {
private MetaDataContexts getMetaDataContexts(final ShardingSphereUser
user) {
return new MetaDataContexts(mock(MetaDataPersistService.class),
- new ShardingSphereMetaData(new LinkedHashMap<>(),
mock(ResourceMetaData.class), buildGlobalRuleMetaData(user), new
ConfigurationProperties(new Properties())));
+ new ShardingSphereMetaData(Collections.emptyMap(),
mock(ResourceMetaData.class), buildGlobalRuleMetaData(user), new
ConfigurationProperties(new Properties())));
}
private RuleMetaData buildGlobalRuleMetaData(final ShardingSphereUser
user) {
diff --git
a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
index 5c83ff004ce..4a42ab0cf3d 100644
---
a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
+++
b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
@@ -163,6 +163,6 @@ class PostgreSQLBatchedStatementsExecutorTest {
@SneakyThrows(ReflectiveOperationException.class)
private void prepareExecutionUnitParameters(final
PostgreSQLBatchedStatementsExecutor target, final List<List<Object>>
parameterSets) {
((Map<ExecutionUnit, List<List<Object>>>)
Plugins.getMemberAccessor().get(PostgreSQLBatchedStatementsExecutor.class.getDeclaredField("executionUnitParams"),
target))
- .replaceAll((k, v) -> parameterSets);
+ .replaceAll((key, vvalue) -> parameterSets);
}
}
