You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by to...@apache.org on 2023/05/10 15:39:16 UTC
[shardingsphere] branch master updated: Remove DatabaseProtocolFrontendEngine.setDatabaseVersion() (#25560)
This is an automated email from the ASF dual-hosted git repository.
totalo 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 6a9b33a12e8 Remove DatabaseProtocolFrontendEngine.setDatabaseVersion() (#25560)
6a9b33a12e8 is described below
commit 6a9b33a12e8a3f3dcb3e56a2afc37ea8bd1151b3
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed May 10 23:38:56 2023 +0800
Remove DatabaseProtocolFrontendEngine.setDatabaseVersion() (#25560)
---
kernel/data-pipeline/core/pom.xml | 2 +-
.../proxy/version/ShardingSphereProxyVersion.java | 7 ++-----
.../proxy/frontend/spi/DatabaseProtocolFrontendEngine.java | 9 ---------
.../proxy/frontend/mysql/MySQLFrontendEngine.java | 6 ------
.../proxy/frontend/mysql/MySQLFrontendEngineTest.java | 13 -------------
.../proxy/frontend/opengauss/OpenGaussFrontendEngine.java | 6 ------
.../proxy/frontend/postgresql/PostgreSQLFrontendEngine.java | 6 ------
7 files changed, 3 insertions(+), 46 deletions(-)
diff --git a/kernel/data-pipeline/core/pom.xml b/kernel/data-pipeline/core/pom.xml
index ed35bad3ea4..786cd6235c6 100644
--- a/kernel/data-pipeline/core/pom.xml
+++ b/kernel/data-pipeline/core/pom.xml
@@ -78,7 +78,7 @@
<artifactId>HikariCP</artifactId>
<scope>compile</scope>
</dependency>
-
+
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
diff --git a/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/version/ShardingSphereProxyVersion.java b/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/version/ShardingSphereProxyVersion.java
index 92fa4ecee6e..c61ce0a6345 100644
--- a/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/version/ShardingSphereProxyVersion.java
+++ b/proxy/bootstrap/src/main/java/org/apache/shardingsphere/proxy/version/ShardingSphereProxyVersion.java
@@ -22,16 +22,14 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.db.protocol.constant.CommonConstants;
+import org.apache.shardingsphere.db.protocol.constant.DatabaseProtocolServerInfo;
import org.apache.shardingsphere.infra.autogen.version.ShardingSphereVersion;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.infra.database.type.DatabaseTypeEngine;
import org.apache.shardingsphere.infra.datasource.state.DataSourceStateManager;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.ShardingSphereResourceMetaData;
-import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.proxy.database.DatabaseServerInfo;
-import org.apache.shardingsphere.proxy.frontend.spi.DatabaseProtocolFrontendEngine;
import javax.sql.DataSource;
import java.util.Map.Entry;
@@ -71,8 +69,7 @@ public final class ShardingSphereProxyVersion {
}
DatabaseServerInfo databaseServerInfo = new DatabaseServerInfo(dataSource.get());
log.info("{}, database name is `{}`", databaseServerInfo, database.getName());
- TypedSPILoader.getService(DatabaseProtocolFrontendEngine.class, DatabaseTypeEngine.getTrunkDatabaseType(databaseServerInfo.getDatabaseName()).getType())
- .setDatabaseVersion(database.getName(), databaseServerInfo.getDatabaseVersion());
+ DatabaseProtocolServerInfo.setProtocolVersion(database.getName(), databaseServerInfo.getDatabaseVersion());
}
private static Optional<DataSource> findDataSourceByProtocolType(final String databaseName, final ShardingSphereResourceMetaData resourceMetaData, final DatabaseType protocolType) {
diff --git a/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/spi/DatabaseProtocolFrontendEngine.java b/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/spi/DatabaseProtocolFrontendEngine.java
index f1d001604bc..22c370e1f30 100644
--- a/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/spi/DatabaseProtocolFrontendEngine.java
+++ b/proxy/frontend/spi/src/main/java/org/apache/shardingsphere/proxy/frontend/spi/DatabaseProtocolFrontendEngine.java
@@ -37,15 +37,6 @@ public interface DatabaseProtocolFrontendEngine extends TypedSPI {
default void initChannel(Channel channel) {
}
- /**
- * Set database version.
- *
- * @param databaseName database name
- * @param databaseVersion database version
- */
- default void setDatabaseVersion(String databaseName, String databaseVersion) {
- }
-
/**
* Get database packet codec engine.
*
diff --git a/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngine.java b/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngine.java
index a06e9a30c6f..039ce5c2443 100644
--- a/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngine.java
+++ b/proxy/frontend/type/mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngine.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.proxy.frontend.mysql;
import io.netty.channel.Channel;
import lombok.Getter;
import org.apache.shardingsphere.db.protocol.codec.DatabasePacketCodecEngine;
-import org.apache.shardingsphere.db.protocol.constant.DatabaseProtocolServerInfo;
import org.apache.shardingsphere.db.protocol.mysql.codec.MySQLPacketCodecEngine;
import org.apache.shardingsphere.db.protocol.mysql.constant.MySQLConstants;
import org.apache.shardingsphere.db.protocol.mysql.netty.MySQLSequenceIdInboundHandler;
@@ -54,11 +53,6 @@ public final class MySQLFrontendEngine implements DatabaseProtocolFrontendEngine
channel.pipeline().addBefore(FrontendChannelInboundHandler.class.getSimpleName(), MySQLSequenceIdInboundHandler.class.getSimpleName(), new MySQLSequenceIdInboundHandler());
}
- @Override
- public void setDatabaseVersion(final String databaseName, final String databaseVersion) {
- DatabaseProtocolServerInfo.setProtocolVersion(databaseName, databaseVersion);
- }
-
@Override
public void release(final ConnectionSession connectionSession) {
MySQLStatementIdGenerator.getInstance().unregisterConnection(connectionSession.getConnectionId());
diff --git a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngineTest.java b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngineTest.java
index 9559dd2c2a5..6d9c0e1b88f 100644
--- a/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngineTest.java
+++ b/proxy/frontend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/frontend/mysql/MySQLFrontendEngineTest.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.proxy.frontend.mysql;
import io.netty.channel.Channel;
-import org.apache.shardingsphere.db.protocol.constant.DatabaseProtocolServerInfo;
import org.apache.shardingsphere.db.protocol.mysql.constant.MySQLConstants;
import org.apache.shardingsphere.db.protocol.mysql.netty.MySQLSequenceIdInboundHandler;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
@@ -32,7 +31,6 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Answers;
import org.mockito.Mock;
-import org.mockito.MockedStatic;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
@@ -42,7 +40,6 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.mockStatic;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -69,16 +66,6 @@ class MySQLFrontendEngineTest {
.addBefore(eq(FrontendChannelInboundHandler.class.getSimpleName()), eq(MySQLSequenceIdInboundHandler.class.getSimpleName()), isA(MySQLSequenceIdInboundHandler.class));
}
- @Test
- void assertSetDatabaseVersion() {
- String databaseName = "db";
- String databaseVersion = "version";
- try (MockedStatic<DatabaseProtocolServerInfo> mockedStatic = mockStatic(DatabaseProtocolServerInfo.class)) {
- engine.setDatabaseVersion(databaseName, databaseVersion);
- mockedStatic.verify(() -> DatabaseProtocolServerInfo.setProtocolVersion(databaseName, databaseVersion));
- }
- }
-
@Test
void assertRelease() {
ConnectionSession connectionSession = mock(ConnectionSession.class);
diff --git a/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/OpenGaussFrontendEngine.java b/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/OpenGaussFrontendEngine.java
index 889b9b99c00..27fb277cfc6 100644
--- a/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/OpenGaussFrontendEngine.java
+++ b/proxy/frontend/type/opengauss/src/main/java/org/apache/shardingsphere/proxy/frontend/opengauss/OpenGaussFrontendEngine.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.proxy.frontend.opengauss;
import lombok.AccessLevel;
import lombok.Getter;
-import org.apache.shardingsphere.db.protocol.constant.DatabaseProtocolServerInfo;
import org.apache.shardingsphere.db.protocol.opengauss.codec.OpenGaussPacketCodecEngine;
import org.apache.shardingsphere.dialect.exception.transaction.InTransactionException;
import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
@@ -43,11 +42,6 @@ public final class OpenGaussFrontendEngine implements DatabaseProtocolFrontendEn
private final OpenGaussPacketCodecEngine codecEngine = new OpenGaussPacketCodecEngine();
- @Override
- public void setDatabaseVersion(final String databaseName, final String databaseVersion) {
- DatabaseProtocolServerInfo.setProtocolVersion(databaseName, databaseVersion);
- }
-
@Override
public void release(final ConnectionSession connectionSession) {
postgreSQLFrontendEngine.release(connectionSession);
diff --git a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/PostgreSQLFrontendEngine.java b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/PostgreSQLFrontendEngine.java
index 414d4666dc4..b8ed22ad311 100644
--- a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/PostgreSQLFrontendEngine.java
+++ b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/PostgreSQLFrontendEngine.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.proxy.frontend.postgresql;
import lombok.Getter;
import org.apache.shardingsphere.db.protocol.codec.DatabasePacketCodecEngine;
-import org.apache.shardingsphere.db.protocol.constant.DatabaseProtocolServerInfo;
import org.apache.shardingsphere.db.protocol.postgresql.codec.PostgreSQLPacketCodecEngine;
import org.apache.shardingsphere.db.protocol.postgresql.packet.PostgreSQLPacket;
import org.apache.shardingsphere.dialect.exception.transaction.InTransactionException;
@@ -43,11 +42,6 @@ public final class PostgreSQLFrontendEngine implements DatabaseProtocolFrontendE
private final DatabasePacketCodecEngine<PostgreSQLPacket> codecEngine = new PostgreSQLPacketCodecEngine();
- @Override
- public void setDatabaseVersion(final String databaseName, final String databaseVersion) {
- DatabaseProtocolServerInfo.setProtocolVersion(databaseName, databaseVersion);
- }
-
@Override
public void release(final ConnectionSession connectionSession) {
PostgreSQLPortalContextRegistry.getInstance().remove(connectionSession.getConnectionId());