uniform variable naming convention

apache · Mar 20, 2024 · e4445af · e4445af
1 parent 5de2d5b
commit e4445af
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/...main/java/org/apache/doris/flink/sink/writer/serializer/JsonDebeziumSchemaSerializer.java b/...main/java/org/apache/doris/flink/sink/writer/serializer/JsonDebeziumSchemaSerializer.java
@@ -71,7 +71,7 @@ public class JsonDebeziumSchemaSerializer implements DorisRecordSerializer<Strin
     private String targetDatabase;
     private String targetTablePrefix;
     private String targetTableSuffix;
-    private boolean ignoreInCompatible;
+    private boolean ignoreIncompatible;
     private JsonDebeziumDataChange dataChange;
     private JsonDebeziumSchemaChange schemaChange;
     private final Set<String> initTableSet = new HashSet<>();
@@ -138,14 +138,14 @@ public JsonDebeziumSchemaSerializer(
             String targetDatabase,
             String targetTablePrefix,
             String targetTableSuffix,
-            boolean ignoreInCompatible) {
+            boolean ignoreIncompatible) {
         this(dorisOptions, pattern, sourceTableName, newSchemaChange, executionOptions);
         this.tableMapping = tableMapping;
         this.tableProperties = tableProperties;
         this.targetDatabase = targetDatabase;
         this.targetTablePrefix = targetTablePrefix;
         this.targetTableSuffix = targetTableSuffix;
-        this.ignoreInCompatible = ignoreInCompatible;
+        this.ignoreIncompatible = ignoreIncompatible;
         init();
     }
 
@@ -163,7 +163,7 @@ private void init() {
                         ignoreUpdateBefore,
                         targetTablePrefix,
                         targetTableSuffix,
-                        ignoreInCompatible);
+                        ignoreIncompatible);
         this.schemaChange =
                 newSchemaChange
                         ? new JsonDebeziumSchemaChangeImplV2(changeContext)
@@ -227,7 +227,7 @@ public static class Builder {
         private String targetDatabase;
         private String targetTablePrefix = "";
         private String targetTableSuffix = "";
-        private boolean ignoreInCompatible = true;
+        private boolean ignoreIncompatible = true;
 
         public JsonDebeziumSchemaSerializer.Builder setDorisOptions(DorisOptions dorisOptions) {
             this.dorisOptions = dorisOptions;
@@ -283,8 +283,8 @@ public Builder setTargetTableSuffix(String tableSuffix) {
             return this;
         }
 
-        public Builder setIgnoreInCompatible(boolean ignoreInCompatible) {
-            this.ignoreInCompatible = ignoreInCompatible;
+        public Builder setIgnoreIncompatible(boolean ignoreInCompatible) {
+            this.ignoreIncompatible = ignoreInCompatible;
             return this;
         }
 
@@ -300,7 +300,7 @@ public JsonDebeziumSchemaSerializer build() {
                     targetDatabase,
                     targetTablePrefix,
                     targetTableSuffix,
-                    ignoreInCompatible);
+                    ignoreIncompatible);
         }
     }
 }
diff --git a/...org/apache/doris/flink/sink/writer/serializer/jsondebezium/JsonDebeziumChangeContext.java b/...org/apache/doris/flink/sink/writer/serializer/jsondebezium/JsonDebeziumChangeContext.java
@@ -40,7 +40,7 @@ public class JsonDebeziumChangeContext implements Serializable {
     private final boolean ignoreUpdateBefore;
     private String targetTablePrefix;
     private String targetTableSuffix;
-    private boolean ignoreInCompatible;
+    private boolean ignoreIncompatible;
 
     public JsonDebeziumChangeContext(
             DorisOptions dorisOptions,
@@ -54,7 +54,7 @@ public JsonDebeziumChangeContext(
             boolean ignoreUpdateBefore,
             String targetTablePrefix,
             String targetTableSuffix,
-            boolean ignoreInCompatible) {
+            boolean ignoreIncompatible) {
         this.dorisOptions = dorisOptions;
         this.tableMapping = tableMapping;
         this.sourceTableName = sourceTableName;
@@ -66,7 +66,7 @@ public JsonDebeziumChangeContext(
         this.ignoreUpdateBefore = ignoreUpdateBefore;
         this.targetTablePrefix = targetTablePrefix;
         this.targetTableSuffix = targetTableSuffix;
-        this.ignoreInCompatible = ignoreInCompatible;
+        this.ignoreIncompatible = ignoreIncompatible;
     }
 
     public DorisOptions getDorisOptions() {
@@ -113,7 +113,7 @@ public String getTargetTableSuffix() {
         return targetTableSuffix;
     }
 
-    public boolean isIgnoreInCompatible() {
-        return ignoreInCompatible;
+    public boolean isIgnoreIncompatible() {
+        return ignoreIncompatible;
     }
 }
diff --git a/...pache/doris/flink/sink/writer/serializer/jsondebezium/JsonDebeziumSchemaChangeImplV2.java b/...pache/doris/flink/sink/writer/serializer/jsondebezium/JsonDebeziumSchemaChangeImplV2.java
@@ -75,7 +75,7 @@ public class JsonDebeziumSchemaChangeImplV2 extends JsonDebeziumSchemaChange {
     private String targetDatabase;
     private String targetTablePrefix;
     private String targetTableSuffix;
-    private boolean ignoreInCompatible;
+    private boolean ignoreIncompatible;
     private final Set<String> filledTables = new HashSet<>();
 
     public JsonDebeziumSchemaChangeImplV2(JsonDebeziumChangeContext changeContext) {
@@ -96,7 +96,7 @@ public JsonDebeziumSchemaChangeImplV2(JsonDebeziumChangeContext changeContext) {
                 changeContext.getTargetTableSuffix() == null
                         ? ""
                         : changeContext.getTargetTableSuffix();
-        this.ignoreInCompatible = changeContext.isIgnoreInCompatible();
+        this.ignoreIncompatible = changeContext.isIgnoreIncompatible();
     }
 
     @Override
@@ -128,7 +128,7 @@ public boolean schemaChange(JsonNode recordRoot) {
 
                 boolean ignoreSchema =
                         DatabaseSync.shouldIgnoreSchemaIncompatible(
-                                ignoreInCompatible,
+                                ignoreIncompatible,
                                 tableSchema.getTable(),
                                 tableSchema.getFields());
                 // If ignoreInCompatible is false, an exception is thrown when the source table

diff --git a/flink-doris-connector/src/main/java/org/apache/doris/flink/tools/cdc/CdcTools.java b/flink-doris-connector/src/main/java/org/apache/doris/flink/tools/cdc/CdcTools.java
@@ -117,7 +117,7 @@ private static void syncDatabase(
         String multiToOneTarget = params.get("multi-to-one-target");
         boolean createTableOnly = params.has("create-table-only");
         boolean ignoreDefaultValue = params.has("ignore-default-value");
-        boolean ignoreIncompatible = params.getBoolean("ignore-incompatible",true);
+        boolean ignoreIncompatible = params.getBoolean("ignore-incompatible", true);
         boolean singleSink = params.has("single-sink");
 
         Preconditions.checkArgument(params.has("sink-conf"));

diff --git a/flink-doris-connector/src/main/java/org/apache/doris/flink/tools/cdc/DatabaseSync.java b/flink-doris-connector/src/main/java/org/apache/doris/flink/tools/cdc/DatabaseSync.java
@@ -83,7 +83,7 @@ public abstract class DatabaseSync {
     protected String tablePrefix;
     protected String tableSuffix;
     protected boolean singleSink;
-    protected boolean ignoreInCompatible = true;
+    protected boolean ignoreIncompatible = true;
     private final Map<String, String> tableMapping = new HashMap<>();
 
     public abstract void registerDriver() throws SQLException;
@@ -135,7 +135,7 @@ public void build() throws Exception {
             // mismatches the Doris schema.
             // If it's true, incompatible schemas are skipped, and a warning log is printed.
             if (shouldIgnoreSchemaIncompatible(
-                    ignoreInCompatible, schema.getTableName(), schema.getFields())) {
+                    ignoreIncompatible, schema.getTableName(), schema.getFields())) {
                 continue;
             }
 
@@ -354,7 +354,7 @@ public DorisRecordSerializer<String> buildSchemaSerializer(
                 .setTargetDatabase(database)
                 .setTargetTablePrefix(tablePrefix)
                 .setTargetTableSuffix(tableSuffix)
-                .setIgnoreInCompatible(ignoreInCompatible)
+                .setIgnoreIncompatible(ignoreIncompatible)
                 .build();
     }
 
@@ -550,7 +550,7 @@ public DatabaseSync setTableSuffix(String tableSuffix) {
     }
 
     public DatabaseSync setIgnoreIncompatible(boolean ignoreIncompatible) {
-        this.ignoreInCompatible = ignoreIncompatible;
+        this.ignoreIncompatible = ignoreIncompatible;
         return this;
     }