Refactor ShadowColumnCondition (#33559)

apache · Nov 6, 2024 · a967dfb · a967dfb
1 parent 5e8dbbc
commit a967dfb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.../core/src/main/java/org/apache/shardingsphere/shadow/condition/ShadowColumnCondition.java b/.../core/src/main/java/org/apache/shardingsphere/shadow/condition/ShadowColumnCondition.java
@@ -29,7 +29,7 @@
 @Getter
 public final class ShadowColumnCondition {
 
-    private final String owner;
+    private final String table;
 
     private final String column;
 

diff --git a/...va/org/apache/shardingsphere/shadow/route/determiner/ColumnShadowAlgorithmDeterminer.java b/...va/org/apache/shardingsphere/shadow/route/determiner/ColumnShadowAlgorithmDeterminer.java
@@ -43,7 +43,7 @@ public final class ColumnShadowAlgorithmDeterminer {
      */
     public static boolean isShadow(final ColumnShadowAlgorithm<Comparable<?>> shadowAlgorithm, final ShadowCondition shadowCondition) {
         for (PreciseColumnShadowValue<Comparable<?>> each : createColumnShadowValues(shadowCondition)) {
-            if (!shadowCondition.getTableName().equals(shadowCondition.getColumnCondition().getOwner()) || !shadowAlgorithm.isShadow(each)) {
+            if (!shadowCondition.getTableName().equals(shadowCondition.getColumnCondition().getTable()) || !shadowAlgorithm.isShadow(each)) {
                 return false;
             }
         }

diff --git a/...here/shadow/route/retriever/dml/table/column/ShadowColumnDataSourceMappingsRetriever.java b/...here/shadow/route/retriever/dml/table/column/ShadowColumnDataSourceMappingsRetriever.java
@@ -89,6 +89,6 @@ private boolean isMatchColumnShadowAlgorithm(final String shadowTable, final Col
     protected abstract Collection<ShadowColumnCondition> getShadowColumnConditions(String shadowColumnName);
 
     protected final String getSingleTableName() {
-        return tableAliasAndNameMappings.entrySet().iterator().next().getValue();
+        return tableAliasAndNameMappings.values().iterator().next();
     }
 }
diff --git a/...ow/route/retriever/dml/table/column/ShadowSelectStatementDataSourceMappingsRetriever.java b/...ow/route/retriever/dml/table/column/ShadowSelectStatementDataSourceMappingsRetriever.java
@@ -60,7 +60,7 @@ protected Collection<ShadowColumnCondition> getShadowColumnConditions(final Stri
             if (1 != columns.size()) {
                 continue;
             }
-            ShadowExtractor.extractValues(each, parameters).map(values -> new ShadowColumnCondition(extractOwnerName(columns.iterator().next()), shadowColumnName, values)).ifPresent(result::add);
+            ShadowExtractor.extractValues(each, parameters).map(values -> new ShadowColumnCondition(getOwnerTableName(columns.iterator().next()), shadowColumnName, values)).ifPresent(result::add);
         }
         return result;
     }
@@ -75,8 +75,8 @@ private Collection<ExpressionSegment> getWhereSegment() {
         return result;
     }
 
-    private String extractOwnerName(final ColumnSegment columnSegment) {
+    private String getOwnerTableName(final ColumnSegment columnSegment) {
         Optional<OwnerSegment> owner = columnSegment.getOwner();
-        return owner.isPresent() ? getTableAliasAndNameMappings().get(owner.get().getIdentifier().getValue()) : getTableAliasAndNameMappings().keySet().iterator().next();
+        return owner.isPresent() ? getTableAliasAndNameMappings().get(owner.get().getIdentifier().getValue()) : getTableAliasAndNameMappings().values().iterator().next();
     }
 }