This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 837eaab8504 Rename HashColumn (#36039)
837eaab8504 is described below
commit 837eaab85048c24ce85be802ff8e262e7367fdc5
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jul 19 22:03:15 2025 +0800
Rename HashColumn (#36039)
---
.../exception/data/ShardingValueDataTypeException.java | 4 ++--
.../engine/WhereClauseShardingConditionEngine.java | 16 ++++++++--------
.../condition/generator/ConditionValueGenerator.java | 4 ++--
.../generator/ConditionValueGeneratorFactory.java | 4 ++--
.../impl/ConditionValueBetweenOperatorGenerator.java | 4 ++--
.../impl/ConditionValueCompareOperatorGenerator.java | 6 +++---
.../impl/ConditionValueInOperatorGenerator.java | 4 ++--
.../generator/ConditionValueGeneratorFactoryTest.java | 4 ++--
.../impl/ConditionValueBetweenOperatorGeneratorTest.java | 4 ++--
.../impl/ConditionValueCompareOperatorGeneratorTest.java | 4 ++--
.../impl/ConditionValueInOperatorGeneratorTest.java | 4 ++--
.../schema/{QualifiedColumn.java => HashColumn.java} | 10 +++++-----
.../{QualifiedColumnTest.java => HashColumnTest.java} | 10 +++++-----
13 files changed, 39 insertions(+), 39 deletions(-)
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/exception/data/ShardingValueDataTypeException.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/exception/data/ShardingValueDataTypeException.java
index 81717fa8089..f65d803b397 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/exception/data/ShardingValueDataTypeException.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/exception/data/ShardingValueDataTypeException.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sharding.exception.data;
import
org.apache.shardingsphere.infra.exception.core.external.sql.sqlstate.XOpenSQLState;
-import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedColumn;
+import org.apache.shardingsphere.infra.metadata.database.schema.HashColumn;
import org.apache.shardingsphere.sharding.exception.ShardingSQLException;
/**
@@ -28,7 +28,7 @@ public final class ShardingValueDataTypeException extends
ShardingSQLException {
private static final long serialVersionUID = -4833106947304679015L;
- public ShardingValueDataTypeException(final QualifiedColumn column) {
+ public ShardingValueDataTypeException(final HashColumn column) {
super(XOpenSQLState.INVALID_DATA_TYPE, 21, "Found different types for
sharding value '%s'.", column);
}
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/WhereClauseShardingConditionEngine.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/WhereClauseShardingConditionEngine.java
index da6418cccd3..88f66351e4f 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/WhereClauseShardingConditionEngine.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/engine/WhereClauseShardingConditionEngine.java
@@ -22,7 +22,7 @@ import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.binder.context.available.WhereContextAvailable;
import
org.apache.shardingsphere.infra.binder.context.extractor.SQLStatementContextExtractor;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
-import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedColumn;
+import org.apache.shardingsphere.infra.metadata.database.schema.HashColumn;
import
org.apache.shardingsphere.sharding.exception.data.ShardingValueDataTypeException;
import
org.apache.shardingsphere.sharding.route.engine.condition.AlwaysFalseShardingCondition;
import
org.apache.shardingsphere.sharding.route.engine.condition.ShardingCondition;
@@ -85,7 +85,7 @@ public final class WhereClauseShardingConditionEngine {
Collection<AndPredicate> andPredicates =
ExpressionExtractor.extractAndPredicates(expression);
Collection<ShardingCondition> result = new LinkedList<>();
for (AndPredicate each : andPredicates) {
- Map<QualifiedColumn, Collection<ShardingConditionValue>>
shardingConditionValues = createShardingConditionValueMap(each.getPredicates(),
params);
+ Map<HashColumn, Collection<ShardingConditionValue>>
shardingConditionValues = createShardingConditionValueMap(each.getPredicates(),
params);
if (shardingConditionValues.isEmpty()) {
return Collections.emptyList();
}
@@ -97,8 +97,8 @@ public final class WhereClauseShardingConditionEngine {
return result;
}
- private Map<QualifiedColumn, Collection<ShardingConditionValue>>
createShardingConditionValueMap(final Collection<ExpressionSegment> predicates,
final List<Object> params) {
- Map<QualifiedColumn, Collection<ShardingConditionValue>> result = new
HashMap<>(predicates.size(), 1F);
+ private Map<HashColumn, Collection<ShardingConditionValue>>
createShardingConditionValueMap(final Collection<ExpressionSegment> predicates,
final List<Object> params) {
+ Map<HashColumn, Collection<ShardingConditionValue>> result = new
HashMap<>(predicates.size(), 1F);
for (ExpressionSegment each : predicates) {
for (ColumnSegment columnSegment : ColumnExtractor.extract(each)) {
String tableName =
columnSegment.getColumnBoundInfo().getOriginalTable().getValue();
@@ -106,7 +106,7 @@ public final class WhereClauseShardingConditionEngine {
if (!shardingColumn.isPresent()) {
continue;
}
- QualifiedColumn column = new
QualifiedColumn(shardingColumn.get(), tableName);
+ HashColumn column = new HashColumn(shardingColumn.get(),
tableName);
Optional<ShardingConditionValue> shardingConditionValue =
ConditionValueGeneratorFactory.generate(each, column, params,
timestampServiceRule);
if (!shardingConditionValue.isPresent()) {
continue;
@@ -117,9 +117,9 @@ public final class WhereClauseShardingConditionEngine {
return result;
}
- private ShardingCondition createShardingCondition(final
Map<QualifiedColumn, Collection<ShardingConditionValue>>
shardingConditionValues) {
+ private ShardingCondition createShardingCondition(final Map<HashColumn,
Collection<ShardingConditionValue>> shardingConditionValues) {
ShardingCondition result = new ShardingCondition();
- for (Entry<QualifiedColumn, Collection<ShardingConditionValue>> entry
: shardingConditionValues.entrySet()) {
+ for (Entry<HashColumn, Collection<ShardingConditionValue>> entry :
shardingConditionValues.entrySet()) {
try {
ShardingConditionValue shardingConditionValue =
mergeShardingConditionValues(entry.getKey(), entry.getValue());
if (shardingConditionValue instanceof
AlwaysFalseShardingConditionValue) {
@@ -134,7 +134,7 @@ public final class WhereClauseShardingConditionEngine {
}
@SuppressWarnings({"unchecked", "rawtypes"})
- private ShardingConditionValue mergeShardingConditionValues(final
QualifiedColumn column, final Collection<ShardingConditionValue>
shardingConditionValues) {
+ private ShardingConditionValue mergeShardingConditionValues(final
HashColumn column, final Collection<ShardingConditionValue>
shardingConditionValues) {
Collection<Comparable<?>> listValue = null;
Range<Comparable<?>> rangeValue = null;
Set<Integer> parameterMarkerIndexes = new HashSet<>();
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValueGenerator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValueGenerator.java
index ad6ef1e1bd5..225603de5b8 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValueGenerator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValueGenerator.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.sharding.route.engine.condition.generator;
-import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedColumn;
+import org.apache.shardingsphere.infra.metadata.database.schema.HashColumn;
import
org.apache.shardingsphere.sharding.route.engine.condition.value.ShardingConditionValue;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.ExpressionSegment;
import org.apache.shardingsphere.timeservice.core.rule.TimestampServiceRule;
@@ -41,5 +41,5 @@ public interface ConditionValueGenerator<T extends
ExpressionSegment> {
* @param timestampServiceRule time service rule
* @return route value
*/
- Optional<ShardingConditionValue> generate(T predicateRightValue,
QualifiedColumn column, List<Object> params, TimestampServiceRule
timestampServiceRule);
+ Optional<ShardingConditionValue> generate(T predicateRightValue,
HashColumn column, List<Object> params, TimestampServiceRule
timestampServiceRule);
}
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValueGeneratorFactory.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValueGeneratorFactory.java
index 55e80919223..3991695a0b9 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValueGeneratorFactory.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValueGeneratorFactory.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.sharding.route.engine.condition.generator;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedColumn;
+import org.apache.shardingsphere.infra.metadata.database.schema.HashColumn;
import
org.apache.shardingsphere.sharding.route.engine.condition.generator.impl.ConditionValueBetweenOperatorGenerator;
import
org.apache.shardingsphere.sharding.route.engine.condition.generator.impl.ConditionValueCompareOperatorGenerator;
import
org.apache.shardingsphere.sharding.route.engine.condition.generator.impl.ConditionValueInOperatorGenerator;
@@ -54,7 +54,7 @@ public final class ConditionValueGeneratorFactory {
* @param timestampServiceRule time service rule
* @return route value
*/
- public static Optional<ShardingConditionValue> generate(final
ExpressionSegment predicate, final QualifiedColumn column, final List<Object>
params,
+ public static Optional<ShardingConditionValue> generate(final
ExpressionSegment predicate, final HashColumn column, final List<Object> params,
final
TimestampServiceRule timestampServiceRule) {
if (predicate instanceof BinaryOperationExpression) {
return
COMPARE_OPERATOR_GENERATOR.generate((BinaryOperationExpression) predicate,
column, params, timestampServiceRule);
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueBetweenOperatorGenerator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueBetweenOperatorGenerator.java
index a0bc6658161..0284a759fcd 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueBetweenOperatorGenerator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueBetweenOperatorGenerator.java
@@ -18,7 +18,7 @@
package
org.apache.shardingsphere.sharding.route.engine.condition.generator.impl;
import com.google.common.collect.Range;
-import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedColumn;
+import org.apache.shardingsphere.infra.metadata.database.schema.HashColumn;
import
org.apache.shardingsphere.sharding.route.engine.condition.ExpressionConditionUtils;
import
org.apache.shardingsphere.sharding.route.engine.condition.generator.ConditionValue;
import
org.apache.shardingsphere.sharding.route.engine.condition.generator.ConditionValueGenerator;
@@ -39,7 +39,7 @@ import java.util.Optional;
public final class ConditionValueBetweenOperatorGenerator implements
ConditionValueGenerator<BetweenExpression> {
@Override
- public Optional<ShardingConditionValue> generate(final BetweenExpression
predicate, final QualifiedColumn column, final List<Object> params, final
TimestampServiceRule timestampServiceRule) {
+ public Optional<ShardingConditionValue> generate(final BetweenExpression
predicate, final HashColumn column, final List<Object> params, final
TimestampServiceRule timestampServiceRule) {
ConditionValue betweenConditionValue = new
ConditionValue(predicate.getBetweenExpr(), params);
ConditionValue andConditionValue = new
ConditionValue(predicate.getAndExpr(), params);
Optional<Comparable<?>> betweenValue =
betweenConditionValue.getValue();
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueCompareOperatorGenerator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueCompareOperatorGenerator.java
index 79df3f49385..d793d90a88b 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueCompareOperatorGenerator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueCompareOperatorGenerator.java
@@ -18,7 +18,7 @@
package
org.apache.shardingsphere.sharding.route.engine.condition.generator.impl;
import com.google.common.collect.Range;
-import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedColumn;
+import org.apache.shardingsphere.infra.metadata.database.schema.HashColumn;
import
org.apache.shardingsphere.sharding.route.engine.condition.ExpressionConditionUtils;
import
org.apache.shardingsphere.sharding.route.engine.condition.generator.ConditionValue;
import
org.apache.shardingsphere.sharding.route.engine.condition.generator.ConditionValueGenerator;
@@ -58,7 +58,7 @@ public final class ConditionValueCompareOperatorGenerator
implements ConditionVa
private static final Collection<String> OPERATORS = new
HashSet<>(Arrays.asList(EQUAL, GREATER_THAN, LESS_THAN, AT_LEAST, AT_MOST, IS));
@Override
- public Optional<ShardingConditionValue> generate(final
BinaryOperationExpression predicate, final QualifiedColumn column, final
List<Object> params,
+ public Optional<ShardingConditionValue> generate(final
BinaryOperationExpression predicate, final HashColumn column, final
List<Object> params,
final
TimestampServiceRule timestampServiceRule) {
String operator = predicate.getOperator().toUpperCase();
if (!isSupportedOperator(operator)) {
@@ -79,7 +79,7 @@ public final class ConditionValueCompareOperatorGenerator
implements ConditionVa
return Optional.empty();
}
- private Optional<ShardingConditionValue> generate(final Comparable<?>
comparable, final QualifiedColumn column, final String operator, final int
parameterMarkerIndex) {
+ private Optional<ShardingConditionValue> generate(final Comparable<?>
comparable, final HashColumn column, final String operator, final int
parameterMarkerIndex) {
String columnName = column.getName();
String tableName = column.getTableName();
List<Integer> parameterMarkerIndexes = parameterMarkerIndex > -1 ?
Collections.singletonList(parameterMarkerIndex) : Collections.emptyList();
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueInOperatorGenerator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueInOperatorGenerator.java
index 45f8f8d11b0..7585223bdcc 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueInOperatorGenerator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueInOperatorGenerator.java
@@ -17,7 +17,7 @@
package
org.apache.shardingsphere.sharding.route.engine.condition.generator.impl;
-import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedColumn;
+import org.apache.shardingsphere.infra.metadata.database.schema.HashColumn;
import
org.apache.shardingsphere.sharding.route.engine.condition.ExpressionConditionUtils;
import
org.apache.shardingsphere.sharding.route.engine.condition.generator.ConditionValue;
import
org.apache.shardingsphere.sharding.route.engine.condition.generator.ConditionValueGenerator;
@@ -39,7 +39,7 @@ import java.util.Optional;
public final class ConditionValueInOperatorGenerator implements
ConditionValueGenerator<InExpression> {
@Override
- public Optional<ShardingConditionValue> generate(final InExpression
predicate, final QualifiedColumn column, final List<Object> params, final
TimestampServiceRule timestampServiceRule) {
+ public Optional<ShardingConditionValue> generate(final InExpression
predicate, final HashColumn column, final List<Object> params, final
TimestampServiceRule timestampServiceRule) {
if (predicate.isNot()) {
return Optional.empty();
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValueGeneratorFactoryTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValueGeneratorFactoryTest.java
index 022f287ab4f..23d8265312a 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValueGeneratorFactoryTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/ConditionValueGeneratorFactoryTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.sharding.route.engine.condition.generator;
-import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedColumn;
+import org.apache.shardingsphere.infra.metadata.database.schema.HashColumn;
import
org.apache.shardingsphere.sharding.route.engine.condition.generator.impl.ConditionValueBetweenOperatorGenerator;
import
org.apache.shardingsphere.sharding.route.engine.condition.generator.impl.ConditionValueCompareOperatorGenerator;
import
org.apache.shardingsphere.sharding.route.engine.condition.generator.impl.ConditionValueInOperatorGenerator;
@@ -45,7 +45,7 @@ import static org.mockito.Mockito.mock;
class ConditionValueGeneratorFactoryTest {
- private final QualifiedColumn column = new QualifiedColumn("id", "tbl");
+ private final HashColumn column = new HashColumn("id", "tbl");
@Test
void assertGenerateBinaryOperationExpression() {
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueBetweenOperatorGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueBetweenOperatorGeneratorTest.java
index d20fbc63c85..4ed2910612f 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueBetweenOperatorGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueBetweenOperatorGeneratorTest.java
@@ -18,7 +18,7 @@
package
org.apache.shardingsphere.sharding.route.engine.condition.generator.impl;
import com.google.common.collect.Range;
-import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedColumn;
+import org.apache.shardingsphere.infra.metadata.database.schema.HashColumn;
import
org.apache.shardingsphere.sharding.route.engine.condition.value.RangeShardingConditionValue;
import
org.apache.shardingsphere.sharding.route.engine.condition.value.ShardingConditionValue;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.ColumnSegment;
@@ -56,7 +56,7 @@ class ConditionValueBetweenOperatorGeneratorTest {
private final ConditionValueBetweenOperatorGenerator generator = new
ConditionValueBetweenOperatorGenerator();
- private final QualifiedColumn column = new QualifiedColumn("id", "tbl");
+ private final HashColumn column = new HashColumn("id", "tbl");
private final TimestampServiceRule timestampServiceRule = new
TimestampServiceRule(new TimestampServiceRuleConfiguration("System", new
Properties()));
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueCompareOperatorGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueCompareOperatorGeneratorTest.java
index 85f5fba2f32..859bec2312e 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueCompareOperatorGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueCompareOperatorGeneratorTest.java
@@ -18,7 +18,7 @@
package
org.apache.shardingsphere.sharding.route.engine.condition.generator.impl;
import com.google.common.collect.Range;
-import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedColumn;
+import org.apache.shardingsphere.infra.metadata.database.schema.HashColumn;
import
org.apache.shardingsphere.sharding.route.engine.condition.value.ListShardingConditionValue;
import
org.apache.shardingsphere.sharding.route.engine.condition.value.RangeShardingConditionValue;
import
org.apache.shardingsphere.sharding.route.engine.condition.value.ShardingConditionValue;
@@ -46,7 +46,7 @@ class ConditionValueCompareOperatorGeneratorTest {
private final ConditionValueCompareOperatorGenerator generator = new
ConditionValueCompareOperatorGenerator();
- private final QualifiedColumn column = new QualifiedColumn("id", "tbl");
+ private final HashColumn column = new HashColumn("id", "tbl");
@SuppressWarnings("unchecked")
@Test
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueInOperatorGeneratorTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueInOperatorGeneratorTest.java
index 4b8658d667c..0d8cd6605e7 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueInOperatorGeneratorTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/route/engine/condition/generator/impl/ConditionValueInOperatorGeneratorTest.java
@@ -17,7 +17,7 @@
package
org.apache.shardingsphere.sharding.route.engine.condition.generator.impl;
-import
org.apache.shardingsphere.infra.metadata.database.schema.QualifiedColumn;
+import org.apache.shardingsphere.infra.metadata.database.schema.HashColumn;
import
org.apache.shardingsphere.sharding.route.engine.condition.value.ListShardingConditionValue;
import
org.apache.shardingsphere.sharding.route.engine.condition.value.ShardingConditionValue;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.ColumnSegment;
@@ -48,7 +48,7 @@ class ConditionValueInOperatorGeneratorTest {
private final ConditionValueInOperatorGenerator generator = new
ConditionValueInOperatorGenerator();
- private final QualifiedColumn column = new QualifiedColumn("id", "tbl");
+ private final HashColumn column = new HashColumn("id", "tbl");
private final TimestampServiceRule timestampServiceRule = new
TimestampServiceRule(new TimestampServiceRuleConfiguration("System", new
Properties()));
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/QualifiedColumn.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/HashColumn.java
similarity index 86%
rename from
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/QualifiedColumn.java
rename to
infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/HashColumn.java
index f74d543ab27..13fbe4a5d93 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/QualifiedColumn.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/HashColumn.java
@@ -23,11 +23,11 @@ import lombok.ToString;
import java.util.Objects;
/**
- * Qualified column.
+ * Hash column.
*/
@Getter
@ToString
-public final class QualifiedColumn {
+public final class HashColumn {
private final String name;
@@ -35,7 +35,7 @@ public final class QualifiedColumn {
private final int hashCode;
- public QualifiedColumn(final String name, final String tableName) {
+ public HashColumn(final String name, final String tableName) {
this.name = name;
this.tableName = tableName;
hashCode = Objects.hash(name.toUpperCase(), tableName.toUpperCase());
@@ -43,8 +43,8 @@ public final class QualifiedColumn {
@Override
public boolean equals(final Object obj) {
- if (obj instanceof QualifiedColumn) {
- QualifiedColumn column = (QualifiedColumn) obj;
+ if (obj instanceof HashColumn) {
+ HashColumn column = (HashColumn) obj;
return null != name && name.equalsIgnoreCase(column.name) && null
!= tableName && tableName.equalsIgnoreCase(column.tableName);
}
return false;
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/QualifiedColumnTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/HashColumnTest.java
similarity index 77%
rename from
infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/QualifiedColumnTest.java
rename to
infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/HashColumnTest.java
index e67ab58ebf3..138b7f3c5af 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/QualifiedColumnTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/HashColumnTest.java
@@ -23,25 +23,25 @@ import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
-class QualifiedColumnTest {
+class HashColumnTest {
@Test
void assertEqualsForDifferentObjectType() {
- assertThat(new QualifiedColumn("col", "tbl"), not(new Object()));
+ assertThat(new HashColumn("col", "tbl"), not(new Object()));
}
@Test
void assertEquals() {
- assertThat(new QualifiedColumn("col", "tbl"), is(new
QualifiedColumn("COL", "TBL")));
+ assertThat(new HashColumn("col", "tbl"), is(new HashColumn("COL",
"TBL")));
}
@Test
void assertNotEqualsWhenColumnNameIsDifferent() {
- assertThat(new QualifiedColumn("col", "tbl"), not(new
QualifiedColumn("col1", "tbl")));
+ assertThat(new HashColumn("col", "tbl"), not(new HashColumn("col1",
"tbl")));
}
@Test
void assertNotEqualsWhenTableNameIsDifferent() {
- assertThat(new QualifiedColumn("col", "tbl"), not(new
QualifiedColumn("col", "tbl1")));
+ assertThat(new HashColumn("col", "tbl"), not(new HashColumn("col",
"tbl1")));
}
}
