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 <[email protected]> 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. *
