This is an automated email from the ASF dual-hosted git repository.
amashenkov pushed a commit to branch ignite-19942
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit c06578f06ce213215e28fe5f8c48adb7808d5842
Author: amashenkov <andrey.mashen...@gmail.com>
AuthorDate: Wed Jul 19 15:12:15 2023 +0300
Resolve conflicts.
---
modules/distribution-zones/build.gradle | 1 -
.../src/main/java/org/apache/ignite/internal/index/IndexManager.java | 2 ++
.../apache/ignite/internal/runner/app/ItIgniteNodeRestartTest.java | 4 ++--
.../org/apache/ignite/internal/schema/CatalogDescriptorUtils.java | 1 +
.../apache/ignite/internal/sql/engine/exec/ddl/DdlCommandHandler.java | 2 +-
.../org/apache/ignite/internal/table/distributed/TableManager.java | 4 ++--
6 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/modules/distribution-zones/build.gradle
b/modules/distribution-zones/build.gradle
index ec90a2420d..46796dacfe 100644
--- a/modules/distribution-zones/build.gradle
+++ b/modules/distribution-zones/build.gradle
@@ -26,7 +26,6 @@ dependencies {
annotationProcessor project(":ignite-configuration-annotation-processor")
annotationProcessor libs.auto.service
- implementation project(':ignite-catalog')
implementation project(':ignite-core')
implementation project(':ignite-configuration-api')
implementation project(':ignite-api')
diff --git
a/modules/index/src/main/java/org/apache/ignite/internal/index/IndexManager.java
b/modules/index/src/main/java/org/apache/ignite/internal/index/IndexManager.java
index d14dc9dfd5..592daa97e0 100644
---
a/modules/index/src/main/java/org/apache/ignite/internal/index/IndexManager.java
+++
b/modules/index/src/main/java/org/apache/ignite/internal/index/IndexManager.java
@@ -312,6 +312,8 @@ public class IndexManager extends Producer<IndexEvent,
IndexEventParameters> imp
});
return future;
+ } catch (Exception ex) {
+ return failedFuture(ex);
} finally {
busyLock.leaveBusy();
}
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 00bf165d11..60e2e37a26 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
@@ -52,13 +52,13 @@ import java.util.function.LongFunction;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;
-import org.apache.calcite.jdbc.CalciteMetaImpl;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgnitionManager;
import org.apache.ignite.InitParameters;
import org.apache.ignite.internal.BaseIgniteRestartTest;
import org.apache.ignite.internal.app.IgniteImpl;
import org.apache.ignite.internal.baseline.BaselineManager;
+import org.apache.ignite.internal.catalog.CatalogManagerImpl;
import org.apache.ignite.internal.catalog.ClockWaiter;
import org.apache.ignite.internal.catalog.storage.UpdateLogImpl;
import
org.apache.ignite.internal.cluster.management.ClusterManagementGroupManager;
@@ -341,7 +341,7 @@ public class ItIgniteNodeRestartTest extends
BaseIgniteRestartTest {
var clockWaiter = new ClockWaiter("test", hybridClock);
- var catalogManager = new CalciteMetaImpl(
+ var catalogManager = new CatalogManagerImpl(
new UpdateLogImpl(metaStorageMgr),
clockWaiter
);
diff --git
a/modules/schema/src/main/java/org/apache/ignite/internal/schema/CatalogDescriptorUtils.java
b/modules/schema/src/main/java/org/apache/ignite/internal/schema/CatalogDescriptorUtils.java
index 54dca3f1b1..bcff576238 100644
---
a/modules/schema/src/main/java/org/apache/ignite/internal/schema/CatalogDescriptorUtils.java
+++
b/modules/schema/src/main/java/org/apache/ignite/internal/schema/CatalogDescriptorUtils.java
@@ -254,6 +254,7 @@ public class CatalogDescriptorUtils {
colTypeChg.changeType(typeName);
switch (spec) {
+ case BOOLEAN:
case INT8:
case INT16:
case INT32:
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ddl/DdlCommandHandler.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ddl/DdlCommandHandler.java
index e8ec21d5eb..9c9b9622bc 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ddl/DdlCommandHandler.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ddl/DdlCommandHandler.java
@@ -21,7 +21,6 @@ import static
java.util.concurrent.CompletableFuture.completedFuture;
import static java.util.concurrent.CompletableFuture.failedFuture;
import static org.apache.ignite.internal.util.CollectionUtils.nullOrEmpty;
import static org.apache.ignite.lang.ErrorGroups.Sql.STMT_VALIDATION_ERR;
-import static
org.apache.ignite.lang.ErrorGroups.Sql.UNSUPPORTED_DDL_OPERATION_ERR;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionException;
@@ -52,6 +51,7 @@ import org.apache.ignite.lang.IndexAlreadyExistsException;
import org.apache.ignite.lang.IndexNotFoundException;
import org.apache.ignite.lang.TableAlreadyExistsException;
import org.apache.ignite.lang.TableNotFoundException;
+import org.apache.ignite.sql.SqlException;
/** DDL commands handler. */
public class DdlCommandHandler {
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
index e2e5ce1092..41f3a4d886 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableManager.java
@@ -46,7 +46,7 @@ import static
org.apache.ignite.internal.utils.RebalanceUtil.extractPartitionNum
import static org.apache.ignite.internal.utils.RebalanceUtil.extractTableId;
import static
org.apache.ignite.internal.utils.RebalanceUtil.pendingPartAssignmentsKey;
import static
org.apache.ignite.internal.utils.RebalanceUtil.stablePartAssignmentsKey;
-import static
org.apache.ignite.lang.ErrorGroups.Sql.DROP_IDX_COLUMN_CONSTRAINT_ERR;
+import static org.apache.ignite.lang.ErrorGroups.Sql.STMT_VALIDATION_ERR;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import java.io.IOException;
@@ -2858,7 +2858,7 @@ public class TableManager extends Producer<TableEvent,
TableEventParameters> imp
}
if (primaryCols.contains(colName)) {
- throw new
SqlException(DROP_IDX_COLUMN_CONSTRAINT_ERR, IgniteStringFormatter
+ throw new SqlException(STMT_VALIDATION_ERR,
IgniteStringFormatter
.format("Can`t delete column, belongs
to primary key: [name={}]", colName));
}
}
