Merge 2 constructors became 1 on LocalDataQueryResultRow (#30095)

apache · Feb 11, 2024 · 9e22577 · 9e22577
1 parent b898ded
commit 9e22577
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 18 deletions.
diff --git a/...java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java b/...java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
@@ -68,7 +68,7 @@ private Collection<LocalDataQueryResultRow> buildColumnData(final EncryptTableRu
             AlgorithmConfiguration encryptorAlgorithmConfig = encryptors.get(each.getCipher().getEncryptorName());
             AlgorithmConfiguration assistedQueryEncryptorAlgorithmConfig = each.getAssistedQuery().isPresent() ? encryptors.get(each.getAssistedQuery().get().getEncryptorName()) : null;
             AlgorithmConfiguration likeQueryEncryptorAlgorithmConfig = each.getLikeQuery().isPresent() ? encryptors.get(each.getLikeQuery().get().getEncryptorName()) : null;
-            result.add(new LocalDataQueryResultRow(Arrays.asList(
+            result.add(new LocalDataQueryResultRow(
                     tableRuleConfig.getName(),
                     each.getName(),
                     each.getCipher().getName(),
@@ -79,7 +79,7 @@ private Collection<LocalDataQueryResultRow> buildColumnData(final EncryptTableRu
                     null == assistedQueryEncryptorAlgorithmConfig ? "" : assistedQueryEncryptorAlgorithmConfig.getType(),
                     null == assistedQueryEncryptorAlgorithmConfig ? "" : PropertiesConverter.convert(assistedQueryEncryptorAlgorithmConfig.getProps()),
                     null == likeQueryEncryptorAlgorithmConfig ? "" : likeQueryEncryptorAlgorithmConfig.getType(),
-                    null == likeQueryEncryptorAlgorithmConfig ? "" : PropertiesConverter.convert(likeQueryEncryptorAlgorithmConfig.getProps()))));
+                    null == likeQueryEncryptorAlgorithmConfig ? "" : PropertiesConverter.convert(likeQueryEncryptorAlgorithmConfig.getProps())));
         }
         return result;
     }

diff --git a/.../main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java b/.../main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java
@@ -57,8 +57,7 @@ private Collection<LocalDataQueryResultRow> buildColumnData(final MaskTableRuleC
         Collection<LocalDataQueryResultRow> result = new LinkedList<>();
         tableRuleConfig.getColumns().forEach(each -> {
             AlgorithmConfiguration maskAlgorithmConfig = algorithmMap.get(each.getMaskAlgorithm());
-            result.add(new LocalDataQueryResultRow(
-                    Arrays.asList(tableRuleConfig.getName(), each.getLogicColumn(), maskAlgorithmConfig.getType(), PropertiesConverter.convert(maskAlgorithmConfig.getProps()))));
+            result.add(new LocalDataQueryResultRow(tableRuleConfig.getName(), each.getLogicColumn(), maskAlgorithmConfig.getType(), PropertiesConverter.convert(maskAlgorithmConfig.getProps())));
         });
         return result;
     }

diff --git a/...n/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRuleExecutor.java b/...n/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRuleExecutor.java
@@ -77,8 +77,8 @@ private Collection<LocalDataQueryResultRow> buildColumnData(final ShadowDataSour
         Collection<LocalDataQueryResultRow> result = new LinkedList<>();
         dataSourceTable.forEach((key, value) -> value.getShadowAlgorithmNames().forEach(each -> {
             AlgorithmConfiguration algorithmConfig = algorithmConfigs.get(each);
-            result.add(new LocalDataQueryResultRow(Arrays.asList(key, dataSourceConfig.getName(), dataSourceConfig.getProductionDataSourceName(), dataSourceConfig.getShadowDataSourceName(),
-                    algorithmConfig.getType(), PropertiesConverter.convert(algorithmConfig.getProps()))));
+            result.add(new LocalDataQueryResultRow(key, dataSourceConfig.getName(), dataSourceConfig.getProductionDataSourceName(), dataSourceConfig.getShadowDataSourceName(),
+                    algorithmConfig.getType(), PropertiesConverter.convert(algorithmConfig.getProps())));
         }));
         return result;
     }

diff --git a/...java/org/apache/shardingsphere/infra/merge/result/impl/local/LocalDataQueryResultRow.java b/...java/org/apache/shardingsphere/infra/merge/result/impl/local/LocalDataQueryResultRow.java
@@ -18,15 +18,13 @@
 package org.apache.shardingsphere.infra.merge.result.impl.local;
 
 import com.google.common.base.Preconditions;
-import lombok.RequiredArgsConstructor;
 
 import java.util.Arrays;
 import java.util.List;
 
 /**
  * Local data query result row.
  */
-@RequiredArgsConstructor
 public final class LocalDataQueryResultRow {
 
     private final List<Object> data;

diff --git a/...va/org/apache/shardingsphere/infra/merge/result/impl/local/LocalDataMergedResultTest.java b/...va/org/apache/shardingsphere/infra/merge/result/impl/local/LocalDataMergedResultTest.java
@@ -23,7 +23,6 @@
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
-import java.util.List;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -59,22 +58,19 @@ void assertGetCalendarValue() {
 
     @Test
     void assertGetInputStream() {
-        List<Object> row = Collections.singletonList("value");
-        LocalDataMergedResult actual = new LocalDataMergedResult(Collections.singletonList(new LocalDataQueryResultRow(row)));
+        LocalDataMergedResult actual = new LocalDataMergedResult(Collections.singletonList(new LocalDataQueryResultRow("value")));
         assertThrows(SQLFeatureNotSupportedException.class, () -> actual.getInputStream(1, "Ascii"));
     }
 
     @Test
     void assertGetCharacterStream() {
-        List<Object> row = Collections.singletonList("value");
-        LocalDataMergedResult actual = new LocalDataMergedResult(Collections.singletonList(new LocalDataQueryResultRow(row)));
+        LocalDataMergedResult actual = new LocalDataMergedResult(Collections.singletonList(new LocalDataQueryResultRow("value")));
         assertThrows(SQLFeatureNotSupportedException.class, () -> actual.getCharacterStream(1));
     }
 
     @Test
     void assertWasNull() {
-        List<Object> row = Collections.singletonList("value");
-        LocalDataMergedResult actual = new LocalDataMergedResult(Collections.singletonList(new LocalDataQueryResultRow(row)));
+        LocalDataMergedResult actual = new LocalDataMergedResult(Collections.singletonList(new LocalDataQueryResultRow("value")));
         assertTrue(actual.next());
         assertFalse(actual.wasNull());
     }

diff --git a/...ata/pipeline/migration/distsql/handler/query/ShowMigrationSourceStorageUnitsExecutor.java b/...ata/pipeline/migration/distsql/handler/query/ShowMigrationSourceStorageUnitsExecutor.java
@@ -31,7 +31,6 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
-import java.util.List;
 
 /**
  * Show migration source storage units executor.
@@ -51,7 +50,7 @@ public Collection<LocalDataQueryResultRow> getRows(final ShowMigrationSourceStor
         Iterator<Collection<Object>> data = jobAPI.listMigrationSourceResources(new PipelineContextKey(InstanceType.PROXY)).iterator();
         Collection<LocalDataQueryResultRow> result = new LinkedList<>();
         while (data.hasNext()) {
-            result.add(new LocalDataQueryResultRow((List<Object>) data.next()));
+            result.add(new LocalDataQueryResultRow(data.next().toArray()));
         }
         return result;
     }

diff --git a/...ngsphere/proxy/backend/mysql/handler/admin/executor/MySQLSystemVariableQueryExecutor.java b/...ngsphere/proxy/backend/mysql/handler/admin/executor/MySQLSystemVariableQueryExecutor.java
@@ -72,7 +72,7 @@ public void execute(final ConnectionSession connectionSession) {
             metaData.add(new RawQueryResultColumnMetaData("", name, name, Types.VARCHAR, "VARCHAR", 1024, 0));
         }
         queryResultMetaData = new RawQueryResultMetaData(metaData);
-        mergedResult = new LocalDataMergedResult(Collections.singleton(new LocalDataQueryResultRow(columnsOfRow)));
+        mergedResult = new LocalDataMergedResult(Collections.singleton(new LocalDataQueryResultRow(columnsOfRow.toArray())));
     }
 
     /**