You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2021/05/28 10:44:19 UTC
[ignite-3] branch ignite-14755 updated (943b850 -> 79b05df)
This is an automated email from the ASF dual-hosted git repository.
agura pushed a change to branch ignite-14755
in repository https://gitbox.apache.org/repos/asf/ignite-3.git.
omit 943b850 IGNITE-14755 Meta storage classes moved to internal package.
add 1d8ea0e IGNITE-14756 Fixed data race in configuration update (#142)
add 25d3598 IGNITE-14764 Consolidation of managers and metastorage server implementation
add 70e0c1c IGNITE-14762 Fix preemptive message handler execution #143
add ed4788a IGNITE-14759: Fix wrong offset calculation for fix-sized column when nullmap is omitted. (#140)
add dd35b12 IGNITE-14388: Add affinity key support. (#127)
add 26839e9 IGNITE-14290: Schema configuration API implementation. (#132)
add 8bc40bd IGNITE-14770 Added unregistration of scalecube mx bean. (#144)
add 11ef216 IGNITE-14689 Remove addListeners and removeListeners from ConfigurationStorage (#148)
add 50d97de IGNITE-14667 Optimization of key criterion inference for aggregated watch. Fixes #121
add 8528db6 IGNITE-14649 Create an annotation processor for network message (de-)serializers (#130)
add 8c124db IGNITE-14732: Introduce SortOrder enum for indexed column. (#133)
add a3a9b8d IGNITE-14788 Configuration schemas fields forced to be public. (#151)
add d70bfa5 Ignite-14785: Use SchemaBuilders instead of Configuration API in tests (#150)
add e1d4caf IGNITE-14082 Implemented handshake protocol in new netty-based networking implementation. (#135)
new 79b05df IGNITE-14755 Meta storage classes moved to internal package.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (943b850)
\
N -- N -- N refs/heads/ignite-14755 (79b05df)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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:
.../ignite/internal/affinity/AffinityManager.java | 51 +-
.../internal/affinity/AffinityManagerTest.java | 6 +-
.../affinity/TestConfigurationStorage.java | 7 +-
.../schemas/runner/ClusterConfigurationSchema.java | 4 +-
.../schemas/runner/NodeConfigurationSchema.java | 4 +-
.../schemas/table/ColumnConfigurationSchema.java | 12 +-
.../table/ColumnTypeConfigurationSchema.java | 12 +-
.../table/IndexColumnConfigurationSchema.java | 10 +-
.../schemas/table/TableConfigurationSchema.java | 4 +-
.../table/TableIndexConfigurationSchema.java | 18 +-
.../schemas/table/TableValidator.java} | 14 +-
.../schemas/table/TablesConfigurationSchema.java | 8 +-
.../schema/{SchemaObject.java => SortOrder.java} | 13 +-
.../apache/ignite/schema/SortedIndexColumn.java | 4 +-
.../processor/internal/Processor.java | 30 +-
.../configuration/ConfigurationChangerTest.java | 8 +-
.../internal/util/ConfigurationUtilTest.java | 4 +-
.../notifications/ConfigurationListenerTest.java | 4 +-
.../sample/BaselineConfigurationSchema.java | 5 +-
.../sample/ClusterWideConfigurationSchema.java | 4 +-
.../sample/LocalConfigurationSchema.java | 2 +-
.../sample/NetworkConfigurationSchema.java | 2 +-
.../sample/TraversableTreeNodeTest.java | 4 +-
.../storage/TestConfigurationStorage.java | 7 +-
.../ignite/configuration/ConfigurationChanger.java | 2 +-
.../ignite/configuration/annotation/Config.java | 6 +-
.../configuration/internal/ConfigurationNode.java | 8 +-
.../storage/ConfigurationStorage.java | 15 +-
.../apache/ignite/internal/util/ArrayUtils.java | 10 +-
.../client/ITMetaStorageServiceTest.java | 19 +-
.../internal/metastorage/MetaStorageManager.java | 78 +--
.../internal/metastorage/watch/KeyCriterion.java | 305 ++++++++---
.../metastorage/watch/WatchAggregator.java | 12 +-
.../internal/metastorage/WatchAggregatorTest.java | 188 ++++++-
modules/network-annotation-processor/README.md | 9 +
.../pom.xml | 73 ++-
.../processor/ITAutoSerializableProcessorTest.java | 138 +++++
.../processor/internal/AllTypesMessage.java | 136 +++++
.../internal/AllTypesMessageFactory.java} | 14 +-
.../processor/internal/AllTypesMessageImpl.java | 471 +++++++++++++++++
.../internal/InvalidAnnotatedTypeMessage.java} | 11 +-
.../processor/internal/InvalidGetterMessage.java} | 15 +-
.../processor/internal/MissingBuilderMessage.java} | 18 +-
.../processor/internal/TransitiveMessage.java} | 65 +--
.../internal/TransitiveMessageFactory.java} | 14 +-
.../internal/UnsupportedTypeMessage.java} | 18 +-
.../processor/annotations/AutoSerializable.java | 72 +++
.../internal/AutoSerializableProcessor.java | 251 +++++++++
.../processor/internal/BaseMethodNameResolver.java | 135 +++++
.../MessageCollectionItemTypeConverter.java | 129 +++++
.../internal/MessageDeserializerGenerator.java | 212 ++++++++
.../internal/MessageReaderMethodResolver.java | 126 +++++
.../internal/MessageSerializerGenerator.java | 136 +++++
.../internal/MessageWriterMethodResolver.java | 133 +++++
.../processor/internal/ProcessingException.java} | 12 +-
.../internal/SerializationFactoryGenerator.java | 69 +++
.../network/processor/internal/TypeUtils.java | 77 +++
.../services/javax.annotation.processing.Processor | 1 +
modules/network-api/README.md | 35 ++
modules/{vault => network-api}/pom.xml | 22 +-
.../ignite/network/AbstractClusterService.java | 8 +-
.../ignite/network/AbstractMessagingService.java | 0
.../ignite/network/AbstractTopologyService.java | 0
.../ignite/network/ClusterLocalConfiguration.java | 10 +-
.../org/apache/ignite/network/ClusterNode.java | 6 +
.../org/apache/ignite/network/ClusterService.java | 6 +-
.../ignite/network/ClusterServiceFactory.java | 7 +-
.../apache/ignite/network/MessagingService.java | 5 +-
.../network/NetworkConfigurationException.java | 0
.../org/apache/ignite/network}/NetworkMessage.java | 4 +-
.../ignite/network/NetworkMessageHandler.java | 2 -
.../ignite/network/TopologyEventHandler.java | 4 +
.../org/apache/ignite/network/TopologyService.java | 2 +
.../serialization}/MessageDeserializer.java | 4 +-
.../serialization}/MessageMappingException.java | 2 +-
.../network/serialization}/MessageReader.java | 8 +-
.../MessageSerializationFactory.java | 4 +-
.../MessageSerializationRegistry.java | 31 +-
.../network/serialization}/MessageSerializer.java | 4 +-
.../network/serialization}/MessageWriter.java | 8 +-
.../MessageSerializationRegistryTest.java | 11 +-
modules/network/README.md | 35 +-
modules/network/pom.xml | 11 +
.../org/apache/ignite/network/TestMessage.java | 61 +--
.../apache/ignite/network/TestMessageFactory.java} | 14 +-
.../{TestMessage.java => TestMessageImpl.java} | 48 +-
.../network/TestMessageSerializationFactory.java | 112 ----
.../netty}/ConnectionManagerTest.java | 94 +++-
.../internal/recovery/RecoveryHandshakeTest.java | 349 +++++++++++++
.../network/scalecube/ITNodeRestartsTest.java | 12 +-
.../scalecube/ITScaleCubeNetworkMessagingTest.java | 25 +-
.../internal/direct/DirectMessageReader.java | 6 +-
.../internal/direct/DirectMessageWriter.java | 6 +-
.../direct/stream/DirectByteBufferStream.java | 14 +-
.../stream/DirectByteBufferStreamImplV1.java | 14 +-
.../internal/handshake/HandshakeAction.java} | 20 +-
.../internal/handshake/HandshakeException.java} | 19 +-
.../internal/handshake/HandshakeManager.java | 59 +++
.../network/internal/netty/ConnectionManager.java | 136 +++--
.../network/internal/netty/HandshakeHandler.java | 98 ++++
.../network/internal/netty/InboundDecoder.java | 24 +-
.../network/internal/netty/MessageHandler.java | 6 +-
.../ignite/network/internal/netty/NettyClient.java | 74 ++-
.../ignite/network/internal/netty/NettySender.java | 134 ++---
.../ignite/network/internal/netty/NettyServer.java | 59 ++-
.../ignite/network/internal/netty/NettyUtils.java | 1 +
.../{NettySender.java => OutboundEncoder.java} | 57 +--
.../recovery/RecoveryClientHandshakeManager.java | 105 ++++
.../recovery/RecoveryServerHandshakeManager.java | 103 ++++
.../recovery/message/HandshakeMessageFactory.java} | 18 +-
.../recovery/message/HandshakeStartMessage.java} | 38 +-
.../message/HandshakeStartMessageImpl.java} | 37 +-
.../message/HandshakeStartResponseMessage.java | 60 +++
.../message/HandshakeStartResponseMessageImpl.java | 83 +++
.../scalecube/DelegatingTransportFactory.java | 30 +-
.../scalecube/ScaleCubeClusterServiceFactory.java | 48 +-
.../ScaleCubeDirectMarshallerTransport.java | 33 +-
.../scalecube/ScaleCubeMessagingService.java | 21 +-
.../scalecube/ScaleCubeTopologyService.java | 8 +-
.../scalecube/message/ScaleCubeMessage.java | 36 +-
.../message/ScaleCubeMessageFactory.java} | 14 +-
...eCubeMessage.java => ScaleCubeMessageImpl.java} | 48 +-
.../ScaleCubeMessageSerializationFactory.java | 116 -----
.../ignite/network/internal/AllTypesMessage.java | 185 ++++---
.../network/internal/AllTypesMessageFactory.java} | 10 +-
.../network/internal/AllTypesMessageGenerator.java | 18 +-
.../network/internal/AllTypesMessageImpl.java | 496 ++++++++++++++++++
.../AllTypesMessageSerializationFactory.java | 562 ---------------------
.../network/internal/netty/InboundDecoderTest.java | 29 +-
.../network/internal/netty/NettyClientTest.java | 74 ++-
.../network/internal/netty/NettyServerTest.java | 118 ++++-
.../ignite/raft/client/message/ActionRequest.java | 2 +-
.../ignite/raft/client/message/ActionResponse.java | 2 +-
.../raft/client/message/AddLearnersRequest.java | 2 +-
.../raft/client/message/AddPeersRequest.java | 2 +-
.../raft/client/message/ChangePeersResponse.java | 2 +-
.../raft/client/message/GetLeaderRequest.java | 2 +-
.../raft/client/message/GetLeaderResponse.java | 2 +-
.../raft/client/message/GetPeersRequest.java | 2 +-
.../raft/client/message/GetPeersResponse.java | 2 +-
.../raft/client/message/RaftErrorResponse.java | 2 +-
.../raft/client/message/RemoveLearnersRequest.java | 2 +-
.../raft/client/message/RemovePeersRequest.java | 2 +-
.../raft/client/message/SnapshotRequest.java | 2 +-
.../client/message/TransferLeadershipRequest.java | 2 +-
.../client/service/impl/RaftGroupServiceImpl.java | 2 +-
.../raft/server/ITRaftCounterServerTest.java | 10 +-
.../java/org/apache/ignite/internal/raft/Loza.java | 15 +-
.../json/TestConfigurationStorage.java | 7 +-
.../runner/app/DynamicTableCreationTest.java | 181 +++++--
.../internal/runner/app/TableCreationTest.java | 48 +-
.../apache/ignite/internal/app/IgnitionImpl.java | 14 +-
.../storage/DistributedConfigurationStorage.java | 56 +-
.../storage/LocalConfigurationStorage.java | 29 +-
.../org/apache/ignite/internal/schema/Column.java | 10 +-
.../org/apache/ignite/internal/schema/Columns.java | 3 +-
.../apache/ignite/internal/schema/NativeType.java | 10 +-
.../ignite/internal/schema/NativeTypeSpec.java | 14 +-
.../apache/ignite/internal/schema/NativeTypes.java | 27 +-
.../ignite/internal/schema/NumericNativeType.java | 7 +-
.../org/apache/ignite/internal/schema/Row.java | 51 +-
.../ignite/internal/schema/RowAssembler.java | 58 ++-
.../ignite/internal/schema/SchemaDescriptor.java | 27 +-
.../ignite/internal/schema/SchemaManager.java | 105 +---
.../ignite/internal/schema/SchemaRegistry.java | 6 +-
.../internal/schema/SortedIndexColumnImpl.java | 13 +-
.../schema/builder/SchemaTableBuilderImpl.java | 28 +-
.../schema/builder/SortedIndexBuilderImpl.java | 7 +-
.../SchemaConfigurationConverter.java | 516 +++++++++++++++++++
.../configuration/SchemaDescriptorConverter.java | 150 ++++++
.../configuration/SchemaTableValidatorImpl.java | 66 +++
.../schema/registry/SchemaRegistryException.java | 1 +
.../schema/registry/SchemaRegistryImpl.java | 1 +
.../ignite/internal/schema/RowAssemblerTest.java | 185 +++++--
.../org/apache/ignite/internal/schema/RowTest.java | 113 ++++-
.../schema/builder/HashIndexBuilderTest.java} | 57 +--
.../schema/builder/PartialIndexBuilderTest.java} | 38 +-
.../PrimaryKeyBuilderTest.java} | 39 +-
.../SchemaTableBuilderTest.java} | 39 +-
.../SortedIndexBuilderTest.java} | 42 +-
.../TableColumnBuilderTest.java} | 36 +-
.../SchemaConfigurationConverterTest.java | 224 ++++++++
.../SchemaDescriptorConverterTest.java | 190 +++++++
.../configuration}/TestConfigurationStorage.java | 17 +-
.../ignite/distributed/ITDistributedTableTest.java | 12 +-
.../internal/table/distributed/TableManager.java | 11 +-
.../distributed/storage/InternalTableImpl.java | 22 +-
.../internal/table/StrictSchemaOperationsTest.java | 27 +-
.../ignite/internal/table/TableManagerTest.java | 42 +-
.../internal/table/TestConfigurationStorage.java | 7 +-
parent/pom.xml | 12 +
pom.xml | 2 +
192 files changed, 7310 insertions(+), 2471 deletions(-)
copy modules/{configuration/src/main/java/org/apache/ignite/configuration/validation/Immutable.java => api/src/main/java/org/apache/ignite/configuration/schemas/table/TableValidator.java} (75%)
copy modules/api/src/main/java/org/apache/ignite/schema/{SchemaObject.java => SortOrder.java} (85%)
create mode 100644 modules/network-annotation-processor/README.md
copy modules/{configuration-annotation-processor => network-annotation-processor}/pom.xml (55%)
create mode 100644 modules/network-annotation-processor/src/integrationTest/java/org/apache/ignite/network/messages/internal/processor/ITAutoSerializableProcessorTest.java
create mode 100644 modules/network-annotation-processor/src/integrationTest/resources/org/apache/ignite/network/processor/internal/AllTypesMessage.java
copy modules/{api/src/main/java/org/apache/ignite/schema/IndexColumn.java => network-annotation-processor/src/integrationTest/resources/org/apache/ignite/network/processor/internal/AllTypesMessageFactory.java} (79%)
create mode 100644 modules/network-annotation-processor/src/integrationTest/resources/org/apache/ignite/network/processor/internal/AllTypesMessageImpl.java
copy modules/{api/src/main/java/org/apache/ignite/table/InvokeProcessorException.java => network-annotation-processor/src/integrationTest/resources/org/apache/ignite/network/processor/internal/InvalidAnnotatedTypeMessage.java} (77%)
copy modules/{core/src/main/java/org/apache/ignite/internal/util/Cursor.java => network-annotation-processor/src/integrationTest/resources/org/apache/ignite/network/processor/internal/InvalidGetterMessage.java} (71%)
copy modules/{affinity/src/main/java/org/apache/ignite/internal/affinity/event/AffinityEvent.java => network-annotation-processor/src/integrationTest/resources/org/apache/ignite/network/processor/internal/MissingBuilderMessage.java} (69%)
copy modules/{raft-client/src/main/java/org/apache/ignite/raft/client/message/impl/RemovePeersRequestImpl.java => network-annotation-processor/src/integrationTest/resources/org/apache/ignite/network/processor/internal/TransitiveMessage.java} (50%)
copy modules/{api/src/main/java/org/apache/ignite/schema/IndexColumn.java => network-annotation-processor/src/integrationTest/resources/org/apache/ignite/network/processor/internal/TransitiveMessageFactory.java} (79%)
copy modules/{affinity/src/main/java/org/apache/ignite/internal/affinity/event/AffinityEvent.java => network-annotation-processor/src/integrationTest/resources/org/apache/ignite/network/processor/internal/UnsupportedTypeMessage.java} (69%)
create mode 100644 modules/network-annotation-processor/src/main/java/org/apache/ignite/network/processor/annotations/AutoSerializable.java
create mode 100644 modules/network-annotation-processor/src/main/java/org/apache/ignite/network/processor/internal/AutoSerializableProcessor.java
create mode 100644 modules/network-annotation-processor/src/main/java/org/apache/ignite/network/processor/internal/BaseMethodNameResolver.java
create mode 100644 modules/network-annotation-processor/src/main/java/org/apache/ignite/network/processor/internal/MessageCollectionItemTypeConverter.java
create mode 100644 modules/network-annotation-processor/src/main/java/org/apache/ignite/network/processor/internal/MessageDeserializerGenerator.java
create mode 100644 modules/network-annotation-processor/src/main/java/org/apache/ignite/network/processor/internal/MessageReaderMethodResolver.java
create mode 100644 modules/network-annotation-processor/src/main/java/org/apache/ignite/network/processor/internal/MessageSerializerGenerator.java
create mode 100644 modules/network-annotation-processor/src/main/java/org/apache/ignite/network/processor/internal/MessageWriterMethodResolver.java
rename modules/{network/src/main/java/org/apache/ignite/network/message/AckResponse.java => network-annotation-processor/src/main/java/org/apache/ignite/network/processor/internal/ProcessingException.java} (74%)
create mode 100644 modules/network-annotation-processor/src/main/java/org/apache/ignite/network/processor/internal/SerializationFactoryGenerator.java
create mode 100644 modules/network-annotation-processor/src/main/java/org/apache/ignite/network/processor/internal/TypeUtils.java
create mode 100644 modules/network-annotation-processor/src/main/resources/META-INF/services/javax.annotation.processing.Processor
create mode 100644 modules/network-api/README.md
copy modules/{vault => network-api}/pom.xml (81%)
rename modules/{network => network-api}/src/main/java/org/apache/ignite/network/AbstractClusterService.java (91%)
rename modules/{network => network-api}/src/main/java/org/apache/ignite/network/AbstractMessagingService.java (100%)
copy modules/{network => network-api}/src/main/java/org/apache/ignite/network/AbstractTopologyService.java (100%)
rename modules/{network => network-api}/src/main/java/org/apache/ignite/network/ClusterLocalConfiguration.java (91%)
rename modules/{network => network-api}/src/main/java/org/apache/ignite/network/ClusterNode.java (94%)
rename modules/{network => network-api}/src/main/java/org/apache/ignite/network/ClusterService.java (86%)
rename modules/{network => network-api}/src/main/java/org/apache/ignite/network/ClusterServiceFactory.java (90%)
rename modules/{network => network-api}/src/main/java/org/apache/ignite/network/MessagingService.java (95%)
rename modules/{network => network-api}/src/main/java/org/apache/ignite/network/NetworkConfigurationException.java (100%)
rename modules/{network/src/main/java/org/apache/ignite/network/message => network-api/src/main/java/org/apache/ignite/network}/NetworkMessage.java (91%)
rename modules/{network => network-api}/src/main/java/org/apache/ignite/network/NetworkMessageHandler.java (95%)
rename modules/{network => network-api}/src/main/java/org/apache/ignite/network/TopologyEventHandler.java (92%)
rename modules/{network => network-api}/src/main/java/org/apache/ignite/network/TopologyService.java (97%)
rename modules/{network/src/main/java/org/apache/ignite/network/message => network-api/src/main/java/org/apache/ignite/network/serialization}/MessageDeserializer.java (92%)
rename modules/{network/src/main/java/org/apache/ignite/network/message => network-api/src/main/java/org/apache/ignite/network/serialization}/MessageMappingException.java (96%)
rename modules/{network/src/main/java/org/apache/ignite/network/internal => network-api/src/main/java/org/apache/ignite/network/serialization}/MessageReader.java (96%)
rename modules/{network/src/main/java/org/apache/ignite/network/message => network-api/src/main/java/org/apache/ignite/network/serialization}/MessageSerializationFactory.java (92%)
rename modules/{network/src/main/java/org/apache/ignite/network/message => network-api/src/main/java/org/apache/ignite/network/serialization}/MessageSerializationRegistry.java (71%)
rename modules/{network/src/main/java/org/apache/ignite/network/message => network-api/src/main/java/org/apache/ignite/network/serialization}/MessageSerializer.java (92%)
rename modules/{network/src/main/java/org/apache/ignite/network/internal => network-api/src/main/java/org/apache/ignite/network/serialization}/MessageWriter.java (97%)
rename modules/{network/src/test/java/org/apache/ignite/network/message => network-api/src/test/java/org/apache/ignite/network/serialization}/MessageSerializationRegistryTest.java (91%)
copy modules/{api/src/main/java/org/apache/ignite/schema/SchemaObject.java => network/src/integrationTest/java/org/apache/ignite/network/TestMessageFactory.java} (82%)
copy modules/network/src/integrationTest/java/org/apache/ignite/network/{TestMessage.java => TestMessageImpl.java} (71%)
delete mode 100644 modules/network/src/integrationTest/java/org/apache/ignite/network/TestMessageSerializationFactory.java
rename modules/network/src/integrationTest/java/org/apache/ignite/network/{ => internal/netty}/ConnectionManagerTest.java (55%)
create mode 100644 modules/network/src/integrationTest/java/org/apache/ignite/network/internal/recovery/RecoveryHandshakeTest.java
copy modules/{api/src/main/java/org/apache/ignite/table/mapper/RecordMapper.java => network/src/main/java/org/apache/ignite/network/internal/handshake/HandshakeAction.java} (65%)
copy modules/{configuration/src/main/java/org/apache/ignite/configuration/ConfigurationChangeException.java => network/src/main/java/org/apache/ignite/network/internal/handshake/HandshakeException.java} (70%)
create mode 100644 modules/network/src/main/java/org/apache/ignite/network/internal/handshake/HandshakeManager.java
create mode 100644 modules/network/src/main/java/org/apache/ignite/network/internal/netty/HandshakeHandler.java
copy modules/network/src/main/java/org/apache/ignite/network/internal/netty/{NettySender.java => OutboundEncoder.java} (73%)
create mode 100644 modules/network/src/main/java/org/apache/ignite/network/internal/recovery/RecoveryClientHandshakeManager.java
create mode 100644 modules/network/src/main/java/org/apache/ignite/network/internal/recovery/RecoveryServerHandshakeManager.java
copy modules/{configuration/src/main/java/org/apache/ignite/configuration/storage/StorageException.java => network/src/main/java/org/apache/ignite/network/internal/recovery/message/HandshakeMessageFactory.java} (68%)
rename modules/network/src/main/java/org/apache/ignite/network/{AbstractTopologyService.java => internal/recovery/message/HandshakeStartMessage.java} (53%)
copy modules/{raft-client/src/main/java/org/apache/ignite/raft/client/message/impl/ActionRequestImpl.java => network/src/main/java/org/apache/ignite/network/internal/recovery/message/HandshakeStartMessageImpl.java} (61%)
create mode 100644 modules/network/src/main/java/org/apache/ignite/network/internal/recovery/message/HandshakeStartResponseMessage.java
create mode 100644 modules/network/src/main/java/org/apache/ignite/network/internal/recovery/message/HandshakeStartResponseMessageImpl.java
copy modules/{api/src/main/java/org/apache/ignite/schema/IndexColumn.java => network/src/main/java/org/apache/ignite/network/scalecube/message/ScaleCubeMessageFactory.java} (79%)
copy modules/network/src/main/java/org/apache/ignite/network/scalecube/message/{ScaleCubeMessage.java => ScaleCubeMessageImpl.java} (56%)
delete mode 100644 modules/network/src/main/java/org/apache/ignite/network/scalecube/message/ScaleCubeMessageSerializationFactory.java
copy modules/{api/src/main/java/org/apache/ignite/table/mapper/KeyMapper.java => network/src/test/java/org/apache/ignite/network/internal/AllTypesMessageFactory.java} (80%)
create mode 100644 modules/network/src/test/java/org/apache/ignite/network/internal/AllTypesMessageImpl.java
delete mode 100644 modules/network/src/test/java/org/apache/ignite/network/internal/AllTypesMessageSerializationFactory.java
create mode 100644 modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/SchemaConfigurationConverter.java
create mode 100644 modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/SchemaDescriptorConverter.java
create mode 100644 modules/schema/src/main/java/org/apache/ignite/internal/schema/configuration/SchemaTableValidatorImpl.java
copy modules/schema/src/{main/java/org/apache/ignite/internal/schema/builder/HashIndexBuilderImpl.java => test/java/org/apache/ignite/internal/schema/builder/HashIndexBuilderTest.java} (51%)
copy modules/schema/src/{main/java/org/apache/ignite/internal/schema/builder/AbstractIndexBuilder.java => test/java/org/apache/ignite/internal/schema/builder/PartialIndexBuilderTest.java} (55%)
copy modules/schema/src/test/java/org/apache/ignite/internal/schema/{ColumnTest.java => builder/PrimaryKeyBuilderTest.java} (54%)
copy modules/schema/src/test/java/org/apache/ignite/internal/schema/{SchemaDescriptorTest.java => builder/SchemaTableBuilderTest.java} (51%)
copy modules/schema/src/test/java/org/apache/ignite/internal/schema/{ColumnTest.java => builder/SortedIndexBuilderTest.java} (55%)
copy modules/schema/src/test/java/org/apache/ignite/internal/schema/{ColumnTest.java => builder/TableColumnBuilderTest.java} (54%)
create mode 100644 modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/SchemaConfigurationConverterTest.java
create mode 100644 modules/schema/src/test/java/org/apache/ignite/internal/schema/configuration/SchemaDescriptorConverterTest.java
copy modules/{rest/src/test/java/org/apache/ignite/rest/presentation/json => schema/src/test/java/org/apache/ignite/internal/schema/configuration}/TestConfigurationStorage.java (84%)
[ignite-3] 01/01: IGNITE-14755 Meta storage classes moved to
internal package.
Posted by ag...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
agura pushed a commit to branch ignite-14755
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
commit 79b05df38a8e3e1b160c28f5ef624d5ba8cd5de8
Author: Andrey Gura <ag...@apache.org>
AuthorDate: Fri May 21 16:27:00 2021 +0300
IGNITE-14755 Meta storage classes moved to internal package.
---
.../ignite/internal/affinity/AffinityManager.java | 10 +--
.../internal/affinity/AffinityManagerTest.java | 12 ++--
.../client/ITMetaStorageServiceTest.java | 11 ---
.../metastorage/client/CompactedException.java | 2 +-
.../metastorage/client/Condition.java | 2 +-
.../metastorage/client/Conditions.java | 2 +-
.../{ => internal}/metastorage/client/Entry.java | 2 +-
.../metastorage/client/EntryEvent.java | 2 +-
.../internal/metastorage/client/EntryImpl.java | 1 -
.../metastorage/client/MetaStorageService.java | 4 +-
.../metastorage/client/MetaStorageServiceImpl.java | 7 --
.../metastorage/client/Operation.java | 2 +-
.../client/OperationTimeoutException.java | 2 +-
.../metastorage/client/Operations.java | 2 +-
.../metastorage/client/WatchEvent.java | 2 +-
.../metastorage/client/WatchListener.java | 2 +-
.../metastorage/client/package-info.java | 2 +-
.../org/apache/ignite/metastorage/client/Key.java | 81 ----------------------
.../metastorage/common/package-info.java | 2 +-
.../internal/metastorage/MetaStorageManager.java | 14 ++--
.../metastorage/watch/AggregatedWatch.java | 2 +-
.../metastorage/watch/WatchAggregator.java | 6 +-
.../internal/metastorage/WatchAggregatorTest.java | 8 +--
.../storage/DistributedConfigurationStorage.java | 14 ++--
.../ignite/internal/schema/SchemaManager.java | 12 ++--
.../internal/table/distributed/TableManager.java | 4 +-
.../ignite/internal/table/TableManagerTest.java | 4 +-
27 files changed, 57 insertions(+), 157 deletions(-)
diff --git a/modules/affinity/src/main/java/org/apache/ignite/internal/affinity/AffinityManager.java b/modules/affinity/src/main/java/org/apache/ignite/internal/affinity/AffinityManager.java
index 8ed1879..c8dbe88 100644
--- a/modules/affinity/src/main/java/org/apache/ignite/internal/affinity/AffinityManager.java
+++ b/modules/affinity/src/main/java/org/apache/ignite/internal/affinity/AffinityManager.java
@@ -31,11 +31,11 @@ import org.apache.ignite.internal.metastorage.MetaStorageManager;
import org.apache.ignite.internal.util.ByteUtils;
import org.apache.ignite.lang.ByteArray;
import org.apache.ignite.lang.IgniteLogger;
-import org.apache.ignite.metastorage.client.Conditions;
-import org.apache.ignite.metastorage.client.EntryEvent;
-import org.apache.ignite.metastorage.client.Operations;
-import org.apache.ignite.metastorage.client.WatchEvent;
-import org.apache.ignite.metastorage.client.WatchListener;
+import org.apache.ignite.internal.metastorage.client.Conditions;
+import org.apache.ignite.internal.metastorage.client.EntryEvent;
+import org.apache.ignite.internal.metastorage.client.Operations;
+import org.apache.ignite.internal.metastorage.client.WatchEvent;
+import org.apache.ignite.internal.metastorage.client.WatchListener;
import org.apache.ignite.network.ClusterNode;
import org.jetbrains.annotations.NotNull;
diff --git a/modules/affinity/src/test/java/org/apache/ignite/internal/affinity/AffinityManagerTest.java b/modules/affinity/src/test/java/org/apache/ignite/internal/affinity/AffinityManagerTest.java
index 9c55e2e..09b2064 100644
--- a/modules/affinity/src/test/java/org/apache/ignite/internal/affinity/AffinityManagerTest.java
+++ b/modules/affinity/src/test/java/org/apache/ignite/internal/affinity/AffinityManagerTest.java
@@ -34,12 +34,12 @@ import org.apache.ignite.internal.util.ByteUtils;
import org.apache.ignite.internal.vault.VaultManager;
import org.apache.ignite.lang.ByteArray;
import org.apache.ignite.lang.IgniteLogger;
-import org.apache.ignite.metastorage.client.Condition;
-import org.apache.ignite.metastorage.client.Entry;
-import org.apache.ignite.metastorage.client.EntryEvent;
-import org.apache.ignite.metastorage.client.Operation;
-import org.apache.ignite.metastorage.client.WatchEvent;
-import org.apache.ignite.metastorage.client.WatchListener;
+import org.apache.ignite.internal.metastorage.client.Condition;
+import org.apache.ignite.internal.metastorage.client.Entry;
+import org.apache.ignite.internal.metastorage.client.EntryEvent;
+import org.apache.ignite.internal.metastorage.client.Operation;
+import org.apache.ignite.internal.metastorage.client.WatchEvent;
+import org.apache.ignite.internal.metastorage.client.WatchListener;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/modules/metastorage-client/src/integrationTest/java/org/apache/ignite/internal/metastorage/client/ITMetaStorageServiceTest.java b/modules/metastorage-client/src/integrationTest/java/org/apache/ignite/internal/metastorage/client/ITMetaStorageServiceTest.java
index 36c04c0..3689696 100644
--- a/modules/metastorage-client/src/integrationTest/java/org/apache/ignite/internal/metastorage/client/ITMetaStorageServiceTest.java
+++ b/modules/metastorage-client/src/integrationTest/java/org/apache/ignite/internal/metastorage/client/ITMetaStorageServiceTest.java
@@ -36,17 +36,6 @@ import org.apache.ignite.internal.util.Cursor;
import org.apache.ignite.lang.ByteArray;
import org.apache.ignite.lang.IgniteLogger;
import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.metastorage.client.CompactedException;
-import org.apache.ignite.metastorage.client.Condition;
-import org.apache.ignite.metastorage.client.Conditions;
-import org.apache.ignite.metastorage.client.Entry;
-import org.apache.ignite.metastorage.client.EntryEvent;
-import org.apache.ignite.metastorage.client.MetaStorageService;
-import org.apache.ignite.metastorage.client.Operation;
-import org.apache.ignite.metastorage.client.OperationTimeoutException;
-import org.apache.ignite.metastorage.client.Operations;
-import org.apache.ignite.metastorage.client.WatchEvent;
-import org.apache.ignite.metastorage.client.WatchListener;
import org.apache.ignite.network.ClusterLocalConfiguration;
import org.apache.ignite.network.ClusterService;
import org.apache.ignite.network.ClusterServiceFactory;
diff --git a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/CompactedException.java b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/CompactedException.java
similarity index 97%
rename from modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/CompactedException.java
rename to modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/CompactedException.java
index c256442..6db20c3 100644
--- a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/CompactedException.java
+++ b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/CompactedException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.metastorage.client;
+package org.apache.ignite.internal.metastorage.client;
/**
* Thrown when a requested operation on meta storage could not be performed because target revisions were removed
diff --git a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Condition.java b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/Condition.java
similarity index 99%
rename from modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Condition.java
rename to modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/Condition.java
index f78b113..45c41c3 100644
--- a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Condition.java
+++ b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/Condition.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.metastorage.client;
+package org.apache.ignite.internal.metastorage.client;
import java.util.Collection;
import org.apache.ignite.internal.metastorage.common.ConditionType;
diff --git a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Conditions.java b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/Conditions.java
similarity index 97%
rename from modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Conditions.java
rename to modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/Conditions.java
index 3d4f370..60b5576 100644
--- a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Conditions.java
+++ b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/Conditions.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.metastorage.client;
+package org.apache.ignite.internal.metastorage.client;
import org.apache.ignite.lang.ByteArray;
import org.jetbrains.annotations.NotNull;
diff --git a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Entry.java b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/Entry.java
similarity index 97%
rename from modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Entry.java
rename to modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/Entry.java
index 8895aac..6b119cf 100644
--- a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Entry.java
+++ b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/Entry.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.metastorage.client;
+package org.apache.ignite.internal.metastorage.client;
import org.apache.ignite.lang.ByteArray;
import org.jetbrains.annotations.NotNull;
diff --git a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/EntryEvent.java b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/EntryEvent.java
similarity index 97%
rename from modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/EntryEvent.java
rename to modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/EntryEvent.java
index 9e9a70d..7986dff 100644
--- a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/EntryEvent.java
+++ b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/EntryEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.metastorage.client;
+package org.apache.ignite.internal.metastorage.client;
import java.io.Serializable;
import org.jetbrains.annotations.NotNull;
diff --git a/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/EntryImpl.java b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/EntryImpl.java
index 94164a0..73819fb 100644
--- a/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/EntryImpl.java
+++ b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/EntryImpl.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.metastorage.client;
import java.util.Arrays;
import org.apache.ignite.lang.ByteArray;
-import org.apache.ignite.metastorage.client.Entry;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/MetaStorageService.java b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/MetaStorageService.java
similarity index 99%
rename from modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/MetaStorageService.java
rename to modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/MetaStorageService.java
index 787a463..932bb6c 100644
--- a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/MetaStorageService.java
+++ b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/MetaStorageService.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.metastorage.client;
+package org.apache.ignite.internal.metastorage.client;
import java.util.Collection;
import java.util.Map;
@@ -301,7 +301,7 @@ public interface MetaStorageService {
/**
* Subscribes on meta storage updates for given keys.
*
- * @param keys Set of target keys. Could be {@code null}.
+ * @param keys Set of target keys. Couldn't be {@code null} or empty.
* @param revision Start revision inclusive. {@code 0} - all revision,
* {@code -1} - latest revision (accordingly to current meta storage state).
* @param lsnr Listener which will be notified for each update.
diff --git a/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/MetaStorageServiceImpl.java b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/MetaStorageServiceImpl.java
index 3d7bde9..c8202f3 100644
--- a/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/MetaStorageServiceImpl.java
+++ b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/MetaStorageServiceImpl.java
@@ -50,13 +50,6 @@ import org.apache.ignite.lang.ByteArray;
import org.apache.ignite.lang.IgniteInternalException;
import org.apache.ignite.lang.IgniteLogger;
import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.metastorage.client.Condition;
-import org.apache.ignite.metastorage.client.Entry;
-import org.apache.ignite.metastorage.client.EntryEvent;
-import org.apache.ignite.metastorage.client.MetaStorageService;
-import org.apache.ignite.metastorage.client.Operation;
-import org.apache.ignite.metastorage.client.WatchEvent;
-import org.apache.ignite.metastorage.client.WatchListener;
import org.apache.ignite.raft.client.service.RaftGroupService;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
diff --git a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Operation.java b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/Operation.java
similarity index 98%
rename from modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Operation.java
rename to modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/Operation.java
index cf7a43e..307aa55 100644
--- a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Operation.java
+++ b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/Operation.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.metastorage.client;
+package org.apache.ignite.internal.metastorage.client;
import org.apache.ignite.internal.metastorage.common.OperationType;
import org.jetbrains.annotations.NotNull;
diff --git a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/OperationTimeoutException.java b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/OperationTimeoutException.java
similarity index 96%
rename from modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/OperationTimeoutException.java
rename to modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/OperationTimeoutException.java
index 3428f39..9080371 100644
--- a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/OperationTimeoutException.java
+++ b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/OperationTimeoutException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.metastorage.client;
+package org.apache.ignite.internal.metastorage.client;
/**
* Thrown when an operation is not executed within a specified time period. Usually in such cases the operation
diff --git a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Operations.java b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/Operations.java
similarity index 97%
rename from modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Operations.java
rename to modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/Operations.java
index 87f806f..f0b8e15 100644
--- a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Operations.java
+++ b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/Operations.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.metastorage.client;
+package org.apache.ignite.internal.metastorage.client;
import org.apache.ignite.lang.ByteArray;
diff --git a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/WatchEvent.java b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/WatchEvent.java
similarity index 97%
rename from modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/WatchEvent.java
rename to modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/WatchEvent.java
index 147ff63..1b56b93 100644
--- a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/WatchEvent.java
+++ b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/WatchEvent.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.metastorage.client;
+package org.apache.ignite.internal.metastorage.client;
import java.util.Collection;
import java.util.List;
diff --git a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/WatchListener.java b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/WatchListener.java
similarity index 96%
rename from modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/WatchListener.java
rename to modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/WatchListener.java
index 37c6a6f..245be81 100644
--- a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/WatchListener.java
+++ b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/WatchListener.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.metastorage.client;
+package org.apache.ignite.internal.metastorage.client;
import org.jetbrains.annotations.NotNull;
diff --git a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/package-info.java b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/package-info.java
similarity index 94%
rename from modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/package-info.java
rename to modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/package-info.java
index 26bfb69..5250092 100644
--- a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/package-info.java
+++ b/modules/metastorage-client/src/main/java/org/apache/ignite/internal/metastorage/client/package-info.java
@@ -18,4 +18,4 @@
/**
* Defines client interface for access to a meta storage server.
*/
-package org.apache.ignite.metastorage.client;
\ No newline at end of file
+package org.apache.ignite.internal.metastorage.client;
\ No newline at end of file
diff --git a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Key.java b/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Key.java
deleted file mode 100644
index 58d416e..0000000
--- a/modules/metastorage-client/src/main/java/org/apache/ignite/metastorage/client/Key.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.metastorage.client;
-
-import java.io.Serializable;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * A wrapper for meta storage key represented by byte array.
- */
-public final class Key implements Comparable<Key>, Serializable {
- /** Byte-wise representation of the key. */
- @NotNull
- private final byte[] arr;
-
- /**
- * Constructs key instance from the given string.
- *
- * @param s The string key representation. Can't be {@code null}.
- */
- public Key(@NotNull String s) {
- this(s.getBytes(StandardCharsets.UTF_8));
- }
-
- /**
- * Constructs key instance from the given byte array. <em>Note:</em> copy of the given byte array will not be
- * created in order to avoid redundant memory consumption.
- *
- * @param arr Byte array. Can't be {@code null}.
- */
- public Key(@NotNull byte[] arr) {
- this.arr = arr;
- }
-
- /**
- * Returns the key as byte array.
- *
- * @return Bytes of the key.
- */
- public byte[] bytes() {
- return arr;
- }
-
- /** {@inheritDoc} */
- @Override public boolean equals(Object o) {
- if (this == o) return true;
-
- if (o == null || getClass() != o.getClass()) return false;
-
- Key key = (Key)o;
-
- return Arrays.equals(arr, key.arr);
- }
-
- /** {@inheritDoc} */
- @Override public int hashCode() {
- return Arrays.hashCode(arr);
- }
-
- /** {@inheritDoc} */
- @Override public int compareTo(@NotNull Key other) {
- return Arrays.compare(this.arr, other.arr);
- }
-}
diff --git a/modules/metastorage-common/src/main/java/org/apache/ignite/metastorage/common/package-info.java b/modules/metastorage-common/src/main/java/org/apache/ignite/internal/metastorage/common/package-info.java
similarity index 94%
rename from modules/metastorage-common/src/main/java/org/apache/ignite/metastorage/common/package-info.java
rename to modules/metastorage-common/src/main/java/org/apache/ignite/internal/metastorage/common/package-info.java
index 084638b..1d97086 100644
--- a/modules/metastorage-common/src/main/java/org/apache/ignite/metastorage/common/package-info.java
+++ b/modules/metastorage-common/src/main/java/org/apache/ignite/internal/metastorage/common/package-info.java
@@ -18,4 +18,4 @@
/**
* Contains entities required by both meta storage client and server implementations.
*/
-package org.apache.ignite.metastorage.common;
+package org.apache.ignite.internal.metastorage.common;
diff --git a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/MetaStorageManager.java b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/MetaStorageManager.java
index f0c90f9..676ff20 100644
--- a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/MetaStorageManager.java
+++ b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/MetaStorageManager.java
@@ -43,13 +43,13 @@ import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.lang.IgniteInternalCheckedException;
import org.apache.ignite.lang.IgniteInternalException;
import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.metastorage.client.CompactedException;
-import org.apache.ignite.metastorage.client.Condition;
-import org.apache.ignite.metastorage.client.Entry;
-import org.apache.ignite.metastorage.client.MetaStorageService;
-import org.apache.ignite.metastorage.client.Operation;
-import org.apache.ignite.metastorage.client.OperationTimeoutException;
-import org.apache.ignite.metastorage.client.WatchListener;
+import org.apache.ignite.internal.metastorage.client.CompactedException;
+import org.apache.ignite.internal.metastorage.client.Condition;
+import org.apache.ignite.internal.metastorage.client.Entry;
+import org.apache.ignite.internal.metastorage.client.MetaStorageService;
+import org.apache.ignite.internal.metastorage.client.Operation;
+import org.apache.ignite.internal.metastorage.client.OperationTimeoutException;
+import org.apache.ignite.internal.metastorage.client.WatchListener;
import org.apache.ignite.network.ClusterNode;
import org.apache.ignite.network.ClusterService;
import org.jetbrains.annotations.NotNull;
diff --git a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/watch/AggregatedWatch.java b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/watch/AggregatedWatch.java
index cfedfbf..307bef3 100644
--- a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/watch/AggregatedWatch.java
+++ b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/watch/AggregatedWatch.java
@@ -17,7 +17,7 @@
package org.apache.ignite.internal.metastorage.watch;
-import org.apache.ignite.metastorage.client.WatchListener;
+import org.apache.ignite.internal.metastorage.client.WatchListener;
/**
* Watch implementation with associated revision.
diff --git a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/watch/WatchAggregator.java b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/watch/WatchAggregator.java
index 6c59290..e2c5501 100644
--- a/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/watch/WatchAggregator.java
+++ b/modules/metastorage/src/main/java/org/apache/ignite/internal/metastorage/watch/WatchAggregator.java
@@ -27,9 +27,9 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.function.BiConsumer;
import org.apache.ignite.lang.ByteArray;
import org.apache.ignite.lang.IgniteBiTuple;
-import org.apache.ignite.metastorage.client.EntryEvent;
-import org.apache.ignite.metastorage.client.WatchEvent;
-import org.apache.ignite.metastorage.client.WatchListener;
+import org.apache.ignite.internal.metastorage.client.EntryEvent;
+import org.apache.ignite.internal.metastorage.client.WatchEvent;
+import org.apache.ignite.internal.metastorage.client.WatchListener;
import org.jetbrains.annotations.NotNull;
/**
diff --git a/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/WatchAggregatorTest.java b/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/WatchAggregatorTest.java
index 461a1bd..cbfcdc3 100644
--- a/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/WatchAggregatorTest.java
+++ b/modules/metastorage/src/test/java/org/apache/ignite/internal/metastorage/WatchAggregatorTest.java
@@ -24,10 +24,10 @@ import java.util.List;
import org.apache.ignite.internal.metastorage.watch.KeyCriterion;
import org.apache.ignite.internal.metastorage.watch.WatchAggregator;
import org.apache.ignite.lang.ByteArray;
-import org.apache.ignite.metastorage.client.Entry;
-import org.apache.ignite.metastorage.client.EntryEvent;
-import org.apache.ignite.metastorage.client.WatchEvent;
-import org.apache.ignite.metastorage.client.WatchListener;
+import org.apache.ignite.internal.metastorage.client.Entry;
+import org.apache.ignite.internal.metastorage.client.EntryEvent;
+import org.apache.ignite.internal.metastorage.client.WatchEvent;
+import org.apache.ignite.internal.metastorage.client.WatchListener;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.junit.jupiter.api.Test;
diff --git a/modules/runner/src/main/java/org/apache/ignite/internal/storage/DistributedConfigurationStorage.java b/modules/runner/src/main/java/org/apache/ignite/internal/storage/DistributedConfigurationStorage.java
index 5b9274f..d19057d 100644
--- a/modules/runner/src/main/java/org/apache/ignite/internal/storage/DistributedConfigurationStorage.java
+++ b/modules/runner/src/main/java/org/apache/ignite/internal/storage/DistributedConfigurationStorage.java
@@ -35,13 +35,13 @@ import org.apache.ignite.internal.util.ByteUtils;
import org.apache.ignite.internal.util.Cursor;
import org.apache.ignite.lang.ByteArray;
import org.apache.ignite.lang.IgniteLogger;
-import org.apache.ignite.metastorage.client.Conditions;
-import org.apache.ignite.metastorage.client.Entry;
-import org.apache.ignite.metastorage.client.EntryEvent;
-import org.apache.ignite.metastorage.client.Operation;
-import org.apache.ignite.metastorage.client.Operations;
-import org.apache.ignite.metastorage.client.WatchEvent;
-import org.apache.ignite.metastorage.client.WatchListener;
+import org.apache.ignite.internal.metastorage.client.Conditions;
+import org.apache.ignite.internal.metastorage.client.Entry;
+import org.apache.ignite.internal.metastorage.client.EntryEvent;
+import org.apache.ignite.internal.metastorage.client.Operation;
+import org.apache.ignite.internal.metastorage.client.Operations;
+import org.apache.ignite.internal.metastorage.client.WatchEvent;
+import org.apache.ignite.internal.metastorage.client.WatchListener;
import org.jetbrains.annotations.NotNull;
/**
diff --git a/modules/schema/src/main/java/org/apache/ignite/internal/schema/SchemaManager.java b/modules/schema/src/main/java/org/apache/ignite/internal/schema/SchemaManager.java
index f388859..e25521d 100644
--- a/modules/schema/src/main/java/org/apache/ignite/internal/schema/SchemaManager.java
+++ b/modules/schema/src/main/java/org/apache/ignite/internal/schema/SchemaManager.java
@@ -40,12 +40,12 @@ import org.apache.ignite.internal.util.Cursor;
import org.apache.ignite.internal.vault.VaultManager;
import org.apache.ignite.lang.ByteArray;
import org.apache.ignite.lang.IgniteLogger;
-import org.apache.ignite.metastorage.client.Conditions;
-import org.apache.ignite.metastorage.client.Entry;
-import org.apache.ignite.metastorage.client.EntryEvent;
-import org.apache.ignite.metastorage.client.Operations;
-import org.apache.ignite.metastorage.client.WatchEvent;
-import org.apache.ignite.metastorage.client.WatchListener;
+import org.apache.ignite.internal.metastorage.client.Conditions;
+import org.apache.ignite.internal.metastorage.client.Entry;
+import org.apache.ignite.internal.metastorage.client.EntryEvent;
+import org.apache.ignite.internal.metastorage.client.Operations;
+import org.apache.ignite.internal.metastorage.client.WatchEvent;
+import org.apache.ignite.internal.metastorage.client.WatchListener;
import org.apache.ignite.schema.SchemaTable;
import org.jetbrains.annotations.NotNull;
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 25e9045..a3f965b 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
@@ -53,8 +53,8 @@ import org.apache.ignite.internal.table.event.TableEventParameters;
import org.apache.ignite.internal.vault.VaultManager;
import org.apache.ignite.lang.ByteArray;
import org.apache.ignite.lang.IgniteLogger;
-import org.apache.ignite.metastorage.client.Conditions;
-import org.apache.ignite.metastorage.client.Operations;
+import org.apache.ignite.internal.metastorage.client.Conditions;
+import org.apache.ignite.internal.metastorage.client.Operations;
import org.apache.ignite.network.ClusterNode;
import org.apache.ignite.raft.client.service.RaftGroupService;
import org.apache.ignite.table.Table;
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/TableManagerTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/TableManagerTest.java
index 8c8a800..fc09474 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/TableManagerTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/TableManagerTest.java
@@ -45,8 +45,8 @@ import org.apache.ignite.internal.schema.event.SchemaEventParameters;
import org.apache.ignite.internal.table.distributed.TableManager;
import org.apache.ignite.internal.vault.VaultManager;
import org.apache.ignite.lang.IgniteLogger;
-import org.apache.ignite.metastorage.client.Condition;
-import org.apache.ignite.metastorage.client.Operation;
+import org.apache.ignite.internal.metastorage.client.Condition;
+import org.apache.ignite.internal.metastorage.client.Operation;
import org.apache.ignite.network.ClusterNode;
import org.apache.ignite.schema.ColumnType;
import org.apache.ignite.schema.SchemaBuilders;