Add "type_aliases" column in "show migration check algorithms" DistSQ…

…L result (#28453)
apache · Sep 18, 2023 · bc575fd · bc575fd
1 parent c1095ea
commit bc575fd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/...rg/apache/shardingsphere/data/pipeline/common/pojo/DataConsistencyCheckAlgorithmInfo.java b/...rg/apache/shardingsphere/data/pipeline/common/pojo/DataConsistencyCheckAlgorithmInfo.java
@@ -32,6 +32,8 @@ public final class DataConsistencyCheckAlgorithmInfo {
 
     private final String type;
 
+    private final String typeAliases;
+
     private final Collection<DatabaseType> supportedDatabaseTypes;
 
     private final String description;

diff --git a/...ingsphere/data/pipeline/core/job/service/impl/AbstractInventoryIncrementalJobAPIImpl.java b/...ingsphere/data/pipeline/core/job/service/impl/AbstractInventoryIncrementalJobAPIImpl.java
@@ -61,6 +61,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
+import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 /**
@@ -203,7 +204,8 @@ public Collection<DataConsistencyCheckAlgorithmInfo> listDataConsistencyCheckAlg
         Collection<DataConsistencyCheckAlgorithmInfo> result = new LinkedList<>();
         for (TableDataConsistencyChecker each : ShardingSphereServiceLoader.getServiceInstances(TableDataConsistencyChecker.class)) {
             SPIDescription description = each.getClass().getAnnotation(SPIDescription.class);
-            result.add(new DataConsistencyCheckAlgorithmInfo(each.getType(), getSupportedDatabaseTypes(each.getSupportedDatabaseTypes()), null == description ? "" : description.value()));
+            String typeAliases = each.getTypeAliases().stream().map(Object::toString).collect(Collectors.joining(","));
+            result.add(new DataConsistencyCheckAlgorithmInfo(each.getType(), typeAliases, getSupportedDatabaseTypes(each.getSupportedDatabaseTypes()), null == description ? "" : description.value()));
         }
         return result;
     }

diff --git a/.../shardingsphere/migration/distsql/handler/query/ShowMigrationCheckAlgorithmsExecutor.java b/.../shardingsphere/migration/distsql/handler/query/ShowMigrationCheckAlgorithmsExecutor.java
@@ -38,14 +38,14 @@ public final class ShowMigrationCheckAlgorithmsExecutor implements QueryableRALE
     public Collection<LocalDataQueryResultRow> getRows(final ShowMigrationCheckAlgorithmsStatement sqlStatement) {
         InventoryIncrementalJobAPI jobAPI = (InventoryIncrementalJobAPI) TypedSPILoader.getService(PipelineJobAPI.class, "MIGRATION");
         return jobAPI.listDataConsistencyCheckAlgorithms().stream().map(
-                each -> new LocalDataQueryResultRow(each.getType(),
+                each -> new LocalDataQueryResultRow(each.getType(), each.getTypeAliases(),
                         each.getSupportedDatabaseTypes().stream().map(DatabaseType::getType).collect(Collectors.joining(",")), each.getDescription()))
                 .collect(Collectors.toList());
     }
 
     @Override
     public Collection<String> getColumnNames() {
-        return Arrays.asList("type", "supported_database_types", "description");
+        return Arrays.asList("type", "type_aliases", "supported_database_types", "description");
     }
 
     @Override

diff --git a/...rdingsphere/migration/distsql/handler/query/ShowMigrationCheckAlgorithmsExecutorTest.java b/...rdingsphere/migration/distsql/handler/query/ShowMigrationCheckAlgorithmsExecutorTest.java
@@ -31,9 +31,10 @@ class ShowMigrationCheckAlgorithmsExecutorTest {
     void assertGetColumnNames() {
         ShowMigrationCheckAlgorithmsExecutor executor = new ShowMigrationCheckAlgorithmsExecutor();
         Collection<String> columns = executor.getColumnNames();
-        assertThat(columns.size(), is(3));
+        assertThat(columns.size(), is(4));
         Iterator<String> iterator = columns.iterator();
         assertThat(iterator.next(), is("type"));
+        assertThat(iterator.next(), is("type_aliases"));
         assertThat(iterator.next(), is("supported_database_types"));
         assertThat(iterator.next(), is("description"));
     }