Merge pull request #34288 from strongduanmu/dev-0109

Revise pr#34163 and update release note
apache · Jan 9, 2025 · 466ba41 · 466ba41
2 parents 5c6745e + fd7c4d4
commit 466ba41
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 39 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -54,6 +54,7 @@
 1. SQL Binder: Support show create table, show columns, show index statement bind - [#34271](https://github.com/apache/shardingsphere/pull/34271)
 1. SQL Parser: Enhance create view, alter view, drop view sql parser - [#34283](https://github.com/apache/shardingsphere/pull/34283)
 1. SQL Binder: Support deny user sql bind and add test case - [#34279](https://github.com/apache/shardingsphere/pull/34279)
+1. SQL Binder: Support with segment bind check with UniqueCommonTableExpressionException - [#34163](https://github.com/apache/shardingsphere/pull/34163)
 
 ### Bug Fixes
 

diff --git a/...t/assign/AssignmentSegmentBinderTest.java → ...l/assign/AssignmentSegmentBinderTest.java b/...t/assign/AssignmentSegmentBinderTest.java → ...l/assign/AssignmentSegmentBinderTest.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.binder.engine.segment.assign;
+package org.apache.shardingsphere.infra.binder.engine.segment.dml.assign;
 
 import com.cedarsoftware.util.CaseInsensitiveMap.CaseInsensitiveString;
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
-import org.apache.shardingsphere.infra.binder.engine.segment.dml.assign.AssignmentSegmentBinder;
 import org.apache.shardingsphere.infra.binder.engine.segment.dml.from.context.TableSegmentBinderContext;
 import org.apache.shardingsphere.infra.binder.engine.segment.dml.from.context.type.SimpleTableSegmentBinderContext;
 import org.apache.shardingsphere.infra.binder.engine.statement.SQLStatementBinderContext;

diff --git a/.../BinaryOperationExpressionBinderTest.java → .../BinaryOperationExpressionBinderTest.java b/.../BinaryOperationExpressionBinderTest.java → .../BinaryOperationExpressionBinderTest.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.binder.engine.segment.expression.type;
+package org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type;
 
 import com.google.common.collect.LinkedHashMultimap;
 import org.apache.shardingsphere.infra.binder.engine.segment.SegmentType;
-import org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type.BinaryOperationExpressionBinder;
 import org.apache.shardingsphere.infra.binder.engine.statement.SQLStatementBinderContext;
 import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.BinaryOperationExpression;
 import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.LiteralExpressionSegment;

diff --git a/...ression/type/ColumnSegmentBinderTest.java → ...ression/type/ColumnSegmentBinderTest.java b/...ression/type/ColumnSegmentBinderTest.java → ...ression/type/ColumnSegmentBinderTest.java
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.binder.engine.segment.expression.type;
+package org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type;
 
 import com.cedarsoftware.util.CaseInsensitiveMap.CaseInsensitiveString;
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
 import org.apache.shardingsphere.infra.binder.engine.segment.SegmentType;
-import org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type.ColumnSegmentBinder;
 import org.apache.shardingsphere.infra.binder.engine.segment.dml.from.context.TableSegmentBinderContext;
 import org.apache.shardingsphere.infra.binder.engine.segment.dml.from.context.type.SimpleTableSegmentBinderContext;
 import org.apache.shardingsphere.infra.binder.engine.statement.SQLStatementBinderContext;

diff --git a/...e/ExistsSubqueryExpressionBinderTest.java → ...e/ExistsSubqueryExpressionBinderTest.java b/...e/ExistsSubqueryExpressionBinderTest.java → ...e/ExistsSubqueryExpressionBinderTest.java
@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.binder.engine.segment.expression.type;
+package org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type;
 
 import com.google.common.collect.LinkedHashMultimap;
-import org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type.ExistsSubqueryExpressionBinder;
 import org.apache.shardingsphere.infra.binder.engine.statement.SQLStatementBinderContext;
 import org.apache.shardingsphere.infra.hint.HintValueContext;
 import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;

diff --git a/.../FunctionExpressionSegmentBinderTest.java → .../FunctionExpressionSegmentBinderTest.java b/.../FunctionExpressionSegmentBinderTest.java → .../FunctionExpressionSegmentBinderTest.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.binder.engine.segment.expression.type;
+package org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type;
 
 import com.google.common.collect.LinkedHashMultimap;
 import org.apache.shardingsphere.infra.binder.engine.segment.SegmentType;
-import org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type.FunctionExpressionSegmentBinder;
 import org.apache.shardingsphere.infra.binder.engine.statement.SQLStatementBinderContext;
 import org.apache.shardingsphere.infra.hint.HintValueContext;
 import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;

diff --git a/...pression/type/InExpressionBinderTest.java → ...pression/type/InExpressionBinderTest.java b/...pression/type/InExpressionBinderTest.java → ...pression/type/InExpressionBinderTest.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.binder.engine.segment.expression.type;
+package org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type;
 
 import com.google.common.collect.LinkedHashMultimap;
 import org.apache.shardingsphere.infra.binder.engine.segment.SegmentType;
-import org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type.InExpressionBinder;
 import org.apache.shardingsphere.infra.binder.engine.statement.SQLStatementBinderContext;
 import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.InExpression;
 import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.LiteralExpressionSegment;

diff --git a/...ression/type/NotExpressionBinderTest.java → ...ression/type/NotExpressionBinderTest.java b/...ression/type/NotExpressionBinderTest.java → ...ression/type/NotExpressionBinderTest.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.binder.engine.segment.expression.type;
+package org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type;
 
 import com.google.common.collect.LinkedHashMultimap;
 import org.apache.shardingsphere.infra.binder.engine.segment.SegmentType;
-import org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type.NotExpressionBinder;
 import org.apache.shardingsphere.infra.binder.engine.statement.SQLStatementBinderContext;
 import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.NotExpression;
 import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.simple.LiteralExpressionSegment;

diff --git a/...ssion/type/SubquerySegmentBinderTest.java → ...ssion/type/SubquerySegmentBinderTest.java b/...ssion/type/SubquerySegmentBinderTest.java → ...ssion/type/SubquerySegmentBinderTest.java
@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.binder.engine.segment.expression.type;
+package org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type;
 
 import com.cedarsoftware.util.CaseInsensitiveMap.CaseInsensitiveString;
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
-import org.apache.shardingsphere.infra.binder.engine.segment.dml.expression.type.SubquerySegmentBinder;
 import org.apache.shardingsphere.infra.binder.engine.segment.dml.from.context.TableSegmentBinderContext;
 import org.apache.shardingsphere.infra.binder.engine.segment.dml.from.context.type.SimpleTableSegmentBinderContext;
 import org.apache.shardingsphere.infra.binder.engine.statement.SQLStatementBinderContext;

diff --git a/...from/type/JoinTableSegmentBinderTest.java → ...from/type/JoinTableSegmentBinderTest.java b/...from/type/JoinTableSegmentBinderTest.java → ...from/type/JoinTableSegmentBinderTest.java
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.binder.engine.segment.from.type;
+package org.apache.shardingsphere.infra.binder.engine.segment.dml.from.type;
 
 import com.cedarsoftware.util.CaseInsensitiveMap.CaseInsensitiveString;
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
 import org.apache.shardingsphere.infra.binder.engine.segment.dml.from.context.TableSegmentBinderContext;
-import org.apache.shardingsphere.infra.binder.engine.segment.dml.from.type.JoinTableSegmentBinder;
 import org.apache.shardingsphere.infra.binder.engine.statement.SQLStatementBinderContext;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 import org.apache.shardingsphere.infra.hint.HintValueContext;

diff --git a/...om/type/SimpleTableSegmentBinderTest.java → ...om/type/SimpleTableSegmentBinderTest.java b/...om/type/SimpleTableSegmentBinderTest.java → ...om/type/SimpleTableSegmentBinderTest.java
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.binder.engine.segment.from.type;
+package org.apache.shardingsphere.infra.binder.engine.segment.dml.from.type;
 
 import com.cedarsoftware.util.CaseInsensitiveMap.CaseInsensitiveString;
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
 import org.apache.shardingsphere.infra.binder.engine.segment.dml.from.context.TableSegmentBinderContext;
-import org.apache.shardingsphere.infra.binder.engine.segment.dml.from.type.SimpleTableSegmentBinder;
 import org.apache.shardingsphere.infra.binder.engine.statement.SQLStatementBinderContext;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 import org.apache.shardingsphere.infra.exception.kernel.metadata.TableNotFoundException;

diff --git a/.../type/SubqueryTableSegmentBinderTest.java → .../type/SubqueryTableSegmentBinderTest.java b/.../type/SubqueryTableSegmentBinderTest.java → .../type/SubqueryTableSegmentBinderTest.java
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.binder.engine.segment.from.type;
+package org.apache.shardingsphere.infra.binder.engine.segment.dml.from.type;
 
 import com.cedarsoftware.util.CaseInsensitiveMap.CaseInsensitiveString;
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
 import org.apache.shardingsphere.infra.binder.engine.segment.dml.from.context.TableSegmentBinderContext;
-import org.apache.shardingsphere.infra.binder.engine.segment.dml.from.type.SubqueryTableSegmentBinder;
 import org.apache.shardingsphere.infra.binder.engine.statement.SQLStatementBinderContext;
 import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
 import org.apache.shardingsphere.infra.hint.HintValueContext;

diff --git a/...ent/predicate/WhereSegmentBinderTest.java → ...dml/predicate/WhereSegmentBinderTest.java b/...ent/predicate/WhereSegmentBinderTest.java → ...dml/predicate/WhereSegmentBinderTest.java
@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.binder.engine.segment.predicate;
+package org.apache.shardingsphere.infra.binder.engine.segment.dml.predicate;
 
 import com.cedarsoftware.util.CaseInsensitiveMap.CaseInsensitiveString;
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
 import org.apache.shardingsphere.infra.binder.engine.segment.dml.from.context.TableSegmentBinderContext;
-import org.apache.shardingsphere.infra.binder.engine.segment.dml.predicate.WhereSegmentBinder;
 import org.apache.shardingsphere.infra.binder.engine.statement.SQLStatementBinderContext;
 import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.ExpressionSegment;
 import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.predicate.WhereSegment;

diff --git a/...ShorthandProjectionSegmentBinderTest.java → ...ShorthandProjectionSegmentBinderTest.java b/...ShorthandProjectionSegmentBinderTest.java → ...ShorthandProjectionSegmentBinderTest.java
@@ -15,14 +15,13 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.binder.engine.segment.projection.type;
+package org.apache.shardingsphere.infra.binder.engine.segment.dml.projection.type;
 
 import com.cedarsoftware.util.CaseInsensitiveMap.CaseInsensitiveString;
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
 import org.apache.shardingsphere.infra.binder.engine.segment.dml.from.context.TableSegmentBinderContext;
 import org.apache.shardingsphere.infra.binder.engine.segment.dml.from.context.type.SimpleTableSegmentBinderContext;
-import org.apache.shardingsphere.infra.binder.engine.segment.dml.projection.type.ShorthandProjectionSegmentBinder;
 import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.column.ColumnSegment;
 import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.expr.subquery.SubquerySegment;
 import org.apache.shardingsphere.sql.parser.statement.core.segment.dml.item.ColumnProjectionSegment;

diff --git a/...ra/binder/with/WithSegmentBinderTest.java → ...gment/dml/with/WithSegmentBinderTest.java b/...ra/binder/with/WithSegmentBinderTest.java → ...gment/dml/with/WithSegmentBinderTest.java
@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.shardingsphere.infra.binder.with;
+package org.apache.shardingsphere.infra.binder.engine.segment.dml.with;
 
 import com.cedarsoftware.util.CaseInsensitiveMap.CaseInsensitiveString;
 import org.apache.shardingsphere.infra.binder.engine.segment.dml.from.context.type.SimpleTableSegmentBinderContext;
-import org.apache.shardingsphere.infra.binder.engine.segment.dml.with.WithSegmentBinder;
 import org.apache.shardingsphere.infra.binder.engine.statement.SQLStatementBinderContext;
 import org.apache.shardingsphere.infra.hint.HintValueContext;
 import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
@@ -48,22 +47,20 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
 
-public class WithSegmentBinderTest {
+class WithSegmentBinderTest {
 
     @Test
     void assertBind() {
-
         MySQLSelectStatement mySQLSelectStatement = new MySQLSelectStatement();
         ProjectionsSegment projectionSegment = new ProjectionsSegment(42, 48);
         ColumnSegment columnSegment = new ColumnSegment(42, 48, new IdentifierValue("user_id"));
         projectionSegment.getProjections().add(new ColumnProjectionSegment(columnSegment));
         mySQLSelectStatement.setProjections(projectionSegment);
         mySQLSelectStatement.setFrom(new SimpleTableSegment(new TableNameSegment(55, 57, new IdentifierValue("cte"))));
-
         MySQLSelectStatement subqueryMySQLSelectStatement = new MySQLSelectStatement();
         ProjectionsSegment subqueryProjectionSegment = new ProjectionsSegment(20, 20);
         ShorthandProjectionSegment shorthandProjectionSegment = new ShorthandProjectionSegment(20, 20);
@@ -75,22 +72,18 @@ void assertBind() {
         commonTableExpressionSegments.add(new CommonTableExpressionSegment(5, 33, new AliasSegment(5, 7, new IdentifierValue("cte")), subquerySegment));
         WithSegment withSegment = new WithSegment(0, 33, commonTableExpressionSegments);
         mySQLSelectStatement.setWithSegment(withSegment);
-
         SQLStatementBinderContext binderContext = new SQLStatementBinderContext(createMetaData(), "foo_db", new HintValueContext(), mySQLSelectStatement);
         WithSegment actual = WithSegmentBinder.bind(withSegment, binderContext, binderContext.getExternalTableBinderContexts());
-
         assertThat(binderContext.getExternalTableBinderContexts().size(), is(1));
         assertThat(binderContext.getCommonTableExpressionsSegmentsUniqueAliases().size(), is(1));
         assertThat(actual.getStartIndex(), is(0));
         assertTrue(binderContext.getExternalTableBinderContexts().containsKey(new CaseInsensitiveString("cte")));
         assertTrue(actual.getCommonTableExpressions().iterator().next().getAliasName().isPresent());
         assertThat(actual.getCommonTableExpressions().iterator().next().getAliasName().get(), is("cte"));
         assertThat(binderContext.getCommonTableExpressionsSegmentsUniqueAliases().iterator().next(), is("cte"));
-
         SimpleTableSegmentBinderContext simpleTableSegment = (SimpleTableSegmentBinderContext) binderContext.getExternalTableBinderContexts().get(new CaseInsensitiveString("cte")).iterator().next();
         ArrayList<ColumnProjectionSegment> columnProjectionSegments = new ArrayList<>();
         simpleTableSegment.getProjectionSegments().forEach(each -> columnProjectionSegments.add((ColumnProjectionSegment) each));
-
         assertThat(columnProjectionSegments.get(0).getColumn().getIdentifier().getValue(), is("user_id"));
         assertThat(columnProjectionSegments.get(1).getColumn().getIdentifier().getValue(), is("name"));
         assertTrue(columnProjectionSegments.get(1).getColumn().getOwner().isPresent());
@@ -108,13 +101,11 @@ private ShardingSphereMetaData createMetaData() {
         when(schema.getTable("t_user").getAllColumns()).thenReturn(Arrays.asList(
                 new ShardingSphereColumn("user_id", Types.INTEGER, true, false, false, true, false, false),
                 new ShardingSphereColumn("name", Types.VARCHAR, false, false, false, true, false, false)));
-
         ShardingSphereMetaData result = mock(ShardingSphereMetaData.class, RETURNS_DEEP_STUBS);
         when(result.getDatabase("foo_db").getSchema("foo_db")).thenReturn(schema);
         when(result.containsDatabase("foo_db")).thenReturn(true);
         when(result.getDatabase("foo_db").containsSchema("foo_db")).thenReturn(true);
         when(result.getDatabase("foo_db").getSchema("foo_db").containsTable("t_user")).thenReturn(true);
         return result;
     }
-
 }
diff --git a/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select-using-with-clause.xml b/test/e2e/sql/src/test/resources/cases/dql/e2e-dql-select-using-with-clause.xml
@@ -19,4 +19,4 @@
     <test-case sql="WITH products AS (SELECT * FROM t_product) SELECT * FROM products" db-types="MySQL" scenario-types="db">
         <assertion />
     </test-case>
-</e2e-test-cases>
+</e2e-test-cases>