Rename PipelineJobInfo.tableName (#29131)

apache · Nov 23, 2023 · 8a6b1d9 · 8a6b1d9
1 parent faf380b
commit 8a6b1d9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/...re/src/main/java/org/apache/shardingsphere/data/pipeline/common/pojo/PipelineJobInfo.java b/...re/src/main/java/org/apache/shardingsphere/data/pipeline/common/pojo/PipelineJobInfo.java
@@ -31,6 +31,5 @@ public final class PipelineJobInfo {
 
     private final String databaseName;
 
-    // TODO Rename
-    private final String table;
+    private final String tableName;
 }
diff --git a/.../apache/shardingsphere/data/pipeline/core/job/service/InventoryIncrementalJobManager.java b/.../apache/shardingsphere/data/pipeline/core/job/service/InventoryIncrementalJobManager.java
@@ -86,7 +86,7 @@ public List<InventoryIncrementalJobItemInfo> getJobItemInfos(final String jobId)
             InventoryIncrementalJobItemProgress jobItemProgress = entry.getValue();
             String errorMessage = new PipelineJobIteErrorMessageManager(jobId, shardingItem).getErrorMessage();
             if (null == jobItemProgress) {
-                result.add(new InventoryIncrementalJobItemInfo(shardingItem, jobInfo.getTable(), null, startTimeMillis, 0, errorMessage));
+                result.add(new InventoryIncrementalJobItemInfo(shardingItem, jobInfo.getTableName(), null, startTimeMillis, 0, errorMessage));
                 continue;
             }
             int inventoryFinishedPercentage = 0;
@@ -95,7 +95,7 @@ public List<InventoryIncrementalJobItemInfo> getJobItemInfos(final String jobId)
             } else if (0 != jobItemProgress.getProcessedRecordsCount() && 0 != jobItemProgress.getInventoryRecordsCount()) {
                 inventoryFinishedPercentage = (int) Math.min(100, jobItemProgress.getProcessedRecordsCount() * 100 / jobItemProgress.getInventoryRecordsCount());
             }
-            result.add(new InventoryIncrementalJobItemInfo(shardingItem, jobInfo.getTable(), jobItemProgress, startTimeMillis, inventoryFinishedPercentage, errorMessage));
+            result.add(new InventoryIncrementalJobItemInfo(shardingItem, jobInfo.getTableName(), jobItemProgress, startTimeMillis, inventoryFinishedPercentage, errorMessage));
         }
         return result;
     }

diff --git a/...n/java/org/apache/shardingsphere/cdc/distsql/handler/query/ShowStreamingListExecutor.java b/...n/java/org/apache/shardingsphere/cdc/distsql/handler/query/ShowStreamingListExecutor.java
@@ -40,7 +40,7 @@ public final class ShowStreamingListExecutor implements QueryableRALExecutor<Sho
     @Override
     public Collection<LocalDataQueryResultRow> getRows(final ShowStreamingListStatement sqlStatement) {
         return pipelineJobManager.getJobInfos(new PipelineContextKey(InstanceType.PROXY)).stream().map(each -> new LocalDataQueryResultRow(each.getJobMetaData().getJobId(),
-                each.getDatabaseName(), each.getTable(),
+                each.getDatabaseName(), each.getTableName(),
                 each.getJobMetaData().getJobItemCount(), each.getJobMetaData().isActive() ? Boolean.TRUE.toString() : Boolean.FALSE.toString(),
                 each.getJobMetaData().getCreateTime(), Optional.ofNullable(each.getJobMetaData().getStopTime()).orElse(""))).collect(Collectors.toList());
     }

diff --git a/.../org/apache/shardingsphere/migration/distsql/handler/query/ShowMigrationListExecutor.java b/.../org/apache/shardingsphere/migration/distsql/handler/query/ShowMigrationListExecutor.java
@@ -39,7 +39,7 @@ public final class ShowMigrationListExecutor implements QueryableRALExecutor<Sho
     @Override
     public Collection<LocalDataQueryResultRow> getRows(final ShowMigrationListStatement sqlStatement) {
         return pipelineJobManager.getJobInfos(new PipelineContextKey(InstanceType.PROXY)).stream().map(each -> new LocalDataQueryResultRow(each.getJobMetaData().getJobId(),
-                each.getTable(), each.getJobMetaData().getJobItemCount(),
+                each.getTableName(), each.getJobMetaData().getJobItemCount(),
                 each.getJobMetaData().isActive() ? Boolean.TRUE.toString() : Boolean.FALSE.toString(),
                 each.getJobMetaData().getCreateTime(), each.getJobMetaData().getStopTime())).collect(Collectors.toList());
     }