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 494c6996042 Rename MySQLBinlogNumberDataTypeHandler (#32543)
494c6996042 is described below
commit 494c6996042b4330008c9a08ad425de839564088
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Aug 16 00:57:38 2024 +0800
Rename MySQLBinlogNumberDataTypeHandler (#32543)
---
.../data/pipeline/mysql/ingest/dumper/MySQLIncrementalDumper.java | 4 ++--
...ogDataTypeHandler.java => MySQLBinlogNumberDataTypeHandler.java} | 4 ++--
.../ingest/dumper/type/impl/MySQLBinlogUnsignedBigintHandler.java | 6 +++---
.../ingest/dumper/type/impl/MySQLBinlogUnsignedIntHandler.java | 4 ++--
.../dumper/type/impl/MySQLBinlogUnsignedMediumintHandler.java | 6 +++---
.../ingest/dumper/type/impl/MySQLBinlogUnsignedSmallintHandler.java | 6 +++---
.../ingest/dumper/type/impl/MySQLBinlogUnsignedTinyintHandler.java | 6 +++---
...eline.mysql.ingest.dumper.type.MySQLBinlogNumberDataTypeHandler} | 0
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/MySQLIncrementalDumper.java
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/MySQLIncrementalDumper.java
index 1e55688b093..971ad1b0588 100644
---
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/MySQLIncrementalDumper.java
+++
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/MySQLIncrementalDumper.java
@@ -41,7 +41,7 @@ import
org.apache.shardingsphere.data.pipeline.mysql.ingest.binlog.event.UpdateR
import
org.apache.shardingsphere.data.pipeline.mysql.ingest.binlog.event.WriteRowsEvent;
import org.apache.shardingsphere.data.pipeline.mysql.ingest.client.ConnectInfo;
import
org.apache.shardingsphere.data.pipeline.mysql.ingest.client.MySQLBinlogClient;
-import
org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.MySQLBinlogDataTypeHandler;
+import
org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.MySQLBinlogNumberDataTypeHandler;
import
org.apache.shardingsphere.db.protocol.mysql.packet.binlog.row.column.value.string.MySQLBinaryString;
import org.apache.shardingsphere.infra.annotation.HighFrequencyInvocation;
import
org.apache.shardingsphere.infra.database.core.connector.ConnectionProperties;
@@ -199,7 +199,7 @@ public final class MySQLIncrementalDumper extends
AbstractPipelineLifecycleRunna
? ((MySQLBinaryString) value).getBytes()
: new String(((MySQLBinaryString) value).getBytes(),
Charset.defaultCharset());
}
- Optional<MySQLBinlogDataTypeHandler> dataTypeHandler =
TypedSPILoader.findService(MySQLBinlogDataTypeHandler.class,
columnMetaData.getDataTypeName());
+ Optional<MySQLBinlogNumberDataTypeHandler> dataTypeHandler =
TypedSPILoader.findService(MySQLBinlogNumberDataTypeHandler.class,
columnMetaData.getDataTypeName());
return dataTypeHandler.isPresent() ?
dataTypeHandler.get().handle(value) : value;
}
diff --git
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/MySQLBinlogDataTypeHandler.java
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/MySQLBinlogNumberDataTypeHandler.java
similarity index 91%
rename from
kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/MySQLBinlogDataTypeHandler.java
rename to
kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/MySQLBinlogNumberDataTypeHandler.java
index a38baffc0e3..cf9e894fccb 100644
---
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/MySQLBinlogDataTypeHandler.java
+++
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/MySQLBinlogNumberDataTypeHandler.java
@@ -23,10 +23,10 @@ import
org.apache.shardingsphere.infra.spi.type.typed.TypedSPI;
import java.io.Serializable;
/**
- * MySQL binlog data type handler.
+ * MySQL binlog number data type handler.
*/
@SingletonSPI
-public interface MySQLBinlogDataTypeHandler extends TypedSPI {
+public interface MySQLBinlogNumberDataTypeHandler extends TypedSPI {
/**
* Handle column value.
diff --git
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/impl/MySQLBinlogUnsignedBigintHandler.java
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/impl/MySQLBinlogUnsignedBigintHandler.java
index be6b62a1715..a488ca23a98 100644
---
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/impl/MySQLBinlogUnsignedBigintHandler.java
+++
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/impl/MySQLBinlogUnsignedBigintHandler.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.impl;
-import
org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.MySQLBinlogDataTypeHandler;
+import
org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.MySQLBinlogNumberDataTypeHandler;
import java.io.Serializable;
import java.math.BigInteger;
@@ -25,7 +25,7 @@ import java.math.BigInteger;
/**
* MySQL binlog unsigned bigint data type handler.
*/
-public final class MySQLBinlogUnsignedBigintHandler implements
MySQLBinlogDataTypeHandler {
+public final class MySQLBinlogUnsignedBigintHandler implements
MySQLBinlogNumberDataTypeHandler {
private static final BigInteger BIGINT_MODULO = new
BigInteger("18446744073709551616");
@@ -35,7 +35,7 @@ public final class MySQLBinlogUnsignedBigintHandler
implements MySQLBinlogDataTy
return null;
}
long longValue = (long) value;
- return 0L > longValue ?
BIGINT_MODULO.add(BigInteger.valueOf(longValue)) : longValue;
+ return longValue < 0L ?
BIGINT_MODULO.add(BigInteger.valueOf(longValue)) : longValue;
}
@Override
diff --git
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/impl/MySQLBinlogUnsignedIntHandler.java
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/impl/MySQLBinlogUnsignedIntHandler.java
index 88fa08c06f8..7a553bf6699 100644
---
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/impl/MySQLBinlogUnsignedIntHandler.java
+++
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/impl/MySQLBinlogUnsignedIntHandler.java
@@ -17,14 +17,14 @@
package org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.impl;
-import
org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.MySQLBinlogDataTypeHandler;
+import
org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.MySQLBinlogNumberDataTypeHandler;
import java.io.Serializable;
/**
* MySQL binlog unsigned int data type handler.
*/
-public final class MySQLBinlogUnsignedIntHandler implements
MySQLBinlogDataTypeHandler {
+public final class MySQLBinlogUnsignedIntHandler implements
MySQLBinlogNumberDataTypeHandler {
private static final long INT_MODULO = 4294967296L;
diff --git
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/impl/MySQLBinlogUnsignedMediumintHandler.java
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/impl/MySQLBinlogUnsignedMediumintHandler.java
index 2370c6c4078..98b7e6487ad 100644
---
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/impl/MySQLBinlogUnsignedMediumintHandler.java
+++
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/impl/MySQLBinlogUnsignedMediumintHandler.java
@@ -17,14 +17,14 @@
package org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.impl;
-import
org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.MySQLBinlogDataTypeHandler;
+import
org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.MySQLBinlogNumberDataTypeHandler;
import java.io.Serializable;
/**
* MySQL binlog unsigned mediumint data type handler.
*/
-public final class MySQLBinlogUnsignedMediumintHandler implements
MySQLBinlogDataTypeHandler {
+public final class MySQLBinlogUnsignedMediumintHandler implements
MySQLBinlogNumberDataTypeHandler {
private static final int MEDIUMINT_MODULO = 16777216;
@@ -34,7 +34,7 @@ public final class MySQLBinlogUnsignedMediumintHandler
implements MySQLBinlogDat
return null;
}
int intValue = (int) value;
- return 0 > intValue ? MEDIUMINT_MODULO + intValue : intValue;
+ return intValue < 0 ? MEDIUMINT_MODULO + intValue : intValue;
}
@Override
diff --git
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/impl/MySQLBinlogUnsignedSmallintHandler.java
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/impl/MySQLBinlogUnsignedSmallintHandler.java
index b0093a52909..34a4a0650fe 100644
---
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/impl/MySQLBinlogUnsignedSmallintHandler.java
+++
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/impl/MySQLBinlogUnsignedSmallintHandler.java
@@ -17,14 +17,14 @@
package org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.impl;
-import
org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.MySQLBinlogDataTypeHandler;
+import
org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.MySQLBinlogNumberDataTypeHandler;
import java.io.Serializable;
/**
* MySQL binlog unsigned smallint data type handler.
*/
-public final class MySQLBinlogUnsignedSmallintHandler implements
MySQLBinlogDataTypeHandler {
+public final class MySQLBinlogUnsignedSmallintHandler implements
MySQLBinlogNumberDataTypeHandler {
private static final int SMALLINT_MODULO = 65536;
@@ -34,7 +34,7 @@ public final class MySQLBinlogUnsignedSmallintHandler
implements MySQLBinlogData
return null;
}
short shortValue = (short) value;
- return 0 > shortValue ? SMALLINT_MODULO + shortValue : shortValue;
+ return shortValue < 0 ? SMALLINT_MODULO + shortValue : shortValue;
}
@Override
diff --git
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/impl/MySQLBinlogUnsignedTinyintHandler.java
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/impl/MySQLBinlogUnsignedTinyintHandler.java
index d7fa713b0ef..c18e4fc1be6 100644
---
a/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/impl/MySQLBinlogUnsignedTinyintHandler.java
+++
b/kernel/data-pipeline/dialect/mysql/src/main/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/dumper/type/impl/MySQLBinlogUnsignedTinyintHandler.java
@@ -17,14 +17,14 @@
package org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.impl;
-import
org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.MySQLBinlogDataTypeHandler;
+import
org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.MySQLBinlogNumberDataTypeHandler;
import java.io.Serializable;
/**
* MySQL binlog unsigned tinyint data type handler.
*/
-public final class MySQLBinlogUnsignedTinyintHandler implements
MySQLBinlogDataTypeHandler {
+public final class MySQLBinlogUnsignedTinyintHandler implements
MySQLBinlogNumberDataTypeHandler {
private static final int TINYINT_MODULO = 256;
@@ -34,7 +34,7 @@ public final class MySQLBinlogUnsignedTinyintHandler
implements MySQLBinlogDataT
return null;
}
byte byteValue = (byte) value;
- return 0 > byteValue ? TINYINT_MODULO + byteValue : byteValue;
+ return byteValue < 0 ? TINYINT_MODULO + byteValue : byteValue;
}
@Override
diff --git
a/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.MySQLBinlogDataTypeHandler
b/kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.MySQLBinlogNumberDataTypeHandler
similarity index 100%
rename from
kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.MySQLBinlogDataTypeHandler
rename to
kernel/data-pipeline/dialect/mysql/src/main/resources/META-INF/services/org.apache.shardingsphere.data.pipeline.mysql.ingest.dumper.type.MySQLBinlogNumberDataTypeHandler
