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 a86b56bc83 IGNITE-20331 Cleanup the code after switching TableManager to the catalog (#2577) add 81cefdd6a4 Catalog feature 13 09 2023 (#2586) No new revisions were added by this update. Summary of changes: buildscripts/java-core.gradle | 2 - .../org/apache/ignite/lang/util/StringUtils.java | 25 + .../apache/ignite/lang/util/StringUtilsTest.java} | 41 +- .../ignite/internal/catalog/CatalogManager.java | 27 - .../internal/catalog/CatalogManagerImpl.java | 135 +--- .../catalog/CatalogParamsValidationUtils.java | 79 +- .../catalog/IndexExistsValidationException.java} | 16 +- ....java => IndexNotFoundValidationException.java} | 15 +- .../commands/AbstractCreateIndexCommand.java | 109 +++ ...java => AbstractCreateIndexCommandBuilder.java} | 25 +- .../commands/AbstractCreateIndexCommandParams.java | 92 --- ...TableCommand.java => AbstractIndexCommand.java} | 17 +- ...mmand.java => AbstractIndexCommandBuilder.java} | 17 +- .../commands/AbstractIndexCommandParams.java | 80 -- .../catalog/commands/AbstractTableCommand.java | 3 +- .../commands/AbstractTableCommandParams.java | 79 -- .../internal/catalog/commands/CatalogUtils.java | 39 - .../catalog/commands/CreateHashIndexCommand.java | 106 +++ ...ams.java => CreateHashIndexCommandBuilder.java} | 25 +- .../catalog/commands/CreateSortedIndexCommand.java | 145 ++++ ...d.java => CreateSortedIndexCommandBuilder.java} | 15 +- .../catalog/commands/CreateSortedIndexParams.java | 61 -- .../catalog/commands/CreateTableCommand.java | 1 + .../catalog/commands/DropIndexCommand.java | 106 +++ ...ogCommand.java => DropIndexCommandBuilder.java} | 12 +- .../descriptors/CatalogTableDescriptor.java | 9 + .../internal/catalog/storage/AlterColumnEntry.java | 1 + .../internal/catalog/storage/DropColumnsEntry.java | 1 + .../internal/catalog/storage/NewColumnsEntry.java | 1 + .../ignite/internal/catalog/storage/UpdateLog.java | 8 +- .../internal/catalog/storage/UpdateLogImpl.java | 24 +- .../internal/catalog/CatalogManagerSelfTest.java | 91 +-- .../catalog/CatalogManagerValidationTest.java | 103 --- .../commands/AbstractCommandValidationTest.java | 78 +- .../CreateAbstractIndexCommandValidationTest.java | 222 ++++++ .../CreateHashIndexCommandValidationTest.java} | 27 +- .../CreateSortedIndexCommandValidationTest.java | 88 +++ .../commands/CreateTableCommandValidationTest.java | 6 +- .../commands/DropIndexCommandValidationTest.java | 121 +++ .../catalog/storage/UpdateLogImplTest.java | 37 +- .../internal/catalog/BaseCatalogManagerTest.java | 53 +- .../internal/client/proto/ClientMessagePacker.java | 48 +- .../client/proto/ClientMessageUnpacker.java | 54 +- .../jdbc/proto/event/JdbcBatchExecuteRequest.java | 4 +- .../proto/event/JdbcBatchPreparedStmntRequest.java | 4 +- .../jdbc/proto/event/JdbcMetaColumnsResult.java | 4 +- .../proto/event/JdbcMetaPrimaryKeysResult.java | 4 +- .../jdbc/proto/event/JdbcMetaSchemasResult.java | 4 +- .../jdbc/proto/event/JdbcMetaTablesRequest.java | 4 +- .../jdbc/proto/event/JdbcPrimaryKeyMeta.java | 4 +- .../jdbc/proto/event/JdbcQueryExecuteResult.java | 4 +- .../jdbc/proto/event/JdbcQueryFetchResult.java | 4 +- .../jdbc/proto/event/JdbcQuerySingleResult.java | 4 +- .../client/proto/ClientMessagePackerTest.java | 12 - .../client/proto/ClientMessageUnpackerTest.java | 22 +- .../ignite/client/handler/ItClientHandlerTest.java | 12 +- .../client/handler/ItClientHandlerTestUtils.java | 2 +- .../handler/ClientInboundMessageHandler.java | 6 +- .../cluster/ClientClusterGetNodesRequest.java | 4 +- .../compute/ClientComputeExecuteRequest.java | 2 +- .../handler/requests/sql/ClientSqlCommon.java | 2 +- .../requests/sql/ClientSqlExecuteRequest.java | 6 +- .../requests/table/ClientSchemasGetRequest.java | 6 +- .../handler/requests/table/ClientTableCommon.java | 4 +- .../ClientTablePartitionAssignmentGetRequest.java | 4 +- .../requests/table/ClientTablesGetRequest.java | 2 +- .../ignite/internal/client/TcpClientChannel.java | 11 +- .../ignite/internal/client/TcpIgniteClient.java | 4 +- .../internal/client/compute/ClientCompute.java | 2 +- .../internal/client/sql/ClientAsyncResultSet.java | 2 +- .../internal/client/sql/ClientColumnMetadata.java | 2 +- .../client/sql/ClientResultSetMetadata.java | 2 +- .../ignite/internal/client/table/ClientTable.java | 11 +- .../ignite/internal/client/table/ClientTables.java | 2 +- .../ignite/client/fakes/FakeIgniteTables.java | 20 +- .../ignite/client/fakes/FakeInternalTable.java | 36 +- .../distributionzones/DistributionZonesUtil.java | 13 + .../RebalanceUtilUpdateAssignmentsTest.java | 1 + .../internal/network/file/ItFileTransferTest.java | 6 + .../apache/ignite/internal/index/IndexManager.java | 10 - .../ignite/internal/index/IndexManagerTest.java | 10 +- .../internal/metastorage/MetaStorageManager.java | 13 + .../metastorage/impl/MetaStorageManagerImpl.java | 8 + .../src/main/resources/marshallable.blacklist | 1 + modules/placement-driver-api/build.gradle | 4 + .../internal/placementdriver/PlacementDriver.java | 4 +- .../{LeaseMeta.java => ReplicaMeta.java} | 3 +- .../placementdriver/TestPlacementDriver.java | 47 ++ .../placementdriver/TestReplicaMetaImpl.java | 82 ++ .../internal/placementdriver/ActiveActorTest.java | 4 +- .../MultiActorPlacementDriverTest.java | 1 - .../PlacementDriverManagerTest.java | 1 - .../placementdriver/AssignmentsTracker.java | 50 +- .../internal/placementdriver/LeaseUpdater.java | 5 +- .../placementdriver/PlacementDriverManager.java | 15 +- .../internal/placementdriver/leases/Lease.java | 14 +- .../placementdriver/leases/LeaseTracker.java | 78 +- .../placementdriver/PlacementDriverTest.java | 33 +- modules/platforms/cpp/DEVNOTES.md | 12 +- .../ignite/client/detail/compute/compute_impl.cpp | 2 +- .../ignite/client/detail/ignite_client_impl.cpp | 21 +- .../cpp/ignite/client/detail/sql/result_set_impl.h | 63 +- .../cpp/ignite/client/detail/table/schema.h | 40 +- .../cpp/ignite/client/detail/table/table_impl.cpp | 8 +- .../cpp/ignite/client/detail/table/tables_impl.cpp | 16 +- .../platforms/cpp/ignite/odbc/query/data_query.cpp | 48 +- .../platforms/cpp/ignite/odbc/query/result_page.h | 5 +- .../cpp/ignite/odbc/query/table_metadata_query.cpp | 2 +- modules/platforms/cpp/ignite/protocol/reader.h | 132 +--- modules/platforms/cpp/ignite/protocol/utils.cpp | 36 +- modules/platforms/cpp/ignite/protocol/utils.h | 35 +- modules/platforms/cpp/ignite/protocol/writer.h | 13 +- .../cpp/tests/client-test/compute_test.cpp | 6 +- .../tests/client-test/record_binary_view_test.cpp | 1 + .../platforms/cpp/tests/client-test/sql_test.cpp | 3 +- .../dotnet/Apache.Ignite.Tests/FakeServer.cs | 44 +- .../Proto/MsgPack/MsgPackReaderTests.cs | 34 +- .../Proto/MsgPack/MsgPackWriterTests.cs | 26 - .../RawSocketConnectionTests.cs | 2 +- .../dotnet/Apache.Ignite.Tests/Sql/SqlTests.cs | 7 +- .../Table/SchemaSynchronizationTest.cs | 1 + .../dotnet/Apache.Ignite/Internal/ClientSocket.cs | 6 +- .../Apache.Ignite/Internal/Compute/Compute.cs | 2 +- .../Apache.Ignite/Internal/IgniteClientInternal.cs | 4 +- .../Internal/Proto/MsgPack/MsgPackReader.cs | 26 - .../Internal/Proto/MsgPack/MsgPackWriter.cs | 52 -- .../dotnet/Apache.Ignite/Internal/Sql/ResultSet.cs | 13 +- .../dotnet/Apache.Ignite/Internal/Table/Table.cs | 10 +- .../dotnet/Apache.Ignite/Internal/Table/Tables.cs | 2 +- .../dotnet/Apache.Ignite/Sql/IgniteDbDataReader.cs | 2 +- .../rpc/impl/RaftGroupEventsClientListener.java | 20 +- modules/runner/build.gradle | 3 +- .../org/apache/ignite/internal/SessionUtils.java | 2 +- .../component/ItRestAddressReportTest.java | 2 +- ...niteDistributionZoneManagerNodeRestartTest.java | 53 +- .../inmemory/ItRaftStorageVolatilityTest.java | 26 +- .../raftsnapshot/ItTableRaftSnapshotsTest.java | 1 + .../ItRebalanceDistributedTest.java | 10 +- .../internal/runner/app/IgniteRunnerTest.java | 3 +- .../runner/app/ItIgniteNodeRestartTest.java | 17 +- .../ItRaftCommandLeftInLogUntilRestartTest.java | 2 + .../runner/app/ItSchemaChangeKvViewTest.java | 1 + .../runner/app/ItSchemaChangeTableViewTest.java | 1 + .../internal/runner/app/ItTablesApiTest.java | 84 ++ .../ignite/internal/runner/app/TableTestUtils.java | 62 ++ .../runner/app/client/ItThinClientSqlTest.java | 6 +- .../schemasync/ItSchemaSyncAndReplicationTest.java | 2 + .../schemasync/ItSchemaSyncSingleNodeTest.java | 224 ++++++ .../sql/engine/ClusterPerClassIntegrationTest.java | 20 +- .../ignite/internal/sql/engine/ItDmlTest.java | 2 +- .../ignite/internal/sql/engine/ItIndexDdlTest.java | 18 +- .../ignite/internal/sql/engine/ItMetadataTest.java | 62 +- .../engine/datatypes/tests/BaseDataTypeTest.java | 34 +- .../ignite/internal/table/ItRoReadsTest.java | 80 +- .../ignite/internal/table/ItTableScanTest.java | 34 +- .../org/apache/ignite/internal/app/IgniteImpl.java | 23 +- .../ignite/{ => internal}/app/IgniteRunner.java | 3 +- .../storage/DistributedConfigurationStorage.java | 24 +- .../storage/LocalConfigurationStorage.java | 10 +- .../DistributedConfigurationStorageTest.java | 7 +- .../ignite/internal/schema/BinaryRowConverter.java | 77 +- .../ignite/internal/schema/ColumnsExtractor.java | 9 +- .../internal/schema/CatalogSchemaManagerTest.java | 10 +- .../CatalogToSchemaDescriptorConverterTest.java | 1 + modules/sql-engine/build.gradle | 1 + .../sql/engine/exec/UpdatableTableImpl.java | 29 +- .../sql/engine/exec/ddl/DdlCommandHandler.java | 25 +- .../exec/ddl/DdlToCatalogCommandConverter.java | 16 +- .../internal/sql/engine/prepare/IgnitePlanner.java | 87 ++- .../sql/engine/prepare/IgniteSqlValidator.java | 2 +- .../sql/engine/prepare/PrepareServiceImpl.java | 9 +- .../sql/engine/prepare/ValidationResult.java | 15 +- .../sql/engine/rule/SetOpConverterRule.java | 2 +- .../sql/engine/exec/rel/BaseAggregateTest.java | 63 +- .../exec/rel/TableScanNodeExecutionTest.java | 4 +- .../engine/schema/CatalogSqlSchemaManagerTest.java | 1 + .../internal/sql/engine/util/ColumnMatcher.java} | 13 +- .../engine/util/InjectQueryCheckerFactory.java} | 19 +- .../internal/sql/engine/util/MetadataMatcher.java | 5 +- .../internal/sql/engine/util/QueryChecker.java | 561 ++----------- .../sql/engine/util/QueryCheckerExtension.java | 122 +++ .../sql/engine/util/QueryCheckerFactory.java | 41 + .../sql/engine/util/QueryCheckerFactoryImpl.java | 113 +++ .../internal/sql/engine/util/QueryCheckerImpl.java | 418 ++++++++++ .../storage/AbstractMvTableStorageTest.java | 39 +- .../index/AbstractHashIndexStorageTest.java | 16 +- .../storage/index/AbstractIndexStorageTest.java | 1 + .../index/AbstractSortedIndexStorageTest.java | 92 +-- .../AbstractPageMemorySortedIndexStorageTest.java | 27 +- modules/table/build.gradle | 5 + .../ItAbstractInternalTableScanTest.java | 7 +- .../ItInternalTableReadOnlyOperationsTest.java | 52 +- .../ItInternalTableReadOnlyScanTest.java | 2 +- .../ignite/distributed/ItTablePersistenceTest.java | 75 +- .../distributed/ItTxDistributedTestSingleNode.java | 5 +- .../ignite/distributed/ReplicaUnavailableTest.java | 16 +- .../ignite/internal/table/ItColocationTest.java | 15 +- .../ignite/internal/table/InternalTable.java | 3 + .../table/distributed/StorageUpdateHandler.java | 12 +- .../table/distributed/TableIdRegistry.java | 48 ++ ...wReplicaRequest.java => TableIdTranslator.java} | 19 +- .../internal/table/distributed/TableManager.java | 282 ++++--- .../table/distributed/TableMessageGroup.java | 20 +- .../distributed/TableSchemaAwareIndexStorage.java | 22 + .../table/distributed/raft/PartitionListener.java | 33 +- ...quest.java => MultipleRowPkReplicaRequest.java} | 16 +- .../request/MultipleRowReplicaRequest.java | 5 +- ....java => ReadOnlyMultiRowPkReplicaRequest.java} | 2 +- ...java => ReadOnlySingleRowPkReplicaRequest.java} | 2 +- ...java => ReadWriteMultiRowPkReplicaRequest.java} | 12 +- .../request/ReadWriteMultiRowReplicaRequest.java | 6 +- .../request/ReadWriteReplicaRequest.java | 2 +- ...ava => ReadWriteSingleRowPkReplicaRequest.java} | 12 +- .../request/ReadWriteSingleRowReplicaRequest.java | 6 +- .../request/ReadWriteSwapRowReplicaRequest.java | 6 +- ...Request.java => SingleRowPkReplicaRequest.java} | 15 +- .../distributed/replicator/CatalogTables.java | 42 + .../replicator/CatalogTablesWithIdConversion.java | 47 ++ .../replicator/DirectCatalogTables.java} | 33 +- .../replicator/PartitionReplicaListener.java | 870 +++++++++++++-------- .../table/distributed/replicator/PendingRows.java | 18 +- .../replicator/SchemaCompatValidator.java | 24 +- ...ntDriver.java => TransactionStateResolver.java} | 6 +- .../distributed/replicator/action/RequestType.java | 40 +- .../distributed/storage/InternalTableImpl.java | 184 +++-- .../apache/ignite/internal/table/TxLocalTest.java | 47 +- .../internal/table/distributed/IndexBaseTest.java | 34 +- .../table/distributed/TableManagerTest.java | 21 +- .../raft/PartitionCommandListenerTest.java | 70 +- .../PartitionReplicaListenerIndexLockingTest.java | 110 ++- .../replication/PartitionReplicaListenerTest.java | 514 +++++++++--- .../replicator/action/RequestTypeTest.java | 60 ++ .../distributed/storage/InternalTableImplTest.java | 7 +- .../apache/ignite/distributed/ItTxTestCluster.java | 42 +- .../replicator/action/RequestTypes.java | 78 +- .../ignite/internal/table/TxAbstractTest.java | 9 +- .../table/impl/DummyInternalTableImpl.java | 71 +- packaging/build.gradle | 2 +- packaging/db/build.gradle | 4 +- 239 files changed, 5537 insertions(+), 3687 deletions(-) copy modules/api/src/{main/java/org/apache/ignite/lang/util/StringUtils.java => test/java/org/apache/ignite/lang/util/StringUtilsTest.java} (50%) copy modules/{table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/ReadOnlySingleRowReplicaRequest.java => catalog/src/main/java/org/apache/ignite/internal/catalog/IndexExistsValidationException.java} (64%) copy modules/catalog/src/main/java/org/apache/ignite/internal/catalog/{commands/AbstractCatalogCommand.java => IndexNotFoundValidationException.java} (66%) create mode 100644 modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AbstractCreateIndexCommand.java copy modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/{DropIndexParams.java => AbstractCreateIndexCommandBuilder.java} (59%) delete mode 100644 modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AbstractCreateIndexCommandParams.java copy modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/{AbstractTableCommand.java => AbstractIndexCommand.java} (69%) copy modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/{AbstractCatalogCommand.java => AbstractIndexCommandBuilder.java} (59%) delete mode 100644 modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AbstractIndexCommandParams.java delete mode 100644 modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AbstractTableCommandParams.java create mode 100644 modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateHashIndexCommand.java rename modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/{DropIndexParams.java => CreateHashIndexCommandBuilder.java} (64%) create mode 100644 modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateSortedIndexCommand.java copy modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/{AbstractCatalogCommand.java => CreateSortedIndexCommandBuilder.java} (54%) delete mode 100644 modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/CreateSortedIndexParams.java create mode 100644 modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/DropIndexCommand.java copy modules/catalog/src/main/java/org/apache/ignite/internal/catalog/commands/{AbstractCatalogCommand.java => DropIndexCommandBuilder.java} (68%) create mode 100644 modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/CreateAbstractIndexCommandValidationTest.java rename modules/catalog/src/{main/java/org/apache/ignite/internal/catalog/commands/CreateHashIndexParams.java => test/java/org/apache/ignite/internal/catalog/commands/CreateHashIndexCommandValidationTest.java} (62%) create mode 100644 modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/CreateSortedIndexCommandValidationTest.java create mode 100644 modules/catalog/src/test/java/org/apache/ignite/internal/catalog/commands/DropIndexCommandValidationTest.java rename modules/placement-driver-api/src/main/java/org/apache/ignite/internal/placementdriver/{LeaseMeta.java => ReplicaMeta.java} (94%) create mode 100644 modules/placement-driver-api/src/testFixtures/java/org/apache/ignite/internal/placementdriver/TestPlacementDriver.java create mode 100644 modules/placement-driver-api/src/testFixtures/java/org/apache/ignite/internal/placementdriver/TestReplicaMetaImpl.java rename modules/runner/src/integrationTest/java/org/apache/ignite/internal/{configuration/storage => rebalance}/ItRebalanceDistributedTest.java (99%) create mode 100644 modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/TableTestUtils.java create mode 100644 modules/runner/src/integrationTest/java/org/apache/ignite/internal/schemasync/ItSchemaSyncSingleNodeTest.java rename modules/runner/src/main/java/org/apache/ignite/{ => internal}/app/IgniteRunner.java (96%) rename modules/{catalog/src/main/java/org/apache/ignite/internal/catalog/commands/AbstractCatalogCommand.java => sql-engine/src/testFixtures/java/org/apache/ignite/internal/sql/engine/util/ColumnMatcher.java} (74%) copy modules/{table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/ReadOnlyMultiRowReplicaRequest.java => sql-engine/src/testFixtures/java/org/apache/ignite/internal/sql/engine/util/InjectQueryCheckerFactory.java} (58%) create mode 100644 modules/sql-engine/src/testFixtures/java/org/apache/ignite/internal/sql/engine/util/QueryCheckerExtension.java create mode 100644 modules/sql-engine/src/testFixtures/java/org/apache/ignite/internal/sql/engine/util/QueryCheckerFactory.java create mode 100644 modules/sql-engine/src/testFixtures/java/org/apache/ignite/internal/sql/engine/util/QueryCheckerFactoryImpl.java create mode 100644 modules/sql-engine/src/testFixtures/java/org/apache/ignite/internal/sql/engine/util/QueryCheckerImpl.java create mode 100644 modules/table/src/main/java/org/apache/ignite/internal/table/distributed/TableIdRegistry.java copy modules/table/src/main/java/org/apache/ignite/internal/table/distributed/{replication/request/ReadOnlyMultiRowReplicaRequest.java => TableIdTranslator.java} (58%) copy modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/{ReadOnlyMultiRowReplicaRequest.java => MultipleRowPkReplicaRequest.java} (64%) copy modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/{ReadOnlyMultiRowReplicaRequest.java => ReadOnlyMultiRowPkReplicaRequest.java} (90%) rename modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/{ReadOnlySingleRowReplicaRequest.java => ReadOnlySingleRowPkReplicaRequest.java} (90%) copy modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/{ReadWriteSwapRowReplicaRequest.java => ReadWriteMultiRowPkReplicaRequest.java} (73%) copy modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/{ReadWriteSwapRowReplicaRequest.java => ReadWriteSingleRowPkReplicaRequest.java} (73%) rename modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replication/request/{ReadOnlyMultiRowReplicaRequest.java => SingleRowPkReplicaRequest.java} (66%) create mode 100644 modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/CatalogTables.java create mode 100644 modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/CatalogTablesWithIdConversion.java copy modules/{api/src/main/java/org/apache/ignite/lang/util/StringUtils.java => table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/DirectCatalogTables.java} (53%) rename modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/{PlacementDriver.java => TransactionStateResolver.java} (95%) create mode 100644 modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replicator/action/RequestTypeTest.java