This is an automated email from the ASF dual-hosted git repository. amashenkov pushed a commit to branch ignite-20015 in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 28809f49fa6795ea3e99ab12afd57e8888440056 Merge: aca1e588e5 6404013215 Author: amashenkov <[email protected]> AuthorDate: Wed Aug 23 15:29:13 2023 +0300 Merge branch 'main' into ignite-20015 # Conflicts: # modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/exec/LogicalRelImplementor.java # modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/externalize/RelJson.java # modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/trait/DistributionFunction.java README.md | 103 +++- build.gradle | 1 - buildscripts/java-core.gradle | 2 +- buildscripts/java-integration-test.gradle | 5 + buildscripts/java-junit5.gradle | 6 + buildscripts/java-test-fixtures.gradle | 5 + buildscripts/sql-parser-generator.gradle | 33 +- check-rules/pmd-rules.xml | 19 + config/java.util.logging.properties | 57 -- docs/_docs/sql-reference/ddl.adoc | 23 +- gradle/libs.versions.toml | 9 + .../affinity/RendezvousAffinityFunctionTest.java | 2 - .../main/java/org/apache/ignite/sql/Statement.java | 19 +- .../java/org/apache/ignite/table/KeyValueView.java | 77 ++- .../java/org/apache/ignite/table/RecordView.java | 57 +- .../main/java/org/apache/ignite/table/Table.java | 3 +- .../main/java/org/apache/ignite/table/Tuple.java | 29 +- .../java/org/apache/ignite/table/TupleImpl.java | 31 +- .../org/apache/ignite/table/mapper/Mapper.java | 17 +- .../apache/ignite/table/mapper/MapperBuilder.java | 17 +- .../ignite/table/mapper/OneColumnMapperImpl.java | 3 +- .../org/apache/ignite/table/mapper/PojoMapper.java | 5 +- .../apache/ignite/table/mapper/PojoMapperImpl.java | 7 +- modules/catalog/build.gradle | 1 - .../internal/catalog/CatalogManagerImpl.java | 61 +- .../catalog/CatalogParamsValidationUtils.java | 16 +- .../commands/AbstractUpdateZoneCommandParams.java | 195 +++++++ .../commands/AbstractZoneCommandParams.java | 32 +- .../internal/catalog/commands/AlterZoneParams.java | 213 ++----- .../internal/catalog/commands/CatalogUtils.java | 85 ++- .../catalog/commands/CreateZoneParams.java | 220 ++----- .../internal/catalog/commands/DropZoneParams.java | 10 +- .../catalog/commands/RenameZoneParams.java | 20 +- .../internal/catalog/CatalogManagerSelfTest.java | 10 +- .../catalog/CatalogManagerValidationTest.java | 250 ++++---- .../catalog/commands/CatalogUtilsTest.java | 219 +++++++ .../cli/commands/ItClusterCommandTest.java | 44 +- ...tConnectWithBasicAuthenticationCommandTest.java | 8 +- .../cli/commands/sql/ItSqlCommandTest.java | 2 +- .../handler/IgniteCliApiExceptionHandler.java | 2 - .../cli/config/ini/IniConfigManagerTest.java | 2 +- .../table/MutableTupleBinaryTupleAdapter.java | 35 +- .../proto/ClientMessagePackerUnpackerTest.java | 3 +- modules/client-handler/build.gradle | 1 - .../ignite/client/handler/ClientResource.java | 3 +- .../handler/requests/table/ClientTableCommon.java | 2 - .../client/handler/requests/table/ClientTuple.java | 5 +- .../ignite/internal/client/sql/ClientSqlRow.java | 7 +- .../internal/client/sql/ClientStatement.java | 7 +- .../client/sql/ClientStatementBuilder.java | 13 +- .../internal/client/table/ClientDataStreamer.java | 2 - .../client/table/ClientKeyValueBinaryView.java | 77 ++- .../internal/client/table/ClientKeyValueView.java | 81 ++- .../client/table/ClientRecordBinaryView.java | 57 +- .../client/table/ClientRecordSerializer.java | 5 +- .../internal/client/table/ClientRecordView.java | 57 +- .../ignite/internal/client/table/ClientSchema.java | 5 +- .../ignite/internal/client/table/ClientTable.java | 3 +- .../ignite/internal/client/table/ClientTuple.java | 5 +- .../client/table/ClientTupleSerializer.java | 19 +- .../internal/client/tx/ClientTransaction.java | 3 +- .../internal/client/tx/ClientTransactions.java | 2 - .../java/org/apache/ignite/client/CustomTuple.java | 30 +- .../ignite/client/PartitionAwarenessTest.java | 11 +- .../ignite/client/fakes/FakeAsyncResultSet.java | 2 - .../ignite/client/fakes/FakeIgniteTables.java | 2 - .../ignite/client/fakes/FakeSchemaRegistry.java | 2 - .../org/apache/ignite/client/fakes/FakeSqlRow.java | 32 +- .../apache/ignite/client/fakes/FakeTxManager.java | 3 +- modules/cluster-management/build.gradle | 1 - .../AbstractClusterStateStorageManagerTest.java | 2 +- .../ignite/internal/deployunit/UnitContent.java | 2 - .../DeploymentUnitAcquiredWaiterTest.java | 2 + modules/configuration-presentation/build.gradle | 1 - .../configuration/asm/DirectProxyAsmGenerator.java | 2 - .../configuration/hocon/HoconConverter.java | 3 +- .../configuration/util/ConfigurationFlattener.java | 3 +- .../configuration/util/ConfigurationUtilTest.java | 2 - .../storage/TestConfigurationStorage.java | 3 +- .../ignite/internal/logger/IgniteLogger.java | 3 +- .../ignite/internal/manager/EventListener.java | 5 +- .../thread/AbstractStripedThreadPoolExecutor.java | 7 - .../internal/tostring/IgniteToStringBuilder.java | 3 +- .../ignite/internal/util/FilteringIterator.java | 5 +- .../apache/ignite/internal/util/GridUnsafe.java | 10 +- .../apache/ignite/internal/util/IgniteUtils.java | 11 + .../PendingIndependentComparableValuesTracker.java | 4 +- .../ignite/internal/manager/ProducerTest.java | 5 +- .../util/PendingComparableValuesTrackerTest.java | 3 - .../internal/util/RefCountedObjectPoolTest.java | 2 +- .../testframework/BaseIgniteAbstractTest.java | 14 - .../testframework/log4j2/LogInspector.java | 364 ++++++++++++ .../testframework/matchers/PathMatcher.java | 105 ++++ .../resources/java.util.logging.properties | 57 -- .../src/testFixtures/resources/log4j2-test.xml | 58 ++ .../distributionzones/rebalance/RebalanceUtil.java | 8 +- .../DistributionZoneCausalityDataNodesTest.java | 3 - .../DistributionZonesTestUtil.java | 2 +- modules/file-transfer/README.md | 26 + modules/{index => file-transfer}/build.gradle | 31 +- .../internal/network/file/ItFileTransferTest.java | 517 +++++++++++++++++ .../ignite/internal/network/file/TestCluster.java | 188 ++++++ .../ignite/internal/network/file/Channel.java} | 22 +- .../internal/network/file/ChunkedFileReader.java | 119 ++++ .../internal/network/file/ChunkedFileWriter.java | 112 ++++ .../network/file/FileChunkMessagesStream.java | 166 ++++++ .../internal/network/file/FileConsumer.java} | 30 +- .../internal/network/file/FileProvider.java} | 19 +- .../ignite/internal/network/file/FileReceiver.java | 197 +++++++ .../ignite/internal/network/file/FileSender.java | 266 +++++++++ .../network/file/FileTransferMessagesHandler.java | 168 ++++++ .../internal/network/file/FileTransferService.java | 69 +++ .../network/file/FileTransferServiceImpl.java | 641 +++++++++++++++++++++ .../network/file/TransferredFilesCollector.java} | 18 +- .../network/file/exception/ErrorCodes.java | 15 +- .../file/exception/FileTransferException.java} | 31 +- .../file/exception/FileValidationException.java} | 25 +- .../network/file/messages/FileChunkMessage.java} | 36 +- .../network/file/messages/FileChunkResponse.java} | 30 +- .../file/messages/FileDownloadRequest.java} | 30 +- .../file/messages/FileDownloadResponse.java} | 27 +- .../internal/network/file/messages/FileHeader.java | 68 +++ .../network/file/messages/FileTransferError.java | 66 +++ .../file/messages/FileTransferErrorMessage.java} | 30 +- .../file/messages/FileTransferInitMessage.java | 50 ++ .../file/messages/FileTransferInitResponse.java} | 30 +- .../file/messages/FileTransferMessageType.java | 76 +++ .../network/file/messages/Identifier.java} | 29 +- .../network/file/ChunkedFileReaderTest.java | 86 +++ .../network/file/ChunkedFileWriterTest.java | 81 +++ .../network/file/FileChunkMessagesStreamTest.java | 121 ++++ .../internal/network/file/FileReceiverTest.java | 174 ++++++ .../internal/network/file/FileSenderTest.java | 296 ++++++++++ .../network/file/FileTransferServiceImplTest.java | 300 ++++++++++ .../network/file/TestMessagingService.java | 81 +++ .../internal/network/file/TestTopologyService.java | 68 +++ .../internal/network/file/FileGenerator.java} | 33 +- .../internal/network/file/PathAssertions.java | 44 ++ modules/index/build.gradle | 1 - .../apache/ignite/jdbc/ItJdbcErrorsSelfTest.java | 6 +- .../internal/jdbc/ConnectionPropertiesImpl.java | 2 - .../ignite/internal/marshaller/Marshaller.java | 7 +- .../TestObjectWithNoDefaultConstructor.java | 4 + .../server/AbstractCompoundCondition.java | 3 +- .../server/AbstractSimpleCondition.java | 11 +- .../metastorage/server/ExistenceCondition.java | 6 +- .../metastorage/server/RevisionCondition.java | 6 +- .../metastorage/server/TombstoneCondition.java | 5 +- .../ignite/internal/metastorage/server/Value.java | 4 +- .../metastorage/server/ValueCondition.java | 7 +- .../ignite/internal/metrics/MetricManager.java | 2 - .../ignite/internal/metrics/MetricRegistry.java | 8 +- .../apache/ignite/network/MessagingService.java | 20 + modules/network/build.gradle | 3 +- .../scalecube/ItScaleCubeNetworkMessagingTest.java | 36 +- .../FileTransferConfigurationSchema.java} | 39 +- .../configuration/NetworkConfigurationSchema.java | 4 + .../network/netty/InboundRecoveryHandler.java | 3 +- .../serialization/marshal/BuiltInMarshalling.java | 2 - .../ignite/network/DefaultMessagingService.java | 13 + .../DefaultUserObjectMarshallerCommonTest.java | 2 +- ...erObjectMarshallerWithArbitraryObjectsTest.java | 3 - ...ltUserObjectMarshallerWithSerializableTest.java | 14 - .../ignite/client/detail/cluster_connection.cpp | 14 +- .../cpp/ignite/client/detail/cluster_connection.h | 48 +- .../ignite/client/detail/compute/compute_impl.cpp | 7 +- .../client/detail/connection_event_handler.h} | 42 +- .../ignite/client/detail/ignite_client_impl.cpp | 2 +- .../cpp/ignite/client/detail/node_connection.cpp | 65 +-- .../cpp/ignite/client/detail/node_connection.h | 29 +- .../cpp/ignite/client/detail/sql/result_set_impl.h | 4 +- .../cpp/ignite/client/detail/sql/sql_impl.cpp | 7 +- .../cpp/ignite/client/detail/table/table_impl.cpp | 61 +- .../cpp/ignite/client/detail/table/tables_impl.cpp | 4 +- .../client/detail/transaction/transaction_impl.h | 3 +- .../client/detail/transaction/transactions_impl.h | 8 +- .../platforms/cpp/ignite/client/detail/utils.cpp | 6 + modules/platforms/cpp/ignite/odbc/CMakeLists.txt | 1 - .../platforms/cpp/ignite/odbc/meta/column_meta.cpp | 24 +- .../platforms/cpp/ignite/odbc/meta/column_meta.h | 18 +- .../platforms/cpp/ignite/odbc/protocol_version.cpp | 136 ----- .../platforms/cpp/ignite/odbc/protocol_version.h | 186 ------ .../platforms/cpp/ignite/odbc/query/data_query.cpp | 12 +- .../platforms/cpp/ignite/odbc/sql_connection.cpp | 110 ++-- modules/platforms/cpp/ignite/odbc/sql_connection.h | 42 +- .../platforms/cpp/ignite/odbc/sql_statement.cpp | 1 + modules/platforms/cpp/ignite/odbc/type_traits.cpp | 117 +++- modules/platforms/cpp/ignite/odbc/type_traits.h | 51 -- .../platforms/cpp/ignite/protocol/CMakeLists.txt | 3 + .../cpp/ignite/protocol/client_operation.h | 4 +- modules/platforms/cpp/ignite/protocol/messages.cpp | 76 +++ modules/platforms/cpp/ignite/protocol/messages.h | 61 ++ .../{client/detail => protocol}/protocol_context.h | 11 +- .../cpp/ignite/protocol/protocol_version.cpp | 82 +++ .../{client/detail => protocol}/protocol_version.h | 100 ++-- modules/platforms/cpp/ignite/protocol/utils.cpp | 6 +- .../cpp/tests/client-test/all_fields_type.h | 3 + .../client-test/key_value_binary_view_test.cpp | 1 + .../cpp/tests/client-test/key_value_view_test.cpp | 2 + .../tests/client-test/record_binary_view_test.cpp | 1 + .../cpp/tests/client-test/record_view_test.cpp | 2 + .../platforms/cpp/tests/client-test/sql_test.cpp | 11 +- .../cpp/tests/odbc-test/connection_test.cpp | 4 +- .../cpp/tests/odbc-test/meta_queries_test.cpp | 2 +- .../cpp/tests/odbc-test/odbc_connection.h | 2 +- .../platforms/cpp/tests/odbc-test/queries_test.cpp | 22 +- .../dotnet/Apache.Ignite.Benchmarks/Program.cs | 4 +- .../SerializerHandlerReadBenchmarks.cs | 55 +- .../Linq/LinqSqlGenerationTests.cs | 4 +- .../Linq/LinqTests.Aggregate.cs | 22 +- .../Apache.Ignite.Tests/Linq/LinqTests.GroupBy.cs | 22 +- .../Apache.Ignite.Tests/Linq/LinqTests.KvView.cs | 22 +- .../dotnet/Apache.Ignite.Tests/Linq/LinqTests.cs | 2 +- .../Sql/IgniteDbDataReaderTests.cs | 4 +- .../Table/BinaryTupleIgniteTupleAdapterTests.cs | 111 ++++ .../Apache.Ignite.Tests/Table/IgniteTupleTests.cs | 36 +- .../Apache.Ignite.Tests/Table/PocoAllColumnsSql.cs | 10 +- .../Table/PocoAllColumnsSqlNullable.cs | 10 +- .../Table/Serialization/ReflectionUtilsTests.cs | 21 +- .../dotnet/Apache.Ignite.Tests/ToStringTests.cs | 3 +- .../Apache.Ignite/Internal/Linq/ResultSelector.cs | 24 +- .../BinaryTuple/BinaryTupleIgniteTupleAdapter.cs | 143 +++++ .../Internal/Table/IgniteTupleCommon.cs} | 39 +- .../Table/Serialization/ObjectSerializerHandler.cs | 31 +- .../Table/Serialization/ReflectionUtils.cs | 19 +- .../Table/Serialization/TupleSerializerHandler.cs | 41 +- .../dotnet/Apache.Ignite/Table/IIgniteTuple.cs | 18 + .../dotnet/Apache.Ignite/Table/IgniteTuple.cs | 53 +- modules/raft/build.gradle | 1 - .../ignite/raft/jraft/core/ItCliServiceTest.java | 20 +- .../apache/ignite/raft/jraft/core/ItNodeTest.java | 8 +- .../raft/server/ItJraftCounterServerTest.java | 2 - .../raft/jraft/disruptor/DisruptorBuilder.java | 1 - .../ignite/raft/jraft/option/NodeOptions.java | 7 +- .../ignite/internal/raft/RaftGroupServiceTest.java | 2 - .../entity/codec/BaseLogEntryCodecFactoryTest.java | 12 +- .../ignite/raft/jraft/core/MockStateMachine.java | 13 +- .../client/TopologyAwareRaftGroupServiceTest.java | 3 - modules/rest/build.gradle | 1 - .../ConfigurationControllerBaseTest.java | 2 - .../ignite/internal/rocksdb/ColumnFamily.java | 11 +- modules/runner/README.md | 2 +- modules/runner/build.gradle | 1 - .../storage/ItRebalanceDistributedTest.java | 372 ++++++------ ...niteDistributionZoneManagerNodeRestartTest.java | 299 +++++----- .../raftsnapshot/ItTableRaftSnapshotsTest.java | 81 +-- .../runner/app/PlatformTestNodeRunner.java | 8 +- .../ignite/internal/sql/api/ItCommonApiTest.java | 13 - .../internal/sql/api/ItSqlAsynchronousApiTest.java | 4 +- .../internal/sql/engine/ItDataTypesTest.java | 2 - .../ignite/internal/sql/engine/ItDmlTest.java | 51 +- .../engine/datatypes/tests/BaseDataTypeTest.java | 32 +- .../datatypes/tests/BaseIndexDataTypeTest.java | 20 +- .../datatypes/varbinary/ItVarBinaryDmlTest.java | 2 +- .../varbinary/ItVarBinaryExpressionTest.java | 1 - .../datatypes/varbinary/ItVarBinaryIndexTest.java | 99 ++++ .../apache/ignite/internal/sqllogic/Script.java | 2 - .../apache/ignite/internal/start/ItStartTest.java | 42 +- .../sql/aggregate/having/test_having.test | 6 +- .../integrationTest/sql/subquery/test_neumann.test | 6 +- .../types/timestamp/test_incorrect_timestamp.test | 30 +- .../sql/types/timestamp/test_timestamp.test | 26 +- .../org/apache/ignite/internal/app/IgniteImpl.java | 2 +- .../ignite/internal/sql/engine/util/VarBinary.java | 3 +- .../apache/ignite/internal/schema/NativeType.java | 3 +- .../ignite/internal/schema/SchemaDescriptor.java | 3 +- .../internal/schema/mapping/ColumnMapper.java | 3 +- .../internal/schema/mapping/ColumnMapperImpl.java | 3 +- .../internal/schema/mapping/ColumnMapping.java | 3 +- .../internal/schema/marshaller/KvMarshaller.java | 9 +- .../internal/schema/marshaller/MarshallerUtil.java | 3 +- .../schema/marshaller/RecordMarshaller.java | 7 +- .../marshaller/reflection/ColumnBinding.java | 8 +- .../marshaller/reflection/KvMarshallerImpl.java | 12 +- .../schema/marshaller/reflection/Marshaller.java | 7 +- .../reflection/RecordMarshallerImpl.java | 10 +- .../reflection/ReflectionMarshallerFactory.java | 5 +- .../schema/marshaller/KvMarshallerTest.java | 2 +- .../schema/registry/UpgradingRowAdapterTest.java | 3 +- modules/sql-engine/build.gradle | 1 - modules/sql-engine/src/main/codegen/config.fmpp | 345 +---------- .../src/main/codegen/includes/parserImpls.ftl | 8 +- .../internal/sql/api/AsyncResultSetImpl.java | 31 +- .../internal/sql/api/StatementBuilderImpl.java | 13 +- .../ignite/internal/sql/api/StatementImpl.java | 7 +- .../internal/sql/engine/SqlQueryProcessor.java | 11 +- .../sql/engine/exec/DestinationFactory.java | 110 ++++ .../internal/sql/engine/exec/ExecutableTable.java | 6 + .../engine/exec/ExecutableTableRegistryImpl.java | 6 + .../engine/exec/ExecutionDependencyResolver.java | 3 +- .../exec/ExecutionDependencyResolverImpl.java | 37 +- .../sql/engine/exec/ExecutionServiceImpl.java | 11 +- .../sql/engine/exec/LogicalRelImplementor.java | 23 +- .../sql/engine/exec/ResolvedDependencies.java | 9 + .../internal/sql/engine/exec/RuntimeHashIndex.java | 2 - .../sql/engine/exec/TableFunctionScan.java | 2 - .../sql/engine/exec/UpdatableTableImpl.java | 4 - .../sql/engine/exec/exp/ExpressionFactoryImpl.java | 6 - .../internal/sql/engine/exec/exp/RexImpTable.java | 13 +- .../engine/exec/exp/agg/AccumulatorsFactory.java | 4 - .../sql/engine/exec/rel/MergeJoinNode.java | 2 - .../internal/sql/engine/exec/rel/ModifyNode.java | 51 +- .../sql/engine/exec/rel/NestedLoopJoinNode.java | 2 - .../internal/sql/engine/exec/rel/SingleNode.java | 5 +- .../sql/engine/metadata/ColocationGroup.java | 2 - .../sql/engine/metadata/FragmentMapping.java | 3 +- .../engine/prepare/IgniteSqlToRelConvertor.java | 119 +++- .../sql/engine/prepare/PlanningContext.java | 5 +- .../sql/engine/schema/CatalogSqlSchemaManager.java | 7 - .../internal/sql/engine/schema/IgniteSchema.java | 32 +- .../sql/engine/schema/SqlSchemaManager.java | 8 - .../sql/engine/schema/SqlSchemaManagerImpl.java | 21 - .../internal/sql/engine/sql/IgniteSqlParser.java | 103 +++- .../sql/engine/trait/DistributionFunction.java | 67 --- .../sql/engine/trait/DistributionTrait.java | 8 - .../sql/engine/trait/IgniteDistribution.java | 11 - .../ignite/internal/sql/engine/util/Commons.java | 9 +- .../sql/engine/util/HashFunctionFactory.java | 6 +- .../sql/engine/util/HashFunctionFactoryImpl.java | 25 +- .../internal/sql/engine/util/IgniteResource.java | 14 +- .../ignite/internal/sql/engine/util/TypeUtils.java | 12 +- .../apache/ignite/internal/sql/engine/TestRow.java | 2 - .../exec/ExecutionDependencyResolverSelfTest.java | 7 +- .../sql/engine/exec/ExecutionServiceImplTest.java | 4 +- .../engine/exec/TestExecutableTableRegistry.java | 6 + .../exec/ddl/DdlToCatalogCommandConverterTest.java | 17 +- .../sql/engine/exec/rel/AbstractExecutionTest.java | 2 - .../exec/rel/AbstractSetOpExecutionTest.java | 2 - .../exec/rel/HashIndexSpoolExecutionTest.java | 3 +- .../exec/rel/SortedIndexSpoolExecutionTest.java | 3 +- .../engine/exec/rel/TableSpoolExecutionTest.java | 3 +- .../engine/framework/ClusterServiceFactory.java | 9 + .../sql/engine/framework/NoOpTransaction.java | 3 +- .../engine/framework/PredefinedSchemaManager.java | 5 - .../sql/engine/framework/TestBuilders.java | 14 +- .../internal/sql/engine/framework/TestNode.java | 2 +- .../sql/engine/planner/DmlPlannerTest.java | 14 +- .../sql/engine/planner/DynamicParametersTest.java | 10 +- .../sql/engine/planner/ImplicitCastsTest.java | 2 +- .../engine/sql/IgniteSqlDecimalLiteralTest.java | 10 - .../sql/engine/sql/IgniteSqlParserTest.java | 61 +- .../internal/sql/engine/sql/SqlDdlParserTest.java | 4 +- .../sql/engine/sql/SqlReservedWordsTest.java | 265 +++++++++ modules/sql-engine/src/test/resources/tpch/q11.sql | 4 +- modules/table/build.gradle | 1 - .../distributed/ItTxDistributedTestSingleNode.java | 6 +- .../schema/marshaller/TupleMarshaller.java | 7 +- .../schema/marshaller/TupleMarshallerImpl.java | 11 +- .../internal/table/AbstractRowTupleAdapter.java | 29 +- .../apache/ignite/internal/table/DataStreamer.java | 2 - .../internal/table/KeyValueBinaryViewImpl.java | 85 ++- .../ignite/internal/table/KeyValueViewImpl.java | 81 ++- .../internal/table/MutableRowTupleAdapter.java | 33 +- .../internal/table/RecordBinaryViewImpl.java | 59 +- .../ignite/internal/table/RecordViewImpl.java | 59 +- .../org/apache/ignite/internal/table/TableRow.java | 13 +- .../internal/table/distributed/TableManager.java | 5 +- .../table/ColocationHashCalculationTest.java | 3 +- .../KeyValueViewOperationsSimpleSchemaTest.java | 2 - .../internal/table/KeyValueViewOperationsTest.java | 6 +- .../internal/table/MutableRowTupleAdapterTest.java | 2 - .../table/RecordBinaryViewOperationsTest.java | 2 - .../internal/table/RecordViewOperationsTest.java | 3 - .../apache/ignite/internal/table/TxLocalTest.java | 6 + .../table/distributed/TableManagerTest.java | 209 ++++--- .../gc/VolatilePageMemoryGcUpdateHandlerTest.java | 2 - .../replication/PartitionReplicaListenerTest.java | 3 - .../distributed/schema/FullTableSchemaTest.java | 3 - .../table/type/NumericTypesSerializerTest.java | 2 - .../ignite/internal/table/TxAbstractTest.java | 18 +- .../table/impl/DummyInternalTableImpl.java | 3 +- .../table/impl/DummySchemaManagerImpl.java | 3 +- .../internal/table/impl/TestTupleBuilder.java | 30 +- .../ignite/internal/tx/InternalTransaction.java | 3 +- .../org/apache/ignite/internal/tx/Timestamp.java | 3 +- .../ignite/internal/tx/impl/HeapLockManager.java | 5 +- .../tx/impl/IgniteAbstractTransactionImpl.java | 4 +- .../internal/tx/impl/ReadWriteTransactionImpl.java | 3 +- packaging/common/bootstrap-functions.sh | 4 +- packaging/docker/docker-entrypoint.sh | 4 +- settings.gradle | 2 + 381 files changed, 9256 insertions(+), 4140 deletions(-) diff --cc modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/trait/DistributionFunction.java index 70c0fcde96,598bc880e0..3aa65f11cb --- a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/trait/DistributionFunction.java +++ b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/engine/trait/DistributionFunction.java @@@ -17,22 -17,9 +17,17 @@@ package org.apache.ignite.internal.sql.engine.trait; - import static org.apache.ignite.internal.util.CollectionUtils.first; - import static org.apache.ignite.internal.util.CollectionUtils.nullOrEmpty; - - import java.util.Collections; - import java.util.List; import java.util.Objects; import org.apache.calcite.rel.RelDistribution; +import org.apache.calcite.rel.RelDistribution.Type; import org.apache.calcite.rel.RelNode; +import org.apache.calcite.util.ImmutableIntList; +import org.apache.ignite.internal.sql.engine.exec.RowHandler; +import org.apache.ignite.internal.sql.engine.metadata.ColocationGroup; +import org.apache.ignite.internal.sql.engine.metadata.NodeWithTerm; +import org.apache.ignite.internal.sql.engine.util.Commons; +import org.apache.ignite.internal.sql.engine.util.HashFunctionFactory; +import org.apache.ignite.internal.util.IgniteUtils; /** * Distribution function.
