You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2024/06/12 17:29:34 UTC
(shardingsphere) branch master updated: Add SelectStatementContext.containsDerivedProjections (#31677)
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 8b95ec2dccc Add SelectStatementContext.containsDerivedProjections (#31677)
8b95ec2dccc is described below
commit 8b95ec2dccc2d45b2d39def3b444ec872f31807c
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Thu Jun 13 01:29:25 2024 +0800
Add SelectStatementContext.containsDerivedProjections (#31677)
* Add SelectStatementContext.containsDerivedProjections
* Add SelectStatementContext.containsDerivedProjections
* Refactor DatabaseConnector
---
.../context/statement/dml/SelectStatementContext.java | 9 +++++++++
.../core/resultset/ShardingSphereResultSetMetaData.java | 14 +++++---------
.../jdbc/core/resultset/ShardingSphereResultSetUtils.java | 8 +-------
.../core/resultset/ShardingSphereResultSetUtilsTest.java | 2 +-
.../proxy/backend/connector/DatabaseConnector.java | 12 ++++--------
5 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/SelectStatementContext.java b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/SelectStatementContext.java
index 3a07257f467..cbbc5408022 100644
--- a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/SelectStatementContext.java
+++ b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/statement/dml/SelectStatementContext.java
@@ -406,6 +406,15 @@ public final class SelectStatementContext extends CommonSQLStatementContext impl
return getSqlStatement().getFrom().isPresent() && getSqlStatement().getFrom().get() instanceof SubqueryTableSegment || getSqlStatement().getWithSegment().isPresent();
}
+ /**
+ * Judge whether contains derived projections.
+ *
+ * @return contains derived projections or not
+ */
+ public boolean containsDerivedProjections() {
+ return containsEnhancedTable && !projectionsContext.getExpandProjections().isEmpty();
+ }
+
@Override
public void setUpParameters(final List<Object> params) {
paginationContext = new PaginationContextEngine(getDatabaseType()).createPaginationContext(getSqlStatement(), projectionsContext, params, whereSegments);
diff --git a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetMetaData.java b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetMetaData.java
index af0c0e21f45..60d912071aa 100644
--- a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetMetaData.java
+++ b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetMetaData.java
@@ -46,13 +46,9 @@ public final class ShardingSphereResultSetMetaData extends WrapperAdapter implem
@Override
public int getColumnCount() throws SQLException {
- return containsDerivedProjections() ? ((SelectStatementContext) sqlStatementContext).getProjectionsContext().getExpandProjections().size() : resultSetMetaData.getColumnCount();
- }
-
- private boolean containsDerivedProjections() {
- return sqlStatementContext instanceof SelectStatementContext
- && ((SelectStatementContext) sqlStatementContext).isContainsEnhancedTable()
- && !((SelectStatementContext) sqlStatementContext).getProjectionsContext().getExpandProjections().isEmpty();
+ return sqlStatementContext instanceof SelectStatementContext && ((SelectStatementContext) sqlStatementContext).containsDerivedProjections()
+ ? ((SelectStatementContext) sqlStatementContext).getProjectionsContext().getExpandProjections().size()
+ : resultSetMetaData.getColumnCount();
}
@Override
@@ -92,7 +88,7 @@ public final class ShardingSphereResultSetMetaData extends WrapperAdapter implem
@Override
public String getColumnLabel(final int column) throws SQLException {
- if (containsDerivedProjections()) {
+ if (sqlStatementContext instanceof SelectStatementContext && ((SelectStatementContext) sqlStatementContext).containsDerivedProjections()) {
checkColumnIndex(column);
return ((SelectStatementContext) sqlStatementContext).getProjectionsContext().getExpandProjections().get(column - 1).getColumnLabel();
}
@@ -101,7 +97,7 @@ public final class ShardingSphereResultSetMetaData extends WrapperAdapter implem
@Override
public String getColumnName(final int column) throws SQLException {
- if (containsDerivedProjections()) {
+ if (sqlStatementContext instanceof SelectStatementContext && ((SelectStatementContext) sqlStatementContext).containsDerivedProjections()) {
checkColumnIndex(column);
return ((SelectStatementContext) sqlStatementContext).getProjectionsContext().getExpandProjections().get(column - 1).getColumnName();
}
diff --git a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtils.java b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtils.java
index e3c8df2e411..40cb59b7f74 100644
--- a/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtils.java
+++ b/jdbc/src/main/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtils.java
@@ -45,7 +45,7 @@ public final class ShardingSphereResultSetUtils {
* @throws SQLException SQL exception
*/
public static Map<String, Integer> createColumnLabelAndIndexMap(final SQLStatementContext sqlStatementContext, final ResultSetMetaData resultSetMetaData) throws SQLException {
- if (containsDerivedProjections(sqlStatementContext)) {
+ if (sqlStatementContext instanceof SelectStatementContext && ((SelectStatementContext) sqlStatementContext).containsDerivedProjections()) {
return createColumnLabelAndIndexMapWithExpandProjections((SelectStatementContext) sqlStatementContext);
}
Map<String, Integer> result = new CaseInsensitiveMap<>(resultSetMetaData.getColumnCount(), 1F);
@@ -55,12 +55,6 @@ public final class ShardingSphereResultSetUtils {
return result;
}
- private static boolean containsDerivedProjections(final SQLStatementContext sqlStatementContext) {
- return sqlStatementContext instanceof SelectStatementContext
- && ((SelectStatementContext) sqlStatementContext).isContainsEnhancedTable()
- && !((SelectStatementContext) sqlStatementContext).getProjectionsContext().getExpandProjections().isEmpty();
- }
-
private static Map<String, Integer> createColumnLabelAndIndexMapWithExpandProjections(final SelectStatementContext statementContext) {
List<Projection> actualProjections = statementContext.getProjectionsContext().getExpandProjections();
Map<String, Integer> result = new CaseInsensitiveMap<>(actualProjections.size(), 1F);
diff --git a/jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtilsTest.java b/jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtilsTest.java
index 571b4f04ed4..c16f135ec42 100644
--- a/jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtilsTest.java
+++ b/jdbc/src/test/java/org/apache/shardingsphere/driver/jdbc/core/resultset/ShardingSphereResultSetUtilsTest.java
@@ -53,7 +53,7 @@ class ShardingSphereResultSetUtilsTest {
@Test
void assertCreateColumnLabelAndIndexMapWithSelectWithExpandProjections() throws SQLException {
SelectStatementContext selectStatementContext = mock(SelectStatementContext.class);
- when(selectStatementContext.isContainsEnhancedTable()).thenReturn(true);
+ when(selectStatementContext.containsDerivedProjections()).thenReturn(true);
List<Projection> projections = new ArrayList<>(2);
projections.add(new ColumnProjection(null, "col1", null, mock(DatabaseType.class)));
projections.add(new ColumnProjection(null, "col2", null, mock(DatabaseType.class)));
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 191b2587c1c..3f1e06e8788 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
@@ -105,7 +105,7 @@ public final class DatabaseConnector implements DatabaseBackendHandler {
private final ShardingSphereDatabase database;
- private final boolean selectContainsEnhancedTable;
+ private final boolean containsDerivedProjections;
private final QueryContext queryContext;
@@ -121,7 +121,7 @@ public final class DatabaseConnector implements DatabaseBackendHandler {
this.driverType = driverType;
this.database = database;
this.queryContext = queryContext;
- selectContainsEnhancedTable = sqlStatementContext instanceof SelectStatementContext && ((SelectStatementContext) sqlStatementContext).isContainsEnhancedTable();
+ containsDerivedProjections = sqlStatementContext instanceof SelectStatementContext && ((SelectStatementContext) sqlStatementContext).containsDerivedProjections();
this.databaseConnectionManager = databaseConnectionManager;
if (sqlStatementContext instanceof CursorAvailable) {
prepareCursorStatementContext((CursorAvailable) sqlStatementContext, databaseConnectionManager.getConnectionSession());
@@ -305,18 +305,14 @@ public final class DatabaseConnector implements DatabaseBackendHandler {
}
private int getColumnCount(final SQLStatementContext sqlStatementContext, final QueryResult queryResultSample) throws SQLException {
- return selectContainsEnhancedTable && hasSelectExpandProjections(sqlStatementContext)
+ return containsDerivedProjections
? ((SelectStatementContext) sqlStatementContext).getProjectionsContext().getExpandProjections().size()
: queryResultSample.getMetaData().getColumnCount();
}
- private boolean hasSelectExpandProjections(final SQLStatementContext sqlStatementContext) {
- return sqlStatementContext instanceof SelectStatementContext && !((SelectStatementContext) sqlStatementContext).getProjectionsContext().getExpandProjections().isEmpty();
- }
-
private QueryHeader createQueryHeader(final QueryHeaderBuilderEngine queryHeaderBuilderEngine, final SQLStatementContext sqlStatementContext,
final QueryResult queryResultSample, final ShardingSphereDatabase database, final int columnIndex) throws SQLException {
- return selectContainsEnhancedTable && hasSelectExpandProjections(sqlStatementContext)
+ return containsDerivedProjections
? queryHeaderBuilderEngine.build(((SelectStatementContext) sqlStatementContext).getProjectionsContext(), queryResultSample.getMetaData(), database, columnIndex)
: queryHeaderBuilderEngine.build(queryResultSample.getMetaData(), database, columnIndex);
}