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 567b94ec7b3 Rename CursorAware (#32098)
567b94ec7b3 is described below
commit 567b94ec7b34c78a4031365cd673f14e5d837acb
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jul 14 16:42:02 2024 +0800
Rename CursorAware (#32098)
* Rename CursorAware
* Rename CursorAware
---
.../rewrite/token/generator/impl/ShardingTableTokenGenerator.java | 4 ++--
.../sharding/merge/ddl/ShardingDDLResultMergerTest.java | 2 +-
.../sharding/merge/ddl/fetch/FetchStreamMergedResultTest.java | 2 +-
.../aware/{CursorDefinitionAware.java => CursorAware.java} | 8 ++++----
.../infra/binder/context/statement/ddl/CloseStatementContext.java | 6 +++---
.../binder/context/statement/ddl/CursorStatementContext.java | 3 +--
.../infra/binder/context/statement/ddl/FetchStatementContext.java | 6 +++---
.../infra/binder/context/statement/ddl/MoveStatementContext.java | 6 +++---
.../shardingsphere/proxy/backend/connector/DatabaseConnector.java | 6 +++---
.../proxy/backend/handler/distsql/rul/PreviewExecutor.java | 6 +++---
.../shardingsphere/test/it/rewrite/engine/SQLRewriterIT.java | 6 +++---
11 files changed, 27 insertions(+), 28 deletions(-)
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingTableTokenGenerator.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingTableTokenGenerator.java
index 498eda4a516..078b0575c2f 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingTableTokenGenerator.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/generator/impl/ShardingTableTokenGenerator.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.sharding.rewrite.token.generator.impl;
import lombok.Setter;
-import
org.apache.shardingsphere.infra.binder.context.aware.CursorDefinitionAware;
+import org.apache.shardingsphere.infra.binder.context.aware.CursorAware;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import org.apache.shardingsphere.infra.binder.context.type.TableAvailable;
import
org.apache.shardingsphere.infra.rewrite.sql.token.generator.CollectionSQLTokenGenerator;
@@ -47,7 +47,7 @@ public final class ShardingTableTokenGenerator implements
CollectionSQLTokenGene
@Override
public boolean isGenerateSQLToken(final SQLStatementContext
sqlStatementContext) {
- return !(sqlStatementContext instanceof CursorDefinitionAware) &&
(isAllBindingTables(sqlStatementContext) ||
routeContext.containsTableSharding());
+ return !(sqlStatementContext instanceof CursorAware) &&
(isAllBindingTables(sqlStatementContext) ||
routeContext.containsTableSharding());
}
private boolean isAllBindingTables(final SQLStatementContext
sqlStatementContext) {
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ddl/ShardingDDLResultMergerTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ddl/ShardingDDLResultMergerTest.java
index 8b426566d2e..1d931b1796f 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ddl/ShardingDDLResultMergerTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ddl/ShardingDDLResultMergerTest.java
@@ -85,7 +85,7 @@ class ShardingDDLResultMergerTest {
OpenGaussFetchStatement fetchStatement = createFetchStatement();
FetchStatementContext result = new
FetchStatementContext(fetchStatement, DefaultDatabase.LOGIC_NAME);
CursorStatementContext cursorStatementContext =
createCursorStatementContext(database);
- result.setUpCursorDefinition(cursorStatementContext);
+ result.setCursorStatementContext(cursorStatementContext);
return result;
}
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ddl/fetch/FetchStreamMergedResultTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ddl/fetch/FetchStreamMergedResultTest.java
index 80cca260f9d..550867c0685 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ddl/fetch/FetchStreamMergedResultTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/ddl/fetch/FetchStreamMergedResultTest.java
@@ -87,7 +87,7 @@ class FetchStreamMergedResultTest {
private static FetchStatementContext createFetchStatementContext(final
boolean containsAllDirectionType) {
FetchStatementContext result = new
FetchStatementContext(createFetchStatement(containsAllDirectionType),
DefaultDatabase.LOGIC_NAME);
- result.setUpCursorDefinition(createCursorStatementContext());
+ result.setCursorStatementContext(createCursorStatementContext());
return result;
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/aware/CursorDefinitionAware.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/aware/CursorAware.java
similarity index 85%
rename from
infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/aware/CursorDefinitionAware.java
rename to
infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/aware/CursorAware.java
index 982b87f860d..214ced27a33 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/aware/CursorDefinitionAware.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/aware/CursorAware.java
@@ -20,14 +20,14 @@ package
org.apache.shardingsphere.infra.binder.context.aware;
import
org.apache.shardingsphere.infra.binder.context.statement.ddl.CursorStatementContext;
/**
- * Cursor definition aware.
+ * Cursor aware.
*/
-public interface CursorDefinitionAware {
+public interface CursorAware {
/**
- * Set up cursor definition.
+ * Set cursor statement context.
*
* @param cursorStatementContext cursor statement context
*/
- void setUpCursorDefinition(CursorStatementContext cursorStatementContext);
+ void setCursorStatementContext(CursorStatementContext
cursorStatementContext);
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CloseStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CloseStatementContext.java
index 73f844a0009..95bb62adeb9 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CloseStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CloseStatementContext.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.binder.context.statement.ddl;
import lombok.Getter;
-import
org.apache.shardingsphere.infra.binder.context.aware.CursorDefinitionAware;
+import org.apache.shardingsphere.infra.binder.context.aware.CursorAware;
import
org.apache.shardingsphere.infra.binder.context.segment.table.TablesContext;
import
org.apache.shardingsphere.infra.binder.context.statement.CommonSQLStatementContext;
import org.apache.shardingsphere.infra.binder.context.type.CursorAvailable;
@@ -38,7 +38,7 @@ import java.util.Optional;
* Close statement context.
*/
@Getter
-public final class CloseStatementContext extends CommonSQLStatementContext
implements CursorAvailable, TableAvailable, WhereAvailable,
CursorDefinitionAware {
+public final class CloseStatementContext extends CommonSQLStatementContext
implements CursorAvailable, TableAvailable, WhereAvailable, CursorAware {
private CursorStatementContext cursorStatementContext;
@@ -60,7 +60,7 @@ public final class CloseStatementContext extends
CommonSQLStatementContext imple
}
@Override
- public void setUpCursorDefinition(final CursorStatementContext
cursorStatementContext) {
+ public void setCursorStatementContext(final CursorStatementContext
cursorStatementContext) {
this.cursorStatementContext = cursorStatementContext;
tablesContext = cursorStatementContext.getTablesContext();
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CursorStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CursorStatementContext.java
index ab7dc60a0f8..ed4ba7a561b 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CursorStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/CursorStatementContext.java
@@ -55,8 +55,7 @@ public final class CursorStatementContext extends
CommonSQLStatementContext impl
private final SelectStatementContext selectStatementContext;
- public CursorStatementContext(final ShardingSphereMetaData metaData, final
List<Object> params,
- final CursorStatement sqlStatement, final
String currentDatabaseName) {
+ public CursorStatementContext(final ShardingSphereMetaData metaData, final
List<Object> params, final CursorStatement sqlStatement, final String
currentDatabaseName) {
super(sqlStatement);
tablesContext = new TablesContext(getSimpleTableSegments(),
getDatabaseType(), currentDatabaseName);
selectStatementContext = new SelectStatementContext(metaData, params,
sqlStatement.getSelect(), currentDatabaseName, Collections.emptyList());
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/FetchStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/FetchStatementContext.java
index 1a12f3eebaf..385b1736a17 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/FetchStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/FetchStatementContext.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.binder.context.statement.ddl;
import lombok.Getter;
-import
org.apache.shardingsphere.infra.binder.context.aware.CursorDefinitionAware;
+import org.apache.shardingsphere.infra.binder.context.aware.CursorAware;
import
org.apache.shardingsphere.infra.binder.context.segment.table.TablesContext;
import
org.apache.shardingsphere.infra.binder.context.statement.CommonSQLStatementContext;
import org.apache.shardingsphere.infra.binder.context.type.CursorAvailable;
@@ -38,7 +38,7 @@ import java.util.Optional;
* Fetch statement context.
*/
@Getter
-public final class FetchStatementContext extends CommonSQLStatementContext
implements CursorAvailable, TableAvailable, WhereAvailable,
CursorDefinitionAware {
+public final class FetchStatementContext extends CommonSQLStatementContext
implements CursorAvailable, TableAvailable, WhereAvailable, CursorAware {
private CursorStatementContext cursorStatementContext;
@@ -60,7 +60,7 @@ public final class FetchStatementContext extends
CommonSQLStatementContext imple
}
@Override
- public void setUpCursorDefinition(final CursorStatementContext
cursorStatementContext) {
+ public void setCursorStatementContext(final CursorStatementContext
cursorStatementContext) {
this.cursorStatementContext = cursorStatementContext;
tablesContext = cursorStatementContext.getTablesContext();
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/MoveStatementContext.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/MoveStatementContext.java
index 291f191572f..d3f91659fc6 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/MoveStatementContext.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/ddl/MoveStatementContext.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.infra.binder.context.statement.ddl;
import lombok.Getter;
-import
org.apache.shardingsphere.infra.binder.context.aware.CursorDefinitionAware;
+import org.apache.shardingsphere.infra.binder.context.aware.CursorAware;
import
org.apache.shardingsphere.infra.binder.context.segment.table.TablesContext;
import
org.apache.shardingsphere.infra.binder.context.statement.CommonSQLStatementContext;
import org.apache.shardingsphere.infra.binder.context.type.CursorAvailable;
@@ -38,7 +38,7 @@ import java.util.Optional;
* Move statement context.
*/
@Getter
-public final class MoveStatementContext extends CommonSQLStatementContext
implements CursorAvailable, TableAvailable, WhereAvailable,
CursorDefinitionAware {
+public final class MoveStatementContext extends CommonSQLStatementContext
implements CursorAvailable, TableAvailable, WhereAvailable, CursorAware {
private CursorStatementContext cursorStatementContext;
@@ -60,7 +60,7 @@ public final class MoveStatementContext extends
CommonSQLStatementContext implem
}
@Override
- public void setUpCursorDefinition(final CursorStatementContext
cursorStatementContext) {
+ public void setCursorStatementContext(final CursorStatementContext
cursorStatementContext) {
this.cursorStatementContext = cursorStatementContext;
tablesContext = cursorStatementContext.getTablesContext();
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnector.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnector.java
index fd89923b5fe..ea4b7693487 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnector.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/connector/DatabaseConnector.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.proxy.backend.connector;
import com.google.common.base.Preconditions;
-import
org.apache.shardingsphere.infra.binder.context.aware.CursorDefinitionAware;
+import org.apache.shardingsphere.infra.binder.context.aware.CursorAware;
import
org.apache.shardingsphere.infra.binder.context.segment.insert.keygen.GeneratedKeyContext;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import
org.apache.shardingsphere.infra.binder.context.statement.ddl.CloseStatementContext;
@@ -269,10 +269,10 @@ public final class DatabaseConnector implements
DatabaseBackendHandler {
if (statementContext instanceof CursorStatementContext) {
connectionSession.getConnectionContext().getCursorContext().getCursorStatementContexts().put(cursorName,
(CursorStatementContext) statementContext);
}
- if (statementContext instanceof CursorDefinitionAware) {
+ if (statementContext instanceof CursorAware) {
CursorStatementContext cursorStatementContext =
connectionSession.getConnectionContext().getCursorContext().getCursorStatementContexts().get(cursorName);
Preconditions.checkArgument(null != cursorStatementContext,
"Cursor %s does not exist.", cursorName);
- ((CursorDefinitionAware)
statementContext).setUpCursorDefinition(cursorStatementContext);
+ ((CursorAware)
statementContext).setCursorStatementContext(cursorStatementContext);
}
if (statementContext instanceof CloseStatementContext) {
connectionSession.getConnectionContext().getCursorContext().removeCursor(cursorName);
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/PreviewExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/PreviewExecutor.java
index a34630354ce..57230b19e75 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/PreviewExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/PreviewExecutor.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.distsql.handler.aware.DistSQLExecutorDatabaseAw
import
org.apache.shardingsphere.distsql.handler.engine.DistSQLConnectionContext;
import
org.apache.shardingsphere.distsql.handler.engine.query.DistSQLQueryExecutor;
import org.apache.shardingsphere.distsql.statement.rul.sql.PreviewStatement;
-import
org.apache.shardingsphere.infra.binder.context.aware.CursorDefinitionAware;
+import org.apache.shardingsphere.infra.binder.context.aware.CursorAware;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import
org.apache.shardingsphere.infra.binder.context.statement.ddl.CursorStatementContext;
import org.apache.shardingsphere.infra.binder.context.type.CursorAvailable;
@@ -94,7 +94,7 @@ public final class PreviewExecutor implements
DistSQLQueryExecutor<PreviewStatem
SQLStatement toBePreviewedStatement =
metaData.getGlobalRuleMetaData().getSingleRule(SQLParserRule.class).getSQLParserEngine(database.getProtocolType()).parse(toBePreviewedSQL,
false);
SQLStatementContext toBePreviewedStatementContext = new
SQLBindEngine(metaData, database.getName(),
hintValueContext).bind(toBePreviewedStatement, Collections.emptyList());
QueryContext queryContext = new
QueryContext(toBePreviewedStatementContext, toBePreviewedSQL,
Collections.emptyList(), hintValueContext,
connectionContext.getConnectionContext(), metaData);
- if (toBePreviewedStatementContext instanceof CursorAvailable &&
toBePreviewedStatementContext instanceof CursorDefinitionAware) {
+ if (toBePreviewedStatementContext instanceof CursorAvailable &&
toBePreviewedStatementContext instanceof CursorAware) {
setUpCursorDefinition(toBePreviewedStatementContext);
}
ShardingSpherePreconditions.checkState(database.isComplete(), () ->
new EmptyRuleException(database.getName()));
@@ -127,7 +127,7 @@ public final class PreviewExecutor implements
DistSQLQueryExecutor<PreviewStatem
String cursorName = ((CursorAvailable)
toBePreviewedStatementContext).getCursorName().get().getIdentifier().getValue().toLowerCase();
CursorStatementContext cursorStatementContext =
connectionContext.getConnectionContext().getCursorContext().getCursorStatementContexts().get(cursorName);
Preconditions.checkNotNull(cursorStatementContext, "Cursor %s does not
exist.", cursorName);
- ((CursorDefinitionAware)
toBePreviewedStatementContext).setUpCursorDefinition(cursorStatementContext);
+ ((CursorAware)
toBePreviewedStatementContext).setCursorStatementContext(cursorStatementContext);
}
private Collection<ExecutionUnit> getFederationExecutionUnits(final
QueryContext queryContext, final ShardingSphereMetaData metaData, final
SQLFederationEngine federationEngine) {
diff --git
a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/SQLRewriterIT.java
b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/SQLRewriterIT.java
index c5ca4c72070..5d60da2aebd 100644
---
a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/SQLRewriterIT.java
+++
b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/SQLRewriterIT.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.it.rewrite.engine;
import com.google.common.base.Preconditions;
-import
org.apache.shardingsphere.infra.binder.context.aware.CursorDefinitionAware;
+import org.apache.shardingsphere.infra.binder.context.aware.CursorAware;
import org.apache.shardingsphere.infra.binder.context.aware.ParameterAware;
import
org.apache.shardingsphere.infra.binder.context.statement.SQLStatementContext;
import
org.apache.shardingsphere.infra.binder.context.statement.ddl.CursorStatementContext;
@@ -142,8 +142,8 @@ public abstract class SQLRewriterIT {
if (sqlStatementContext instanceof ParameterAware) {
((ParameterAware)
sqlStatementContext).setUpParameters(testParams.getInputParameters());
}
- if (sqlStatementContext instanceof CursorDefinitionAware) {
- ((CursorDefinitionAware)
sqlStatementContext).setUpCursorDefinition(createCursorDefinition(databaseName,
metaData, sqlStatementParserEngine));
+ if (sqlStatementContext instanceof CursorAware) {
+ ((CursorAware)
sqlStatementContext).setCursorStatementContext(createCursorDefinition(databaseName,
metaData, sqlStatementParserEngine));
}
ConnectionContext connectionContext = mock(ConnectionContext.class);
when(connectionContext.getCursorContext()).thenReturn(new
CursorConnectionContext());
