You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by tk...@apache.org on 2023/09/07 04:39:17 UTC

[ignite-3] branch catalog-feature updated (cd9bfab4f3 -> 49b281def2)

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

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


    from cd9bfab4f3 Merge branch 'main' into catalog-feature
     add 912920af7d IGNITE-20340 Move handler of AlterTable command from CatalogManager to command itself (#2547)
     add 40bb4f70f6 IGNITE-20306 .NET: Fix TestAutoFlushFrequency flakiness (#2559)
     new 49b281def2 Merge branch 'ai-main' into catalog-feature

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../ignite/internal/catalog/CatalogManager.java    |  27 -
 .../internal/catalog/CatalogManagerImpl.java       | 182 -------
 .../catalog/CatalogParamsValidationUtils.java      |  34 --
 .../catalog/commands/AlterColumnParams.java        | 174 -------
 .../commands/AlterTableAddColumnCommand.java       | 151 ++++++
 ...java => AlterTableAddColumnCommandBuilder.java} |   8 +-
 .../commands/AlterTableAddColumnParams.java        |  59 ---
 .../commands/AlterTableAlterColumnCommand.java     | 269 ++++++++++
 .../AlterTableAlterColumnCommandBuilder.java       |  50 ++
 .../commands/AlterTableDropColumnCommand.java      | 157 ++++++
 ...ava => AlterTableDropColumnCommandBuilder.java} |   8 +-
 .../commands/AlterTableDropColumnParams.java       |  59 ---
 .../catalog/commands/CreateTableCommand.java       |   6 +-
 ...ommandParams.java => DeferredDefaultValue.java} |  13 +-
 .../internal/catalog/CatalogManagerSelfTest.java   | 106 ++--
 .../catalog/CatalogManagerValidationTest.java      |  80 ---
 .../commands/AbstractCommandValidationTest.java    |  52 +-
 .../AlterTableAddColumnCommandValidationTest.java  | 204 ++++++++
 ...AlterTableAlterColumnCommandValidationTest.java | 544 +++++++++++++++++++++
 .../AlterTableDropColumnCommandValidationTest.java | 207 ++++++++
 .../commands/CreateTableCommandValidationTest.java |  10 +-
 .../internal/catalog/BaseCatalogManagerTest.java   |  12 +-
 .../ignite/internal/util/CollectionUtils.java      |  11 +-
 .../Apache.Ignite.Tests/Table/DataStreamerTests.cs |  12 +-
 .../engine/exec/ddl/DdlCommandHandlerWrapper.java  |  18 +-
 .../exec/ddl/DdlToCatalogCommandConverter.java     |  35 +-
 .../engine/util/SqlExceptionMapperProvider.java    |   4 +
 27 files changed, 1767 insertions(+), 725 deletions(-)
 delete mode 100644 modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AlterColumnParams.java
 create mode 100644 modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AlterTableAddColumnCommand.java
 copy modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/{DropTableCommandBuilder.java => AlterTableAddColumnCommandBuilder.java} (74%)
 delete mode 100644 modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AlterTableAddColumnParams.java
 create mode 100644 modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AlterTableAlterColumnCommand.java
 create mode 100644 modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AlterTableAlterColumnCommandBuilder.java
 create mode 100644 modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AlterTableDropColumnCommand.java
 copy modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/{DropTableCommandBuilder.java => AlterTableDropColumnCommandBuilder.java} (75%)
 delete mode 100644 modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AlterTableDropColumnParams.java
 copy modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/{DdlCommandParams.java => DeferredDefaultValue.java} (61%)
 create mode 100644 modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/AlterTableAddColumnCommandValidationTest.java
 create mode 100644 modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/AlterTableAlterColumnCommandValidationTest.java
 create mode 100644 modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/AlterTableDropColumnCommandValidationTest.java


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

Posted by tk...@apache.org.
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 49b281def2883515fb954753a6f3b3d8ce546f99
Merge: cd9bfab4f3 40bb4f70f6
Author: Kirill Tkalenko <tk...@yandex.ru>
AuthorDate: Thu Sep 7 07:39:01 2023 +0300

    Merge branch 'ai-main' into catalog-feature

 .../ignite/internal/catalog/CatalogManager.java    |  27 -
 .../internal/catalog/CatalogManagerImpl.java       | 182 -------
 .../catalog/CatalogParamsValidationUtils.java      |  34 --
 .../catalog/commands/AlterColumnParams.java        | 174 -------
 .../commands/AlterTableAddColumnCommand.java       | 151 ++++++
 .../AlterTableAddColumnCommandBuilder.java         |  32 ++
 .../commands/AlterTableAddColumnParams.java        |  59 ---
 .../commands/AlterTableAlterColumnCommand.java     | 269 ++++++++++
 .../AlterTableAlterColumnCommandBuilder.java       |  50 ++
 .../commands/AlterTableDropColumnCommand.java      | 157 ++++++
 .../AlterTableDropColumnCommandBuilder.java        |  32 ++
 .../commands/AlterTableDropColumnParams.java       |  59 ---
 .../catalog/commands/CreateTableCommand.java       |   6 +-
 .../catalog/commands/DeferredDefaultValue.java     |  33 ++
 .../internal/catalog/CatalogManagerSelfTest.java   | 106 ++--
 .../catalog/CatalogManagerValidationTest.java      |  80 ---
 .../commands/AbstractCommandValidationTest.java    |  52 +-
 .../AlterTableAddColumnCommandValidationTest.java  | 204 ++++++++
 ...AlterTableAlterColumnCommandValidationTest.java | 544 +++++++++++++++++++++
 .../AlterTableDropColumnCommandValidationTest.java | 207 ++++++++
 .../commands/CreateTableCommandValidationTest.java |  10 +-
 .../internal/catalog/BaseCatalogManagerTest.java   |  12 +-
 .../ignite/internal/util/CollectionUtils.java      |  11 +-
 .../Apache.Ignite.Tests/Table/DataStreamerTests.cs |  12 +-
 .../engine/exec/ddl/DdlCommandHandlerWrapper.java  |  18 +-
 .../exec/ddl/DdlToCatalogCommandConverter.java     |  35 +-
 .../engine/util/SqlExceptionMapperProvider.java    |   4 +
 27 files changed, 1841 insertions(+), 719 deletions(-)

diff --cc modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ddl/DdlCommandHandlerWrapper.java
index 07dc19ea96,139e0ffc81..a4fd8076d3
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ddl/DdlCommandHandlerWrapper.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ddl/DdlCommandHandlerWrapper.java
@@@ -75,14 -104,60 +76,17 @@@ public class DdlCommandHandlerWrapper e
              AlterTableDropCommand dropCommand = (AlterTableDropCommand) cmd;
  
              return ddlCommandFuture
-                     .thenCompose(res -> catalogManager.dropColumn(DdlToCatalogCommandConverter.convert(dropCommand))
-                             .handle(handleModificationResult(dropCommand.ifTableExists(), TableNotFoundException.class))
-                     );
+                     .thenCompose(res -> catalogManager.execute(DdlToCatalogCommandConverter.convert(dropCommand))
+                             .handle(handleModificationResult(
+                                     dropCommand.ifTableExists(), TableNotFoundValidationException.class))
+                     ).handle(handleModificationResult(dropCommand.ifTableExists(), TableNotFoundException.class));
          } else if (cmd instanceof AlterColumnCommand) {
              return ddlCommandFuture
-                     .thenCompose(res -> catalogManager.alterColumn(DdlToCatalogCommandConverter.convert((AlterColumnCommand) cmd))
+                     .thenCompose(res -> catalogManager.execute(DdlToCatalogCommandConverter.convert((AlterColumnCommand) cmd))
+                                     .handle(handleModificationResult(
+                                             ((AlterColumnCommand) cmd).ifTableExists(), TableNotFoundValidationException.class))
                              .handle(handleModificationResult(((AlterColumnCommand) cmd).ifTableExists(), TableNotFoundException.class))
                      );
 -        } else if (cmd instanceof CreateIndexCommand) {
 -            return ddlCommandFuture
 -                    .thenCompose(res -> {
 -                        AbstractCreateIndexCommandParams params = DdlToCatalogCommandConverter.convert((CreateIndexCommand) cmd);
 -                        if (params instanceof CreateSortedIndexParams) {
 -                            return catalogManager.createIndex((CreateSortedIndexParams) params);
 -                        } else {
 -                            return catalogManager.createIndex((CreateHashIndexParams) params);
 -                        }
 -                    }).handle(handleModificationResult(((CreateIndexCommand) cmd).ifNotExists(), IndexAlreadyExistsException.class));
 -        } else if (cmd instanceof DropIndexCommand) {
 -            return ddlCommandFuture
 -                    .thenCompose(res -> catalogManager.dropIndex(DdlToCatalogCommandConverter.convert((DropIndexCommand) cmd))
 -                            .handle(handleModificationResult(((DropIndexCommand) cmd).ifNotExists(), IndexNotFoundException.class))
 -                    );
 -        } else if (cmd instanceof CreateZoneCommand) {
 -            CreateZoneCommand zoneCommand = (CreateZoneCommand) cmd;
 -
 -            return ddlCommandFuture
 -                    .thenCompose(res -> catalogManager.createZone(DdlToCatalogCommandConverter.convert(zoneCommand))
 -                            .handle(handleModificationResult(zoneCommand.ifNotExists(), DistributionZoneAlreadyExistsException.class))
 -                    );
 -        } else if (cmd instanceof DropZoneCommand) {
 -            DropZoneCommand zoneCommand = (DropZoneCommand) cmd;
 -
 -            return ddlCommandFuture
 -                    .thenCompose(res -> catalogManager.dropZone(DdlToCatalogCommandConverter.convert(zoneCommand))
 -                            .handle(handleModificationResult(zoneCommand.ifExists(), DistributionZoneNotFoundException.class))
 -                    );
 -        } else if (cmd instanceof AlterZoneRenameCommand) {
 -            AlterZoneRenameCommand zoneCommand = (AlterZoneRenameCommand) cmd;
 -
 -            return ddlCommandFuture
 -                    .thenCompose(res -> catalogManager.renameZone(DdlToCatalogCommandConverter.convert(zoneCommand))
 -                            .handle(handleModificationResult(zoneCommand.ifExists(), DistributionZoneNotFoundException.class))
 -                    );
 -        } else if (cmd instanceof AlterZoneSetCommand) {
 -            AlterZoneSetCommand zoneCommand = (AlterZoneSetCommand) cmd;
 -
 -            return ddlCommandFuture
 -                    .thenCompose(res -> catalogManager.alterZone(DdlToCatalogCommandConverter.convert(zoneCommand))
 -                            .handle(handleModificationResult(zoneCommand.ifExists(), DistributionZoneNotFoundException.class))
 -                    );
          }
  
          return ddlCommandFuture;