This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a commit to branch ignite-22681 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit e8c1d67027cabe708fafa08614a01ea13565d158 Author: amashenkov <[email protected]> AuthorDate: Tue Aug 6 15:52:33 2024 +0300 Get rid of useless helper class. --- modules/placement-driver/build.gradle | 1 + .../ItPrimaryReplicaChoiceTest.java | 2 +- .../ItSchemaForwardCompatibilityTest.java | 2 +- .../ItSchemaSyncAndImplicitTransactionsTest.java | 2 +- .../schemasync/ItSchemaSyncAndReplicationTest.java | 2 +- .../schemasync/ItSchemaSyncMultiNodeTest.java | 2 +- .../schemasync/ItSchemaSyncSingleNodeTest.java | 2 +- .../ignite/internal/table/ItDurableFinishTest.java | 2 +- .../partition/ItAbstractPartitionManagerTest.java | 2 +- .../org/apache/ignite/internal/SessionUtils.java | 52 ---------------------- .../internal/sql/engine/util/SqlTestUtils.java | 28 ++++++++++++ .../raftsnapshot/ItTableRaftSnapshotsTest.java | 2 +- .../ignite/internal/rebalance/ItRebalanceTest.java | 2 +- .../internal/table/ItOperationRetryTest.java | 2 +- .../table/ItTransactionPrimaryChangeTest.java | 2 +- .../internal/table/ItTransactionRecoveryTest.java | 2 +- .../internal/table/ItTxResourcesVacuumTest.java | 2 +- modules/transactions/build.gradle | 1 + .../tx/readonly/ItReadOnlyTxInPastTest.java | 2 +- 19 files changed, 45 insertions(+), 67 deletions(-) diff --git a/modules/placement-driver/build.gradle b/modules/placement-driver/build.gradle index 3b7debbdf5..b4034a5be4 100644 --- a/modules/placement-driver/build.gradle +++ b/modules/placement-driver/build.gradle @@ -66,6 +66,7 @@ dependencies { integrationTestImplementation(testFixtures(project(':ignite-storage-api'))) integrationTestImplementation(testFixtures(project(':ignite-distribution-zones'))) integrationTestImplementation(testFixtures(project(':ignite-runner'))) + integrationTestImplementation(testFixtures(project(':ignite-sql-engine'))) integrationTestImplementation(testFixtures(project(':ignite-replicator'))) integrationTestImplementation(testFixtures(project(':ignite-metrics:'))) integrationTestImplementation(testFixtures(project(':ignite-raft'))) diff --git a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/ItPrimaryReplicaChoiceTest.java b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/ItPrimaryReplicaChoiceTest.java index 269d926085..1718628f4a 100644 --- a/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/ItPrimaryReplicaChoiceTest.java +++ b/modules/placement-driver/src/integrationTest/java/org/apache/ignite/internal/placementdriver/ItPrimaryReplicaChoiceTest.java @@ -19,9 +19,9 @@ package org.apache.ignite.internal.placementdriver; import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.stream.Collectors.toSet; -import static org.apache.ignite.internal.SessionUtils.executeUpdate; import static org.apache.ignite.internal.TestWrappers.unwrapTableImpl; import static org.apache.ignite.internal.TestWrappers.unwrapTableViewInternal; +import static org.apache.ignite.internal.sql.engine.util.SqlTestUtils.executeUpdate; import static org.apache.ignite.internal.testframework.IgniteTestUtils.bypassingThreadAssertions; import static org.apache.ignite.internal.testframework.IgniteTestUtils.waitForCondition; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully; diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaForwardCompatibilityTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaForwardCompatibilityTest.java index 3cfdd08f2c..c6322032e4 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaForwardCompatibilityTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaForwardCompatibilityTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.schemasync; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.apache.ignite.internal.SessionUtils.executeUpdate; +import static org.apache.ignite.internal.sql.engine.util.SqlTestUtils.executeUpdate; import static org.apache.ignite.internal.testframework.asserts.CompletableFutureAssert.assertWillThrow; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncAndImplicitTransactionsTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncAndImplicitTransactionsTest.java index 061d5a0b20..6a1217ed22 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncAndImplicitTransactionsTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncAndImplicitTransactionsTest.java @@ -21,7 +21,7 @@ import static java.util.concurrent.CompletableFuture.runAsync; import static java.util.function.Function.identity; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toMap; -import static org.apache.ignite.internal.SessionUtils.executeUpdate; +import static org.apache.ignite.internal.sql.engine.util.SqlTestUtils.executeUpdate; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully; import static org.hamcrest.MatcherAssert.assertThat; diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncAndReplicationTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncAndReplicationTest.java index 622dbe6be9..820d261023 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncAndReplicationTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncAndReplicationTest.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.schemasync; -import static org.apache.ignite.internal.SessionUtils.executeUpdate; +import static org.apache.ignite.internal.sql.engine.util.SqlTestUtils.executeUpdate; import static org.apache.ignite.internal.TestWrappers.unwrapTableManager; import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_STORAGE_PROFILE; import static org.apache.ignite.internal.testframework.IgniteTestUtils.waitForCondition; diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncMultiNodeTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncMultiNodeTest.java index 36b37346a1..a6710e0c55 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncMultiNodeTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncMultiNodeTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.schemasync; import static java.util.concurrent.CompletableFuture.runAsync; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.apache.ignite.internal.SessionUtils.executeUpdate; +import static org.apache.ignite.internal.sql.engine.util.SqlTestUtils.executeUpdate; import static org.apache.ignite.internal.test.WatchListenerInhibitor.metastorageEventsInhibitor; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willTimeoutIn; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully; diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncSingleNodeTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncSingleNodeTest.java index 90e4b701ea..660f3cd485 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncSingleNodeTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncSingleNodeTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.schemasync; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.apache.ignite.internal.SessionUtils.executeUpdate; +import static org.apache.ignite.internal.sql.engine.util.SqlTestUtils.executeUpdate; import static org.apache.ignite.internal.TestWrappers.unwrapTableViewInternal; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItDurableFinishTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItDurableFinishTest.java index 929e46a5fb..987062e196 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItDurableFinishTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/ItDurableFinishTest.java @@ -20,7 +20,7 @@ package org.apache.ignite.internal.table; import static java.util.Arrays.asList; import static java.util.concurrent.TimeUnit.SECONDS; import static java.util.stream.Collectors.toSet; -import static org.apache.ignite.internal.SessionUtils.executeUpdate; +import static org.apache.ignite.internal.sql.engine.util.SqlTestUtils.executeUpdate; import static org.apache.ignite.internal.TestWrappers.unwrapTableImpl; import static org.apache.ignite.internal.TestWrappers.unwrapTableViewInternal; import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_STORAGE_PROFILE; diff --git a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/partition/ItAbstractPartitionManagerTest.java b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/partition/ItAbstractPartitionManagerTest.java index 8ca8096487..86727e1c0d 100644 --- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/partition/ItAbstractPartitionManagerTest.java +++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/table/partition/ItAbstractPartitionManagerTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.table.partition; import static java.util.concurrent.CompletableFuture.allOf; -import static org.apache.ignite.internal.SessionUtils.executeUpdate; +import static org.apache.ignite.internal.sql.engine.util.SqlTestUtils.executeUpdate; import static org.apache.ignite.internal.TestWrappers.unwrapTableViewInternal; import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_STORAGE_PROFILE; import static org.apache.ignite.internal.table.TableRow.tuple; diff --git a/modules/runner/src/testFixtures/java/org/apache/ignite/internal/SessionUtils.java b/modules/runner/src/testFixtures/java/org/apache/ignite/internal/SessionUtils.java deleted file mode 100644 index 349eabed87..0000000000 --- a/modules/runner/src/testFixtures/java/org/apache/ignite/internal/SessionUtils.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.internal; - -import org.apache.ignite.sql.IgniteSql; -import org.apache.ignite.sql.ResultSet; -import org.apache.ignite.tx.Transaction; -import org.jetbrains.annotations.Nullable; - -/** - * Helper method for running SQL queries. - */ -public class SessionUtils { - /** - * Executes an update on a sql, possibly in a transaction. - * - * @param query SQL query to execute. - * @param sql Session on which to execute. - * @param transaction Transaction in which to execute the update, or {@code null} if the update should - * be executed n an implicit transaction. - */ - public static void executeUpdate(String query, IgniteSql sql, @Nullable Transaction transaction) { - try (ResultSet<?> ignored = sql.execute(transaction, query)) { - // Do nothing, just adhere to the syntactic ceremony... - } - } - - /** - * Executes an update on a sql in an implicit transaction. - * - * @param query SQL query to execute. - * @param sql Session on which to execute. - */ - public static void executeUpdate(String query, IgniteSql sql) { - executeUpdate(query, sql, null); - } -} diff --git a/modules/sql-engine/src/testFixtures/java/org/apache/ignite/internal/sql/engine/util/SqlTestUtils.java b/modules/sql-engine/src/testFixtures/java/org/apache/ignite/internal/sql/engine/util/SqlTestUtils.java index 5dd6a82fd3..bb927c7925 100644 --- a/modules/sql-engine/src/testFixtures/java/org/apache/ignite/internal/sql/engine/util/SqlTestUtils.java +++ b/modules/sql-engine/src/testFixtures/java/org/apache/ignite/internal/sql/engine/util/SqlTestUtils.java @@ -60,9 +60,13 @@ import org.apache.ignite.internal.sql.engine.type.UuidType; import org.apache.ignite.lang.ErrorGroup; import org.apache.ignite.lang.ErrorGroups; import org.apache.ignite.sql.ColumnType; +import org.apache.ignite.sql.IgniteSql; +import org.apache.ignite.sql.ResultSet; import org.apache.ignite.sql.SqlException; +import org.apache.ignite.tx.Transaction; import org.hamcrest.CoreMatchers; import org.hamcrest.StringDescription; +import org.jetbrains.annotations.Nullable; import org.junit.jupiter.api.function.Executable; /** @@ -387,4 +391,28 @@ public class SqlTestUtils { throw new IllegalArgumentException("Unknown type " + columnType); } } + + /** + * Executes an update on a sql, possibly in a transaction. + * + * @param query SQL query to execute. + * @param sql Session on which to execute. + * @param transaction Transaction in which to execute the update, or {@code null} if the update should + * be executed n an implicit transaction. + */ + public static void executeUpdate(String query, IgniteSql sql, @Nullable Transaction transaction) { + try (ResultSet<?> ignored = sql.execute(transaction, query)) { + // Do nothing, just adhere to the syntactic ceremony... + } + } + + /** + * Executes an update on a sql in an implicit transaction. + * + * @param query SQL query to execute. + * @param sql Session on which to execute. + */ + public static void executeUpdate(String query, IgniteSql sql) { + executeUpdate(query, sql, null); + } } diff --git a/modules/table/src/integrationTest/java/org/apache/ignite/internal/raftsnapshot/ItTableRaftSnapshotsTest.java b/modules/table/src/integrationTest/java/org/apache/ignite/internal/raftsnapshot/ItTableRaftSnapshotsTest.java index 23a05c3bb2..83d6df25b7 100644 --- a/modules/table/src/integrationTest/java/org/apache/ignite/internal/raftsnapshot/ItTableRaftSnapshotsTest.java +++ b/modules/table/src/integrationTest/java/org/apache/ignite/internal/raftsnapshot/ItTableRaftSnapshotsTest.java @@ -19,7 +19,7 @@ package org.apache.ignite.internal.raftsnapshot; import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; -import static org.apache.ignite.internal.SessionUtils.executeUpdate; +import static org.apache.ignite.internal.sql.engine.util.SqlTestUtils.executeUpdate; import static org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_AIMEM_PROFILE_NAME; import static org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_AIPERSIST_PROFILE_NAME; import static org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_ROCKSDB_PROFILE_NAME; diff --git a/modules/table/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceTest.java b/modules/table/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceTest.java index ecf77eb130..1a4bbaa383 100644 --- a/modules/table/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceTest.java +++ b/modules/table/src/integrationTest/java/org/apache/ignite/internal/rebalance/ItRebalanceTest.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.rebalance; -import static org.apache.ignite.internal.SessionUtils.executeUpdate; +import static org.apache.ignite.internal.sql.engine.util.SqlTestUtils.executeUpdate; import static org.apache.ignite.internal.TestWrappers.unwrapTableViewInternal; import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_STORAGE_PROFILE; import static org.apache.ignite.internal.distributionzones.rebalance.RebalanceUtil.partitionAssignments; diff --git a/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/ItOperationRetryTest.java b/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/ItOperationRetryTest.java index b0a0ca9469..bb5fe35e43 100644 --- a/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/ItOperationRetryTest.java +++ b/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/ItOperationRetryTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.table; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.apache.ignite.internal.SessionUtils.executeUpdate; +import static org.apache.ignite.internal.sql.engine.util.SqlTestUtils.executeUpdate; import static org.apache.ignite.internal.TestWrappers.unwrapTableImpl; import static org.apache.ignite.internal.storage.pagememory.configuration.PageMemoryStorageEngineLocalConfigurationModule.DEFAULT_PROFILE_NAME; import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully; diff --git a/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/ItTransactionPrimaryChangeTest.java b/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/ItTransactionPrimaryChangeTest.java index ab81610af0..df924b8a1f 100644 --- a/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/ItTransactionPrimaryChangeTest.java +++ b/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/ItTransactionPrimaryChangeTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.table; import static java.util.stream.Collectors.toList; -import static org.apache.ignite.internal.SessionUtils.executeUpdate; +import static org.apache.ignite.internal.sql.engine.util.SqlTestUtils.executeUpdate; import static org.apache.ignite.internal.TestDefaultProfilesNames.DEFAULT_AIPERSIST_PROFILE_NAME; import static org.apache.ignite.internal.TestWrappers.unwrapIgniteTransaction; import static org.apache.ignite.internal.TestWrappers.unwrapTableImpl; diff --git a/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/ItTransactionRecoveryTest.java b/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/ItTransactionRecoveryTest.java index 8d43943ccc..03742aec8c 100644 --- a/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/ItTransactionRecoveryTest.java +++ b/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/ItTransactionRecoveryTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.table; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.apache.ignite.internal.SessionUtils.executeUpdate; +import static org.apache.ignite.internal.sql.engine.util.SqlTestUtils.executeUpdate; import static org.apache.ignite.internal.TestWrappers.unwrapTableImpl; import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_STORAGE_PROFILE; import static org.apache.ignite.internal.testframework.IgniteTestUtils.bypassingThreadAssertions; diff --git a/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/ItTxResourcesVacuumTest.java b/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/ItTxResourcesVacuumTest.java index 5ba0b25ff9..e8b72fc1eb 100644 --- a/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/ItTxResourcesVacuumTest.java +++ b/modules/table/src/integrationTest/java/org/apache/ignite/internal/table/ItTxResourcesVacuumTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.internal.table; import static java.util.stream.Collectors.toSet; -import static org.apache.ignite.internal.SessionUtils.executeUpdate; +import static org.apache.ignite.internal.sql.engine.util.SqlTestUtils.executeUpdate; import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_STORAGE_PROFILE; import static org.apache.ignite.internal.table.NodeUtils.transferPrimary; import static org.apache.ignite.internal.testframework.IgniteTestUtils.runAsync; diff --git a/modules/transactions/build.gradle b/modules/transactions/build.gradle index ac8c8276dd..727ec4af26 100644 --- a/modules/transactions/build.gradle +++ b/modules/transactions/build.gradle @@ -56,6 +56,7 @@ dependencies { integrationTestImplementation project(':ignite-api') integrationTestImplementation(testFixtures(project(':ignite-core'))) integrationTestImplementation(testFixtures(project(':ignite-transactions'))) + integrationTestImplementation(testFixtures(project(':ignite-sql-engine'))) integrationTestImplementation(testFixtures(project(':ignite-runner'))) testFixturesImplementation project(':ignite-configuration') diff --git a/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/tx/readonly/ItReadOnlyTxInPastTest.java b/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/tx/readonly/ItReadOnlyTxInPastTest.java index e03cf24b7f..28492b82c7 100644 --- a/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/tx/readonly/ItReadOnlyTxInPastTest.java +++ b/modules/transactions/src/integrationTest/java/org/apache/ignite/internal/tx/readonly/ItReadOnlyTxInPastTest.java @@ -17,7 +17,7 @@ package org.apache.ignite.internal.tx.readonly; -import static org.apache.ignite.internal.SessionUtils.executeUpdate; +import static org.apache.ignite.internal.sql.engine.util.SqlTestUtils.executeUpdate; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is;
