This is an automated email from the ASF dual-hosted git repository.
zstan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 636a03c4d1 IGNITE-19091 Sql. Fix
ItIgniteNodeRestartTest::testQueryCorrectnessAfterNodeRestart (#3712)
636a03c4d1 is described below
commit 636a03c4d1acc971f1ca4faea1db3d47fd1e16b9
Author: Evgeniy Stanilovskiy <[email protected]>
AuthorDate: Wed May 8 10:37:21 2024 +0300
IGNITE-19091 Sql. Fix
ItIgniteNodeRestartTest::testQueryCorrectnessAfterNodeRestart (#3712)
---
.../runner/app/ItIgniteNodeRestartTest.java | 33 +---------------------
1 file changed, 1 insertion(+), 32 deletions(-)
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
index b88f8d3b99..cdb511f090 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java
@@ -37,9 +37,7 @@ import static
org.apache.ignite.internal.testframework.IgniteTestUtils.testNodeN
import static
org.apache.ignite.internal.testframework.IgniteTestUtils.waitForCondition;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willSucceedFast;
-import static
org.apache.ignite.internal.util.CompletableFutures.falseCompletedFuture;
import static
org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture;
-import static
org.apache.ignite.internal.util.CompletableFutures.trueCompletedFuture;
import static org.apache.ignite.sql.ColumnType.INT32;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -91,9 +89,6 @@ import
org.apache.ignite.internal.catalog.commands.ColumnParams;
import org.apache.ignite.internal.catalog.commands.CreateTableCommand;
import org.apache.ignite.internal.catalog.commands.TableHashPrimaryKey;
import
org.apache.ignite.internal.catalog.configuration.SchemaSynchronizationConfiguration;
-import org.apache.ignite.internal.catalog.descriptors.CatalogIndexDescriptor;
-import org.apache.ignite.internal.catalog.events.CatalogEvent;
-import
org.apache.ignite.internal.catalog.events.MakeIndexAvailableEventParameters;
import org.apache.ignite.internal.catalog.storage.UpdateLogImpl;
import org.apache.ignite.internal.cluster.management.ClusterInitializer;
import
org.apache.ignite.internal.cluster.management.ClusterManagementGroupManager;
@@ -806,8 +801,7 @@ public class ItIgniteNodeRestartTest extends
BaseIgniteRestartTest {
* </ol>
*/
@Test
- @Disabled("https://issues.apache.org/jira/browse/IGNITE-19091";)
- public void testQueryCorrectnessAfterNodeRestart() throws
InterruptedException {
+ public void testQueryCorrectnessAfterNodeRestart() {
IgniteImpl ignite1 = startNode(0);
createTableWithoutData(ignite1, TABLE_NAME, 2, 1);
@@ -825,8 +819,6 @@ public class ItIgniteNodeRestartTest extends
BaseIgniteRestartTest {
sql1.execute(null, "CREATE INDEX idx1 ON " + TABLE_NAME + "(id)");
- waitForIndexToBecomeAvailable(List.of(ignite1, ignite2), "idx1");
-
ResultSet<SqlRow> plan = sql1.execute(null, "EXPLAIN PLAN FOR " + sql);
String planStr = plan.next().stringValue(0);
@@ -1911,29 +1903,6 @@ public class ItIgniteNodeRestartTest extends
BaseIgniteRestartTest {
}
}
- private void waitForIndexToBecomeAvailable(Collection<IgniteImpl> nodes,
String indexName) throws InterruptedException {
- CountDownLatch latch = new CountDownLatch(nodes.size());
-
- nodes.forEach(node ->
node.catalogManager().listen(CatalogEvent.INDEX_AVAILABLE, event -> {
- MakeIndexAvailableEventParameters availableEvent =
(MakeIndexAvailableEventParameters) event;
-
- CatalogIndexDescriptor index =
node.catalogManager().index(availableEvent.indexId(), event.catalogVersion());
-
- assertNotNull(index, "Cannot find an index by ID=" +
availableEvent.indexId());
-
- if (index.name().equalsIgnoreCase(indexName)) {
- // That's our index.
- latch.countDown();
-
- return trueCompletedFuture();
- }
-
- return falseCompletedFuture();
- }));
-
- assertTrue(latch.await(10, TimeUnit.SECONDS));
- }
-
/**
* Creates a table.
*
