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 19fb084586c Refactor MySQL show XXX statement to impl
FromDatabaseAvailable (#35732)
19fb084586c is described below
commit 19fb084586c246615645fb336424fe940a85c8a7
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Jun 17 14:26:07 2025 +0800
Refactor MySQL show XXX statement to impl FromDatabaseAvailable (#35732)
---
.../statement/core/statement/dal/ShowColumnsStatement.java | 9 +++------
.../parser/statement/core/statement/dal/ShowIndexStatement.java | 9 +++------
.../statement/core/statement/dal/ShowTableStatusStatement.java | 9 +++------
.../parser/statement/core/statement/dal/ShowTablesStatement.java | 9 +++------
4 files changed, 12 insertions(+), 24 deletions(-)
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowColumnsStatement.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowColumnsStatement.java
index f293aa3591b..d6b6d4c6a0f 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowColumnsStatement.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowColumnsStatement.java
@@ -23,6 +23,7 @@ import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatab
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.ShowFilterSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.SimpleTableSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.AbstractSQLStatement;
+import
org.apache.shardingsphere.sql.parser.statement.core.statement.FromDatabaseAvailable;
import java.util.Optional;
@@ -31,7 +32,7 @@ import java.util.Optional;
*/
@RequiredArgsConstructor
@Getter
-public final class ShowColumnsStatement extends AbstractSQLStatement
implements DALStatement {
+public final class ShowColumnsStatement extends AbstractSQLStatement
implements DALStatement, FromDatabaseAvailable {
private final SimpleTableSegment table;
@@ -39,11 +40,7 @@ public final class ShowColumnsStatement extends
AbstractSQLStatement implements
private final ShowFilterSegment filter;
- /**
- * Get from database.
- *
- * @return from database
- */
+ @Override
public Optional<FromDatabaseSegment> getFromDatabase() {
return Optional.ofNullable(fromDatabase);
}
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowIndexStatement.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowIndexStatement.java
index 00f45b23b97..ae000d66e9c 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowIndexStatement.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowIndexStatement.java
@@ -22,6 +22,7 @@ import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatabaseSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.SimpleTableSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.AbstractSQLStatement;
+import
org.apache.shardingsphere.sql.parser.statement.core.statement.FromDatabaseAvailable;
import java.util.Optional;
@@ -30,17 +31,13 @@ import java.util.Optional;
*/
@RequiredArgsConstructor
@Getter
-public final class ShowIndexStatement extends AbstractSQLStatement implements
DALStatement {
+public final class ShowIndexStatement extends AbstractSQLStatement implements
DALStatement, FromDatabaseAvailable {
private final SimpleTableSegment table;
private final FromDatabaseSegment fromDatabase;
- /**
- * Get from database.
- *
- * @return from database
- */
+ @Override
public Optional<FromDatabaseSegment> getFromDatabase() {
return Optional.ofNullable(fromDatabase);
}
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowTableStatusStatement.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowTableStatusStatement.java
index 3a99999487c..2993c0544a6 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowTableStatusStatement.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowTableStatusStatement.java
@@ -21,6 +21,7 @@ import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatabaseSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.ShowFilterSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.AbstractSQLStatement;
+import
org.apache.shardingsphere.sql.parser.statement.core.statement.FromDatabaseAvailable;
import java.util.Optional;
@@ -28,17 +29,13 @@ import java.util.Optional;
* Show table status statement.
*/
@RequiredArgsConstructor
-public final class ShowTableStatusStatement extends AbstractSQLStatement
implements DALStatement {
+public final class ShowTableStatusStatement extends AbstractSQLStatement
implements DALStatement, FromDatabaseAvailable {
private final FromDatabaseSegment fromDatabase;
private final ShowFilterSegment filter;
- /**
- * Get from database.
- *
- * @return from database
- */
+ @Override
public Optional<FromDatabaseSegment> getFromDatabase() {
return Optional.ofNullable(fromDatabase);
}
diff --git
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowTablesStatement.java
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowTablesStatement.java
index 4f2374b31f0..7483a77f852 100644
---
a/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowTablesStatement.java
+++
b/parser/sql/statement/core/src/main/java/org/apache/shardingsphere/sql/parser/statement/core/statement/dal/ShowTablesStatement.java
@@ -22,6 +22,7 @@ import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatabaseSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.ShowFilterSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.AbstractSQLStatement;
+import
org.apache.shardingsphere.sql.parser.statement.core.statement.FromDatabaseAvailable;
import java.util.Optional;
@@ -30,7 +31,7 @@ import java.util.Optional;
*/
@RequiredArgsConstructor
@Getter
-public final class ShowTablesStatement extends AbstractSQLStatement implements
DALStatement {
+public final class ShowTablesStatement extends AbstractSQLStatement implements
DALStatement, FromDatabaseAvailable {
private final FromDatabaseSegment fromDatabase;
@@ -38,11 +39,7 @@ public final class ShowTablesStatement extends
AbstractSQLStatement implements D
private final boolean containsFull;
- /**
- * Get from database segment.
- *
- * @return from database segment
- */
+ @Override
public Optional<FromDatabaseSegment> getFromDatabase() {
return Optional.ofNullable(fromDatabase);
}
