(shardingsphere) branch master updated: Refactor InventoryDumper (#32687)

[sunnianjun]

This is an automated email from the ASF dual-hosted git repository.

sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new f24bdfa4fe7 Refactor InventoryDumper (#32687)
f24bdfa4fe7 is described below

commit f24bdfa4fe7b5ff290997cf8971f055fd0264c18
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Mon Aug 26 19:53:09 2024 +0800

    Refactor InventoryDumper (#32687)
---
 .../core/ingest/dumper/inventory/InventoryDumper.java         |  8 ++------
 .../core/ingest/dumper/inventory/InventoryDumperContext.java  | 11 +++++++++++
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git 
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/InventoryDumper.java
 
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/InventoryDumper.java
index 18a6129522e..3baaaa00f81 100644
--- 
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/InventoryDumper.java
+++ 
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/InventoryDumper.java
@@ -253,7 +253,7 @@ public class InventoryDumper extends 
AbstractPipelineLifecycleRunnable implement
     private String buildInventoryDumpPageByPageSQL(final 
InventoryQueryParameter queryParam) {
         String schemaName = 
dumperContext.getCommonContext().getTableAndSchemaNameMapper().getSchemaName(dumperContext.getLogicTableName());
         PipelineColumnMetaData firstColumn = 
dumperContext.getUniqueKeyColumns().get(0);
-        List<String> columnNames = getQueryColumnNames();
+        List<String> columnNames = dumperContext.getQueryColumnNames();
         if (QueryType.POINT_QUERY == queryParam.getQueryType()) {
             return inventoryDumpSQLBuilder.buildPointQuerySQL(schemaName, 
dumperContext.getActualTableName(), columnNames, firstColumn.getName());
         }
@@ -270,10 +270,6 @@ public class InventoryDumper extends 
AbstractPipelineLifecycleRunnable implement
         throw new PipelineInternalException("Primary key position is 
invalid.");
     }
     
-    private List<String> getQueryColumnNames() {
-        return 
Optional.ofNullable(dumperContext.getInsertColumnNames()).orElse(Collections.singletonList("*"));
-    }
-    
     private Object getFirstUniqueKeyValue(final List<Record> dataRecords, 
final int index) {
         return ((DataRecord) 
dataRecords.get(index)).getUniqueKeyValue().iterator().next();
     }
@@ -325,7 +321,7 @@ public class InventoryDumper extends 
AbstractPipelineLifecycleRunnable implement
             return dumperContext.getQuerySQL();
         }
         String schemaName = 
dumperContext.getCommonContext().getTableAndSchemaNameMapper().getSchemaName(dumperContext.getLogicTableName());
-        List<String> columnNames = getQueryColumnNames();
+        List<String> columnNames = dumperContext.getQueryColumnNames();
         return inventoryDumpSQLBuilder.buildFetchAllSQL(schemaName, 
dumperContext.getActualTableName(), columnNames);
     }
     
diff --git 
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/InventoryDumperContext.java
 
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/InventoryDumperContext.java
index a3a0c580e6a..306be54aadd 100644
--- 
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/InventoryDumperContext.java
+++ 
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/ingest/dumper/inventory/InventoryDumperContext.java
@@ -24,7 +24,9 @@ import 
org.apache.shardingsphere.data.pipeline.core.ingest.dumper.DumperCommonCo
 import 
org.apache.shardingsphere.data.pipeline.core.metadata.model.PipelineColumnMetaData;
 import 
org.apache.shardingsphere.data.pipeline.core.ratelimit.JobRateLimitAlgorithm;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * Inventory dumper context.
@@ -69,4 +71,13 @@ public final class InventoryDumperContext {
     public boolean hasUniqueKey() {
         return null != uniqueKeyColumns && !uniqueKeyColumns.isEmpty();
     }
+    
+    /**
+     * Get query column names.
+     *
+     * @return query column names
+     */
+    public List<String> getQueryColumnNames() {
+        return 
Optional.ofNullable(insertColumnNames).orElse(Collections.singletonList("*"));
+    }
 }