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 ccfb091e93a Add more tests for fetch size setters (#37610)
ccfb091e93a is described below
commit ccfb091e93a7c5d7e295a9322fbc2e68051f5bde
Author: Liang Zhang <[email protected]>
AuthorDate: Thu Jan 1 21:45:32 2026 +0800
Add more tests for fetch size setters (#37610)
* Add more SQL parser test cases on ClickHouse
* Add more tests for fetch size setters
---
...StatementMemoryStrictlyFetchSizeSetterTest.java | 27 ++++++++++++++++++----
...StatementMemoryStrictlyFetchSizeSetterTest.java | 27 ++++++++++++++++++----
.../executor/OpenGaussSelectVersionExecutor.java | 1 -
...StatementMemoryStrictlyFetchSizeSetterTest.java | 27 ++++++++++++++++++----
4 files changed, 66 insertions(+), 16 deletions(-)
diff --git
a/proxy/backend/dialect/firebird/src/test/java/org/apache/shardingsphere/proxy/backend/firebird/connector/jdbc/statement/FirebirdStatementMemoryStrictlyFetchSizeSetterTest.java
b/proxy/backend/dialect/firebird/src/test/java/org/apache/shardingsphere/proxy/backend/firebird/connector/jdbc/statement/FirebirdStatementMemoryStrictlyFetchSizeSetterTest.java
index 9595cb47664..3a33da528b7 100644
---
a/proxy/backend/dialect/firebird/src/test/java/org/apache/shardingsphere/proxy/backend/firebird/connector/jdbc/statement/FirebirdStatementMemoryStrictlyFetchSizeSetterTest.java
+++
b/proxy/backend/dialect/firebird/src/test/java/org/apache/shardingsphere/proxy/backend/firebird/connector/jdbc/statement/FirebirdStatementMemoryStrictlyFetchSizeSetterTest.java
@@ -17,8 +17,12 @@
package
org.apache.shardingsphere.proxy.backend.firebird.connector.jdbc.statement;
+import
org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
+import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
+import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.manager.ContextManager;
+import
org.apache.shardingsphere.proxy.backend.connector.jdbc.statement.StatementMemoryStrictlyFetchSizeSetter;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import
org.apache.shardingsphere.test.infra.framework.extension.mock.AutoMockExtension;
import
org.apache.shardingsphere.test.infra.framework.extension.mock.StaticMockSettings;
@@ -37,18 +41,31 @@ import static org.mockito.Mockito.when;
@StaticMockSettings(ProxyContext.class)
class FirebirdStatementMemoryStrictlyFetchSizeSetterTest {
+ private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "Firebird");
+
+ private final StatementMemoryStrictlyFetchSizeSetter fetchSizeSetter =
DatabaseTypedSPILoader.getService(StatementMemoryStrictlyFetchSizeSetter.class,
databaseType);
+
@Test
- void assertSetFetchSize() throws SQLException {
+ void assertSetFetchSizeWithDefaultValue() throws SQLException {
Statement statement = mock(Statement.class);
- ContextManager contextManager = mockContextManager();
+ ContextManager contextManager = mockContextManager(-1);
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
- new
FirebirdStatementMemoryStrictlyFetchSizeSetter().setFetchSize(statement);
+ fetchSizeSetter.setFetchSize(statement);
verify(statement).setFetchSize(1);
}
- private ContextManager mockContextManager() {
+ @Test
+ void assertSetFetchSizeWithCustomValue() throws SQLException {
+ Statement statement = mock(Statement.class);
+ ContextManager contextManager = mockContextManager(20);
+
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
+ fetchSizeSetter.setFetchSize(statement);
+ verify(statement).setFetchSize(20);
+ }
+
+ private ContextManager mockContextManager(final int configuredFetchSize) {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
-
when(result.getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE)).thenReturn(-1);
+
when(result.getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE)).thenReturn(configuredFetchSize);
return result;
}
}
diff --git
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/connector/jdbc/statement/MySQLStatementMemoryStrictlyFetchSizeSetterTest.java
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/connector/jdbc/statement/MySQLStatementMemoryStrictlyFetchSizeSetterTest.java
index 3d57d12bbf5..a609d8dcdb8 100644
---
a/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/connector/jdbc/statement/MySQLStatementMemoryStrictlyFetchSizeSetterTest.java
+++
b/proxy/backend/dialect/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/connector/jdbc/statement/MySQLStatementMemoryStrictlyFetchSizeSetterTest.java
@@ -17,8 +17,12 @@
package org.apache.shardingsphere.proxy.backend.mysql.connector.jdbc.statement;
+import
org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
+import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
+import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.manager.ContextManager;
+import
org.apache.shardingsphere.proxy.backend.connector.jdbc.statement.StatementMemoryStrictlyFetchSizeSetter;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import
org.apache.shardingsphere.test.infra.framework.extension.mock.AutoMockExtension;
import
org.apache.shardingsphere.test.infra.framework.extension.mock.StaticMockSettings;
@@ -37,18 +41,31 @@ import static org.mockito.Mockito.when;
@StaticMockSettings(ProxyContext.class)
class MySQLStatementMemoryStrictlyFetchSizeSetterTest {
+ private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "MySQL");
+
+ private final StatementMemoryStrictlyFetchSizeSetter fetchSizeSetter =
DatabaseTypedSPILoader.getService(StatementMemoryStrictlyFetchSizeSetter.class,
databaseType);
+
@Test
- void assertSetFetchSize() throws SQLException {
+ void assertSetFetchSizeWithDefaultValue() throws SQLException {
Statement statement = mock(Statement.class);
- ContextManager contextManager = mockContextManager();
+ ContextManager contextManager = mockContextManager(-1);
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
- new
MySQLStatementMemoryStrictlyFetchSizeSetter().setFetchSize(statement);
+ fetchSizeSetter.setFetchSize(statement);
verify(statement).setFetchSize(Integer.MIN_VALUE);
}
- private ContextManager mockContextManager() {
+ @Test
+ void assertSetFetchSizeWithCustomValue() throws SQLException {
+ Statement statement = mock(Statement.class);
+ ContextManager contextManager = mockContextManager(100);
+
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
+ fetchSizeSetter.setFetchSize(statement);
+ verify(statement).setFetchSize(100);
+ }
+
+ private ContextManager mockContextManager(final int configuredFetchSize) {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
-
when(result.getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE)).thenReturn(-1);
+
when(result.getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE)).thenReturn(configuredFetchSize);
return result;
}
}
diff --git
a/proxy/backend/dialect/opengauss/src/main/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/executor/OpenGaussSelectVersionExecutor.java
b/proxy/backend/dialect/opengauss/src/main/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/executor/OpenGaussSelectVersionExecutor.java
index a88247fdfb7..3bcfbaff901 100644
---
a/proxy/backend/dialect/opengauss/src/main/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/executor/OpenGaussSelectVersionExecutor.java
+++
b/proxy/backend/dialect/opengauss/src/main/java/org/apache/shardingsphere/proxy/backend/opengauss/handler/admin/executor/OpenGaussSelectVersionExecutor.java
@@ -40,7 +40,6 @@ public final class OpenGaussSelectVersionExecutor implements
DatabaseAdminQueryE
private static final String FUNCTION_NAME = "VERSION()";
- @Getter
private MergedResult mergedResult;
@Override
diff --git
a/proxy/backend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/connector/jdbc/statement/PostgreSQLStatementMemoryStrictlyFetchSizeSetterTest.java
b/proxy/backend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/connector/jdbc/statement/PostgreSQLStatementMemoryStrictlyFetchSizeSetterTest.java
index 576b843741e..6652f4e265d 100644
---
a/proxy/backend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/connector/jdbc/statement/PostgreSQLStatementMemoryStrictlyFetchSizeSetterTest.java
+++
b/proxy/backend/dialect/postgresql/src/test/java/org/apache/shardingsphere/proxy/backend/postgresql/connector/jdbc/statement/PostgreSQLStatementMemoryStrictlyFetchSizeSetterTest.java
@@ -17,8 +17,12 @@
package
org.apache.shardingsphere.proxy.backend.postgresql.connector.jdbc.statement;
+import
org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
+import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
+import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.manager.ContextManager;
+import
org.apache.shardingsphere.proxy.backend.connector.jdbc.statement.StatementMemoryStrictlyFetchSizeSetter;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import
org.apache.shardingsphere.test.infra.framework.extension.mock.AutoMockExtension;
import
org.apache.shardingsphere.test.infra.framework.extension.mock.StaticMockSettings;
@@ -37,18 +41,31 @@ import static org.mockito.Mockito.when;
@StaticMockSettings(ProxyContext.class)
class PostgreSQLStatementMemoryStrictlyFetchSizeSetterTest {
+ private final DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "PostgreSQL");
+
+ private final StatementMemoryStrictlyFetchSizeSetter fetchSizeSetter =
DatabaseTypedSPILoader.getService(StatementMemoryStrictlyFetchSizeSetter.class,
databaseType);
+
@Test
- void assertSetFetchSize() throws SQLException {
+ void assertSetFetchSizeWithDefaultValue() throws SQLException {
Statement statement = mock(Statement.class);
- ContextManager contextManager = mockContextManager();
+ ContextManager contextManager = mockContextManager(-1);
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
- new
PostgreSQLStatementMemoryStrictlyFetchSizeSetter().setFetchSize(statement);
+ fetchSizeSetter.setFetchSize(statement);
verify(statement).setFetchSize(1);
}
- private ContextManager mockContextManager() {
+ @Test
+ void assertSetFetchSizeWithCustomValue() throws SQLException {
+ Statement statement = mock(Statement.class);
+ ContextManager contextManager = mockContextManager(10);
+
when(ProxyContext.getInstance().getContextManager()).thenReturn(contextManager);
+ fetchSizeSetter.setFetchSize(statement);
+ verify(statement).setFetchSize(10);
+ }
+
+ private ContextManager mockContextManager(final int configuredFetchSize) {
ContextManager result = mock(ContextManager.class, RETURNS_DEEP_STUBS);
-
when(result.getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE)).thenReturn(-1);
+
when(result.getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.PROXY_BACKEND_QUERY_FETCH_SIZE)).thenReturn(configuredFetchSize);
return result;
}
}
