move storage

dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/DataSyncServiceImpl.java

@@ -19,8 +19,8 @@ import org.dbsyncer.parser.model.TableGroup;
 import org.dbsyncer.sdk.enums.StorageEnum;
 import org.dbsyncer.sdk.listener.event.RowChangedEvent;
 import org.dbsyncer.sdk.model.Field;
-import org.dbsyncer.sdk.storage.FieldResolver;
-import org.dbsyncer.sdk.storage.Query;
+import org.dbsyncer.sdk.filter.FieldResolver;
+import org.dbsyncer.sdk.filter.Query;
 import org.dbsyncer.storage.StorageService;
 import org.dbsyncer.storage.binlog.proto.BinlogMap;
 import org.dbsyncer.storage.constant.ConfigConstant;

dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/MetricReporter.java

@@ -1,3 +1,6 @@
+/**
+ * DBSyncer Copyright 2020-2023 All Rights Reserved.
+ */
 package org.dbsyncer.biz.impl;
 
 import org.dbsyncer.biz.enums.BufferActuatorMetricEnum;
@@ -22,7 +25,7 @@ import org.dbsyncer.parser.model.Meta;
 import org.dbsyncer.parser.model.TableGroup;
 import org.dbsyncer.sdk.constant.ConnectorConstant;
 import org.dbsyncer.sdk.enums.StorageEnum;
-import org.dbsyncer.sdk.storage.Query;
+import org.dbsyncer.sdk.filter.Query;
 import org.dbsyncer.storage.StorageService;
 import org.dbsyncer.storage.constant.ConfigConstant;
 import org.dbsyncer.storage.enums.StorageDataStatusEnum;
@@ -44,9 +47,9 @@ import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**
- * @author AE86
- * @version 1.0.0
- * @date 2020/04/23 11:30
+ * @Author AE86
+ * @Version 1.0.0
+ * @Date 2020-04-23 11:30
  */
 @Component
 public class MetricReporter implements ScheduledTaskJob {

dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/MonitorServiceImpl.java

@@ -40,10 +40,10 @@ import org.dbsyncer.parser.model.Meta;
 import org.dbsyncer.sdk.enums.FilterEnum;
 import org.dbsyncer.sdk.enums.ModelEnum;
 import org.dbsyncer.sdk.enums.StorageEnum;
-import org.dbsyncer.sdk.storage.BooleanFilter;
-import org.dbsyncer.sdk.storage.FieldResolver;
-import org.dbsyncer.sdk.storage.Query;
-import org.dbsyncer.sdk.storage.filter.LongFilter;
+import org.dbsyncer.sdk.filter.BooleanFilter;
+import org.dbsyncer.sdk.filter.FieldResolver;
+import org.dbsyncer.sdk.filter.Query;
+import org.dbsyncer.sdk.filter.impl.LongFilter;
 import org.dbsyncer.storage.StorageService;
 import org.dbsyncer.storage.constant.ConfigConstant;
 import org.dbsyncer.storage.enums.StorageDataStatusEnum;

dbsyncer-common/src/main/java/org/dbsyncer/common/column/AbstractColumnValue.java

@@ -1,3 +1,6 @@
+/**
+ * DBSyncer Copyright 2020-2023 All Rights Reserved.
+ */
 package org.dbsyncer.common.column;
 
 public abstract class AbstractColumnValue<T> implements ColumnValue {

dbsyncer-common/src/main/java/org/dbsyncer/common/column/ColumnValue.java

@@ -1,3 +1,6 @@
+/**
+ * DBSyncer Copyright 2020-2023 All Rights Reserved.
+ */
 package org.dbsyncer.common.column;
 
 import java.math.BigDecimal;
@@ -6,9 +9,9 @@ import java.sql.Time;
 import java.sql.Timestamp;
 
 /**
- * @author AE86
- * @version 1.0.0
- * @date 2022/4/22 22:39
+ * @Author AE86
+ * @Version 1.0.0
+ * @Date 2022-04-22 22:39
  */
 public interface ColumnValue {
 

dbsyncer-manager/src/main/java/org/dbsyncer/manager/impl/PreloadTemplate.java

@@ -21,7 +21,7 @@ import org.dbsyncer.parser.model.OperationConfig;
 import org.dbsyncer.plugin.PluginFactory;
 import org.dbsyncer.sdk.connector.ConnectorInstance;
 import org.dbsyncer.sdk.enums.StorageEnum;
-import org.dbsyncer.sdk.storage.Query;
+import org.dbsyncer.sdk.filter.Query;
 import org.dbsyncer.storage.StorageService;
 import org.dbsyncer.storage.constant.ConfigConstant;
 import org.slf4j.Logger;

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/storage/AbstractFilter.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/filter/AbstractFilter.java

@@ -1,7 +1,7 @@
 /**
  * DBSyncer Copyright 2020-2023 All Rights Reserved.
  */
-package org.dbsyncer.sdk.storage;
+package org.dbsyncer.sdk.filter;
 
 import org.dbsyncer.sdk.enums.FilterTypeEnum;
 import org.dbsyncer.sdk.model.Filter;

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/storage/BooleanFilter.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/filter/BooleanFilter.java

@@ -1,4 +1,4 @@
-package org.dbsyncer.sdk.storage;
+package org.dbsyncer.sdk.filter;
 
 import org.dbsyncer.sdk.enums.OperationEnum;
 

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/storage/FieldResolver.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/filter/FieldResolver.java

@@ -1,7 +1,7 @@
 /**
  * DBSyncer Copyright 2020-2023 All Rights Reserved.
  */
-package org.dbsyncer.sdk.storage;
+package org.dbsyncer.sdk.filter;
 
 /**
  * @Author AE86

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/storage/Query.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/filter/Query.java

@@ -1,13 +1,13 @@
 /**
  * DBSyncer Copyright 2020-2023 All Rights Reserved.
  */
-package org.dbsyncer.sdk.storage;
+package org.dbsyncer.sdk.filter;
 
 import org.dbsyncer.sdk.enums.SortEnum;
 import org.dbsyncer.sdk.enums.FilterEnum;
 import org.dbsyncer.sdk.enums.StorageEnum;
-import org.dbsyncer.sdk.storage.filter.IntFilter;
-import org.dbsyncer.sdk.storage.filter.StringFilter;
+import org.dbsyncer.sdk.filter.impl.IntFilter;
+import org.dbsyncer.sdk.filter.impl.StringFilter;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/storage/filter/IntFilter.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/filter/impl/IntFilter.java

@@ -1,11 +1,11 @@
 /**
  * DBSyncer Copyright 2020-2023 All Rights Reserved.
  */
-package org.dbsyncer.sdk.storage.filter;
+package org.dbsyncer.sdk.filter.impl;
 
 import org.dbsyncer.sdk.enums.FilterEnum;
 import org.dbsyncer.sdk.enums.FilterTypeEnum;
-import org.dbsyncer.sdk.storage.AbstractFilter;
+import org.dbsyncer.sdk.filter.AbstractFilter;
 
 import java.util.Objects;
 

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/storage/filter/LongFilter.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/filter/impl/LongFilter.java

@@ -1,11 +1,11 @@
 /**
  * DBSyncer Copyright 2020-2023 All Rights Reserved.
  */
-package org.dbsyncer.sdk.storage.filter;
+package org.dbsyncer.sdk.filter.impl;
 
 import org.dbsyncer.sdk.enums.FilterEnum;
 import org.dbsyncer.sdk.enums.FilterTypeEnum;
-import org.dbsyncer.sdk.storage.AbstractFilter;
+import org.dbsyncer.sdk.filter.AbstractFilter;
 
 import java.util.Objects;
 

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/storage/filter/StringFilter.java → dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/filter/impl/StringFilter.java

@@ -1,11 +1,11 @@
 /**
  * DBSyncer Copyright 2020-2023 All Rights Reserved.
  */
-package org.dbsyncer.sdk.storage.filter;
+package org.dbsyncer.sdk.filter.impl;
 
 import org.dbsyncer.sdk.enums.FilterEnum;
 import org.dbsyncer.sdk.enums.FilterTypeEnum;
-import org.dbsyncer.sdk.storage.AbstractFilter;
+import org.dbsyncer.sdk.filter.AbstractFilter;
 
 public class StringFilter extends AbstractFilter {
 

dbsyncer-storage/src/main/java/org/dbsyncer/storage/AbstractStorageService.java

@@ -6,8 +6,8 @@ package org.dbsyncer.storage;
 import org.dbsyncer.common.model.Paging;
 import org.dbsyncer.common.util.CollectionUtils;
 import org.dbsyncer.sdk.enums.StorageEnum;
-import org.dbsyncer.sdk.storage.BooleanFilter;
-import org.dbsyncer.sdk.storage.Query;
+import org.dbsyncer.sdk.filter.BooleanFilter;
+import org.dbsyncer.sdk.filter.Query;
 import org.dbsyncer.storage.strategy.Strategy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

dbsyncer-storage/src/main/java/org/dbsyncer/storage/StorageService.java

@@ -2,7 +2,7 @@ package org.dbsyncer.storage;
 
 import org.dbsyncer.common.model.Paging;
 import org.dbsyncer.sdk.enums.StorageEnum;
-import org.dbsyncer.sdk.storage.Query;
+import org.dbsyncer.sdk.filter.Query;
 
 import java.util.List;
 import java.util.Map;

dbsyncer-storage/src/main/java/org/dbsyncer/storage/binlog/BinlogColumnValue.java

@@ -1,3 +1,6 @@
+/**
+ * DBSyncer Copyright 2020-2023 All Rights Reserved.
+ */
 package org.dbsyncer.storage.binlog;
 
 import com.google.protobuf.ByteString;
@@ -11,9 +14,9 @@ import java.sql.Time;
 import java.sql.Timestamp;
 
 /**
- * @author AE86
- * @version 1.0.0
- * @date 2022/6/30 22:39
+ * @Author AE86
+ * @Version 1.0.0
+ * @Date 2022-06-30 22:39
  */
 public class BinlogColumnValue extends AbstractColumnValue<ByteString> {
 

dbsyncer-storage/src/main/java/org/dbsyncer/storage/constant/ConfigConstant.java

@@ -1,9 +1,12 @@
+/**
+ * DBSyncer Copyright 2020-2023 All Rights Reserved.
+ */
 package org.dbsyncer.storage.constant;
 
 /**
- * @author AE86
- * @version 1.0.0
- * @date 2019/11/16 22:14
+ * @Author AE86
+ * @Version 1.0.0
+ * @Date 2019-11-16 22:14
  */
 public class ConfigConstant {
 

dbsyncer-storage/src/main/java/org/dbsyncer/storage/enums/StorageDataStatusEnum.java

@@ -1,42 +1,34 @@
+/**
+ * DBSyncer Copyright 2020-2023 All Rights Reserved.
+ */
 package org.dbsyncer.storage.enums;
 
 /**
- * @author AE86
- * @version 1.0.0
- * @date 2021/3/10 20:31
+ * 同步数据状态枚举
+ *
+ * @Author AE86
+ * @Version 1.0.0
+ * @Date 2021-03-10 20:31
  */
 public enum StorageDataStatusEnum {
 
     /**
      * 失败
      */
-    FAIL(0, "0", "失败"),
+    FAIL(0),
     /**
      * 成功
      */
-    SUCCESS(1, "1", "成功");
+    SUCCESS(1);
 
     private Integer value;
 
-    private String code;
-
-    private String message;
-
-    StorageDataStatusEnum(Integer value, String code, String message) {
+    StorageDataStatusEnum(Integer value) {
         this.value = value;
-        this.code = code;
-        this.message = message;
     }
 
     public Integer getValue() {
         return value;
     }
 
-    public String getCode() {
-        return code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
 }

dbsyncer-storage/src/main/java/org/dbsyncer/storage/impl/DiskQueryHelper.java

@@ -9,7 +9,7 @@ import org.apache.lucene.index.Term;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
 import org.dbsyncer.common.util.NumberUtil;
-import org.dbsyncer.sdk.storage.AbstractFilter;
+import org.dbsyncer.sdk.filter.AbstractFilter;
 import org.dbsyncer.storage.StorageException;
 
 /**

dbsyncer-storage/src/main/java/org/dbsyncer/storage/impl/DiskStorageServiceImpl.java

@@ -24,9 +24,9 @@ import org.dbsyncer.storage.constant.ConfigConstant;
 import org.dbsyncer.sdk.enums.StorageEnum;
 import org.dbsyncer.storage.lucene.Option;
 import org.dbsyncer.storage.lucene.Shard;
-import org.dbsyncer.sdk.storage.AbstractFilter;
-import org.dbsyncer.sdk.storage.BooleanFilter;
-import org.dbsyncer.sdk.storage.Query;
+import org.dbsyncer.sdk.filter.AbstractFilter;
+import org.dbsyncer.sdk.filter.BooleanFilter;
+import org.dbsyncer.sdk.filter.Query;
 import org.dbsyncer.storage.util.DocumentUtil;
 
 import javax.annotation.PostConstruct;

dbsyncer-storage/src/main/java/org/dbsyncer/storage/impl/MySQLStorageServiceImpl.java

@@ -17,9 +17,9 @@ import org.dbsyncer.sdk.enums.FilterEnum;
 import org.dbsyncer.sdk.enums.SqlBuilderEnum;
 import org.dbsyncer.sdk.enums.StorageEnum;
 import org.dbsyncer.sdk.model.Field;
-import org.dbsyncer.sdk.storage.AbstractFilter;
-import org.dbsyncer.sdk.storage.BooleanFilter;
-import org.dbsyncer.sdk.storage.Query;
+import org.dbsyncer.sdk.filter.AbstractFilter;
+import org.dbsyncer.sdk.filter.BooleanFilter;
+import org.dbsyncer.sdk.filter.Query;
 import org.dbsyncer.sdk.util.DatabaseUtil;
 import org.dbsyncer.storage.AbstractStorageService;
 import org.dbsyncer.storage.NullExecutorException;

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

@@ -6,7 +6,7 @@ package org.dbsyncer.storage.lucene;
 import org.apache.lucene.index.IndexableField;
 import org.apache.lucene.search.Query;
 import org.apache.lucene.search.highlight.Highlighter;
-import org.dbsyncer.sdk.storage.FieldResolver;
+import org.dbsyncer.sdk.filter.FieldResolver;
 
 import java.util.Map;
 import java.util.Set;