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/08/24 13:11:01 UTC

[ignite-3] branch main updated: IGNITE-20265 Check and slightly refactor the validation of tables and indexes in the catalog (#2485)

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

tkalkirill 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 1641950030 IGNITE-20265 Check and slightly refactor the validation of tables and indexes in the catalog (#2485)
1641950030 is described below

commit 1641950030481693b2cdda01d6116745871ea7f7
Author: Kirill Tkalenko <tk...@yandex.ru>
AuthorDate: Thu Aug 24 16:10:55 2023 +0300

    IGNITE-20265 Check and slightly refactor the validation of tables and indexes in the catalog (#2485)
---
 .../internal/catalog/CatalogManagerImpl.java       | 103 +++++-------
 .../catalog/CatalogParamsValidationUtils.java      |  67 +++++++-
 ....java => AbstractCreateIndexCommandParams.java} |  94 ++++-------
 .../commands/AbstractIndexCommandParams.java       |  88 +++-------
 .../catalog/commands/CreateHashIndexParams.java    |  36 +---
 .../catalog/commands/CreateSortedIndexParams.java  |  43 ++---
 .../internal/catalog/commands/DropIndexParams.java |  71 +-------
 .../internal/catalog/CatalogManagerSelfTest.java   | 185 +++++++++++----------
 .../catalog/CatalogManagerValidationTest.java      | 103 ++++++++++++
 .../internal/catalog/BaseCatalogManagerTest.java   |  68 ++++++++
 .../engine/exec/ddl/DdlCommandHandlerWrapper.java  |   4 +-
 .../exec/ddl/DdlToCatalogCommandConverter.java     |   4 +-
 12 files changed, 455 insertions(+), 411 deletions(-)

diff --git a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogManagerImpl.java b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogManagerImpl.java
index 0df31b6a20..6d42b93a12 100644
--- a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogManagerImpl.java
+++ b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogManagerImpl.java
@@ -21,7 +21,10 @@ import static java.util.concurrent.CompletableFuture.completedFuture;
 import static java.util.concurrent.CompletableFuture.failedFuture;
 import static java.util.stream.Collectors.joining;
 import static org.apache.ignite.internal.catalog.CatalogParamsValidationUtils.validateAlterZoneParams;
+import static org.apache.ignite.internal.catalog.CatalogParamsValidationUtils.validateCreateHashIndexParams;
+import static org.apache.ignite.internal.catalog.CatalogParamsValidationUtils.validateCreateSortedIndexParams;
 import static org.apache.ignite.internal.catalog.CatalogParamsValidationUtils.validateCreateZoneParams;
+import static org.apache.ignite.internal.catalog.CatalogParamsValidationUtils.validateDropIndexParams;
 import static org.apache.ignite.internal.catalog.CatalogParamsValidationUtils.validateDropZoneParams;
 import static org.apache.ignite.internal.catalog.CatalogParamsValidationUtils.validateRenameZoneParams;
 import static org.apache.ignite.internal.catalog.commands.CatalogUtils.fromParams;
@@ -44,6 +47,7 @@ import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.function.LongSupplier;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import org.apache.ignite.internal.catalog.commands.AbstractCreateIndexCommandParams;
 import org.apache.ignite.internal.catalog.commands.AlterColumnParams;
 import org.apache.ignite.internal.catalog.commands.AlterTableAddColumnParams;
 import org.apache.ignite.internal.catalog.commands.AlterTableDropColumnParams;
@@ -54,15 +58,14 @@ import org.apache.ignite.internal.catalog.commands.CreateHashIndexParams;
 import org.apache.ignite.internal.catalog.commands.CreateSortedIndexParams;
 import org.apache.ignite.internal.catalog.commands.CreateTableParams;
 import org.apache.ignite.internal.catalog.commands.CreateZoneParams;
-import org.apache.ignite.internal.catalog.commands.DataStorageParams;
 import org.apache.ignite.internal.catalog.commands.DropIndexParams;
 import org.apache.ignite.internal.catalog.commands.DropTableParams;
 import org.apache.ignite.internal.catalog.commands.DropZoneParams;
 import org.apache.ignite.internal.catalog.commands.RenameZoneParams;
-import org.apache.ignite.internal.catalog.descriptors.CatalogDataStorageDescriptor;
 import org.apache.ignite.internal.catalog.descriptors.CatalogHashIndexDescriptor;
 import org.apache.ignite.internal.catalog.descriptors.CatalogIndexDescriptor;
 import org.apache.ignite.internal.catalog.descriptors.CatalogSchemaDescriptor;
+import org.apache.ignite.internal.catalog.descriptors.CatalogSortedIndexDescriptor;
 import org.apache.ignite.internal.catalog.descriptors.CatalogTableColumnDescriptor;
 import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
 import org.apache.ignite.internal.catalog.descriptors.CatalogZoneDescriptor;
@@ -98,6 +101,8 @@ import org.apache.ignite.lang.ColumnNotFoundException;
 import org.apache.ignite.lang.ErrorGroups;
 import org.apache.ignite.lang.ErrorGroups.Common;
 import org.apache.ignite.lang.ErrorGroups.DistributionZones;
+import org.apache.ignite.lang.ErrorGroups.Index;
+import org.apache.ignite.lang.IgniteException;
 import org.apache.ignite.lang.IgniteInternalException;
 import org.apache.ignite.lang.IndexAlreadyExistsException;
 import org.apache.ignite.lang.IndexNotFoundException;
@@ -324,7 +329,7 @@ public class CatalogManagerImpl extends Producer<CatalogEvent, CatalogEventParam
 
             CatalogTableDescriptor table = fromParams(id++, zone.id(), params);
 
-            CatalogHashIndexDescriptor pkIndex = createHashIndexDescriptor(table, id++, createPkIndexParams(params));
+            CatalogIndexDescriptor pkIndex = createPkIndex(table, id++, createPkIndexParams(params));
 
             return List.of(
                     new NewTableEntry(table),
@@ -428,15 +433,17 @@ public class CatalogManagerImpl extends Producer<CatalogEvent, CatalogEventParam
     @Override
     public CompletableFuture<Void> createIndex(CreateHashIndexParams params) {
         return saveUpdateAndWaitForActivation(catalog -> {
+            validateCreateHashIndexParams(params);
+
             CatalogSchemaDescriptor schema = getSchema(catalog, params.schemaName());
 
-            if (schema.index(params.indexName()) != null) {
-                throw new IndexAlreadyExistsException(schema.name(), params.indexName());
-            }
+            ensureNoTableOrIndexExistsWithSameName(schema, params.indexName());
 
             CatalogTableDescriptor table = getTable(schema, params.tableName());
 
-            CatalogHashIndexDescriptor index = createHashIndexDescriptor(table, catalog.objectIdGenState(), params);
+            validateIndexColumns(table, params);
+
+            CatalogHashIndexDescriptor index = fromParams(catalog.objectIdGenState(), table.id(), params);
 
             return List.of(
                     new NewIndexEntry(index),
@@ -448,17 +455,17 @@ public class CatalogManagerImpl extends Producer<CatalogEvent, CatalogEventParam
     @Override
     public CompletableFuture<Void> createIndex(CreateSortedIndexParams params) {
         return saveUpdateAndWaitForActivation(catalog -> {
+            validateCreateSortedIndexParams(params);
+
             CatalogSchemaDescriptor schema = getSchema(catalog, params.schemaName());
 
-            if (schema.index(params.indexName()) != null) {
-                throw new IndexAlreadyExistsException(schema.name(), params.indexName());
-            }
+            ensureNoTableOrIndexExistsWithSameName(schema, params.indexName());
 
             CatalogTableDescriptor table = getTable(schema, params.tableName());
 
-            validateCreateSortedIndexParams(params, table);
+            validateIndexColumns(table, params);
 
-            CatalogIndexDescriptor index = fromParams(catalog.objectIdGenState(), table.id(), params);
+            CatalogSortedIndexDescriptor index = fromParams(catalog.objectIdGenState(), table.id(), params);
 
             return List.of(
                     new NewIndexEntry(index),
@@ -470,6 +477,8 @@ public class CatalogManagerImpl extends Producer<CatalogEvent, CatalogEventParam
     @Override
     public CompletableFuture<Void> dropIndex(DropIndexParams params) {
         return saveUpdateAndWaitForActivation(catalog -> {
+            validateDropIndexParams(params);
+
             CatalogSchemaDescriptor schema = getSchema(catalog, params.schemaName());
 
             CatalogIndexDescriptor index = schema.index(params.indexName());
@@ -857,46 +866,6 @@ public class CatalogManagerImpl extends Producer<CatalogEvent, CatalogEventParam
                         }));
     }
 
-    private static void validateCreateHashIndexParams(CreateHashIndexParams params, CatalogTableDescriptor table) {
-        validateIndexColumns(params.columns(), table);
-    }
-
-    private static void validateCreateSortedIndexParams(CreateSortedIndexParams params, CatalogTableDescriptor table) {
-        validateIndexColumns(params.columns(), table);
-
-        if (params.collations().size() != params.columns().size()) {
-            throw new IgniteInternalException(
-                    ErrorGroups.Index.INVALID_INDEX_DEFINITION_ERR,
-                    "Columns collations doesn't match number of columns."
-            );
-        }
-    }
-
-    private static void validateIndexColumns(List<String> indexColumns, CatalogTableDescriptor table) {
-        if (indexColumns.isEmpty()) {
-            throw new IgniteInternalException(
-                    ErrorGroups.Index.INVALID_INDEX_DEFINITION_ERR,
-                    "No index columns was specified."
-            );
-        }
-
-        Predicate<String> duplicateValidator = Predicate.not(new HashSet<>()::add);
-
-        for (String columnName : indexColumns) {
-            CatalogTableColumnDescriptor columnDescriptor = table.columnDescriptor(columnName);
-
-            if (columnDescriptor == null) {
-                throw new ColumnNotFoundException(columnName);
-            } else if (duplicateValidator.test(columnName)) {
-                throw new IgniteInternalException(
-                        ErrorGroups.Index.INVALID_INDEX_DEFINITION_ERR,
-                        "Can't create index on duplicate columns: {}",
-                        String.join(", ", indexColumns)
-                );
-            }
-        }
-    }
-
     private static void validateAlterTableColumn(
             CatalogTableColumnDescriptor origin,
             CatalogTableColumnDescriptor target,
@@ -946,16 +915,18 @@ public class CatalogManagerImpl extends Producer<CatalogEvent, CatalogEventParam
                 .tableName(params.tableName())
                 .indexName(params.tableName() + "_PK")
                 .columns(params.primaryKeyColumns())
-                .unique()
+                .unique(true)
                 .build();
     }
 
-    private static CatalogHashIndexDescriptor createHashIndexDescriptor(
+    private static CatalogHashIndexDescriptor createPkIndex(
             CatalogTableDescriptor table,
             int indexId,
             CreateHashIndexParams params
     ) {
-        validateCreateHashIndexParams(params, table);
+        validateCreateHashIndexParams(params);
+
+        validateIndexColumns(table, params);
 
         return fromParams(indexId, table.id(), params);
     }
@@ -965,7 +936,25 @@ public class CatalogManagerImpl extends Producer<CatalogEvent, CatalogEventParam
         listen(evt, (EventListener<CatalogEventParameters>) closure);
     }
 
-    private static @Nullable CatalogDataStorageDescriptor dataStorage(@Nullable DataStorageParams params) {
-        return params == null ? null : fromParams(params);
+    private static void ensureNoTableOrIndexExistsWithSameName(CatalogSchemaDescriptor schema, String name) {
+        if (schema.index(name) != null) {
+            throw new IndexAlreadyExistsException(schema.name(), name);
+        }
+
+        if (schema.table(name) != null) {
+            throw new TableAlreadyExistsException(schema.name(), name);
+        }
+    }
+
+    private static void validateIndexColumns(CatalogTableDescriptor table, AbstractCreateIndexCommandParams params) {
+        for (String indexColumn : params.columns()) {
+            if (table.columnDescriptor(indexColumn) == null) {
+                throw new ColumnNotFoundException(indexColumn);
+            }
+        }
+
+        if (params.unique() && !params.columns().containsAll(table.colocationColumns())) {
+            throw new IgniteException(Index.INVALID_INDEX_DEFINITION_ERR, "Unique index must include all colocation columns");
+        }
     }
 }
diff --git a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogParamsValidationUtils.java b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogParamsValidationUtils.java
index e7f08cbd81..4dbdba5ea9 100644
--- a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogParamsValidationUtils.java
+++ b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogParamsValidationUtils.java
@@ -21,11 +21,20 @@ import static org.apache.ignite.internal.catalog.commands.CatalogUtils.MAX_PARTI
 
 import com.jayway.jsonpath.InvalidPathException;
 import com.jayway.jsonpath.JsonPath;
+import java.util.HashSet;
+import java.util.function.Predicate;
+import org.apache.ignite.internal.catalog.commands.AbstractCreateIndexCommandParams;
+import org.apache.ignite.internal.catalog.commands.AbstractIndexCommandParams;
 import org.apache.ignite.internal.catalog.commands.AlterZoneParams;
+import org.apache.ignite.internal.catalog.commands.CreateHashIndexParams;
+import org.apache.ignite.internal.catalog.commands.CreateSortedIndexParams;
 import org.apache.ignite.internal.catalog.commands.CreateZoneParams;
+import org.apache.ignite.internal.catalog.commands.DropIndexParams;
 import org.apache.ignite.internal.catalog.commands.DropZoneParams;
 import org.apache.ignite.internal.catalog.commands.RenameZoneParams;
+import org.apache.ignite.internal.util.CollectionUtils;
 import org.apache.ignite.lang.ErrorGroups.DistributionZones;
+import org.apache.ignite.lang.ErrorGroups.Index;
 import org.apache.ignite.lang.util.StringUtils;
 import org.jetbrains.annotations.Nullable;
 
@@ -57,6 +66,26 @@ class CatalogParamsValidationUtils {
         );
     }
 
+    static void validateCreateHashIndexParams(CreateHashIndexParams params) {
+        validateCommonCreateIndexParams(params);
+    }
+
+    static void validateCreateSortedIndexParams(CreateSortedIndexParams params) {
+        validateCommonCreateIndexParams(params);
+
+        if (CollectionUtils.nullOrEmpty(params.collations())) {
+            throw new CatalogValidationException(Index.INVALID_INDEX_DEFINITION_ERR, "Columns collations not specified");
+        }
+
+        if (params.collations().size() != params.columns().size()) {
+            throw new CatalogValidationException(Index.INVALID_INDEX_DEFINITION_ERR, "Columns collations doesn't match number of columns");
+        }
+    }
+
+    static void validateDropIndexParams(DropIndexParams params) {
+        validateCommonIndexParams(params);
+    }
+
     static void validateDropZoneParams(DropZoneParams params) {
         validateZoneName(params.zoneName());
     }
@@ -98,12 +127,7 @@ class CatalogParamsValidationUtils {
     }
 
     private static void validateZoneName(String zoneName, String errorMessage) {
-        if (StringUtils.nullOrBlank(zoneName)) {
-            throw new CatalogValidationException(
-                    DistributionZones.ZONE_DEFINITION_ERR,
-                    errorMessage
-            );
-        }
+        validateNameField(zoneName, DistributionZones.ZONE_DEFINITION_ERR, errorMessage);
     }
 
     private static void validateZonePartitions(@Nullable Integer partitions) {
@@ -172,4 +196,35 @@ class CatalogParamsValidationUtils {
             );
         }
     }
+
+    private static void validateCommonIndexParams(AbstractIndexCommandParams params) {
+        validateNameField(params.indexName(), Index.INVALID_INDEX_DEFINITION_ERR, "Missing index name");
+    }
+
+    private static void validateCommonCreateIndexParams(AbstractCreateIndexCommandParams params) {
+        validateCommonIndexParams(params);
+
+        validateNameField(params.tableName(), Index.INVALID_INDEX_DEFINITION_ERR, "Missing table name");
+
+        if (CollectionUtils.nullOrEmpty(params.columns())) {
+            throw new CatalogValidationException(Index.INVALID_INDEX_DEFINITION_ERR, "Columns not specified");
+        }
+
+        params.columns().stream()
+                .filter(Predicate.not(new HashSet<>()::add))
+                .findAny()
+                .ifPresent(columnName -> {
+                    throw new CatalogValidationException(
+                            Index.INVALID_INDEX_DEFINITION_ERR,
+                            "Duplicate columns are present: {}",
+                            params.columns()
+                    );
+                });
+    }
+
+    private static void validateNameField(String name, int errorCode, String errorMessage) {
+        if (StringUtils.nullOrBlank(name)) {
+            throw new CatalogValidationException(errorCode, errorMessage);
+        }
+    }
 }
diff --git a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AbstractIndexCommandParams.java b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AbstractCreateIndexCommandParams.java
similarity index 51%
copy from modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AbstractIndexCommandParams.java
copy to modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AbstractCreateIndexCommandParams.java
index ea980ece94..7224c5990a 100644
--- a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AbstractIndexCommandParams.java
+++ b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AbstractCreateIndexCommandParams.java
@@ -17,80 +17,39 @@
 
 package org.apache.ignite.internal.catalog.commands;
 
-/**
- * Abstract index ddl command.
- */
-public abstract class AbstractIndexCommandParams implements DdlCommandParams {
-    /** Index name. */
-    protected String indexName;
-
-    /** Schema name where this new index will be created. */
-    protected String schema;
+import java.util.List;
 
+/** Abstract create index ddl command. */
+public abstract class AbstractCreateIndexCommandParams extends AbstractIndexCommandParams {
     /** Table name. */
     protected String tableName;
 
     /** Unique index flag. */
     protected boolean unique;
 
-    /**
-     * Returns index simple name.
-     */
-    public String indexName() {
-        return indexName;
-    }
+    /** Indexed columns. */
+    protected List<String> columns;
 
-    /**
-     * Returns schema name.
-     */
-    public String schemaName() {
-        return schema;
-    }
-
-    /**
-     * Returns table name.
-     */
+    /** Returns table name. */
     public String tableName() {
         return tableName;
     }
 
-    /**
-     * Returns {@code true} if index is unique, {@code false} otherwise.
-     */
+    /** Returns {@code true} if index is unique, {@code false} otherwise. */
     public boolean unique() {
         return unique;
     }
 
-    /**
-     * Parameters builder.
-     */
-    protected abstract static class AbstractBuilder<ParamT extends AbstractIndexCommandParams, BuilderT> {
-        protected ParamT params;
-
-        AbstractBuilder(ParamT params) {
-            this.params = params;
-        }
-
-        /**
-         * Sets schema name.
-         *
-         * @param schemaName Schema name.
-         * @return {@code this}.
-         */
-        public BuilderT schemaName(String schemaName) {
-            params.schema = schemaName;
-            return (BuilderT) this;
-        }
+    /** Returns index columns. */
+    public List<String> columns() {
+        return columns;
+    }
 
-        /**
-         * Sets index simple name.
-         *
-         * @param indexName Index simple name.
-         * @return {@code this}.
-         */
-        public BuilderT indexName(String indexName) {
-            params.indexName = indexName;
-            return (BuilderT) this;
+    /** Parameters builder. */
+    protected abstract static class AbstractCreateIndexBuilder<ParamT extends AbstractCreateIndexCommandParams, BuilderT> extends
+            AbstractIndexBuilder<ParamT, BuilderT> {
+        AbstractCreateIndexBuilder(ParamT params) {
+            super(params);
         }
 
         /**
@@ -107,22 +66,27 @@ public abstract class AbstractIndexCommandParams implements DdlCommandParams {
 
         /**
          * Sets unique flag.
+         *
+         * @param uniq {@code true} if index is unique, {@code false} otherwise.
+         * @return {@code this}.
          */
-        public BuilderT unique() {
-            params.unique = true;
+        public BuilderT unique(boolean uniq) {
+            params.unique = uniq;
 
             return (BuilderT) this;
         }
 
         /**
-         * Builds parameters.
+         * Set columns names.
          *
-         * @return Parameters.
+         * @param columns Columns names.
+         * @return {@code this}.
+         * @throws NullPointerException If the columns is {@code null} or one of its elements.
          */
-        public ParamT build() {
-            ParamT params0 = params;
-            params = null;
-            return params0;
+        public BuilderT columns(List<String> columns) {
+            params.columns = List.copyOf(columns);
+
+            return (BuilderT) this;
         }
     }
 }
diff --git a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AbstractIndexCommandParams.java b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AbstractIndexCommandParams.java
index ea980ece94..85f983f405 100644
--- a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AbstractIndexCommandParams.java
+++ b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AbstractIndexCommandParams.java
@@ -17,108 +17,60 @@
 
 package org.apache.ignite.internal.catalog.commands;
 
-/**
- * Abstract index ddl command.
- */
+import org.jetbrains.annotations.Nullable;
+
+/** Abstract create index ddl command. */
 public abstract class AbstractIndexCommandParams implements DdlCommandParams {
     /** Index name. */
     protected String indexName;
 
-    /** Schema name where this new index will be created. */
-    protected String schema;
-
-    /** Table name. */
-    protected String tableName;
-
-    /** Unique index flag. */
-    protected boolean unique;
+    /** Schema name, {@code null} means to use the default schema. */
+    protected @Nullable String schemaName;
 
-    /**
-     * Returns index simple name.
-     */
+    /** Returns index name. */
     public String indexName() {
         return indexName;
     }
 
-    /**
-     * Returns schema name.
-     */
-    public String schemaName() {
-        return schema;
+    /** Returns schema name, {@code null} means to use the default schema. */
+    public @Nullable String schemaName() {
+        return schemaName;
     }
 
-    /**
-     * Returns table name.
-     */
-    public String tableName() {
-        return tableName;
-    }
-
-    /**
-     * Returns {@code true} if index is unique, {@code false} otherwise.
-     */
-    public boolean unique() {
-        return unique;
-    }
-
-    /**
-     * Parameters builder.
-     */
-    protected abstract static class AbstractBuilder<ParamT extends AbstractIndexCommandParams, BuilderT> {
+    /** Parameters builder. */
+    protected abstract static class AbstractIndexBuilder<ParamT extends AbstractCreateIndexCommandParams, BuilderT> {
         protected ParamT params;
 
-        AbstractBuilder(ParamT params) {
+        /** Constructor. */
+        AbstractIndexBuilder(ParamT params) {
             this.params = params;
         }
 
         /**
          * Sets schema name.
          *
-         * @param schemaName Schema name.
+         * @param schemaName Schema name, {@code null} to use to use the default schema.
          * @return {@code this}.
          */
-        public BuilderT schemaName(String schemaName) {
-            params.schema = schemaName;
+        public BuilderT schemaName(@Nullable String schemaName) {
+            params.schemaName = schemaName;
+
             return (BuilderT) this;
         }
 
         /**
-         * Sets index simple name.
+         * Sets index name.
          *
-         * @param indexName Index simple name.
+         * @param indexName Index name.
          * @return {@code this}.
          */
         public BuilderT indexName(String indexName) {
             params.indexName = indexName;
-            return (BuilderT) this;
-        }
-
-        /**
-         * Set table name.
-         *
-         * @param tableName Table name.
-         * @return {@code this}.
-         */
-        public BuilderT tableName(String tableName) {
-            params.tableName = tableName;
-
-            return (BuilderT) this;
-        }
-
-        /**
-         * Sets unique flag.
-         */
-        public BuilderT unique() {
-            params.unique = true;
 
             return (BuilderT) this;
         }
 
-        /**
-         * Builds parameters.
-         *
-         * @return Parameters.
-         */
+        /** Builds parameters. */
         public ParamT build() {
             ParamT params0 = params;
             params = null;
diff --git a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateHashIndexParams.java b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateHashIndexParams.java
index 961cd914e7..2a765ddbef 100644
--- a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateHashIndexParams.java
+++ b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateHashIndexParams.java
@@ -17,45 +17,21 @@
 
 package org.apache.ignite.internal.catalog.commands;
 
-import java.util.List;
-
-/**
- * CREATE INDEX statement.
- */
-public class CreateHashIndexParams extends AbstractIndexCommandParams {
+/** CREATE INDEX statement. */
+public class CreateHashIndexParams extends AbstractCreateIndexCommandParams {
     /** Creates parameters builder. */
     public static Builder builder() {
         return new Builder();
     }
 
-    /** Indexed columns. */
-    private List<String> columns;
-
-    /**
-     * Gets indexed columns.
-     */
-    public List<String> columns() {
-        return columns;
+    private CreateHashIndexParams() {
+        // No-op.
     }
 
-    /**
-     * Parameters builder.
-     */
-    public static class Builder extends AbstractIndexCommandParams.AbstractBuilder<CreateHashIndexParams, CreateHashIndexParams.Builder> {
+    /** Parameters builder. */
+    public static class Builder extends AbstractCreateIndexBuilder<CreateHashIndexParams, Builder> {
         private Builder() {
             super(new CreateHashIndexParams());
         }
-
-        /**
-         * Set columns names.
-         *
-         * @param columns Columns names.
-         * @return {@code this}.
-         */
-        public Builder columns(List<String> columns) {
-            params.columns = columns;
-
-            return this;
-        }
     }
 }
diff --git a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateSortedIndexParams.java b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateSortedIndexParams.java
index 2da5babf22..745a5de623 100644
--- a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateSortedIndexParams.java
+++ b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateSortedIndexParams.java
@@ -20,63 +20,40 @@ package org.apache.ignite.internal.catalog.commands;
 import java.util.List;
 import org.apache.ignite.internal.catalog.descriptors.CatalogColumnCollation;
 
-/**
- * CREATE INDEX statement.
- */
-public class CreateSortedIndexParams extends AbstractIndexCommandParams {
+/** CREATE INDEX statement. */
+public class CreateSortedIndexParams extends AbstractCreateIndexCommandParams {
     /** Creates parameters builder. */
     public static Builder builder() {
         return new Builder();
     }
 
-    /** Indexed columns. */
-    private List<String> columns;
+    private CreateSortedIndexParams() {
+        // No-op.
+    }
 
     /** Columns collations. */
     private List<CatalogColumnCollation> collations;
 
-    /**
-     * Gets indexed columns.
-     */
-    public List<String> columns() {
-        return columns;
-    }
-
-    /**
-     * Gets columns collations.
-     */
+    /** Gets columns collations. */
     public List<CatalogColumnCollation> collations() {
         return collations;
     }
 
-    /**
-     * Parameters builder.
-     */
-    public static class Builder extends AbstractBuilder<CreateSortedIndexParams, CreateSortedIndexParams.Builder> {
+    /** Parameters builder. */
+    public static class Builder extends AbstractCreateIndexBuilder<CreateSortedIndexParams, Builder> {
         private Builder() {
             super(new CreateSortedIndexParams());
         }
 
-        /**
-         * Set columns names.
-         *
-         * @param columns Columns names.
-         * @return {@code this}.
-         */
-        public Builder columns(List<String> columns) {
-            params.columns = columns;
-
-            return this;
-        }
-
         /**
          * Set columns collations.
          *
          * @param collations Columns collations.
          * @return {@code this}.
+         * @throws NullPointerException If the columns is {@code null} or one of its elements.
          */
         public Builder collations(List<CatalogColumnCollation> collations) {
-            params.collations = collations;
+            params.collations = List.copyOf(collations);
 
             return this;
         }
diff --git a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/DropIndexParams.java b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/DropIndexParams.java
index 0ccc8660c4..100f3c3fe1 100644
--- a/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/DropIndexParams.java
+++ b/modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/DropIndexParams.java
@@ -17,76 +17,21 @@
 
 package org.apache.ignite.internal.catalog.commands;
 
-/**
- * DROP INDEX statement.
- */
-public class DropIndexParams implements DdlCommandParams {
+/** DROP INDEX statement. */
+public class DropIndexParams extends AbstractCreateIndexCommandParams {
     /** Creates parameters builder. */
     public static Builder builder() {
         return new Builder();
     }
 
-    /** Index name. */
-    protected String indexName;
-
-    /** Schema name where this new index will be created. */
-    protected String schema;
-
-    /**
-     * Returns index simple name.
-     */
-    public String indexName() {
-        return indexName;
-    }
-
-    /**
-     * Returns schema name.
-     */
-    public String schemaName() {
-        return schema;
+    private DropIndexParams() {
+        // No-op.
     }
 
-    /**
-     * Parameters builder.
-     */
-    public static class Builder {
-        private DropIndexParams params;
-
-        Builder() {
-            this.params = new DropIndexParams();
-        }
-
-        /**
-         * Sets schema name.
-         *
-         * @param schemaName Schema name.
-         * @return {@code this}.
-         */
-        public Builder schemaName(String schemaName) {
-            params.schema = schemaName;
-            return this;
-        }
-
-        /**
-         * Sets index simple name.
-         *
-         * @param indexName Index simple name.
-         * @return {@code this}.
-         */
-        public Builder indexName(String indexName) {
-            params.indexName = indexName;
-            return this;
-        }
-
-        /**
-         * Builds parameters.
-         *
-         * @return Parameters.
-         */
-        public DropIndexParams build() {
-            DropIndexParams params0 = params;
-            params = null;
-            return params0;
+    /** Parameters builder. */
+    public static class Builder extends AbstractIndexBuilder<DropIndexParams, Builder> {
+        private Builder() {
+            super(new DropIndexParams());
         }
     }
 }
diff --git a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerSelfTest.java b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerSelfTest.java
index 3ec2cc3c1f..6f1a9408dc 100644
--- a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerSelfTest.java
+++ b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerSelfTest.java
@@ -29,6 +29,8 @@ import static org.apache.ignite.internal.catalog.commands.CatalogUtils.DEFAULT_S
 import static org.apache.ignite.internal.catalog.commands.CatalogUtils.DEFAULT_VARLEN_LENGTH;
 import static org.apache.ignite.internal.catalog.commands.CatalogUtils.IMMEDIATE_TIMER_VALUE;
 import static org.apache.ignite.internal.catalog.commands.CatalogUtils.INFINITE_TIMER_VALUE;
+import static org.apache.ignite.internal.catalog.descriptors.CatalogColumnCollation.ASC_NULLS_LAST;
+import static org.apache.ignite.internal.catalog.descriptors.CatalogColumnCollation.DESC_NULLS_FIRST;
 import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrow;
 import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrowFast;
 import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willBe;
@@ -86,7 +88,6 @@ import org.apache.ignite.internal.catalog.commands.DropIndexParams;
 import org.apache.ignite.internal.catalog.commands.DropTableParams;
 import org.apache.ignite.internal.catalog.commands.DropZoneParams;
 import org.apache.ignite.internal.catalog.commands.RenameZoneParams;
-import org.apache.ignite.internal.catalog.descriptors.CatalogColumnCollation;
 import org.apache.ignite.internal.catalog.descriptors.CatalogHashIndexDescriptor;
 import org.apache.ignite.internal.catalog.descriptors.CatalogIndexDescriptor;
 import org.apache.ignite.internal.catalog.descriptors.CatalogSchemaDescriptor;
@@ -114,6 +115,7 @@ import org.apache.ignite.internal.hlc.HybridTimestamp;
 import org.apache.ignite.internal.manager.EventListener;
 import org.apache.ignite.lang.ColumnAlreadyExistsException;
 import org.apache.ignite.lang.ColumnNotFoundException;
+import org.apache.ignite.lang.IgniteException;
 import org.apache.ignite.lang.IgniteInternalException;
 import org.apache.ignite.lang.IndexAlreadyExistsException;
 import org.apache.ignite.lang.IndexNotFoundException;
@@ -135,11 +137,9 @@ import org.mockito.ArgumentCaptor;
 public class CatalogManagerSelfTest extends BaseCatalogManagerTest {
     private static final String SCHEMA_NAME = DEFAULT_SCHEMA_NAME;
     private static final String ZONE_NAME = DEFAULT_ZONE_NAME;
-    private static final String TABLE_NAME = "myTable";
     private static final String TABLE_NAME_2 = "myTable2";
     private static final String NEW_COLUMN_NAME = "NEWCOL";
     private static final String NEW_COLUMN_NAME_2 = "NEWCOL2";
-    private static final String INDEX_NAME = "myIndex";
 
     @Test
     public void testEmptyCatalog() {
@@ -432,7 +432,7 @@ public class CatalogManagerSelfTest extends BaseCatalogManagerTest {
     @Test
     public void testDropIndexedColumn() {
         assertThat(manager.createTable(simpleTable(TABLE_NAME)), willBe(nullValue()));
-        assertThat(manager.createIndex(simpleIndex(INDEX_NAME, TABLE_NAME)), willBe(nullValue()));
+        assertThat(manager.createIndex(simpleIndex()), willBe(nullValue()));
 
         // Try to drop indexed column
         AlterTableDropColumnParams params = AlterTableDropColumnParams.builder()
@@ -916,15 +916,8 @@ public class CatalogManagerSelfTest extends BaseCatalogManagerTest {
 
     @Test
     public void testDropTableWithIndex() {
-        CreateHashIndexParams params = CreateHashIndexParams.builder()
-                .schemaName(SCHEMA_NAME)
-                .indexName(INDEX_NAME)
-                .tableName(TABLE_NAME)
-                .columns(List.of("VAL"))
-                .build();
-
         assertThat(manager.createTable(simpleTable(TABLE_NAME)), willBe(nullValue()));
-        assertThat(manager.createIndex(params), willBe(nullValue()));
+        assertThat(manager.createIndex(simpleIndex()), willBe(nullValue()));
 
         long beforeDropTimestamp = clock.nowLong();
 
@@ -967,14 +960,7 @@ public class CatalogManagerSelfTest extends BaseCatalogManagerTest {
     public void testCreateHashIndex() {
         assertThat(manager.createTable(simpleTable(TABLE_NAME)), willBe(nullValue()));
 
-        CreateHashIndexParams params = CreateHashIndexParams.builder()
-                .schemaName(SCHEMA_NAME)
-                .indexName(INDEX_NAME)
-                .tableName(TABLE_NAME)
-                .columns(List.of("VAL", "ID"))
-                .build();
-
-        assertThat(manager.createIndex(params), willBe(nullValue()));
+        assertThat(manager.createIndex(createHashIndexParams(INDEX_NAME, List.of("VAL", "ID"))), willBe(nullValue()));
 
         // Validate catalog version from the past.
         CatalogSchemaDescriptor schema = manager.schema(1);
@@ -1005,14 +991,12 @@ public class CatalogManagerSelfTest extends BaseCatalogManagerTest {
     public void testCreateSortedIndex() {
         assertThat(manager.createTable(simpleTable(TABLE_NAME)), willBe(nullValue()));
 
-        CreateSortedIndexParams params = CreateSortedIndexParams.builder()
-                .schemaName(SCHEMA_NAME)
-                .indexName(INDEX_NAME)
-                .tableName(TABLE_NAME)
-                .unique()
-                .columns(List.of("VAL", "ID"))
-                .collations(List.of(CatalogColumnCollation.DESC_NULLS_FIRST, CatalogColumnCollation.ASC_NULLS_LAST))
-                .build();
+        CreateSortedIndexParams params = createSortedIndexParams(
+                INDEX_NAME,
+                true,
+                List.of("VAL", "ID"),
+                List.of(DESC_NULLS_FIRST, ASC_NULLS_LAST)
+        );
 
         assertThat(manager.createIndex(params), willBe(nullValue()));
 
@@ -1039,40 +1023,12 @@ public class CatalogManagerSelfTest extends BaseCatalogManagerTest {
         assertEquals(schema.table(TABLE_NAME).id(), index.tableId());
         assertEquals("VAL", index.columns().get(0).name());
         assertEquals("ID", index.columns().get(1).name());
-        assertEquals(CatalogColumnCollation.DESC_NULLS_FIRST, index.columns().get(0).collation());
-        assertEquals(CatalogColumnCollation.ASC_NULLS_LAST, index.columns().get(1).collation());
+        assertEquals(DESC_NULLS_FIRST, index.columns().get(0).collation());
+        assertEquals(ASC_NULLS_LAST, index.columns().get(1).collation());
         assertTrue(index.unique());
         assertFalse(index.writeOnly());
     }
 
-    @Test
-    public void testCreateIndexWithSameName() {
-        assertThat(manager.createTable(simpleTable(TABLE_NAME)), willBe(nullValue()));
-
-        CreateHashIndexParams params = CreateHashIndexParams.builder()
-                .indexName(INDEX_NAME)
-                .tableName(TABLE_NAME)
-                .columns(List.of("VAL"))
-                .build();
-
-        assertThat(manager.createIndex(params), willBe(nullValue()));
-        assertThat(manager.createIndex(params), willThrow(IndexAlreadyExistsException.class));
-    }
-
-    @Test
-    public void testCreateIndexOnDuplicateColumns() {
-        assertThat(manager.createTable(simpleTable(TABLE_NAME)), willBe(nullValue()));
-
-        CreateHashIndexParams params = CreateHashIndexParams.builder()
-                .indexName(INDEX_NAME)
-                .tableName(TABLE_NAME)
-                .columns(List.of("VAL", "VAL"))
-                .build();
-
-        assertThat(manager.createIndex(params),
-                willThrow(IgniteInternalException.class, "Can't create index on duplicate columns: VAL, VAL"));
-    }
-
     @Test
     public void operationWillBeRetriedFiniteAmountOfTimes() {
         UpdateLog updateLogMock = mock(UpdateLog.class);
@@ -1212,12 +1168,7 @@ public class CatalogManagerSelfTest extends BaseCatalogManagerTest {
 
         DropTableParams dropTableparams = DropTableParams.builder().tableName(TABLE_NAME).build();
 
-        CreateHashIndexParams createIndexParams = CreateHashIndexParams.builder()
-                .schemaName(SCHEMA_NAME)
-                .indexName(INDEX_NAME)
-                .tableName(TABLE_NAME)
-                .columns(List.of("key2"))
-                .build();
+        CreateHashIndexParams createIndexParams = createHashIndexParams(INDEX_NAME, List.of("key2"));
 
         DropIndexParams dropIndexParams = DropIndexParams.builder().indexName(INDEX_NAME).build();
 
@@ -1640,17 +1591,7 @@ public class CatalogManagerSelfTest extends BaseCatalogManagerTest {
     void testGetTableIdOnDropIndexEvent() {
         assertThat(manager.createTable(simpleTable(TABLE_NAME)), willBe(nullValue()));
 
-        assertThat(
-                manager.createIndex(
-                        CreateHashIndexParams.builder()
-                                .schemaName(SCHEMA_NAME)
-                                .tableName(TABLE_NAME)
-                                .indexName(INDEX_NAME)
-                                .columns(List.of("VAL"))
-                                .build()
-                ),
-                willBe(nullValue())
-        );
+        assertThat(manager.createIndex(createHashIndexParams(INDEX_NAME, List.of("VAL"))), willBe(nullValue()));
 
         int tableId = manager.table(TABLE_NAME, clock.nowLong()).id();
         int pkIndexId = manager.index(createPkIndexName(TABLE_NAME), clock.nowLong()).id();
@@ -1814,7 +1755,7 @@ public class CatalogManagerSelfTest extends BaseCatalogManagerTest {
         assertThat(manager.createTable(simpleTable(TABLE_NAME)), willBe(nullValue()));
         assertEquals(1, manager.latestCatalogVersion());
 
-        assertThat(manager.createIndex(simpleIndex(INDEX_NAME, TABLE_NAME)), willBe(nullValue()));
+        assertThat(manager.createIndex(simpleIndex()), willBe(nullValue()));
         assertEquals(2, manager.latestCatalogVersion());
     }
 
@@ -1831,7 +1772,7 @@ public class CatalogManagerSelfTest extends BaseCatalogManagerTest {
     @Test
     void testIndexes() {
         assertThat(manager.createTable(simpleTable(TABLE_NAME)), willBe(nullValue()));
-        assertThat(manager.createIndex(simpleIndex(INDEX_NAME, TABLE_NAME)), willBe(nullValue()));
+        assertThat(manager.createIndex(simpleIndex()), willBe(nullValue()));
 
         assertThat(manager.indexes(0), empty());
         assertThat(manager.indexes(1), hasItems(index(1, createPkIndexName(TABLE_NAME))));
@@ -1918,6 +1859,85 @@ public class CatalogManagerSelfTest extends BaseCatalogManagerTest {
         assertEquals(DEFAULT_DATA_REGION, zone.dataStorage().dataRegion());
     }
 
+    @Test
+    void testCreateIndexWithAlreadyExistingName() {
+        assertThat(manager.createTable(simpleTable(TABLE_NAME)), willCompleteSuccessfully());
+        assertThat(manager.createIndex(simpleIndex()), willCompleteSuccessfully());
+
+        assertThat(
+                manager.createIndex(createHashIndexParams(INDEX_NAME, List.of("VAL"))),
+                willThrowFast(IndexAlreadyExistsException.class)
+        );
+
+        assertThat(
+                manager.createIndex(createSortedIndexParams(INDEX_NAME, List.of("VAL"), List.of(ASC_NULLS_LAST))),
+                willThrowFast(IndexAlreadyExistsException.class)
+        );
+    }
+
+    @Test
+    void testCreateIndexWithSameNameAsExistingTable() {
+        assertThat(manager.createTable(simpleTable(TABLE_NAME)), willCompleteSuccessfully());
+
+        assertThat(
+                manager.createIndex(createHashIndexParams(TABLE_NAME, List.of("VAL"))),
+                willThrowFast(TableAlreadyExistsException.class)
+        );
+
+        assertThat(
+                manager.createIndex(createSortedIndexParams(TABLE_NAME, List.of("VAL"), List.of(ASC_NULLS_LAST))),
+                willThrowFast(TableAlreadyExistsException.class)
+        );
+    }
+
+    @Test
+    void testCreateIndexWithNotExistingTable() {
+        assertThat(
+                manager.createIndex(createHashIndexParams(TABLE_NAME, List.of("VAL"))),
+                willThrowFast(TableNotFoundException.class)
+        );
+
+        assertThat(
+                manager.createIndex(createSortedIndexParams(TABLE_NAME, List.of("VAL"), List.of(ASC_NULLS_LAST))),
+                willThrowFast(TableNotFoundException.class)
+        );
+    }
+
+    @Test
+    void testCreateIndexWithMissingTableColumns() {
+        assertThat(manager.createTable(simpleTable(TABLE_NAME)), willCompleteSuccessfully());
+
+        assertThat(
+                manager.createIndex(createHashIndexParams(INDEX_NAME, List.of("fake"))),
+                willThrowFast(ColumnNotFoundException.class)
+        );
+
+        assertThat(
+                manager.createIndex(createSortedIndexParams(INDEX_NAME, List.of("fake"), List.of(ASC_NULLS_LAST))),
+                willThrowFast(ColumnNotFoundException.class)
+        );
+    }
+
+    @Test
+    void testCreateUniqIndexWithMissingTableColocationColumns() {
+        assertThat(manager.createTable(simpleTable(TABLE_NAME)), willCompleteSuccessfully());
+
+        assertThat(
+                manager.createIndex(createHashIndexParams(INDEX_NAME, true, List.of("VAL"))),
+                willThrowFast(IgniteException.class, "Unique index must include all colocation columns")
+        );
+
+        assertThat(
+                manager.createIndex(createSortedIndexParams(INDEX_NAME, true, List.of("VAL"), List.of(ASC_NULLS_LAST))),
+                willThrowFast(IgniteException.class, "Unique index must include all colocation columns")
+        );
+    }
+
+    @Test
+    void testDropNotExistingIndex() {
+        assertThat(manager.dropIndex(DropIndexParams.builder().indexName(INDEX_NAME).build()), willThrowFast(IndexNotFoundException.class));
+    }
+
     private void createSomeTable(String tableName) {
         CreateTableParams params = CreateTableParams.builder()
                 .schemaName(SCHEMA_NAME)
@@ -1988,17 +2008,12 @@ public class CatalogManagerSelfTest extends BaseCatalogManagerTest {
                 .zone(ZONE_NAME)
                 .columns(cols)
                 .primaryKeyColumns(List.of(cols.get(0).name()))
+                .colocationColumns(List.of(cols.get(0).name()))
                 .build();
     }
 
-    private static CreateSortedIndexParams simpleIndex(String indexName, String tableName) {
-        return CreateSortedIndexParams.builder()
-                .indexName(indexName)
-                .tableName(tableName)
-                .unique()
-                .columns(List.of("VAL"))
-                .collations(List.of(CatalogColumnCollation.ASC_NULLS_LAST))
-                .build();
+    private static CreateSortedIndexParams simpleIndex() {
+        return createSortedIndexParams(INDEX_NAME, List.of("VAL"), List.of(ASC_NULLS_LAST));
     }
 
     private static class TestColumnTypeParams {
diff --git a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerValidationTest.java b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerValidationTest.java
index 34d01aa79d..2a9b680a47 100644
--- a/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerValidationTest.java
+++ b/modules/catalog/src/test/java/org/apache/ignite/internal/catalog/CatalogManagerValidationTest.java
@@ -17,19 +17,26 @@
 
 package org.apache.ignite.internal.catalog;
 
+import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
 import static org.apache.ignite.internal.catalog.commands.CatalogUtils.DEFAULT_FILTER;
 import static org.apache.ignite.internal.catalog.commands.CatalogUtils.DEFAULT_PARTITION_COUNT;
 import static org.apache.ignite.internal.catalog.commands.CatalogUtils.DEFAULT_REPLICA_COUNT;
 import static org.apache.ignite.internal.catalog.commands.CatalogUtils.IMMEDIATE_TIMER_VALUE;
 import static org.apache.ignite.internal.catalog.commands.CatalogUtils.INFINITE_TIMER_VALUE;
 import static org.apache.ignite.internal.catalog.commands.CatalogUtils.MAX_PARTITION_COUNT;
+import static org.apache.ignite.internal.catalog.descriptors.CatalogColumnCollation.ASC_NULLS_FIRST;
 import static org.apache.ignite.internal.testframework.matchers.CompletableFutureExceptionMatcher.willThrowFast;
 import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willBe;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.nullValue;
 
+import java.util.Arrays;
+import java.util.List;
 import org.apache.ignite.internal.catalog.commands.AlterZoneParams;
+import org.apache.ignite.internal.catalog.commands.CreateHashIndexParams;
+import org.apache.ignite.internal.catalog.commands.CreateSortedIndexParams;
 import org.apache.ignite.internal.catalog.commands.CreateZoneParams;
+import org.apache.ignite.internal.catalog.commands.DropIndexParams;
 import org.apache.ignite.internal.catalog.commands.DropZoneParams;
 import org.apache.ignite.internal.catalog.commands.RenameZoneParams;
 import org.jetbrains.annotations.Nullable;
@@ -550,6 +557,102 @@ public class CatalogManagerValidationTest extends BaseCatalogManagerTest {
         );
     }
 
+    @Test
+    void testValidateTableNameOnIndexCreation() {
+        assertThat(
+                manager.createIndex(CreateHashIndexParams.builder().schemaName(DEFAULT_SCHEMA_NAME).indexName(INDEX_NAME).build()),
+                willThrowFast(CatalogValidationException.class, "Missing table name")
+        );
+
+        assertThat(
+                manager.createIndex(CreateSortedIndexParams.builder().schemaName(DEFAULT_SCHEMA_NAME).indexName(INDEX_NAME).build()),
+                willThrowFast(CatalogValidationException.class, "Missing table name")
+        );
+    }
+
+    @Test
+    void testValidateIndexNameOnIndexCreation() {
+        assertThat(
+                manager.createIndex(CreateHashIndexParams.builder().schemaName(DEFAULT_SCHEMA_NAME).tableName(TABLE_NAME).build()),
+                willThrowFast(CatalogValidationException.class, "Missing index name")
+        );
+
+        assertThat(
+                manager.createIndex(CreateSortedIndexParams.builder().schemaName(DEFAULT_SCHEMA_NAME).tableName(TABLE_NAME).build()),
+                willThrowFast(CatalogValidationException.class, "Missing index name")
+        );
+    }
+
+    @Test
+    void testValidateIndexColumnsNotSpecifiedOnIndexCreation() {
+        assertThat(
+                manager.createIndex(createHashIndexParams(INDEX_NAME, null)),
+                willThrowFast(CatalogValidationException.class, "Columns not specified")
+        );
+
+        assertThat(
+                manager.createIndex(createSortedIndexParams(INDEX_NAME, null, null)),
+                willThrowFast(CatalogValidationException.class, "Columns not specified")
+        );
+
+        assertThat(
+                manager.createIndex(createHashIndexParams(INDEX_NAME, List.of())),
+                willThrowFast(CatalogValidationException.class, "Columns not specified")
+        );
+
+        assertThat(
+                manager.createIndex(createSortedIndexParams(INDEX_NAME, List.of(), null)),
+                willThrowFast(CatalogValidationException.class, "Columns not specified")
+        );
+    }
+
+    @Test
+    void testValidateIndexColumnsDuplicatesOnIndexCreation() {
+        assertThat(
+                manager.createIndex(createHashIndexParams(INDEX_NAME, Arrays.asList("key", "key"))),
+                willThrowFast(CatalogValidationException.class, "Duplicate columns are present")
+        );
+
+        assertThat(
+                manager.createIndex(createSortedIndexParams(INDEX_NAME, Arrays.asList("key", "key"), null)),
+                willThrowFast(CatalogValidationException.class, "Duplicate columns are present")
+        );
+    }
+
+    @Test
+    void testValidateIndexColumnsCollationsNotSpecifiedOnIndexCreation() {
+        assertThat(
+                manager.createIndex(createSortedIndexParams(INDEX_NAME, List.of("key"), null)),
+                willThrowFast(CatalogValidationException.class, "Columns collations not specified")
+        );
+
+        assertThat(
+                manager.createIndex(createSortedIndexParams(INDEX_NAME, List.of("key"), List.of())),
+                willThrowFast(CatalogValidationException.class, "Columns collations not specified")
+        );
+    }
+
+    @Test
+    void testValidateIndexColumnsCollationsNotScameSizeWithColumnsOnIndexCreation() {
+        assertThat(
+                manager.createIndex(createSortedIndexParams(INDEX_NAME, List.of("key", "val"), List.of(ASC_NULLS_FIRST))),
+                willThrowFast(CatalogValidationException.class, "Columns collations doesn't match number of columns")
+        );
+
+        assertThat(
+                manager.createIndex(createSortedIndexParams(INDEX_NAME, List.of("key"), List.of(ASC_NULLS_FIRST, ASC_NULLS_FIRST))),
+                willThrowFast(CatalogValidationException.class, "Columns collations doesn't match number of columns")
+        );
+    }
+
+    @Test
+    void testValidateIndexNameOnIndexDrop() {
+        assertThat(
+                manager.dropIndex(DropIndexParams.builder().schemaName(DEFAULT_SCHEMA_NAME).build()),
+                willThrowFast(CatalogValidationException.class, "Missing index name")
+        );
+    }
+
     private static CreateZoneParams.Builder createZoneBuilder(String zoneName) {
         return CreateZoneParams.builder().zoneName(zoneName);
     }
diff --git a/modules/catalog/src/testFixtures/java/org/apache/ignite/internal/catalog/BaseCatalogManagerTest.java b/modules/catalog/src/testFixtures/java/org/apache/ignite/internal/catalog/BaseCatalogManagerTest.java
index 8d3f230eb0..c138c767e9 100644
--- a/modules/catalog/src/testFixtures/java/org/apache/ignite/internal/catalog/BaseCatalogManagerTest.java
+++ b/modules/catalog/src/testFixtures/java/org/apache/ignite/internal/catalog/BaseCatalogManagerTest.java
@@ -17,12 +17,17 @@
 
 package org.apache.ignite.internal.catalog;
 
+import static org.apache.ignite.internal.catalog.CatalogService.DEFAULT_SCHEMA_NAME;
 import static org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.spy;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
+import org.apache.ignite.internal.catalog.commands.CreateHashIndexParams;
+import org.apache.ignite.internal.catalog.commands.CreateSortedIndexParams;
+import org.apache.ignite.internal.catalog.descriptors.CatalogColumnCollation;
 import org.apache.ignite.internal.catalog.storage.UpdateLog;
 import org.apache.ignite.internal.catalog.storage.UpdateLogImpl;
 import org.apache.ignite.internal.hlc.HybridClock;
@@ -34,6 +39,7 @@ import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
 import org.apache.ignite.internal.util.IgniteUtils;
 import org.apache.ignite.internal.vault.VaultManager;
 import org.apache.ignite.internal.vault.inmemory.InMemoryVaultService;
+import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 
@@ -43,6 +49,10 @@ import org.junit.jupiter.api.BeforeEach;
 public abstract class BaseCatalogManagerTest extends BaseIgniteAbstractTest {
     private static final String NODE_NAME = "test";
 
+    protected static final String TABLE_NAME = "test_table";
+
+    protected static final String INDEX_NAME = "myIndex";
+
     final HybridClock clock = new HybridClockImpl();
 
     private VaultManager vault;
@@ -81,4 +91,62 @@ public abstract class BaseCatalogManagerTest extends BaseIgniteAbstractTest {
                 .map(component -> component::stop)
         );
     }
+
+    protected static CreateHashIndexParams createHashIndexParams(
+            String indexName,
+            boolean uniq,
+            @Nullable List<String> indexColumns
+    ) {
+        CreateHashIndexParams.Builder builder = CreateHashIndexParams.builder()
+                .schemaName(DEFAULT_SCHEMA_NAME)
+                .tableName(TABLE_NAME)
+                .indexName(indexName);
+
+        builder.unique(uniq);
+
+        if (indexColumns != null) {
+            builder.columns(indexColumns);
+        }
+
+        return builder.build();
+    }
+
+    protected static CreateHashIndexParams createHashIndexParams(
+            String indexName,
+            @Nullable List<String> indexColumns
+    ) {
+        return createHashIndexParams(indexName, false, indexColumns);
+    }
+
+    protected static CreateSortedIndexParams createSortedIndexParams(
+            String indexName,
+            boolean uniq,
+            @Nullable List<String> indexColumns,
+            @Nullable List<CatalogColumnCollation> columnsCollations
+    ) {
+        CreateSortedIndexParams.Builder builder = CreateSortedIndexParams.builder()
+                .schemaName(DEFAULT_SCHEMA_NAME)
+                .tableName(TABLE_NAME)
+                .indexName(indexName);
+
+        builder.unique(uniq);
+
+        if (indexColumns != null) {
+            builder.columns(indexColumns);
+        }
+
+        if (columnsCollations != null) {
+            builder.collations(columnsCollations);
+        }
+
+        return builder.build();
+    }
+
+    protected static CreateSortedIndexParams createSortedIndexParams(
+            String indexName,
+            @Nullable List<String> indexColumns,
+            @Nullable List<CatalogColumnCollation> columnsCollations
+    ) {
+        return createSortedIndexParams(indexName, false, indexColumns, columnsCollations);
+    }
 }
diff --git 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
index 96dbc912d6..225c6d0b91 100644
--- 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
@@ -20,7 +20,7 @@ package org.apache.ignite.internal.sql.engine.exec.ddl;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import org.apache.ignite.internal.catalog.CatalogManager;
-import org.apache.ignite.internal.catalog.commands.AbstractIndexCommandParams;
+import org.apache.ignite.internal.catalog.commands.AbstractCreateIndexCommandParams;
 import org.apache.ignite.internal.catalog.commands.CreateHashIndexParams;
 import org.apache.ignite.internal.catalog.commands.CreateSortedIndexParams;
 import org.apache.ignite.internal.distributionzones.DistributionZoneAlreadyExistsException;
@@ -108,7 +108,7 @@ public class DdlCommandHandlerWrapper extends DdlCommandHandler {
         } else if (cmd instanceof CreateIndexCommand) {
             return ddlCommandFuture
                     .thenCompose(res -> {
-                        AbstractIndexCommandParams params = DdlToCatalogCommandConverter.convert((CreateIndexCommand) cmd);
+                        AbstractCreateIndexCommandParams params = DdlToCatalogCommandConverter.convert((CreateIndexCommand) cmd);
                         if (params instanceof CreateSortedIndexParams) {
                             return catalogManager.createIndex((CreateSortedIndexParams) params);
                         } else {
diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ddl/DdlToCatalogCommandConverter.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ddl/DdlToCatalogCommandConverter.java
index 90d1deff2f..45ccfdd95c 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ddl/DdlToCatalogCommandConverter.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ddl/DdlToCatalogCommandConverter.java
@@ -25,7 +25,7 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 import org.apache.calcite.rel.type.RelDataType;
 import org.apache.calcite.sql.type.SqlTypeName;
-import org.apache.ignite.internal.catalog.commands.AbstractIndexCommandParams;
+import org.apache.ignite.internal.catalog.commands.AbstractCreateIndexCommandParams;
 import org.apache.ignite.internal.catalog.commands.AlterColumnParams;
 import org.apache.ignite.internal.catalog.commands.AlterTableAddColumnParams;
 import org.apache.ignite.internal.catalog.commands.AlterTableDropColumnParams;
@@ -184,7 +184,7 @@ class DdlToCatalogCommandConverter {
     }
 
 
-    static AbstractIndexCommandParams convert(CreateIndexCommand cmd) {
+    static AbstractCreateIndexCommandParams convert(CreateIndexCommand cmd) {
         switch (cmd.type()) {
             case HASH:
                 return CreateHashIndexParams.builder()