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 537309b7fcb Refactor constructor of ShowStatement to empty
buildAttributes (#38355)
537309b7fcb is described below
commit 537309b7fcb3b4428b72eff72c3aeed7b2db2f1b
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Mar 5 20:57:05 2026 +0800
Refactor constructor of ShowStatement to empty buildAttributes (#38355)
---
.../ShowStatusFromReadwriteSplittingRulesStatement.java | 14 +++++++-------
.../ral/queryable/show/ShowTableMetaDataStatement.java | 11 +++++++----
.../type/rql/resource/ShowStorageUnitsStatement.java | 11 +++++++----
.../statement/type/rql/resource/ShowTablesStatement.java | 11 +++++++----
.../type/rql/rule/database/ShowDatabaseRulesStatement.java | 10 ++++++----
5 files changed, 34 insertions(+), 23 deletions(-)
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 99baf5042d5..397a02dc125 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
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.readwritesplitting.distsql.statement;
import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.distsql.statement.type.rql.resource.ResourceQueryStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatabaseSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.attribute.SQLStatementAttributes;
@@ -29,15 +28,17 @@ import java.util.Optional;
/**
* Show status from readwrite-splitting rules statement.
*/
-@RequiredArgsConstructor
+@Getter
public final class ShowStatusFromReadwriteSplittingRulesStatement extends
ResourceQueryStatement {
- private final FromDatabaseSegment fromDatabase;
-
private final String ruleName;
- @Getter
- private SQLStatementAttributes attributes;
+ private final SQLStatementAttributes attributes;
+
+ public ShowStatusFromReadwriteSplittingRulesStatement(final
FromDatabaseSegment fromDatabase, final String ruleName) {
+ this.ruleName = ruleName;
+ attributes = new SQLStatementAttributes(new
FromDatabaseSQLStatementAttribute(fromDatabase));
+ }
/**
* Get rule name.
@@ -50,6 +51,5 @@ public final class
ShowStatusFromReadwriteSplittingRulesStatement extends Resour
@Override
public void buildAttributes() {
- attributes = new SQLStatementAttributes(new
FromDatabaseSQLStatementAttribute(fromDatabase));
}
}
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/ral/queryable/show/ShowTableMetaDataStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/ral/queryable/show/ShowTableMetaDataStatement.java
index 5e7b9f75be9..bc1ffd2cf4e 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/ral/queryable/show/ShowTableMetaDataStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/ral/queryable/show/ShowTableMetaDataStatement.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.distsql.statement.type.ral.queryable.show;
import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.distsql.statement.type.ral.queryable.QueryableRALStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatabaseSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.attribute.SQLStatementAttributes;
@@ -29,7 +28,6 @@ import java.util.Collection;
/**
* Show table meta data statement.
*/
-@RequiredArgsConstructor
@Getter
public final class ShowTableMetaDataStatement extends QueryableRALStatement {
@@ -37,10 +35,15 @@ public final class ShowTableMetaDataStatement extends
QueryableRALStatement {
private final FromDatabaseSegment fromDatabase;
- private SQLStatementAttributes attributes;
+ private final SQLStatementAttributes attributes;
+
+ public ShowTableMetaDataStatement(final Collection<String> tableNames,
final FromDatabaseSegment fromDatabase) {
+ this.tableNames = tableNames;
+ this.fromDatabase = fromDatabase;
+ attributes = new SQLStatementAttributes(new
FromDatabaseSQLStatementAttribute(fromDatabase));
+ }
@Override
public void buildAttributes() {
- attributes = new SQLStatementAttributes(new
FromDatabaseSQLStatementAttribute(fromDatabase));
}
}
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/rql/resource/ShowStorageUnitsStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/rql/resource/ShowStorageUnitsStatement.java
index c78d2ecf125..d30ea420577 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/rql/resource/ShowStorageUnitsStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/rql/resource/ShowStorageUnitsStatement.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.distsql.statement.type.rql.resource;
import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatabaseSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.attribute.SQLStatementAttributes;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.attribute.type.FromDatabaseSQLStatementAttribute;
@@ -28,7 +27,6 @@ import java.util.Optional;
/**
* Show storage unit statement.
*/
-@RequiredArgsConstructor
@Getter
public final class ShowStorageUnitsStatement extends ResourceQueryStatement {
@@ -36,7 +34,13 @@ public final class ShowStorageUnitsStatement extends
ResourceQueryStatement {
private final String likePattern;
- private SQLStatementAttributes attributes;
+ private final SQLStatementAttributes attributes;
+
+ public ShowStorageUnitsStatement(final FromDatabaseSegment fromDatabase,
final String likePattern) {
+ this.fromDatabase = fromDatabase;
+ this.likePattern = likePattern;
+ attributes = new SQLStatementAttributes(new
FromDatabaseSQLStatementAttribute(fromDatabase));
+ }
/**
* Get like pattern.
@@ -49,6 +53,5 @@ public final class ShowStorageUnitsStatement extends
ResourceQueryStatement {
@Override
public void buildAttributes() {
- attributes = new SQLStatementAttributes(new
FromDatabaseSQLStatementAttribute(fromDatabase));
}
}
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/rql/resource/ShowTablesStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/rql/resource/ShowTablesStatement.java
index 1e528ca452d..baa7bfae049 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/rql/resource/ShowTablesStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/rql/resource/ShowTablesStatement.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.distsql.statement.type.rql.resource;
import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatabaseSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.attribute.SQLStatementAttributes;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.attribute.type.FromDatabaseSQLStatementAttribute;
@@ -28,7 +27,6 @@ import java.util.Optional;
/**
* Show tables statement.
*/
-@RequiredArgsConstructor
@Getter
public abstract class ShowTablesStatement extends ResourceQueryStatement {
@@ -36,7 +34,13 @@ public abstract class ShowTablesStatement extends
ResourceQueryStatement {
private final String likePattern;
- private SQLStatementAttributes attributes;
+ private final SQLStatementAttributes attributes;
+
+ public ShowTablesStatement(final FromDatabaseSegment fromDatabase, final
String likePattern) {
+ this.fromDatabase = fromDatabase;
+ this.likePattern = likePattern;
+ attributes = new SQLStatementAttributes(new
FromDatabaseSQLStatementAttribute(fromDatabase));
+ }
/**
* Get like pattern.
@@ -49,6 +53,5 @@ public abstract class ShowTablesStatement extends
ResourceQueryStatement {
@Override
public void buildAttributes() {
- attributes = new SQLStatementAttributes(new
FromDatabaseSQLStatementAttribute(fromDatabase));
}
}
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/rql/rule/database/ShowDatabaseRulesStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/rql/rule/database/ShowDatabaseRulesStatement.java
index 3098fab0fab..20d94fc75d2 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/rql/rule/database/ShowDatabaseRulesStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/type/rql/rule/database/ShowDatabaseRulesStatement.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.distsql.statement.type.rql.rule.database;
import lombok.Getter;
-import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.distsql.statement.type.rql.rule.RuleQueryStatement;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.dal.FromDatabaseSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.statement.attribute.SQLStatementAttributes;
@@ -27,16 +26,19 @@ import
org.apache.shardingsphere.sql.parser.statement.core.statement.attribute.t
/**
* Show database rules statement.
*/
-@RequiredArgsConstructor
@Getter
public abstract class ShowDatabaseRulesStatement extends RuleQueryStatement {
private final FromDatabaseSegment fromDatabase;
- private SQLStatementAttributes attributes;
+ private final SQLStatementAttributes attributes;
+
+ public ShowDatabaseRulesStatement(final FromDatabaseSegment fromDatabase) {
+ this.fromDatabase = fromDatabase;
+ attributes = new SQLStatementAttributes(new
FromDatabaseSQLStatementAttribute(fromDatabase));
+ }
@Override
public void buildAttributes() {
- attributes = new SQLStatementAttributes(new
FromDatabaseSQLStatementAttribute(fromDatabase));
}
}
