From d3aa8e14743a94cdab5d22187737fb1b67768a4c Mon Sep 17 00:00:00 2001 From: zhaojun Date: Thu, 21 May 2020 16:02:19 +0800 Subject: [PATCH] update mysql & postgresql version for proxy (#5721) * update mysql & postgresql version for proxy * fix unit test error --- .../postgresql/auth/PostgreSQLAuthenticationEngine.java | 2 +- .../mysql/client/netty/MySQLNegotiateHandlerTest.java | 6 +++--- .../database/protocol/mysql/constant/MySQLServerInfo.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sharding-proxy/sharding-proxy-frontend/sharding-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/shardingproxy/frontend/postgresql/auth/PostgreSQLAuthenticationEngine.java b/sharding-proxy/sharding-proxy-frontend/sharding-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/shardingproxy/frontend/postgresql/auth/PostgreSQLAuthenticationEngine.java index 97bca34d14..449090466a 100644 --- a/sharding-proxy/sharding-proxy-frontend/sharding-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/shardingproxy/frontend/postgresql/auth/PostgreSQLAuthenticationEngine.java +++ b/sharding-proxy/sharding-proxy-frontend/sharding-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/shardingproxy/frontend/postgresql/auth/PostgreSQLAuthenticationEngine.java @@ -71,7 +71,7 @@ public final class PostgreSQLAuthenticationEngine implements AuthenticationEngin backendConnection.setCurrentSchema(databaseName); // TODO send a md5 authentication request message context.write(new PostgreSQLAuthenticationOKPacket(true)); - context.write(new PostgreSQLParameterStatusPacket("server_version", "8.4")); + context.write(new PostgreSQLParameterStatusPacket("server_version", "12.3")); context.write(new PostgreSQLParameterStatusPacket("client_encoding", "UTF8")); context.write(new PostgreSQLParameterStatusPacket("server_encoding", "UTF8")); context.writeAndFlush(new PostgreSQLReadyForQueryPacket()); diff --git a/sharding-scaling/sharding-scaling-mysql/src/test/java/org/apache/shardingsphere/shardingscaling/mysql/client/netty/MySQLNegotiateHandlerTest.java b/sharding-scaling/sharding-scaling-mysql/src/test/java/org/apache/shardingsphere/shardingscaling/mysql/client/netty/MySQLNegotiateHandlerTest.java index ccb09b4799..d24050ae2a 100644 --- a/sharding-scaling/sharding-scaling-mysql/src/test/java/org/apache/shardingsphere/shardingscaling/mysql/client/netty/MySQLNegotiateHandlerTest.java +++ b/sharding-scaling/sharding-scaling-mysql/src/test/java/org/apache/shardingsphere/shardingscaling/mysql/client/netty/MySQLNegotiateHandlerTest.java @@ -79,9 +79,9 @@ public final class MySQLNegotiateHandlerTest { mySQLNegotiateHandler.channelRead(channelHandlerContext, handshakePacket); verify(channel).writeAndFlush(ArgumentMatchers.any(MySQLHandshakeResponse41Packet.class)); ServerInfo serverInfo = ReflectionUtil.getFieldValueFromClass(mySQLNegotiateHandler, "serverInfo", ServerInfo.class); - assertThat(serverInfo.getServerVersion().getMajor(), is(5)); - assertThat(serverInfo.getServerVersion().getMinor(), is(6)); - assertThat(serverInfo.getServerVersion().getSeries(), is(4)); + assertThat(serverInfo.getServerVersion().getMajor(), is(8)); + assertThat(serverInfo.getServerVersion().getMinor(), is(0)); + assertThat(serverInfo.getServerVersion().getSeries(), is(20)); } @Test diff --git a/shardingsphere-database-protocol/shardingsphere-database-protocol-mysql/src/main/java/org/apache/shardingsphere/database/protocol/mysql/constant/MySQLServerInfo.java b/shardingsphere-database-protocol/shardingsphere-database-protocol-mysql/src/main/java/org/apache/shardingsphere/database/protocol/mysql/constant/MySQLServerInfo.java index b424dd7c04..121cac0116 100644 --- a/shardingsphere-database-protocol/shardingsphere-database-protocol-mysql/src/main/java/org/apache/shardingsphere/database/protocol/mysql/constant/MySQLServerInfo.java +++ b/shardingsphere-database-protocol/shardingsphere-database-protocol-mysql/src/main/java/org/apache/shardingsphere/database/protocol/mysql/constant/MySQLServerInfo.java @@ -34,7 +34,7 @@ public final class MySQLServerInfo { /** * Server version. */ - public static final String SERVER_VERSION = "5.6.4-Sharding-Proxy 4.1.0"; + public static final String SERVER_VERSION = "8.0.20-Sharding-Proxy 4.1.0"; /** * Charset code 0x21 is utf8_general_ci. -- GitLab