Fix comments

Change-Id: I0064aa87a79b7e477d64e8b49fc2f58d04717359
apache · Feb 5, 2025 · 257bb7a · 257bb7a
1 parent 92da574
commit 257bb7a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/...n-flink-1.18/src/main/java/org/apache/paimon/flink/procedure/ClearConsumersProcedure.java b/...n-flink-1.18/src/main/java/org/apache/paimon/flink/procedure/ClearConsumersProcedure.java
@@ -22,6 +22,7 @@
 import org.apache.paimon.catalog.Identifier;
 import org.apache.paimon.consumer.ConsumerManager;
 import org.apache.paimon.table.FileStoreTable;
+import org.apache.paimon.utils.StringUtils;
 
 import org.apache.flink.table.procedure.ProcedureContext;
 
@@ -61,14 +62,14 @@ public String[] call(
                         fileStoreTable.location(),
                         fileStoreTable.snapshotManager().branch());
 
-        includingConsumers = nullable(includingConsumers);
-        excludingConsumers = nullable(excludingConsumers);
         Pattern includingPattern =
-                includingConsumers == null
+                StringUtils.isNullOrWhitespaceOnly(includingConsumers)
                         ? Pattern.compile(".*")
                         : Pattern.compile(includingConsumers);
         Pattern excludingPattern =
-                excludingConsumers == null ? null : Pattern.compile(excludingConsumers);
+                StringUtils.isNullOrWhitespaceOnly(excludingConsumers)
+                        ? null
+                        : Pattern.compile(excludingConsumers);
         consumerManager.clearConsumers(includingPattern, excludingPattern);
 
         return new String[] {"Success"};

diff --git a/...paimon-flink-common/src/main/java/org/apache/paimon/flink/action/ClearConsumerAction.java b/...paimon-flink-common/src/main/java/org/apache/paimon/flink/action/ClearConsumerAction.java
@@ -57,16 +57,14 @@ public void run() throws Exception {
                         dataTable.location(),
                         dataTable.snapshotManager().branch());
 
-        includingConsumers =
-                StringUtils.isNullOrWhitespaceOnly(includingConsumers) ? null : includingConsumers;
-        excludingConsumers =
-                StringUtils.isNullOrWhitespaceOnly(excludingConsumers) ? null : excludingConsumers;
         Pattern includingPattern =
-                includingConsumers == null
+                StringUtils.isNullOrWhitespaceOnly(includingConsumers)
                         ? Pattern.compile(".*")
                         : Pattern.compile(includingConsumers);
         Pattern excludingPattern =
-                excludingConsumers == null ? null : Pattern.compile(excludingConsumers);
+                StringUtils.isNullOrWhitespaceOnly(excludingConsumers)
+                        ? null
+                        : Pattern.compile(excludingConsumers);
         consumerManager.clearConsumers(includingPattern, excludingPattern);
     }
 }
diff --git a/...flink-common/src/main/java/org/apache/paimon/flink/procedure/ClearConsumersProcedure.java b/...flink-common/src/main/java/org/apache/paimon/flink/procedure/ClearConsumersProcedure.java
@@ -22,6 +22,7 @@
 import org.apache.paimon.catalog.Identifier;
 import org.apache.paimon.consumer.ConsumerManager;
 import org.apache.paimon.table.FileStoreTable;
+import org.apache.paimon.utils.StringUtils;
 
 import org.apache.flink.table.annotation.ArgumentHint;
 import org.apache.flink.table.annotation.DataTypeHint;
@@ -76,14 +77,14 @@ public String[] call(
                         fileStoreTable.location(),
                         fileStoreTable.snapshotManager().branch());
 
-        includingConsumers = nullable(includingConsumers);
-        excludingConsumers = nullable(excludingConsumers);
         Pattern includingPattern =
-                includingConsumers == null
+                StringUtils.isNullOrWhitespaceOnly(includingConsumers)
                         ? Pattern.compile(".*")
                         : Pattern.compile(includingConsumers);
         Pattern excludingPattern =
-                excludingConsumers == null ? null : Pattern.compile(excludingConsumers);
+                StringUtils.isNullOrWhitespaceOnly(excludingConsumers)
+                        ? null
+                        : Pattern.compile(excludingConsumers);
         consumerManager.clearConsumers(includingPattern, excludingPattern);
 
         return new String[] {"Success"};

diff --git a/...spark-common/src/main/java/org/apache/paimon/spark/procedure/ClearConsumersProcedure.java b/...spark-common/src/main/java/org/apache/paimon/spark/procedure/ClearConsumersProcedure.java
@@ -83,17 +83,15 @@ public StructType outputType() {
     public InternalRow[] call(InternalRow args) {
         Identifier tableIdent = toIdentifier(args.getString(0), PARAMETERS[0].name());
         String includingConsumers = args.isNullAt(1) ? null : args.getString(1);
-        includingConsumers =
-                StringUtils.isNullOrWhitespaceOnly(includingConsumers) ? null : includingConsumers;
         String excludingConsumers = args.isNullAt(2) ? null : args.getString(2);
-        excludingConsumers =
-                StringUtils.isNullOrWhitespaceOnly(excludingConsumers) ? null : excludingConsumers;
         Pattern includingPattern =
-                includingConsumers == null
+                StringUtils.isNullOrWhitespaceOnly(includingConsumers)
                         ? Pattern.compile(".*")
                         : Pattern.compile(includingConsumers);
         Pattern excludingPattern =
-                excludingConsumers == null ? null : Pattern.compile(excludingConsumers);
+                StringUtils.isNullOrWhitespaceOnly(excludingConsumers)
+                        ? null
+                        : Pattern.compile(excludingConsumers);
 
         return modifyPaimonTable(
                 tableIdent,