This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-22611
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/ignite-22611 by this push:
new 7ececa4677 Avoid extending AutoClosable in Statement.
7ececa4677 is described below
commit 7ececa4677ad4b19a4b9a4663dbd239564111a20
Author: amashenkov <[email protected]>
AuthorDate: Fri Jun 28 16:38:38 2024 +0300
Avoid extending AutoClosable in Statement.
---
.../apache/ignite/example/sql/SqlApiExample.java | 31 ++++++++++------------
.../main/java/org/apache/ignite/sql/Statement.java | 6 +----
.../apache/ignite/internal/sql/StatementImpl.java | 6 -----
.../ignite/internal/benchmark/SelectBenchmark.java | 6 ++---
.../internal/sql/api/StatementBuilderImplTest.java | 16 +++++------
5 files changed, 26 insertions(+), 39 deletions(-)
diff --git
a/examples/src/main/java/org/apache/ignite/example/sql/SqlApiExample.java
b/examples/src/main/java/org/apache/ignite/example/sql/SqlApiExample.java
index b9a762ce48..dd741d465f 100644
--- a/examples/src/main/java/org/apache/ignite/example/sql/SqlApiExample.java
+++ b/examples/src/main/java/org/apache/ignite/example/sql/SqlApiExample.java
@@ -93,22 +93,21 @@ public class SqlApiExample {
try {
System.out.println("\nPopulating 'CITIES' table...");
- try (Statement stmt = client.sql().createStatement("INSERT
INTO CITIES (ID, NAME) VALUES (?, ?)")) {
- long rowsAdded = 0;
-
- try (ResultSet<?> rs = client.sql().execute(tx, stmt, 1,
"Forest Hill")) {
- rowsAdded += rs.affectedRows();
- }
- try (ResultSet<?> rs = client.sql().execute(tx, stmt, 2,
"Denver")) {
- rowsAdded += rs.affectedRows();
- }
- try (ResultSet<?> rs = client.sql().execute(tx, stmt, 3,
"St. Petersburg")) {
- rowsAdded += rs.affectedRows();
- }
-
- System.out.println("\nAdded cities: " + rowsAdded);
+ Statement stmt = client.sql().createStatement("INSERT INTO
CITIES (ID, NAME) VALUES (?, ?)");
+ long rowsAdded = 0;
+
+ try (ResultSet<?> rs = client.sql().execute(tx, stmt, 1,
"Forest Hill")) {
+ rowsAdded += rs.affectedRows();
+ }
+ try (ResultSet<?> rs = client.sql().execute(tx, stmt, 2,
"Denver")) {
+ rowsAdded += rs.affectedRows();
+ }
+ try (ResultSet<?> rs = client.sql().execute(tx, stmt, 3, "St.
Petersburg")) {
+ rowsAdded += rs.affectedRows();
}
+ System.out.println("\nAdded cities: " + rowsAdded);
+
//--------------------------------------------------------------------------------------
//
// Populating 'ACCOUNTS' table.
@@ -117,7 +116,7 @@ public class SqlApiExample {
System.out.println("\nPopulating 'ACCOUNTS' table...");
- long rowsAdded = Arrays.stream(client.sql().executeBatch(tx,
+ rowsAdded = Arrays.stream(client.sql().executeBatch(tx,
"INSERT INTO ACCOUNTS (ACCOUNT_ID, CITY_ID,
FIRST_NAME, LAST_NAME, BALANCE) values (?, ?, ?, ?, ?)",
BatchedArguments.of(1, 1, "John", "Doe",
1000.0d)
.add(2, 1, "Jane", "Roe", 2000.0d)
@@ -221,8 +220,6 @@ public class SqlApiExample {
.thenCompose(SqlApiExample::fetchAllRowsInto)
.get();
- stmt.close();
-
System.out.println("\nDropping the tables...");
client.sql().executeScript(
diff --git a/modules/api/src/main/java/org/apache/ignite/sql/Statement.java
b/modules/api/src/main/java/org/apache/ignite/sql/Statement.java
index a2ae260aec..11e6dd29b3 100644
--- a/modules/api/src/main/java/org/apache/ignite/sql/Statement.java
+++ b/modules/api/src/main/java/org/apache/ignite/sql/Statement.java
@@ -29,7 +29,7 @@ import java.util.concurrent.TimeUnit;
* If the server-side state does not exist due to any reason - the very first
run, current client node reconnect, cache
* invalidation, etc. - this state is restored automatically. This may cause
the user to experience a slightly increased latency.
*/
-public interface Statement extends AutoCloseable {
+public interface Statement {
/**
* Returns a string representation of an SQL statement.
*
@@ -75,10 +75,6 @@ public interface Statement extends AutoCloseable {
*/
StatementBuilder toBuilder();
- /** {@inheritDoc} */
- @Override
- void close();
-
/**
* Statement builder provides methods for building a statement object,
which represents a query and holds query-specific
* settings that overrides the session defaults.
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/sql/StatementImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/sql/StatementImpl.java
index fc8000c81e..7c99139447 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/sql/StatementImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/sql/StatementImpl.java
@@ -120,10 +120,4 @@ public class StatementImpl implements Statement {
.pageSize(pageSize)
.queryTimeout(queryTimeoutMs, TimeUnit.MILLISECONDS);
}
-
- /** {@inheritDoc} */
- @Override
- public void close() {
- // No-op.
- }
}
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/benchmark/SelectBenchmark.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/benchmark/SelectBenchmark.java
index 85a2b3f109..2367f828ed 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/benchmark/SelectBenchmark.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/benchmark/SelectBenchmark.java
@@ -230,9 +230,9 @@ public class SelectBenchmark extends
AbstractMultiNodeBenchmark {
/** Initializes session. */
@Setup
public void setUp() throws Exception {
- try (Statement statement =
clusterNode.sql().createStatement("SELECT 1")) {
- pageSize = statement.pageSize();
- }
+ Statement statement = clusterNode.sql().createStatement("SELECT
1");
+
+ pageSize = statement.pageSize();
}
private Iterator<InternalSqlRow> query(String sql, Object... args) {
diff --git
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/api/StatementBuilderImplTest.java
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/api/StatementBuilderImplTest.java
index 9f603e0afa..be8cd08a5a 100644
---
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/api/StatementBuilderImplTest.java
+++
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/api/StatementBuilderImplTest.java
@@ -86,14 +86,14 @@ public class StatementBuilderImplTest {
}
@Test
- public void checkDefaultParameters() throws Exception {
- try (Statement statement = builder.query(QUERY).build()) {
- assertThat(statement.defaultSchema(),
is(SqlCommon.DEFAULT_SCHEMA_NAME));
- assertThat(statement.query(), is(QUERY));
- assertThat(statement.timeZoneId(), is(ZoneId.systemDefault()));
- assertThat(statement.pageSize(), is(SqlCommon.DEFAULT_PAGE_SIZE));
- assertThat(statement.queryTimeout(TimeUnit.NANOSECONDS), is(0L));
- }
+ public void checkDefaultParameters() {
+ Statement statement = builder.query(QUERY).build();
+
+ assertThat(statement.defaultSchema(),
is(SqlCommon.DEFAULT_SCHEMA_NAME));
+ assertThat(statement.query(), is(QUERY));
+ assertThat(statement.timeZoneId(), is(ZoneId.systemDefault()));
+ assertThat(statement.pageSize(), is(SqlCommon.DEFAULT_PAGE_SIZE));
+ assertThat(statement.queryTimeout(TimeUnit.NANOSECONDS), is(0L));
}
@Test
