tkalkirill commented on code in PR #2493:
URL: https://github.com/apache/ignite-3/pull/2493#discussion_r1305326270
##########
modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogManagerImpl.java:
##########
@@ -947,14 +836,45 @@ private static void
ensureNoTableOrIndexExistsWithSameName(CatalogSchemaDescript
}
private static void validateIndexColumns(CatalogTableDescriptor table,
AbstractCreateIndexCommandParams params) {
- for (String indexColumn : params.columns()) {
- if (table.columnDescriptor(indexColumn) == null) {
- throw new ColumnNotFoundException(indexColumn);
- }
- }
+ validateColumnsExistsInTable(table, params.columns());
if (params.unique() &&
!params.columns().containsAll(table.colocationColumns())) {
throw new IgniteException(Index.INVALID_INDEX_DEFINITION_ERR,
"Unique index must include all colocation columns");
}
}
+
+ private static void ensureColumnCanBeDropped(
+ CatalogSchemaDescriptor schema,
+ CatalogTableDescriptor table,
+ AlterTableDropColumnParams params
+ ) {
+ validateColumnsExistsInTable(table, params.columns());
+
+ List<String> inPrimaryKeyColumns = params.columns().stream()
+ .filter(table::isPrimaryKeyColumn)
+ .collect(toList());
+
+ if (!inPrimaryKeyColumns.isEmpty()) {
+ throw new IgniteException(Table.TABLE_DEFINITION_ERR, "Can't drop
primary key columns: " + inPrimaryKeyColumns);
Review Comment:
Do you have a suggestion?
##########
modules/catalog/src/main/java/org/apache/ignite/internal/catalog/CatalogManagerImpl.java:
##########
@@ -947,14 +836,45 @@ private static void
ensureNoTableOrIndexExistsWithSameName(CatalogSchemaDescript
}
private static void validateIndexColumns(CatalogTableDescriptor table,
AbstractCreateIndexCommandParams params) {
- for (String indexColumn : params.columns()) {
- if (table.columnDescriptor(indexColumn) == null) {
- throw new ColumnNotFoundException(indexColumn);
- }
- }
+ validateColumnsExistsInTable(table, params.columns());
if (params.unique() &&
!params.columns().containsAll(table.colocationColumns())) {
throw new IgniteException(Index.INVALID_INDEX_DEFINITION_ERR,
"Unique index must include all colocation columns");
}
}
+
+ private static void ensureColumnCanBeDropped(
+ CatalogSchemaDescriptor schema,
+ CatalogTableDescriptor table,
+ AlterTableDropColumnParams params
+ ) {
+ validateColumnsExistsInTable(table, params.columns());
+
+ List<String> inPrimaryKeyColumns = params.columns().stream()
+ .filter(table::isPrimaryKeyColumn)
+ .collect(toList());
+
+ if (!inPrimaryKeyColumns.isEmpty()) {
+ throw new IgniteException(Table.TABLE_DEFINITION_ERR, "Can't drop
primary key columns: " + inPrimaryKeyColumns);
+ }
+
+ Arrays.stream(schema.indexes())
+ .filter(index -> index.tableId() == table.id())
+ .forEach(index -> params.columns().stream()
+ .filter(index::hasColumn)
+ .findAny()
+ .ifPresent(columnName -> {
+ throw new SqlException(
Review Comment:
same
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
