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/11 07:01:28 UTC

[ignite-3] branch catalog-feature updated (31d5ed162e -> 693f950b5b)

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 31d5ed162e IGNITE-19499 TableManager should listen CatalogService events instead of configuration (#2500)
     add 42d717ed93 IGNITE-18670: Sql. It is possible to reference aliases in GROUP BY clause. (#2545)
     add 22efe81f33 IGNITE-20354 Reduce code duplication in commit cleanup (#2557)
     add 6df2cc270a IGNITE-19791 Sql. Introduce SqlRowHandler that supports binary tuple rows (#2512)
     add 33e83aa9f5 IGNITE-17578 Transactions: async cleanup processing on tx commit (#2529)
     add a1fe0da528 IGNITE-20181: KV/Binary view public API should only throw public exceptions (#2523)
     add 61b28d67a4 IGNITE-14818 Implement compressed encoding for short type in messaging. (#2544)
     add de51d814b8 IGNITE-20351 Log response body in REST test if it fails (#2553)
     add 673a0a99a7 IGNITE-20149 Sql. Revise the use of the INTERNAL_ERR code in the sql module (#2549)
     new daf8a1c0e2 Merge branch 'ai-main' into catalog-feature
     new 693f950b5b CATALOG-FEATURE after merge ai-main

The 2 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:
 .../apache/ignite/lang/MarshallerException.java    |  18 +-
 .../ignite/lang/UnexpectedNullValueException.java  |   3 +-
 .../apache/ignite/sql/CursorClosedException.java   |   2 +-
 .../ignite/internal/IgniteExceptionArchTest.java   |   2 -
 .../client/handler/JdbcQueryEventHandlerImpl.java  |  38 +-
 .../ignite/lang/IgniteExceptionMapperUtil.java     |   8 +-
 .../apache/ignite/jdbc/ItJdbcBatchSelfTest.java    |  27 +-
 .../ignite/jdbc/ItJdbcStatementSelfTest.java       |   6 +-
 .../org/apache/ignite/network/NetworkMessage.java  |   4 +-
 .../network/serialization/MessageReader.java       |   8 +
 .../network/direct/DirectMarshallingUtils.java     |  49 ---
 .../network/direct/DirectMessageReader.java        |  11 +
 .../network/direct/DirectMessageWriter.java        |   1 -
 .../stream/DirectByteBufferStreamImplV1.java       | 141 +++----
 .../network/message/ClassDescriptorMessage.java    |   4 +-
 .../internal/network/netty/InboundDecoder.java     |  72 ++--
 .../PerSessionSerializationService.java            |   2 +-
 .../internal/network/netty/NettyServerTest.java    |   4 +-
 .../Table/SchemaValidationTest.cs                  |  16 +-
 .../ignite/internal/raft/util/OptimizedStream.java |   7 -
 .../rest/authentication/ItAuthenticationTest.java  |   5 +-
 .../ignite/internal/rest/ssl/ItRestSslTest.java    |  27 +-
 .../ignite/internal/sql/api/ItCommonApiTest.java   |   4 +-
 .../internal/sql/api/ItSqlAsynchronousApiTest.java | 141 +++----
 .../internal/sql/api/ItSqlClientMetricsTest.java   |  10 +-
 .../internal/sql/api/ItSqlSynchronousApiTest.java  |  93 +++--
 .../internal/sql/engine/ItCreateTableDdlTest.java  |   1 +
 .../internal/sql/engine/ItDataTypesTest.java       |   5 +-
 .../ignite/internal/sql/engine/ItDmlTest.java      |   7 +-
 .../sql/engine/ItDynamicParameterTest.java         |   9 +-
 .../internal/sql/engine/ItLimitOffsetTest.java     |   3 +
 .../internal/sql/engine/ItSqlOperatorsTest.java    |   7 +-
 .../sql/aggregate/group/test_group_by.test         |  17 +-
 .../sql/aggregate/group/test_group_by.test_ignore  |  16 +-
 .../ignite/internal/schema/row/InternalTuple.java  |  16 +
 .../sql/engine/QueryCancelledException.java        |   9 +
 .../ignite/internal/sql/engine/QueryContext.java   |   4 +-
 .../internal/sql/engine/SqlQueryProcessor.java     |  11 +-
 .../sql/engine/exec/ExchangeServiceImpl.java       |   3 +-
 .../engine/exec/ExecutionCancelledException.java   |  38 --
 .../sql/engine/exec/ExecutionServiceImpl.java      |  21 +-
 .../sql/engine/exec/QueryValidationException.java  |  38 --
 .../internal/sql/engine/exec/RowHandler.java       |  24 ++
 .../internal/sql/engine/exec/SqlRowHandler.java    | 411 +++++++++++++++++++++
 .../sql/engine/exec/TableRowConverterImpl.java     |  50 ++-
 .../sql/engine/exec/exp/ExpressionFactoryImpl.java |  22 +-
 .../sql/engine/exec/exp/agg/Accumulators.java      |  65 +++-
 .../internal/sql/engine/exec/rel/AbstractNode.java |   4 +-
 .../sql/engine/exec/rel/AsyncRootNode.java         |   4 +-
 .../internal/sql/engine/exec/rel/ModifyNode.java   |  23 +-
 .../internal/sql/engine/exec/rel/RootNode.java     |   8 +-
 .../sql/engine/exec/row/RowSchemaTypes.java        |  24 ++
 .../metadata/RemoteFragmentExecutionException.java |   7 +-
 .../sql/engine/prepare/PrepareServiceImpl.java     |   4 +-
 .../engine/util/SqlExceptionMapperProvider.java    |   7 +-
 .../ignite/internal/sql/engine/util/TypeUtils.java |   2 +-
 .../engine/QueryTransactionWrapperSelfTest.java    |   1 +
 .../sql/engine/exec/ExecutionServiceImplTest.java  |   6 +-
 .../exec/IdentityDistributionFunctionSelfTest.java |  18 +-
 .../sql/engine/exec/RuntimeSortedIndexTest.java    |   1 +
 .../sql/engine/exec/rel/AbstractExecutionTest.java |   8 +-
 .../engine/exec/rel/MergeJoinExecutionTest.java    |   2 +-
 .../engine/exec/rel/ScannableTableSelfTest.java    |   2 +-
 .../sql/engine/exec/row/SqlRowHandlerTest.java     | 254 +++++++++++++
 .../sql/engine/framework}/ArrayRowHandler.java     |  22 +-
 .../sql/engine/framework/TestBuilders.java         |   1 -
 .../internal/sql/engine/framework/TestNode.java    |   1 -
 .../sql/engine/planner/PlannerTimeoutTest.java     |   1 +
 .../sql/engine/util/HashFunctionsTest.java         |   2 +-
 .../internal/sql/engine/util/SqlTestUtils.java     |  37 +-
 ...ItTxDistributedTestThreeNodesThreeReplicas.java |   8 +
 ...butedTestThreeNodesThreeReplicasCollocated.java |   8 +
 .../ignite/internal/table/AbstractTableView.java   |  34 +-
 .../internal/table/KeyValueBinaryViewImpl.java     |  46 +--
 ...aluePojoStreamerPartitionAwarenessProvider.java |   2 +-
 .../ignite/internal/table/KeyValueViewImpl.java    |  67 ++--
 .../internal/table/RecordBinaryViewImpl.java       |  49 +--
 .../ignite/internal/table/RecordViewImpl.java      |  59 +--
 .../internal/table/TableViewRowConverter.java      |  66 ++++
 .../table/distributed/StorageUpdateHandler.java    | 106 +++++-
 .../table/distributed/raft/PartitionListener.java  |  59 +--
 .../replicator/PartitionReplicaListener.java       |  80 ++--
 .../table/distributed/replicator/PendingRows.java  |  99 +++++
 .../internal/table/distributed/IndexBaseTest.java  |  12 +-
 .../table/distributed/IndexCleanupTest.java        |  13 +-
 .../distributed/StorageUpdateHandlerTest.java      |   2 +
 .../apache/ignite/distributed/ItTxTestCluster.java |   8 +-
 87 files changed, 1830 insertions(+), 807 deletions(-)
 delete mode 100644 modules/network/src/main/java/org/apache/ignite/internal/network/direct/DirectMarshallingUtils.java
 delete mode 100644 modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/ExecutionCancelledException.java
 delete mode 100644 modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/QueryValidationException.java
 create mode 100644 modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/SqlRowHandler.java
 create mode 100644 modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/exec/row/SqlRowHandlerTest.java
 rename modules/sql-engine/src/{main/java/org/apache/ignite/internal/sql/engine/exec => test/java/org/apache/ignite/internal/sql/engine/framework}/ArrayRowHandler.java (82%)
 create mode 100644 modules/table/src/main/java/org/apache/ignite/internal/table/TableViewRowConverter.java
 create mode 100644 modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PendingRows.java


[ignite-3] 02/02: CATALOG-FEATURE after merge ai-main

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 693f950b5bf8948e17bd8ee458208966e5565e9e
Author: Kirill Tkalenko <tk...@yandex.ru>
AuthorDate: Mon Sep 11 09:59:02 2023 +0300

    CATALOG-FEATURE after merge ai-main
---
 .../internal/sql/engine/exec/TableRowConverterImpl.java  | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/TableRowConverterImpl.java b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/TableRowConverterImpl.java
index 5c58079614..7fe1f5f3e0 100644
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/TableRowConverterImpl.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/TableRowConverterImpl.java
@@ -23,9 +23,11 @@ import org.apache.ignite.internal.schema.BinaryRow;
 import org.apache.ignite.internal.schema.BinaryRowConverter;
 import org.apache.ignite.internal.schema.BinaryTuple;
 import org.apache.ignite.internal.schema.BinaryTupleSchema;
+import org.apache.ignite.internal.schema.Column;
 import org.apache.ignite.internal.schema.SchemaDescriptor;
 import org.apache.ignite.internal.schema.SchemaRegistry;
 import org.apache.ignite.internal.schema.row.Row;
+import org.apache.ignite.internal.sql.engine.schema.ColumnDescriptor;
 import org.apache.ignite.internal.sql.engine.schema.TableDescriptor;
 import org.jetbrains.annotations.Nullable;
 
@@ -42,6 +44,8 @@ public class TableRowConverterImpl implements TableRowConverter {
 
     private final BinaryTupleSchema binaryTupleSchema;
 
+    private final int[] physicalIndexMap;
+
     /** Constructor. */
     public TableRowConverterImpl(SchemaRegistry schemaRegistry, SchemaDescriptor schemaDescriptor, TableDescriptor desc) {
         this.schemaRegistry = schemaRegistry;
@@ -49,6 +53,14 @@ public class TableRowConverterImpl implements TableRowConverter {
         this.desc = desc;
 
         this.binaryTupleSchema = BinaryTupleSchema.createRowSchema(schemaDescriptor);
+
+        physicalIndexMap = new int[desc.columnsCount()];
+
+        for (int i = 0; i < desc.columnsCount(); i++) {
+            ColumnDescriptor col = desc.columnDescriptor(i);
+            Column column = schemaDescriptor.column(col.name());
+            physicalIndexMap[i] = column.schemaIndex();
+        }
     }
 
     /** {@inheritDoc} */
@@ -72,7 +84,7 @@ public class TableRowConverterImpl implements TableRowConverter {
         BinaryTupleBuilder tupleBuilder = new BinaryTupleBuilder(desc.columnsCount());
 
         for (int i = 0; i < desc.columnsCount(); i++) {
-            int index = desc.columnDescriptor(i).physicalIndex();
+            int index = physicalIndexMap[i];
 
             BinaryRowConverter.appendValue(tupleBuilder, binarySchema.element(index), binarySchema.value(row, index));
         }
@@ -84,7 +96,7 @@ public class TableRowConverterImpl implements TableRowConverter {
         BinaryTupleBuilder tupleBuilder = new BinaryTupleBuilder(requiredColumns.cardinality());
 
         for (int i = requiredColumns.nextSetBit(0); i != -1; i = requiredColumns.nextSetBit(i + 1)) {
-            int index = desc.columnDescriptor(i).physicalIndex();
+            int index = physicalIndexMap[i];
 
             BinaryRowConverter.appendValue(tupleBuilder, binarySchema.element(index), binarySchema.value(row, index));
         }


[ignite-3] 01/02: 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 daf8a1c0e255dbb79c27a815ba3802c96b7c6062
Merge: 31d5ed162e 673a0a99a7
Author: Kirill Tkalenko <tk...@yandex.ru>
AuthorDate: Mon Sep 11 09:58:11 2023 +0300

    Merge branch 'ai-main' into catalog-feature

 .../apache/ignite/lang/MarshallerException.java    |  18 +-
 .../ignite/lang/UnexpectedNullValueException.java  |   3 +-
 .../apache/ignite/sql/CursorClosedException.java   |   2 +-
 .../ignite/internal/IgniteExceptionArchTest.java   |   2 -
 .../client/handler/JdbcQueryEventHandlerImpl.java  |  38 +-
 .../ignite/lang/IgniteExceptionMapperUtil.java     |   8 +-
 .../apache/ignite/jdbc/ItJdbcBatchSelfTest.java    |  27 +-
 .../ignite/jdbc/ItJdbcStatementSelfTest.java       |   6 +-
 .../org/apache/ignite/network/NetworkMessage.java  |   4 +-
 .../network/serialization/MessageReader.java       |   8 +
 .../network/direct/DirectMarshallingUtils.java     |  49 ---
 .../network/direct/DirectMessageReader.java        |  11 +
 .../network/direct/DirectMessageWriter.java        |   1 -
 .../stream/DirectByteBufferStreamImplV1.java       | 141 +++----
 .../network/message/ClassDescriptorMessage.java    |   4 +-
 .../internal/network/netty/InboundDecoder.java     |  72 ++--
 .../PerSessionSerializationService.java            |   2 +-
 .../internal/network/netty/NettyServerTest.java    |   4 +-
 .../Table/SchemaValidationTest.cs                  |  16 +-
 .../ignite/internal/raft/util/OptimizedStream.java |   7 -
 .../rest/authentication/ItAuthenticationTest.java  |   5 +-
 .../ignite/internal/rest/ssl/ItRestSslTest.java    |  27 +-
 .../ignite/internal/sql/api/ItCommonApiTest.java   |   4 +-
 .../internal/sql/api/ItSqlAsynchronousApiTest.java | 141 +++----
 .../internal/sql/api/ItSqlClientMetricsTest.java   |  10 +-
 .../internal/sql/api/ItSqlSynchronousApiTest.java  |  93 +++--
 .../internal/sql/engine/ItCreateTableDdlTest.java  |   1 +
 .../internal/sql/engine/ItDataTypesTest.java       |   5 +-
 .../ignite/internal/sql/engine/ItDmlTest.java      |   7 +-
 .../sql/engine/ItDynamicParameterTest.java         |   9 +-
 .../internal/sql/engine/ItLimitOffsetTest.java     |   3 +
 .../internal/sql/engine/ItSqlOperatorsTest.java    |   7 +-
 .../sql/aggregate/group/test_group_by.test         |  17 +-
 .../sql/aggregate/group/test_group_by.test_ignore  |  16 +-
 .../ignite/internal/schema/row/InternalTuple.java  |  16 +
 .../sql/engine/QueryCancelledException.java        |   9 +
 .../ignite/internal/sql/engine/QueryContext.java   |   4 +-
 .../internal/sql/engine/SqlQueryProcessor.java     |  11 +-
 .../sql/engine/exec/ExchangeServiceImpl.java       |   3 +-
 .../engine/exec/ExecutionCancelledException.java   |  38 --
 .../sql/engine/exec/ExecutionServiceImpl.java      |  21 +-
 .../sql/engine/exec/QueryValidationException.java  |  38 --
 .../internal/sql/engine/exec/RowHandler.java       |  24 ++
 .../internal/sql/engine/exec/SqlRowHandler.java    | 411 +++++++++++++++++++++
 .../sql/engine/exec/TableRowConverterImpl.java     |  58 +--
 .../sql/engine/exec/exp/ExpressionFactoryImpl.java |  22 +-
 .../sql/engine/exec/exp/agg/Accumulators.java      |  65 +++-
 .../internal/sql/engine/exec/rel/AbstractNode.java |   4 +-
 .../sql/engine/exec/rel/AsyncRootNode.java         |   4 +-
 .../internal/sql/engine/exec/rel/ModifyNode.java   |  23 +-
 .../internal/sql/engine/exec/rel/RootNode.java     |   8 +-
 .../sql/engine/exec/row/RowSchemaTypes.java        |  24 ++
 .../metadata/RemoteFragmentExecutionException.java |   7 +-
 .../sql/engine/prepare/PrepareServiceImpl.java     |   4 +-
 .../engine/util/SqlExceptionMapperProvider.java    |   7 +-
 .../ignite/internal/sql/engine/util/TypeUtils.java |   2 +-
 .../engine/QueryTransactionWrapperSelfTest.java    |   1 +
 .../sql/engine/exec/ExecutionServiceImplTest.java  |   6 +-
 .../exec/IdentityDistributionFunctionSelfTest.java |  18 +-
 .../sql/engine/exec/RuntimeSortedIndexTest.java    |   1 +
 .../sql/engine/exec/rel/AbstractExecutionTest.java |   8 +-
 .../engine/exec/rel/MergeJoinExecutionTest.java    |   2 +-
 .../engine/exec/rel/ScannableTableSelfTest.java    |   2 +-
 .../sql/engine/exec/row/SqlRowHandlerTest.java     | 254 +++++++++++++
 .../sql/engine/framework}/ArrayRowHandler.java     |  22 +-
 .../sql/engine/framework/TestBuilders.java         |   1 -
 .../internal/sql/engine/framework/TestNode.java    |   1 -
 .../sql/engine/planner/PlannerTimeoutTest.java     |   1 +
 .../sql/engine/util/HashFunctionsTest.java         |   2 +-
 .../internal/sql/engine/util/SqlTestUtils.java     |  37 +-
 ...ItTxDistributedTestThreeNodesThreeReplicas.java |   8 +
 ...butedTestThreeNodesThreeReplicasCollocated.java |   8 +
 .../ignite/internal/table/AbstractTableView.java   |  34 +-
 .../internal/table/KeyValueBinaryViewImpl.java     |  46 +--
 ...aluePojoStreamerPartitionAwarenessProvider.java |   2 +-
 .../ignite/internal/table/KeyValueViewImpl.java    |  67 ++--
 .../internal/table/RecordBinaryViewImpl.java       |  49 +--
 .../ignite/internal/table/RecordViewImpl.java      |  59 +--
 .../internal/table/TableViewRowConverter.java      |  66 ++++
 .../table/distributed/StorageUpdateHandler.java    | 106 +++++-
 .../table/distributed/raft/PartitionListener.java  |  59 +--
 .../replicator/PartitionReplicaListener.java       |  80 ++--
 .../table/distributed/replicator/PendingRows.java  |  99 +++++
 .../internal/table/distributed/IndexBaseTest.java  |  12 +-
 .../table/distributed/IndexCleanupTest.java        |  13 +-
 .../distributed/StorageUpdateHandlerTest.java      |   2 +
 .../apache/ignite/distributed/ItTxTestCluster.java |   8 +-
 87 files changed, 1828 insertions(+), 817 deletions(-)

diff --cc modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItCommonApiTest.java
index 2471f3f50f,53bff13425..d733a5dda7
--- a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItCommonApiTest.java
+++ b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/sql/api/ItCommonApiTest.java
@@@ -32,10 -34,16 +32,10 @@@ import java.util.concurrent.ExecutionEx
  import java.util.concurrent.TimeUnit;
  import org.apache.calcite.schema.SchemaPlus;
  import org.apache.ignite.Ignite;
 -import org.apache.ignite.internal.schema.testutils.SchemaConfigurationConverter;
 -import org.apache.ignite.internal.schema.testutils.builder.SchemaBuilders;
 -import org.apache.ignite.internal.schema.testutils.definition.ColumnType;
 -import org.apache.ignite.internal.schema.testutils.definition.ColumnType.TemporalColumnType;
 -import org.apache.ignite.internal.schema.testutils.definition.TableDefinition;
  import org.apache.ignite.internal.sql.engine.ClusterPerClassIntegrationTest;
+ import org.apache.ignite.internal.sql.engine.QueryCancelledException;
  import org.apache.ignite.internal.sql.engine.SqlQueryProcessor;
- import org.apache.ignite.internal.sql.engine.exec.ExecutionCancelledException;
  import org.apache.ignite.internal.sql.engine.schema.SqlSchemaManager;
 -import org.apache.ignite.internal.table.distributed.TableManager;
  import org.apache.ignite.internal.testframework.IgniteTestUtils;
  import org.apache.ignite.internal.tx.InternalTransaction;
  import org.apache.ignite.internal.tx.TxManager;
diff --cc modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
index ce381c4e29,1528871187..2e89c46f2e
--- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
+++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/SqlQueryProcessor.java
@@@ -50,8 -52,7 +50,7 @@@ import org.apache.ignite.internal.manag
  import org.apache.ignite.internal.manager.EventListener;
  import org.apache.ignite.internal.metrics.MetricManager;
  import org.apache.ignite.internal.replicator.ReplicaService;
 -import org.apache.ignite.internal.schema.SchemaManager;
 +import org.apache.ignite.internal.schema.CatalogSchemaManager;
- import org.apache.ignite.internal.sql.engine.exec.ArrayRowHandler;
  import org.apache.ignite.internal.sql.engine.exec.ExchangeServiceImpl;
  import org.apache.ignite.internal.sql.engine.exec.ExecutableTableRegistryImpl;
  import org.apache.ignite.internal.sql.engine.exec.ExecutionDependencyResolverImpl;
@@@ -61,8 -62,8 +60,8 @@@ import org.apache.ignite.internal.sql.e
  import org.apache.ignite.internal.sql.engine.exec.MailboxRegistryImpl;
  import org.apache.ignite.internal.sql.engine.exec.QueryTaskExecutor;
  import org.apache.ignite.internal.sql.engine.exec.QueryTaskExecutorImpl;
- import org.apache.ignite.internal.sql.engine.exec.QueryValidationException;
+ import org.apache.ignite.internal.sql.engine.exec.SqlRowHandler;
 -import org.apache.ignite.internal.sql.engine.exec.ddl.DdlCommandHandlerWrapper;
 +import org.apache.ignite.internal.sql.engine.exec.ddl.DdlCommandHandler;
  import org.apache.ignite.internal.sql.engine.message.MessageServiceImpl;
  import org.apache.ignite.internal.sql.engine.prepare.PrepareService;
  import org.apache.ignite.internal.sql.engine.prepare.PrepareServiceImpl;
diff --cc modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestNode.java
index f75043639d,5df6fc04fb..29b409ed3b
--- a/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestNode.java
+++ b/modules/sql-engine/src/test/java/org/apache/ignite/internal/sql/engine/framework/TestNode.java
@@@ -28,10 -27,11 +28,9 @@@ import java.util.ArrayList
  import java.util.Collections;
  import java.util.List;
  import java.util.stream.Collectors;
 -import org.apache.calcite.schema.SchemaPlus;
  import org.apache.calcite.tools.Frameworks;
 -import org.apache.ignite.internal.catalog.CatalogService;
  import org.apache.ignite.internal.metrics.MetricManager;
  import org.apache.ignite.internal.sql.engine.QueryCancel;
- import org.apache.ignite.internal.sql.engine.exec.ArrayRowHandler;
  import org.apache.ignite.internal.sql.engine.exec.ExchangeService;
  import org.apache.ignite.internal.sql.engine.exec.ExchangeServiceImpl;
  import org.apache.ignite.internal.sql.engine.exec.ExecutionDependencyResolver;
diff --cc modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java
index 62f2c8efef,9d5c3faab0..c841f3149a
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaListener.java
@@@ -68,11 -67,10 +65,13 @@@ import org.apache.ignite.internal.binar
  import org.apache.ignite.internal.catalog.CatalogService;
  import org.apache.ignite.internal.catalog.descriptors.CatalogIndexDescriptor;
  import org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
 +import org.apache.ignite.internal.catalog.events.CreateIndexEventParameters;
 +import org.apache.ignite.internal.catalog.events.DropIndexEventParameters;
  import org.apache.ignite.internal.hlc.HybridClock;
  import org.apache.ignite.internal.hlc.HybridTimestamp;
+ import org.apache.ignite.internal.logger.IgniteLogger;
+ import org.apache.ignite.internal.logger.Loggers;
 +import org.apache.ignite.internal.manager.EventListener;
  import org.apache.ignite.internal.raft.Command;
  import org.apache.ignite.internal.raft.Peer;
  import org.apache.ignite.internal.raft.service.RaftGroupService;
@@@ -252,9 -254,9 +254,6 @@@ public class PartitionReplicaListener i
      /** Flag indicates whether the current replica is the primary. */
      private volatile boolean primary;
  
-     /** Rows that were inserted, updated or removed. All row IDs are sorted in natural order to prevent deadlocks upon commit/abort. */
-     private final Map<UUID, SortedSet<RowId>> txsPendingRowIds = new ConcurrentHashMap<>();
 -    private final TablesConfiguration tablesConfig;
 -
--
      /**
       * The constructor.
       *