[ignite-3] 01/02: Merge branch 'ai-main' into catalog-feature

[tkalkirill]

This is an automated email from the ASF dual-hosted git repository.

tkalkirill pushed a commit to branch catalog-feature
in repository https://gitbox.apache.org/repos/asf/ignite-3.git

commit 0bbb67a86bce0c0305b442757b68de9c0affeac0
Merge: 7311385a42 dfdc132f5b
Author: Kirill Tkalenko <tkalkir...@yandex.ru>
AuthorDate: Tue Aug 8 12:19:39 2023 +0300

    Merge branch 'ai-main' into catalog-feature

 .../distributionzones/DistributionZoneManager.java |   2 +-
 .../BaseDistributionZoneManagerTest.java           |  55 +-
 .../DistributionZoneManagerAlterFilterTest.java    | 117 +---
 ...ibutionZoneManagerConfigurationChangesTest.java |  45 +-
 .../DistributionZoneManagerFilterTest.java         |  24 +-
 .../DistributionZoneManagerScaleUpTest.java        | 500 ++++++--------
 .../DistributionZoneManagerTest.java               | 749 +--------------------
 .../DistributionZoneManagerWatchListenerTest.java  |   9 +-
 .../DistributionZoneCausalityDataNodesTest.java    | 362 +++-------
 .../DistributionZonesTestUtil.java                 | 113 +++-
 .../apache/ignite/raft/jraft/core/ItNodeTest.java  |   7 +-
 .../org/apache/ignite/raft/jraft/JRaftUtils.java   |   4 +-
 .../apache/ignite/raft/jraft/core/NodeImpl.java    |  17 +-
 .../storage/ItRebalanceDistributedTest.java        |  22 +-
 ...niteDistributionZoneManagerNodeRestartTest.java |  61 +-
 .../runner/app/PlatformTestNodeRunner.java         |   2 +-
 .../ignite/internal/sql/engine/ItZoneDdlTest.java  | 122 ++--
 .../datatypes/uuid/ItUuidExpressionTest.java       |  19 +
 modules/sql-engine/build.gradle                    |   1 +
 .../DdlCommandHandlerExceptionHandlingTest.java    |  90 +--
 .../exec/ddl/DdlToCatalogCommandConverterTest.java | 103 +++
 .../ddl/DistributionZoneDdlCommandHandlerTest.java | 173 +----
 22 files changed, 795 insertions(+), 1802 deletions(-)

diff --cc 
modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/PlatformTestNodeRunner.java
index f644e8a303,ca7e03065a..8afecc4ad1
--- 
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/PlatformTestNodeRunner.java
+++ 
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/PlatformTestNodeRunner.java
@@@ -265,23 -258,11 +265,23 @@@ public class PlatformTestNodeRunner 
      }
  
      private static void createTables(Ignite node) {
 -        var keyCol = "key";
 +        var keyCol = "KEY";
  
-         await(createZone(((IgniteImpl) node).distributionZoneManager(), 
ZONE_NAME, 10, 1));
+         createZone(((IgniteImpl) node).distributionZoneManager(), ZONE_NAME, 
10, 1);
  
 -        TableDefinition schTbl = SchemaBuilders.tableBuilder(SCHEMA_NAME, 
TABLE_NAME).columns(
 +        IgniteImpl ignite = ((IgniteImpl) node);
 +
 +        CreateZoneParams createZoneParams = CreateZoneParams.builder()
 +                .zoneName(ZONE_NAME)
 +                .partitions(10)
 +                .replicas(1)
 +                .dataNodesAutoAdjustScaleUp(IMMEDIATE_TIMER_VALUE)
 +                .dataNodesAutoAdjustScaleDown(IMMEDIATE_TIMER_VALUE)
 +                .build();
 +
 +        assertThat(ignite.catalogManager().createZone(createZoneParams), 
willBe(nullValue()));
 +
 +        TableDefinition schTbl = 
SchemaBuilders.tableBuilder(DEFAULT_SCHEMA_NAME, TABLE_NAME).columns(
                  SchemaBuilders.column(keyCol, ColumnType.INT64).build(),
                  SchemaBuilders.column("val", 
ColumnType.string()).asNullable(true).build()
          ).withPrimaryKey(keyCol).build();
diff --cc 
modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/ddl/DistributionZoneDdlCommandHandlerTest.java
index ef5c12fd79,8ce2fdc698..54fbc587bc
--- 
a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/ddl/DistributionZoneDdlCommandHandlerTest.java
+++ 
b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/ddl/DistributionZoneDdlCommandHandlerTest.java
@@@ -17,19 -17,17 +17,16 @@@
  
  package org.apache.ignite.internal.sql.engine.exec.ddl;
  
+ import static java.util.concurrent.CompletableFuture.completedFuture;
+ import static 
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
  import static org.hamcrest.MatcherAssert.assertThat;
- import static org.hamcrest.Matchers.equalTo;
- import static org.junit.jupiter.api.Assertions.assertEquals;
- import static org.junit.jupiter.api.Assertions.assertNotNull;
- import static org.junit.jupiter.api.Assertions.assertThrows;
+ import static org.mockito.ArgumentMatchers.any;
+ import static org.mockito.ArgumentMatchers.eq;
  import static org.mockito.Mockito.mock;
+ import static org.mockito.Mockito.verify;
  
- import java.util.Arrays;
- import java.util.concurrent.CompletableFuture;
- import java.util.concurrent.atomic.AtomicReference;
- import org.apache.ignite.internal.catalog.CatalogManager;
  import 
org.apache.ignite.internal.distributionzones.DistributionZoneConfigurationParameters;
  import org.apache.ignite.internal.distributionzones.DistributionZoneManager;
 -import org.apache.ignite.internal.index.IndexManager;
  import 
org.apache.ignite.internal.sql.engine.prepare.ddl.AlterZoneRenameCommand;
  import org.apache.ignite.internal.sql.engine.prepare.ddl.AlterZoneSetCommand;
  import org.apache.ignite.internal.sql.engine.prepare.ddl.CreateZoneCommand;