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 05d4013c693 Rename FromDatabaseAvailable.getFromDatabase() (#35729)
05d4013c693 is described below
commit 05d4013c693f4f97f4838245777b267510171bc5
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Jun 16 19:21:05 2025 +0800
Rename FromDatabaseAvailable.getFromDatabase() (#35729)
* Rename DialectCommonSQLStatementContextWarpProvider
* Rename FromDatabaseAvailable.getFromDatabase()
---
.../AlterReadwriteSplittingStorageUnitStatusStatement.java | 2 +-
.../statement/ShowStatusFromReadwriteSplittingRulesStatement.java | 2 +-
.../shardingsphere/distsql/handler/util/DatabaseNameUtils.java | 2 +-
.../shardingsphere/distsql/handler/util/DatabaseNameUtilsTest.java | 2 +-
.../ral/queryable/export/ExportDatabaseConfigurationStatement.java | 2 +-
.../statement/ral/queryable/show/ShowTableMetaDataStatement.java | 2 +-
.../distsql/statement/rql/resource/ShowStorageUnitsStatement.java | 2 +-
.../distsql/statement/rql/resource/ShowTablesStatement.java | 2 +-
.../statement/rql/rule/database/ShowDatabaseRulesStatement.java | 2 +-
.../sql/parser/statement/core/statement/FromDatabaseAvailable.java | 6 +++---
.../ral/impl/queryable/ShowTableMetaDataStatementAssert.java | 4 ++--
.../AlterReadwriteSplittingStorageUnitStatusStatementAssert.java | 6 +++---
.../asserts/statement/rql/impl/ShowRulesStatementAssert.java | 6 +++---
.../asserts/statement/rql/impl/ShowStorageUnitsStatementAssert.java | 6 +++---
.../asserts/statement/rql/impl/ShowTablesStatementAssert.java | 6 +++---
15 files changed, 26 insertions(+), 26 deletions(-)
diff --git
a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/AlterReadwriteSplittingStorageUnitStatusStatement.java
b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/AlterReadwriteSplittingStorageUnitStatusStatement.java
index 2bfae0fdbe4..010459d8797 100644
---
a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/AlterReadwriteSplittingStorageUnitStatusStatement.java
+++
b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/AlterReadwriteSplittingStorageUnitStatusStatement.java
@@ -41,7 +41,7 @@ public final class
AlterReadwriteSplittingStorageUnitStatusStatement extends Upd
private final boolean enable;
@Override
- public Optional<DatabaseSegment> getDatabase() {
+ public Optional<DatabaseSegment> getFromDatabase() {
return Optional.ofNullable(database);
}
}
diff --git
a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowStatusFromReadwriteSplittingRulesStatement.java
b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowStatusFromReadwriteSplittingRulesStatement.java
index db7d7ed595d..7b2743057bf 100644
---
a/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowStatusFromReadwriteSplittingRulesStatement.java
+++
b/features/readwrite-splitting/distsql/statement/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/statement/ShowStatusFromReadwriteSplittingRulesStatement.java
@@ -35,7 +35,7 @@ public final class
ShowStatusFromReadwriteSplittingRulesStatement extends Resour
private final String ruleName;
@Override
- public Optional<DatabaseSegment> getDatabase() {
+ public Optional<DatabaseSegment> getFromDatabase() {
return Optional.ofNullable(database);
}
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/util/DatabaseNameUtils.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/util/DatabaseNameUtils.java
index 7f25f47f94a..b958c5dc554 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/util/DatabaseNameUtils.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/util/DatabaseNameUtils.java
@@ -39,7 +39,7 @@ public final class DatabaseNameUtils {
* @return database name
*/
public static String getDatabaseName(final SQLStatement sqlStatement,
final String currentDatabaseName) {
- Optional<DatabaseSegment> databaseSegment = sqlStatement instanceof
FromDatabaseAvailable ? ((FromDatabaseAvailable) sqlStatement).getDatabase() :
Optional.empty();
+ Optional<DatabaseSegment> databaseSegment = sqlStatement instanceof
FromDatabaseAvailable ? ((FromDatabaseAvailable)
sqlStatement).getFromDatabase() : Optional.empty();
return databaseSegment.map(optional ->
optional.getIdentifier().getValue()).orElse(currentDatabaseName);
}
}
diff --git
a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/util/DatabaseNameUtilsTest.java
b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/util/DatabaseNameUtilsTest.java
index 3efc7ba4872..fd098355277 100644
---
a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/util/DatabaseNameUtilsTest.java
+++
b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/util/DatabaseNameUtilsTest.java
@@ -38,7 +38,7 @@ class DatabaseNameUtilsTest {
FromDatabaseAvailable sqlStatement = mock(FromDatabaseAvailable.class,
withSettings().extraInterfaces(SQLStatement.class));
DatabaseSegment databaseSegment = mock(DatabaseSegment.class,
RETURNS_DEEP_STUBS);
when(databaseSegment.getIdentifier().getValue()).thenReturn("bar_db");
-
when(sqlStatement.getDatabase()).thenReturn(Optional.of(databaseSegment));
+
when(sqlStatement.getFromDatabase()).thenReturn(Optional.of(databaseSegment));
assertThat(DatabaseNameUtils.getDatabaseName((SQLStatement)
sqlStatement, "foo_db"), is("bar_db"));
}
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/export/ExportDatabaseConfigurationStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/export/ExportDatabaseConfigurationStatement.java
index 109177addcc..be6493131ae 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/export/ExportDatabaseConfigurationStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/export/ExportDatabaseConfigurationStatement.java
@@ -35,7 +35,7 @@ public final class ExportDatabaseConfigurationStatement
extends QueryableRALStat
private final String filePath;
@Override
- public Optional<DatabaseSegment> getDatabase() {
+ public Optional<DatabaseSegment> getFromDatabase() {
return Optional.ofNullable(database);
}
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/show/ShowTableMetaDataStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/show/ShowTableMetaDataStatement.java
index d08b197bf56..b52169826e9 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/show/ShowTableMetaDataStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/ral/queryable/show/ShowTableMetaDataStatement.java
@@ -38,7 +38,7 @@ public final class ShowTableMetaDataStatement extends
QueryableRALStatement impl
private final DatabaseSegment database;
@Override
- public Optional<DatabaseSegment> getDatabase() {
+ public Optional<DatabaseSegment> getFromDatabase() {
return Optional.ofNullable(database);
}
}
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ShowStorageUnitsStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ShowStorageUnitsStatement.java
index 326eae2bbf4..52d40284766 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ShowStorageUnitsStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ShowStorageUnitsStatement.java
@@ -36,7 +36,7 @@ public final class ShowStorageUnitsStatement extends
ResourceQueryStatement impl
private final String likePattern;
@Override
- public Optional<DatabaseSegment> getDatabase() {
+ public Optional<DatabaseSegment> getFromDatabase() {
return Optional.ofNullable(database);
}
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ShowTablesStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ShowTablesStatement.java
index 19ac9db03c7..0eacd1642ce 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ShowTablesStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/resource/ShowTablesStatement.java
@@ -39,7 +39,7 @@ public abstract class ShowTablesStatement extends
ResourceQueryStatement impleme
* @return database
*/
@Override
- public final Optional<DatabaseSegment> getDatabase() {
+ public final Optional<DatabaseSegment> getFromDatabase() {
return Optional.ofNullable(database);
}
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/database/ShowDatabaseRulesStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/database/ShowDatabaseRulesStatement.java
index fcc6a45ca2c..d3ed05218fd 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/database/ShowDatabaseRulesStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rql/rule/database/ShowDatabaseRulesStatement.java
@@ -33,7 +33,7 @@ public abstract class ShowDatabaseRulesStatement extends
RuleQueryStatement impl
private final DatabaseSegment database;
@Override
- public final Optional<DatabaseSegment> getDatabase() {
+ public final Optional<DatabaseSegment> getFromDatabase() {
return Optional.ofNullable(database);
}
}
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/FromDatabaseAvailable.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/FromDatabaseAvailable.java
index d5da95ba7da..a242069a163 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/FromDatabaseAvailable.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/FromDatabaseAvailable.java
@@ -27,9 +27,9 @@ import java.util.Optional;
public interface FromDatabaseAvailable {
/**
- * Get database.
+ * Get from database.
*
- * @return database segment
+ * @return from database
*/
- Optional<DatabaseSegment> getDatabase();
+ Optional<DatabaseSegment> getFromDatabase();
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowTableMetaDataStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowTableMetaDataStatementAssert.java
index a0e3905fb87..adb3d8a3e80 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowTableMetaDataStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/queryable/ShowTableMetaDataStatementAssert.java
@@ -44,8 +44,8 @@ public final class ShowTableMetaDataStatementAssert {
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final ShowTableMetaDataStatement actual, final
ShowTableMetaDataStatementTestCase expected) {
if (ExistingAssert.assertIs(assertContext, actual, expected)) {
- assertTrue(actual.getDatabase().isPresent());
- DatabaseAssert.assertIs(assertContext, actual.getDatabase().get(),
expected.getDatabase());
+ assertTrue(actual.getFromDatabase().isPresent());
+ DatabaseAssert.assertIs(assertContext,
actual.getFromDatabase().get(), expected.getDatabase());
assertThat(assertContext.getText("Table assertion error:"),
actual.getTableNames(), is(expected.getTableNames()));
}
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterReadwriteSplittingStorageUnitStatusStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterReadwriteSplittingStorageUnitStatusStatementAssert.java
index e84bf09fef4..6a48a351ea1 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterReadwriteSplittingStorageUnitStatusStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/AlterReadwriteSplittingStorageUnitStatusStatementAssert.java
@@ -53,10 +53,10 @@ public final class
AlterReadwriteSplittingStorageUnitStatusStatementAssert {
private static void assertIs(final SQLCaseAssertContext assertContext,
final AlterReadwriteSplittingStorageUnitStatusStatement actual, final
DatabaseContainedTestCase expected) {
if (null == expected.getDatabase()) {
- assertFalse(actual.getDatabase().isPresent(),
assertContext.getText("Actual database should not exist."));
+ assertFalse(actual.getFromDatabase().isPresent(),
assertContext.getText("Actual database should not exist."));
} else {
- assertTrue(actual.getDatabase().isPresent(),
assertContext.getText("Actual database should exist."));
- DatabaseAssert.assertIs(assertContext, actual.getDatabase().get(),
expected.getDatabase());
+ assertTrue(actual.getFromDatabase().isPresent(),
assertContext.getText("Actual database should exist."));
+ DatabaseAssert.assertIs(assertContext,
actual.getFromDatabase().get(), expected.getDatabase());
}
}
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowRulesStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowRulesStatementAssert.java
index 1b63931f12d..31eefbbc83e 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowRulesStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowRulesStatementAssert.java
@@ -50,10 +50,10 @@ public final class ShowRulesStatementAssert {
private static void assertIs(final SQLCaseAssertContext assertContext,
final ShowDatabaseRulesStatement actual, final DatabaseContainedTestCase
expected) {
if (null == expected.getDatabase()) {
- assertFalse(actual.getDatabase().isPresent(),
assertContext.getText("Actual database should not exist."));
+ assertFalse(actual.getFromDatabase().isPresent(),
assertContext.getText("Actual database should not exist."));
} else {
- assertTrue(actual.getDatabase().isPresent(),
assertContext.getText("Actual database should exist."));
- DatabaseAssert.assertIs(assertContext, actual.getDatabase().get(),
expected.getDatabase());
+ assertTrue(actual.getFromDatabase().isPresent(),
assertContext.getText("Actual database should exist."));
+ DatabaseAssert.assertIs(assertContext,
actual.getFromDatabase().get(), expected.getDatabase());
}
}
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowStorageUnitsStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowStorageUnitsStatementAssert.java
index 8056b131384..5ddadc9a2db 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowStorageUnitsStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowStorageUnitsStatementAssert.java
@@ -51,10 +51,10 @@ public final class ShowStorageUnitsStatementAssert {
private static void assertIs(final SQLCaseAssertContext assertContext,
final ShowStorageUnitsStatement actual, final ShowStorageUnitsStatementTestCase
expected) {
if (null == expected.getDatabase()) {
- assertFalse(actual.getDatabase().isPresent(),
assertContext.getText("Actual database should not exist."));
+ assertFalse(actual.getFromDatabase().isPresent(),
assertContext.getText("Actual database should not exist."));
} else {
- assertTrue(actual.getDatabase().isPresent(),
assertContext.getText("Actual database should exist."));
- DatabaseAssert.assertIs(assertContext, actual.getDatabase().get(),
expected.getDatabase());
+ assertTrue(actual.getFromDatabase().isPresent(),
assertContext.getText("Actual database should exist."));
+ DatabaseAssert.assertIs(assertContext,
actual.getFromDatabase().get(), expected.getDatabase());
}
if (null == expected.getLikePattern()) {
assertFalse(actual.getLikePattern().isPresent(),
assertContext.getText("Actual like pattern should not exist."));
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowTablesStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowTablesStatementAssert.java
index 5d3e31a9eca..58480a16591 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowTablesStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rql/impl/ShowTablesStatementAssert.java
@@ -51,10 +51,10 @@ public final class ShowTablesStatementAssert {
private static void assertIs(final SQLCaseAssertContext assertContext,
final ShowTablesStatement actual, final ShowTableStatementTestCase expected) {
if (null == expected.getDatabase()) {
- assertFalse(actual.getDatabase().isPresent(),
assertContext.getText("Actual database should not exist."));
+ assertFalse(actual.getFromDatabase().isPresent(),
assertContext.getText("Actual database should not exist."));
} else {
- assertTrue(actual.getDatabase().isPresent(),
assertContext.getText("Actual database should exist."));
- DatabaseAssert.assertIs(assertContext, actual.getDatabase().get(),
expected.getDatabase());
+ assertTrue(actual.getFromDatabase().isPresent(),
assertContext.getText("Actual database should exist."));
+ DatabaseAssert.assertIs(assertContext,
actual.getFromDatabase().get(), expected.getDatabase());
}
if (null == expected.getLikePattern()) {
assertFalse(actual.getLikePattern().isPresent(),
assertContext.getText("Actual like pattern should not exist."));
