You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/07/04 16:18:31 UTC
(shardingsphere) branch master updated: Rename CreateIndexStatement.anonymousIndexStartIndex (#35890)
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 e509cb17e68 Rename CreateIndexStatement.anonymousIndexStartIndex (#35890)
e509cb17e68 is described below
commit e509cb17e680ca5770185882a821164c52af6d85
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Jul 5 00:18:26 2025 +0800
Rename CreateIndexStatement.anonymousIndexStartIndex (#35890)
---
.../ShardingCreateIndexSupportedCheckerTest.java | 6 +++---
.../statement/ddl/CreateIndexStatementBinder.java | 2 +-
.../type/OpenGaussDDLStatementVisitor.java | 2 +-
.../type/PostgreSQLDDLStatementVisitor.java | 2 +-
.../type/ddl/index/CreateIndexStatement.java | 21 ++++++++++-----------
5 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingCreateIndexSupportedCheckerTest.java b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingCreateIndexSupportedCheckerTest.java
index 248a072b762..ca86b1069a6 100644
--- a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingCreateIndexSupportedCheckerTest.java
+++ b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/checker/sql/ddl/ShardingCreateIndexSupportedCheckerTest.java
@@ -86,7 +86,7 @@ class ShardingCreateIndexSupportedCheckerTest {
CreateIndexStatement sqlStatement = new CreateIndexStatement();
sqlStatement.setTable(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order"))));
sqlStatement.getColumns().add(new ColumnSegment(0, 0, new IdentifierValue("content")));
- sqlStatement.setGeneratedIndexStartIndex(10);
+ sqlStatement.setAnonymousIndexStartIndex(10);
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
when(schema.containsTable("t_order")).thenReturn(true);
assertDoesNotThrow(() -> new ShardingCreateIndexSupportedChecker().check(rule, database, schema, new CommonSQLStatementContext(mock(), sqlStatement)));
@@ -97,7 +97,7 @@ class ShardingCreateIndexSupportedCheckerTest {
CreateIndexStatement sqlStatement = new CreateIndexStatement();
sqlStatement.setTable(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order"))));
sqlStatement.getColumns().add(new ColumnSegment(0, 0, new IdentifierValue("content")));
- sqlStatement.setGeneratedIndexStartIndex(10);
+ sqlStatement.setAnonymousIndexStartIndex(10);
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
when(schema.containsTable("t_order")).thenReturn(false);
assertThrows(NoSuchTableException.class, () -> new ShardingCreateIndexSupportedChecker().check(rule, database, schema, new CommonSQLStatementContext(mock(), sqlStatement)));
@@ -108,7 +108,7 @@ class ShardingCreateIndexSupportedCheckerTest {
CreateIndexStatement sqlStatement = new CreateIndexStatement();
sqlStatement.setTable(new SimpleTableSegment(new TableNameSegment(0, 0, new IdentifierValue("t_order"))));
sqlStatement.getColumns().add(new ColumnSegment(0, 0, new IdentifierValue("content")));
- sqlStatement.setGeneratedIndexStartIndex(10);
+ sqlStatement.setAnonymousIndexStartIndex(10);
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
when(schema.containsTable("t_order")).thenReturn(true);
when(schema.containsIndex("t_order", "content_idx")).thenReturn(true);
diff --git a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateIndexStatementBinder.java b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateIndexStatementBinder.java
index 9d079d1b834..1c9b4596189 100644
--- a/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateIndexStatementBinder.java
+++ b/infra/binder/core/src/main/java/org/apache/shardingsphere/infra/binder/engine/statement/ddl/CreateIndexStatementBinder.java
@@ -53,7 +53,7 @@ public final class CreateIndexStatementBinder implements SQLStatementBinder<Crea
result.setTable(boundTable);
result.getColumns().addAll(boundColumns);
result.setIndex(sqlStatement.getIndex());
- sqlStatement.getGeneratedIndexStartIndex().ifPresent(result::setGeneratedIndexStartIndex);
+ sqlStatement.getAnonymousIndexStartIndex().ifPresent(result::setAnonymousIndexStartIndex);
result.setIfNotExists(sqlStatement.isIfNotExists());
sqlStatement.getAlgorithmType().ifPresent(result::setAlgorithmType);
sqlStatement.getLockTable().ifPresent(result::setLockTable);
diff --git a/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDDLStatementVisitor.java b/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDDLStatementVisitor.java
index 311ef548af0..0aa80d86c09 100644
--- a/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDDLStatementVisitor.java
+++ b/parser/sql/dialect/opengauss/src/main/java/org/apache/shardingsphere/sql/parser/opengauss/visitor/statement/type/OpenGaussDDLStatementVisitor.java
@@ -533,7 +533,7 @@ public final class OpenGaussDDLStatementVisitor extends OpenGaussStatementVisito
result.setTable((SimpleTableSegment) visit(ctx.tableName()));
result.getColumns().addAll(((CollectionValue<ColumnSegment>) visit(ctx.indexParams())).getValue());
if (null == ctx.indexName()) {
- result.setGeneratedIndexStartIndex(ctx.ON().getSymbol().getStartIndex() - 1);
+ result.setAnonymousIndexStartIndex(ctx.ON().getSymbol().getStartIndex() - 1);
} else {
result.setIndex((IndexSegment) visit(ctx.indexName()));
}
diff --git a/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDDLStatementVisitor.java b/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDDLStatementVisitor.java
index 3d2e7008335..a149adeaf54 100644
--- a/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDDLStatementVisitor.java
+++ b/parser/sql/dialect/postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/statement/type/PostgreSQLDDLStatementVisitor.java
@@ -675,7 +675,7 @@ public final class PostgreSQLDDLStatementVisitor extends PostgreSQLStatementVisi
if (null != ctx.indexName()) {
result.setIndex((IndexSegment) visit(ctx.indexName()));
} else {
- result.setGeneratedIndexStartIndex(ctx.ON().getSymbol().getStartIndex() - 1);
+ result.setAnonymousIndexStartIndex(ctx.ON().getSymbol().getStartIndex() - 1);
}
return result;
}
diff --git a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/ddl/index/CreateIndexStatement.java b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/ddl/index/CreateIndexStatement.java
index 436c1cf02ba..8f5a268a0f4 100644
--- a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/ddl/index/CreateIndexStatement.java
+++ b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/type/ddl/index/CreateIndexStatement.java
@@ -50,7 +50,7 @@ public final class CreateIndexStatement extends DDLStatement {
private boolean ifNotExists;
- private Integer generatedIndexStartIndex;
+ private Integer anonymousIndexStartIndex;
private AlgorithmTypeSegment algorithmType;
@@ -59,12 +59,12 @@ public final class CreateIndexStatement extends DDLStatement {
private final Collection<ColumnSegment> columns = new LinkedList<>();
/**
- * Get generated index start index.
+ * Get anonymous index start index.
*
- * @return generated index start index
+ * @return anonymous index start index
*/
- public Optional<Integer> getGeneratedIndexStartIndex() {
- return Optional.ofNullable(generatedIndexStartIndex);
+ public Optional<Integer> getAnonymousIndexStartIndex() {
+ return Optional.ofNullable(anonymousIndexStartIndex);
}
/**
@@ -101,13 +101,12 @@ public final class CreateIndexStatement extends DDLStatement {
if (null != index) {
return Collections.singleton(index);
}
- if (getGeneratedIndexStartIndex().isPresent()) {
- int generatedIndexStartIndex = getGeneratedIndexStartIndex().get();
- IndexNameSegment generatedIndexNameSegment = new IndexNameSegment(generatedIndexStartIndex, generatedIndexStartIndex,
- new IdentifierValue(getGeneratedLogicIndexName(columns)));
- return Collections.singleton(new IndexSegment(generatedIndexStartIndex, generatedIndexStartIndex, generatedIndexNameSegment));
+ if (!getAnonymousIndexStartIndex().isPresent()) {
+ return Collections.emptyList();
}
- return Collections.emptyList();
+ int anonymousIndexStartIndex = getAnonymousIndexStartIndex().get();
+ IndexNameSegment anonymousIndexNameSegment = new IndexNameSegment(anonymousIndexStartIndex, anonymousIndexStartIndex, new IdentifierValue(getGeneratedLogicIndexName(columns)));
+ return Collections.singleton(new IndexSegment(anonymousIndexStartIndex, anonymousIndexStartIndex, anonymousIndexNameSegment));
}
private String getGeneratedLogicIndexName(final Collection<ColumnSegment> columns) {