This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 0dfdb1d9758 Rename MySQLServerVersion (#32579)
0dfdb1d9758 is described below
commit 0dfdb1d9758f8fa5811fe58169d3a40eadcc8378
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Aug 18 15:46:13 2024 +0800
Rename MySQLServerVersion (#32579)
---
.../mysql/datasource/MySQLJdbcQueryPropertiesExtension.java | 4 ++--
.../mysql/ingest/incremental/client/MySQLBinlogClient.java | 4 ++--
.../client/{ServerVersion.java => MySQLServerVersion.java} | 6 +++---
.../incremental/client/netty/MySQLNegotiateHandler.java | 6 +++---
.../ingest/incremental/client/MySQLBinlogClientTest.java | 6 +++---
.../{ServerVersionTest.java => MySQLServerVersionTest.java} | 8 ++++----
.../incremental/client/netty/MySQLNegotiateHandlerTest.java | 12 ++++++------
7 files changed, 23 insertions(+), 23 deletions(-)
diff --git
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/datasource/MySQLJdbcQueryPropertiesExtension.java
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/datasource/MySQLJdbcQueryPropertiesExtension.java
index bf91659e12a..421714c250c 100644
---
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/datasource/MySQLJdbcQueryPropertiesExtension.java
+++
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/datasource/MySQLJdbcQueryPropertiesExtension.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.data.pipeline.mysql.datasource;
import lombok.extern.slf4j.Slf4j;
-import
org.apache.shardingsphere.data.pipeline.mysql.ingest.incremental.client.ServerVersion;
+import
org.apache.shardingsphere.data.pipeline.mysql.ingest.incremental.client.MySQLServerVersion;
import
org.apache.shardingsphere.data.pipeline.spi.JdbcQueryPropertiesExtension;
import java.util.Properties;
@@ -48,7 +48,7 @@ public final class MySQLJdbcQueryPropertiesExtension
implements JdbcQueryPropert
private String getZeroDateTimeBehavior() {
// refer https://bugs.mysql.com/bug.php?id=91065
- return null != MYSQL_CONNECTOR_VERSION && new
ServerVersion(MYSQL_CONNECTOR_VERSION).greaterThanOrEqualTo(8, 0, 0) ?
"CONVERT_TO_NULL" : "convertToNull";
+ return null != MYSQL_CONNECTOR_VERSION && new
MySQLServerVersion(MYSQL_CONNECTOR_VERSION).greaterThanOrEqualTo(8, 0, 0) ?
"CONVERT_TO_NULL" : "convertToNull";
}
private static String initMySQLConnectorVersion() {
diff --git
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/MySQLBinlogClient.java
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/MySQLBinlogClient.java
index 2a868335e39..b75a399064b 100644
---
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/MySQLBinlogClient.java
+++
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/MySQLBinlogClient.java
@@ -84,7 +84,7 @@ public final class MySQLBinlogClient {
private Promise<Object> responseCallback;
- private ServerVersion serverVersion;
+ private MySQLServerVersion serverVersion;
private volatile boolean running = true;
@@ -112,7 +112,7 @@ public final class MySQLBinlogClient {
socketChannel.pipeline().addLast(new
MySQLCommandResponseHandler());
}
}).connect(connectInfo.getHost(),
connectInfo.getPort()).channel();
- serverVersion = waitExpectedResponse(ServerVersion.class).orElse(null);
+ serverVersion =
waitExpectedResponse(MySQLServerVersion.class).orElse(null);
running = true;
}
diff --git
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/ServerVersion.java
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/MySQLServerVersion.java
similarity index 95%
rename from
kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/ServerVersion.java
rename to
kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/MySQLServerVersion.java
index c392745f656..8717e5f0f8c 100644
---
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/ServerVersion.java
+++
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/MySQLServerVersion.java
@@ -23,10 +23,10 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * Server version.
+ * MySQL server version.
*/
@Slf4j
-public final class ServerVersion {
+public final class MySQLServerVersion {
private static final Pattern VERSION_PATTERN =
Pattern.compile("^(\\d+)\\.(\\d+)\\.(\\d+).*");
@@ -36,7 +36,7 @@ public final class ServerVersion {
private final int series;
- public ServerVersion(final String version) {
+ public MySQLServerVersion(final String version) {
Matcher matcher = VERSION_PATTERN.matcher(version);
if (matcher.matches()) {
major = Short.parseShort(matcher.group(1));
diff --git
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/netty/MySQLNegotiateHandler.java
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/netty/MySQLNegotiateHandler.java
index d2df4376710..3c39ec14b85 100644
---
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/netty/MySQLNegotiateHandler.java
+++
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/netty/MySQLNegotiateHandler.java
@@ -24,7 +24,7 @@ import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import
org.apache.shardingsphere.data.pipeline.core.exception.PipelineInternalException;
import
org.apache.shardingsphere.data.pipeline.mysql.ingest.incremental.client.PasswordEncryption;
-import
org.apache.shardingsphere.data.pipeline.mysql.ingest.incremental.client.ServerVersion;
+import
org.apache.shardingsphere.data.pipeline.mysql.ingest.incremental.client.MySQLServerVersion;
import
org.apache.shardingsphere.db.protocol.mysql.constant.MySQLAuthenticationMethod;
import
org.apache.shardingsphere.db.protocol.mysql.constant.MySQLAuthenticationPlugin;
import
org.apache.shardingsphere.db.protocol.mysql.constant.MySQLCapabilityFlag;
@@ -58,7 +58,7 @@ public final class MySQLNegotiateHandler extends
ChannelInboundHandlerAdapter {
private final Promise<Object> authResultCallback;
- private ServerVersion serverVersion;
+ private MySQLServerVersion serverVersion;
private byte[] seed;
@@ -74,7 +74,7 @@ public final class MySQLNegotiateHandler extends
ChannelInboundHandlerAdapter {
handshakeResponsePacket.setCapabilityFlags(generateClientCapability());
handshakeResponsePacket.setAuthPluginName(MySQLAuthenticationMethod.NATIVE);
ctx.channel().writeAndFlush(handshakeResponsePacket);
- serverVersion = new ServerVersion(handshake.getServerVersion());
+ serverVersion = new
MySQLServerVersion(handshake.getServerVersion());
return;
}
if (msg instanceof MySQLAuthSwitchRequestPacket) {
diff --git
a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/MySQLBinlogClientTest.java
b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/MySQLBinlogClientTest.java
index 246b0050418..a7d5863c9b0 100644
---
a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/MySQLBinlogClientTest.java
+++
b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/MySQLBinlogClientTest.java
@@ -82,10 +82,10 @@ class MySQLBinlogClientTest {
@Test
void assertConnect() throws ReflectiveOperationException {
- ServerVersion expected = new ServerVersion("5.5.0-log");
+ MySQLServerVersion expected = new MySQLServerVersion("5.5.0-log");
mockChannelResponse(expected);
client.connect();
- ServerVersion actual = (ServerVersion)
Plugins.getMemberAccessor().get(MySQLBinlogClient.class.getDeclaredField("serverVersion"),
client);
+ MySQLServerVersion actual = (MySQLServerVersion)
Plugins.getMemberAccessor().get(MySQLBinlogClient.class.getDeclaredField("serverVersion"),
client);
assertThat(actual, is(expected));
}
@@ -121,7 +121,7 @@ class MySQLBinlogClientTest {
@Test
void assertSubscribeBelow56Version() throws ReflectiveOperationException {
- ServerVersion serverInfo = new ServerVersion("5.5.0-log");
+ MySQLServerVersion serverInfo = new MySQLServerVersion("5.5.0-log");
Plugins.getMemberAccessor().set(MySQLBinlogClient.class.getDeclaredField("serverVersion"),
client, serverInfo);
Plugins.getMemberAccessor().set(MySQLBinlogClient.class.getDeclaredField("channel"),
client, channel);
Plugins.getMemberAccessor().set(MySQLBinlogClient.class.getDeclaredField("eventLoopGroup"),
client, new NioEventLoopGroup(1));
diff --git
a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/ServerVersionTest.java
b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/MySQLServerVersionTest.java
similarity index 87%
rename from
kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/ServerVersionTest.java
rename to
kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/MySQLServerVersionTest.java
index b4176aab6de..31a1070385d 100644
---
a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/ServerVersionTest.java
+++
b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/MySQLServerVersionTest.java
@@ -22,11 +22,11 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
-class ServerVersionTest {
+class MySQLServerVersionTest {
@Test
void assertGreaterThan() {
- ServerVersion actual = new ServerVersion("5.7.12");
+ MySQLServerVersion actual = new MySQLServerVersion("5.7.12");
assertTrue(actual.greaterThanOrEqualTo(4, 0, 0));
assertTrue(actual.greaterThanOrEqualTo(5, 6, 0));
assertTrue(actual.greaterThanOrEqualTo(5, 7, 11));
@@ -34,7 +34,7 @@ class ServerVersionTest {
@Test
void assertLowerThan() {
- ServerVersion actual = new ServerVersion("5.6.6");
+ MySQLServerVersion actual = new MySQLServerVersion("5.6.6");
assertFalse(actual.greaterThanOrEqualTo(8, 0, 0));
assertFalse(actual.greaterThanOrEqualTo(5, 7, 11));
assertFalse(actual.greaterThanOrEqualTo(5, 6, 8));
@@ -42,7 +42,7 @@ class ServerVersionTest {
@Test
void assertEqualTo() {
- ServerVersion actual = new ServerVersion("5.6.6");
+ MySQLServerVersion actual = new MySQLServerVersion("5.6.6");
assertTrue(actual.greaterThanOrEqualTo(5, 6, 6));
}
}
diff --git
a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/netty/MySQLNegotiateHandlerTest.java
b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/netty/MySQLNegotiateHandlerTest.java
index 54cab6c6138..45d1f025599 100644
---
a/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/netty/MySQLNegotiateHandlerTest.java
+++
b/kernel/data-pipeline/dialect/mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/incremental/client/netty/MySQLNegotiateHandlerTest.java
@@ -21,7 +21,7 @@ import io.netty.channel.Channel;
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelPipeline;
import io.netty.util.concurrent.Promise;
-import
org.apache.shardingsphere.data.pipeline.mysql.ingest.incremental.client.ServerVersion;
+import
org.apache.shardingsphere.data.pipeline.mysql.ingest.incremental.client.MySQLServerVersion;
import
org.apache.shardingsphere.db.protocol.mysql.constant.MySQLAuthenticationMethod;
import
org.apache.shardingsphere.db.protocol.mysql.packet.generic.MySQLErrPacket;
import
org.apache.shardingsphere.db.protocol.mysql.packet.generic.MySQLOKPacket;
@@ -82,16 +82,16 @@ class MySQLNegotiateHandlerTest {
handshakePacket.setAuthPluginName(MySQLAuthenticationMethod.NATIVE);
mysqlNegotiateHandler.channelRead(channelHandlerContext,
handshakePacket);
verify(channel).writeAndFlush(ArgumentMatchers.any(MySQLHandshakeResponse41Packet.class));
- ServerVersion serverVersion = (ServerVersion)
Plugins.getMemberAccessor().get(MySQLNegotiateHandler.class.getDeclaredField("serverVersion"),
mysqlNegotiateHandler);
-
assertThat(Plugins.getMemberAccessor().get(ServerVersion.class.getDeclaredField("major"),
serverVersion), is(5));
-
assertThat(Plugins.getMemberAccessor().get(ServerVersion.class.getDeclaredField("minor"),
serverVersion), is(7));
-
assertThat(Plugins.getMemberAccessor().get(ServerVersion.class.getDeclaredField("series"),
serverVersion), is(22));
+ MySQLServerVersion serverVersion = (MySQLServerVersion)
Plugins.getMemberAccessor().get(MySQLNegotiateHandler.class.getDeclaredField("serverVersion"),
mysqlNegotiateHandler);
+
assertThat(Plugins.getMemberAccessor().get(MySQLServerVersion.class.getDeclaredField("major"),
serverVersion), is(5));
+
assertThat(Plugins.getMemberAccessor().get(MySQLServerVersion.class.getDeclaredField("minor"),
serverVersion), is(7));
+
assertThat(Plugins.getMemberAccessor().get(MySQLServerVersion.class.getDeclaredField("series"),
serverVersion), is(22));
}
@Test
void assertChannelReadOkPacket() throws ReflectiveOperationException {
MySQLOKPacket okPacket = new MySQLOKPacket(0);
- ServerVersion serverVersion = new ServerVersion("5.5.0-log");
+ MySQLServerVersion serverVersion = new MySQLServerVersion("5.5.0-log");
Plugins.getMemberAccessor().set(MySQLNegotiateHandler.class.getDeclaredField("serverVersion"),
mysqlNegotiateHandler, serverVersion);
mysqlNegotiateHandler.channelRead(channelHandlerContext, okPacket);
verify(pipeline).remove(mysqlNegotiateHandler);
