!364 rename

Merge pull request !364 from AE86/v_2.0

dbsyncer-connector/dbsyncer-connector-mysql/src/main/java/org/dbsyncer/connector/mysql/binlog/BinaryLogRemoteClient.java

@@ -12,12 +12,12 @@ import com.github.shyiko.mysql.binlog.network.*;
 import com.github.shyiko.mysql.binlog.network.protocol.*;
 import com.github.shyiko.mysql.binlog.network.protocol.command.*;
 import org.dbsyncer.common.util.StringUtil;
-import org.dbsyncer.connector.mysql.deserializer.DeleteDeserialize;
+import org.dbsyncer.connector.mysql.deserializer.DeleteDeserializer;
 import org.dbsyncer.connector.mysql.deserializer.ExtDeleteDeserializer;
 import org.dbsyncer.connector.mysql.deserializer.ExtUpdateDeserializer;
-import org.dbsyncer.connector.mysql.deserializer.UpdateDeserialize;
+import org.dbsyncer.connector.mysql.deserializer.UpdateDeserializer;
 import org.dbsyncer.connector.mysql.deserializer.ExtWriteDeserializer;
-import org.dbsyncer.connector.mysql.deserializer.WriteDeserialize;
+import org.dbsyncer.connector.mysql.deserializer.WriteDeserializer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -587,9 +587,9 @@ public class BinaryLogRemoteClient implements BinaryLogClient {
         eventDataDeserializers.put(EventType.ROTATE, new RotateEventDataDeserializer());
         eventDataDeserializers.put(EventType.FORMAT_DESCRIPTION, new FormatDescriptionEventDataDeserializer());
         eventDataDeserializers.put(EventType.TABLE_MAP, new TableMapEventDataDeserializer());
-        eventDataDeserializers.put(EventType.UPDATE_ROWS, new UpdateDeserialize(tableMapEventByTableId));
-        eventDataDeserializers.put(EventType.WRITE_ROWS, new WriteDeserialize(tableMapEventByTableId));
-        eventDataDeserializers.put(EventType.DELETE_ROWS, new DeleteDeserialize(tableMapEventByTableId));
+        eventDataDeserializers.put(EventType.UPDATE_ROWS, new UpdateDeserializer(tableMapEventByTableId));
+        eventDataDeserializers.put(EventType.WRITE_ROWS, new WriteDeserializer(tableMapEventByTableId));
+        eventDataDeserializers.put(EventType.DELETE_ROWS, new DeleteDeserializer(tableMapEventByTableId));
         eventDataDeserializers.put(EventType.EXT_WRITE_ROWS, (new ExtWriteDeserializer(tableMapEventByTableId)).setMayContainExtraInformation(true));
         eventDataDeserializers.put(EventType.EXT_UPDATE_ROWS, (new ExtUpdateDeserializer(tableMapEventByTableId)).setMayContainExtraInformation(true));
         eventDataDeserializers.put(EventType.EXT_DELETE_ROWS, (new ExtDeleteDeserializer(tableMapEventByTableId)).setMayContainExtraInformation(true));

dbsyncer-connector/dbsyncer-connector-mysql/src/main/java/org/dbsyncer/connector/mysql/deserializer/DeleteDeserialize.java → dbsyncer-connector/dbsyncer-connector-mysql/src/main/java/org/dbsyncer/connector/mysql/deserializer/DeleteDeserializer.java

@@ -8,6 +8,7 @@ import com.github.shyiko.mysql.binlog.event.deserialization.DeleteRowsEventDataD
 import com.github.shyiko.mysql.binlog.io.ByteArrayInputStream;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.Map;
 
 /**
@@ -15,14 +16,21 @@ import java.util.Map;
  * @Version 1.0.0
  * @Date 2025-04-12 15:21
  */
-public class DeleteDeserialize extends DeleteRowsEventDataDeserializer {
+public final class DeleteDeserializer extends DeleteRowsEventDataDeserializer {
+
+    private final DatetimeV2Deserialize datetimeV2Deserialize = new DatetimeV2Deserialize();
     private final JsonBinaryDeserialize jsonBinaryDeserialize = new JsonBinaryDeserialize();
 
-    public DeleteDeserialize(Map<Long, TableMapEventData> tableMapEventByTableId) {
+    public DeleteDeserializer(Map<Long, TableMapEventData> tableMapEventByTableId) {
         super(tableMapEventByTableId);
     }
 
     protected byte[] deserializeJson(int meta, ByteArrayInputStream inputStream) throws IOException {
         return jsonBinaryDeserialize.deserializeJson(meta, inputStream);
     }
+
+    @Override
+    protected Serializable deserializeDatetimeV2(int meta, ByteArrayInputStream inputStream) throws IOException {
+        return datetimeV2Deserialize.deserializeDatetimeV2(meta, inputStream);
+    }
 }

dbsyncer-connector/dbsyncer-connector-mysql/src/main/java/org/dbsyncer/connector/mysql/deserializer/UpdateDeserialize.java → dbsyncer-connector/dbsyncer-connector-mysql/src/main/java/org/dbsyncer/connector/mysql/deserializer/UpdateDeserializer.java

@@ -8,6 +8,7 @@ import com.github.shyiko.mysql.binlog.event.deserialization.UpdateRowsEventDataD
 import com.github.shyiko.mysql.binlog.io.ByteArrayInputStream;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.Map;
 
 /**
@@ -15,9 +16,12 @@ import java.util.Map;
  * @Version 1.0.0
  * @Date 2025-04-12 15:05
  */
-public class UpdateDeserialize extends UpdateRowsEventDataDeserializer {
+public final class UpdateDeserializer extends UpdateRowsEventDataDeserializer {
+
+    private final DatetimeV2Deserialize datetimeV2Deserialize = new DatetimeV2Deserialize();
     private final JsonBinaryDeserialize jsonBinaryDeserialize = new JsonBinaryDeserialize();
-    public UpdateDeserialize(Map<Long, TableMapEventData> tableMapEventByTableId) {
+
+    public UpdateDeserializer(Map<Long, TableMapEventData> tableMapEventByTableId) {
         super(tableMapEventByTableId);
     }
 
@@ -25,4 +29,8 @@ public class UpdateDeserialize extends UpdateRowsEventDataDeserializer {
         return jsonBinaryDeserialize.deserializeJson(meta, inputStream);
     }
 
+    @Override
+    protected Serializable deserializeDatetimeV2(int meta, ByteArrayInputStream inputStream) throws IOException {
+        return datetimeV2Deserialize.deserializeDatetimeV2(meta, inputStream);
+    }
 }

dbsyncer-connector/dbsyncer-connector-mysql/src/main/java/org/dbsyncer/connector/mysql/deserializer/WriteDeserialize.java → dbsyncer-connector/dbsyncer-connector-mysql/src/main/java/org/dbsyncer/connector/mysql/deserializer/WriteDeserializer.java

@@ -8,6 +8,7 @@ import com.github.shyiko.mysql.binlog.event.deserialization.WriteRowsEventDataDe
 import com.github.shyiko.mysql.binlog.io.ByteArrayInputStream;
 
 import java.io.IOException;
+import java.io.Serializable;
 import java.util.Map;
 
 /**
@@ -15,14 +16,21 @@ import java.util.Map;
  * @Version 1.0.0
  * @Date 2025-04-12 15:21
  */
-public class WriteDeserialize extends WriteRowsEventDataDeserializer {
+public final class WriteDeserializer extends WriteRowsEventDataDeserializer {
+
+    private final DatetimeV2Deserialize datetimeV2Deserialize = new DatetimeV2Deserialize();
     private final JsonBinaryDeserialize jsonBinaryDeserialize = new JsonBinaryDeserialize();
 
-    public WriteDeserialize(Map<Long, TableMapEventData> tableMapEventByTableId) {
+    public WriteDeserializer(Map<Long, TableMapEventData> tableMapEventByTableId) {
         super(tableMapEventByTableId);
     }
 
     protected byte[] deserializeJson(int meta, ByteArrayInputStream inputStream) throws IOException {
         return jsonBinaryDeserialize.deserializeJson(meta, inputStream);
     }
+
+    @Override
+    protected Serializable deserializeDatetimeV2(int meta, ByteArrayInputStream inputStream) throws IOException {
+        return datetimeV2Deserialize.deserializeDatetimeV2(meta, inputStream);
+    }
 }

dbsyncer-storage/src/main/java/org/dbsyncer/storage/lucene/Shard.java

@@ -48,18 +48,16 @@ public class Shard {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    private File indexPath;
+    private final File indexPath;
 
-    private Directory directory;
+    private final Directory directory;
 
-    private Analyzer analyzer;
+    private final Analyzer analyzer;
 
     private IndexWriter indexWriter;
 
     private IndexReader indexReader;
 
-    private IndexWriterConfig config;
-
     private final Object LOCK = new Object();
 
     private static final int MAX_SIZE = 10000;
@@ -253,7 +251,7 @@ public class Shard {
             IOUtils.close(writeLock); // release write lock
         }
         // 创建索引写入配置
-        config = new IndexWriterConfig(analyzer);
+        IndexWriterConfig config = new IndexWriterConfig(analyzer);
         // 默认32M, 减少合并次数
         config.setRAMBufferSizeMB(32);
         // 创建索引写入对象

dbsyncer-web/src/main/java/org/dbsyncer/web/Version.java

@@ -17,7 +17,7 @@ public class Version {
 
     public static final Version V_2_0_5 = new Version(20_00_05_2025_02_19_00L);
     public static final Version V_2_0_6 = new Version(20_00_06_2025_00_00_00L);
-    public static final Version CURRENT = new Version(20_00_06_2025_04_12_00L);
+    public static final Version CURRENT = new Version(20_00_06_2025_04_14_00L);
 
     public Version(long version) {
         this.version = version;