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 9935b82deea Rename DialectJoinOrderOption to DialectJoinOption and
update references (#35302)
9935b82deea is described below
commit 9935b82deeae2bbc748b94ef56bba09953769b64
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Wed Apr 30 23:22:06 2025 +0800
Rename DialectJoinOrderOption to DialectJoinOption and update references
(#35302)
---
.../engine/segment/dml/from/type/JoinTableSegmentBinder.java | 6 +++---
.../metadata/database/metadata/DialectDatabaseMetaData.java | 10 +++++-----
.../{DialectJoinOrderOption.java => DialectJoinOption.java} | 4 ++--
.../mysql/metadata/database/MySQLDatabaseMetaData.java | 6 +++---
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/from/type/JoinTableSegmentBinder.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/from/type/JoinTableSegmentBinder.java
index 44b9afa2677..c286d660b29 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/from/type/JoinTableSegmentBinder.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/dml/from/type/JoinTableSegmentBinder.java
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type
import
org.apache.shardingsphere.infra.binder.engine.segment.dml.from.TableSegmentBinder;
import
org.apache.shardingsphere.infra.binder.engine.segment.dml.from.context.TableSegmentBinderContext;
import
org.apache.shardingsphere.infra.binder.engine.statement.SQLStatementBinderContext;
-import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.join.DialectJoinOrderOption;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.join.DialectJoinOption;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry;
import
org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
@@ -114,7 +114,7 @@ public final class JoinTableSegmentBinder {
private static Collection<ProjectionSegment>
getDerivedJoinTableProjectionSegments(final JoinTableSegment segment, final
DatabaseType databaseType,
final Map<String, ProjectionSegment> usingColumnsByNaturalJoin,
final Multimap<CaseInsensitiveString, TableSegmentBinderContext>
tableBinderContexts) {
- DialectJoinOrderOption joinOrderOption = new
DatabaseTypeRegistry(databaseType).getDialectDatabaseMetaData().getJoinOrderOption();
+ DialectJoinOption joinOrderOption = new
DatabaseTypeRegistry(databaseType).getDialectDatabaseMetaData().getJoinOption();
Collection<ProjectionSegment> projectionSegments =
getProjectionSegments(segment, joinOrderOption, tableBinderContexts);
if (segment.getUsing().isEmpty() && !segment.isNatural()) {
return projectionSegments;
@@ -129,7 +129,7 @@ public final class JoinTableSegmentBinder {
return result;
}
- private static Collection<ProjectionSegment> getProjectionSegments(final
JoinTableSegment segment, final DialectJoinOrderOption joinOrderOption,
+ private static Collection<ProjectionSegment> getProjectionSegments(final
JoinTableSegment segment, final DialectJoinOption joinOrderOption,
final
Multimap<CaseInsensitiveString, TableSegmentBinderContext> tableBinderContexts)
{
Collection<ProjectionSegment> result = new LinkedList<>();
if (joinOrderOption.isRightColumnsByFirstOrder() &&
JoinType.RIGHT.name().equalsIgnoreCase(segment.getJoinType()) &&
(!segment.getUsing().isEmpty() || segment.isNatural())) {
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/DialectDatabaseMetaData.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/DialectDatabaseMetaData.java
index 0e248ba737e..69da162f027 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/DialectDatabaseMetaData.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/DialectDatabaseMetaData.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.datatype.DefaultDataTypeOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.datatype.DialectDataTypeOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.index.DialectIndexOption;
-import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.join.DialectJoinOrderOption;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.join.DialectJoinOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.schema.DefaultSchemaOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.schema.DialectSchemaOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.table.DialectDriverQuerySystemCatalogOption;
@@ -130,12 +130,12 @@ public interface DialectDatabaseMetaData extends
DatabaseTypedSPI {
}
/**
- * Get join order option.
+ * Get join option.
*
- * @return join order option
+ * @return join option
*/
- default DialectJoinOrderOption getJoinOrderOption() {
- return new DialectJoinOrderOption(false, false);
+ default DialectJoinOption getJoinOption() {
+ return new DialectJoinOption(false, false);
}
/**
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/join/DialectJoinOrderOption.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/join/DialectJoinOption.java
similarity index 93%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/join/DialectJoinOrderOption.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/join/DialectJoinOption.java
index 85720c9fb3b..62d645726a0 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/join/DialectJoinOrderOption.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/join/DialectJoinOption.java
@@ -21,11 +21,11 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
- * Dialect join order option.
+ * Dialect join option.
*/
@RequiredArgsConstructor
@Getter
-public final class DialectJoinOrderOption {
+public final class DialectJoinOption {
private final boolean isUsingColumnsByProjectionOrder;
diff --git
a/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/metadata/database/MySQLDatabaseMetaData.java
b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/metadata/database/MySQLDatabaseMetaData.java
index a831f25575d..9d25551711b 100644
---
a/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/metadata/database/MySQLDatabaseMetaData.java
+++
b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/metadata/database/MySQLDatabaseMetaData.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.column.DialectColumnOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.connection.DialectConnectionOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.datatype.DialectDataTypeOption;
-import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.join.DialectJoinOrderOption;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.join.DialectJoinOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.transaction.DialectTransactionOption;
import
org.apache.shardingsphere.infra.database.mysql.metadata.database.option.MySQLDataTypeOption;
@@ -63,8 +63,8 @@ public final class MySQLDatabaseMetaData implements
DialectDatabaseMetaData {
}
@Override
- public DialectJoinOrderOption getJoinOrderOption() {
- return new DialectJoinOrderOption(true, true);
+ public DialectJoinOption getJoinOption() {
+ return new DialectJoinOption(true, true);
}
@Override
