This is an automated email from the ASF dual-hosted git repository.
panjuan 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 8dd2b3a9084 Merge SQLRULStatement and RULStatement (#29828)
8dd2b3a9084 is described below
commit 8dd2b3a90844d5912dfa52e1bd5262d3dfb14ac4
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Jan 24 16:41:01 2024 +0800
Merge SQLRULStatement and RULStatement (#29828)
---
.../distsql/statement/rul/SQLRULStatement.java | 31 ------------
.../distsql/statement/rul/sql/FormatStatement.java | 10 ++--
.../distsql/statement/rul/sql/ParseStatement.java | 10 ++--
.../statement/rul/sql/PreviewStatement.java | 10 ++--
.../asserts/statement/rul/RULStatementAssert.java | 19 ++++++--
.../statement/rul/impl/SQLRULStatementAssert.java | 57 ----------------------
.../sql => type}/FormatSQLStatementAssert.java | 2 +-
.../{impl/sql => type}/ParseStatementAssert.java | 2 +-
.../{impl/sql => type}/PreviewStatementAssert.java | 2 +-
9 files changed, 33 insertions(+), 110 deletions(-)
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/SQLRULStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/SQLRULStatement.java
deleted file mode 100644
index dc5e0cdf0e9..00000000000
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/SQLRULStatement.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.distsql.statement.rul;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-/**
- * SQL RUL statement.
- */
-@Getter
-@RequiredArgsConstructor
-public abstract class SQLRULStatement extends RULStatement {
-
- private final String sql;
-}
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/FormatStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/FormatStatement.java
index 7f69260629e..7e4ca855c2f 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/FormatStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/FormatStatement.java
@@ -18,15 +18,15 @@
package org.apache.shardingsphere.distsql.statement.rul.sql;
import lombok.Getter;
-import org.apache.shardingsphere.distsql.statement.rul.SQLRULStatement;
+import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.distsql.statement.rul.RULStatement;
/**
* Format statement.
*/
+@RequiredArgsConstructor
@Getter
-public final class FormatStatement extends SQLRULStatement {
+public final class FormatStatement extends RULStatement {
- public FormatStatement(final String sql) {
- super(sql);
- }
+ private final String sql;
}
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/ParseStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/ParseStatement.java
index 6c0c5b17560..fb2a4dbf7c1 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/ParseStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/ParseStatement.java
@@ -18,15 +18,15 @@
package org.apache.shardingsphere.distsql.statement.rul.sql;
import lombok.Getter;
-import org.apache.shardingsphere.distsql.statement.rul.SQLRULStatement;
+import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.distsql.statement.rul.RULStatement;
/**
* Parse statement.
*/
+@RequiredArgsConstructor
@Getter
-public final class ParseStatement extends SQLRULStatement {
+public final class ParseStatement extends RULStatement {
- public ParseStatement(final String sql) {
- super(sql);
- }
+ private final String sql;
}
diff --git
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/PreviewStatement.java
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/PreviewStatement.java
index 6cee111a463..b25664513a4 100644
---
a/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/PreviewStatement.java
+++
b/parser/distsql/statement/src/main/java/org/apache/shardingsphere/distsql/statement/rul/sql/PreviewStatement.java
@@ -18,15 +18,15 @@
package org.apache.shardingsphere.distsql.statement.rul.sql;
import lombok.Getter;
-import org.apache.shardingsphere.distsql.statement.rul.SQLRULStatement;
+import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.distsql.statement.rul.RULStatement;
/**
* Preview statement.
*/
+@RequiredArgsConstructor
@Getter
-public final class PreviewStatement extends SQLRULStatement {
+public final class PreviewStatement extends RULStatement {
- public PreviewStatement(final String sql) {
- super(sql);
- }
+ private final String sql;
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/RULStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/RULStatementAssert.java
index cbfcecb0474..ea7a3a99eaa 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/RULStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/RULStatementAssert.java
@@ -20,10 +20,17 @@ package
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.distsql.statement.rul.RULStatement;
-import org.apache.shardingsphere.distsql.statement.rul.SQLRULStatement;
+import org.apache.shardingsphere.distsql.statement.rul.sql.FormatStatement;
+import org.apache.shardingsphere.distsql.statement.rul.sql.ParseStatement;
+import org.apache.shardingsphere.distsql.statement.rul.sql.PreviewStatement;
import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.impl.SQLRULStatementAssert;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.type.FormatSQLStatementAssert;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.type.ParseStatementAssert;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.type.PreviewStatementAssert;
import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rul.FormatSQLStatementTestCase;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rul.ParseStatementTestCase;
+import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rul.PreviewStatementTestCase;
/**
* RUL statement assert.
@@ -39,8 +46,12 @@ public final class RULStatementAssert {
* @param expected expected RUL statement test case
*/
public static void assertIs(final SQLCaseAssertContext assertContext,
final RULStatement actual, final SQLParserTestCase expected) {
- if (actual instanceof SQLRULStatement) {
- SQLRULStatementAssert.assertIs(assertContext, (SQLRULStatement)
actual, expected);
+ if (actual instanceof PreviewStatement) {
+ PreviewStatementAssert.assertIs(assertContext, (PreviewStatement)
actual, (PreviewStatementTestCase) expected);
+ } else if (actual instanceof ParseStatement) {
+ ParseStatementAssert.assertIs(assertContext, (ParseStatement)
actual, (ParseStatementTestCase) expected);
+ } else if (actual instanceof FormatStatement) {
+ FormatSQLStatementAssert.assertIs(assertContext, (FormatStatement)
actual, (FormatSQLStatementTestCase) expected);
}
}
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/SQLRULStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/SQLRULStatementAssert.java
deleted file mode 100644
index 3f840e62d13..00000000000
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/SQLRULStatementAssert.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.impl;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.distsql.statement.rul.SQLRULStatement;
-import org.apache.shardingsphere.distsql.statement.rul.sql.FormatStatement;
-import org.apache.shardingsphere.distsql.statement.rul.sql.ParseStatement;
-import org.apache.shardingsphere.distsql.statement.rul.sql.PreviewStatement;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.SQLCaseAssertContext;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.impl.sql.FormatSQLStatementAssert;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.impl.sql.ParseStatementAssert;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.impl.sql.PreviewStatementAssert;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rul.FormatSQLStatementTestCase;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rul.ParseStatementTestCase;
-import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rul.PreviewStatementTestCase;
-
-/**
- * SQL RUL statement assert.
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class SQLRULStatementAssert {
-
- /**
- * Assert SQL RUL statement is correct with expected parser result.
- *
- * @param assertContext assert context
- * @param actual actual SQL RUL statement
- * @param expected expected SQL RUL statement test case
- */
- public static void assertIs(final SQLCaseAssertContext assertContext,
final SQLRULStatement actual, final SQLParserTestCase expected) {
- if (actual instanceof PreviewStatement) {
- PreviewStatementAssert.assertIs(assertContext, (PreviewStatement)
actual, (PreviewStatementTestCase) expected);
- } else if (actual instanceof ParseStatement) {
- ParseStatementAssert.assertIs(assertContext, (ParseStatement)
actual, (ParseStatementTestCase) expected);
- } else if (actual instanceof FormatStatement) {
- FormatSQLStatementAssert.assertIs(assertContext, (FormatStatement)
actual, (FormatSQLStatementTestCase) expected);
- }
- }
-}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/FormatSQLStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/type/FormatSQLStatementAssert.java
similarity index 98%
rename from
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/FormatSQLStatementAssert.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/type/FormatSQLStatementAssert.java
index a639e99514c..1038fe9a781 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/FormatSQLStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/type/FormatSQLStatementAssert.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.impl.sql;
+package
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.type;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/ParseStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/type/ParseStatementAssert.java
similarity index 98%
rename from
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/ParseStatementAssert.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/type/ParseStatementAssert.java
index f1798d1c149..0a975282d5a 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/ParseStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/type/ParseStatementAssert.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.impl.sql;
+package
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.type;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/PreviewStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/type/PreviewStatementAssert.java
similarity index 98%
rename from
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/PreviewStatementAssert.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/type/PreviewStatementAssert.java
index 51688532b27..de90a94b3b8 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/impl/sql/PreviewStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/rul/type/PreviewStatementAssert.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.impl.sql;
+package
org.apache.shardingsphere.test.it.sql.parser.internal.asserts.statement.rul.type;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
