This is an automated email from the ASF dual-hosted git repository.
rpuch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new c9e8a17112e IGNITE-28302 Move IndexMeta to partition-replication
module (#7825)
c9e8a17112e is described below
commit c9e8a17112ec726a7788a20efcf3bc1677314218
Author: Roman Puchkovskiy <[email protected]>
AuthorDate: Fri Mar 20 10:36:51 2026 +0400
IGNITE-28302 Move IndexMeta to partition-replication module (#7825)
---
.../ignite/internal/index/ChangeIndexStatusTask.java | 6 +++---
.../org/apache/ignite/internal/index/IndexBuildTask.java | 2 +-
.../org/apache/ignite/internal/index/IndexBuilder.java | 6 +++---
.../apache/ignite/internal/index/IndexBuilderTest.java | 6 +++---
.../ignite/internal/index/IndexMetaStorageMocks.java | 4 ++--
.../internal/partition/replicator}/index/IndexMeta.java | 8 ++++----
.../partition/replicator}/index/MetaIndexStatus.java | 6 +++---
.../replicator}/index/MetaIndexStatusChange.java | 2 +-
.../table/distributed/index/IndexMetaSerializer.java | 3 +++
.../table/distributed/index/IndexMetaStorage.java | 8 +++++---
.../raft/handlers/BuildIndexCommandHandler.java | 8 ++++----
.../raft/snapshot/FullStateTransferIndexChooser.java | 4 ++--
.../replicator/PartitionReplicaBuildIndexProcessor.java | 6 +++---
.../table/distributed/replicator/ReplicatorUtils.java | 2 +-
.../handlers/BuildIndexReplicaRequestHandler.java | 6 +++---
.../table/distributed/index/BaseIndexMetaStorageTest.java | 3 +++
.../table/distributed/index/IndexMetaSerializerTest.java | 15 +++++++++------
.../distributed/index/IndexMetaStorageRecoveryTest.java | 15 +++++++++------
.../table/distributed/index/IndexMetaStorageTest.java | 15 +++++++++------
.../internal/table/distributed/index/IndexMetaTest.java | 3 +++
.../table/distributed/index/MetaIndexStatusTest.java | 1 +
.../distributed/raft/PartitionCommandListenerTest.java | 10 +++++-----
.../replication/PartitionReplicaListenerTest.java | 6 +++---
.../table/distributed/replicator/ReplicatorUtilsTest.java | 2 +-
24 files changed, 84 insertions(+), 63 deletions(-)
diff --git
a/modules/index/src/main/java/org/apache/ignite/internal/index/ChangeIndexStatusTask.java
b/modules/index/src/main/java/org/apache/ignite/internal/index/ChangeIndexStatusTask.java
index 2004c343543..1ea65d26a90 100644
---
a/modules/index/src/main/java/org/apache/ignite/internal/index/ChangeIndexStatusTask.java
+++
b/modules/index/src/main/java/org/apache/ignite/internal/index/ChangeIndexStatusTask.java
@@ -64,15 +64,15 @@ import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.network.ClusterService;
import org.apache.ignite.internal.network.RecipientLeftException;
+import org.apache.ignite.internal.partition.replicator.index.IndexMeta;
+import org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus;
+import
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatusChange;
import org.apache.ignite.internal.placementdriver.PlacementDriver;
import org.apache.ignite.internal.placementdriver.PrimaryReplicaAwaitException;
import
org.apache.ignite.internal.placementdriver.PrimaryReplicaAwaitTimeoutException;
import org.apache.ignite.internal.placementdriver.ReplicaMeta;
import org.apache.ignite.internal.replicator.ZonePartitionId;
-import org.apache.ignite.internal.table.distributed.index.IndexMeta;
import org.apache.ignite.internal.table.distributed.index.IndexMetaStorage;
-import org.apache.ignite.internal.table.distributed.index.MetaIndexStatus;
-import
org.apache.ignite.internal.table.distributed.index.MetaIndexStatusChange;
import org.apache.ignite.internal.util.IgniteSpinBusyLock;
/**
diff --git
a/modules/index/src/main/java/org/apache/ignite/internal/index/IndexBuildTask.java
b/modules/index/src/main/java/org/apache/ignite/internal/index/IndexBuildTask.java
index d5b62d55b9c..1c81dcb96dc 100644
---
a/modules/index/src/main/java/org/apache/ignite/internal/index/IndexBuildTask.java
+++
b/modules/index/src/main/java/org/apache/ignite/internal/index/IndexBuildTask.java
@@ -50,6 +50,7 @@ import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
import org.apache.ignite.internal.network.InternalClusterNode;
import
org.apache.ignite.internal.partition.replicator.TableTxRwOperationTracker;
+import
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatusChange;
import
org.apache.ignite.internal.partition.replicator.network.PartitionReplicationMessagesFactory;
import
org.apache.ignite.internal.partition.replicator.network.replication.BuildIndexReplicaRequest;
import org.apache.ignite.internal.raft.GroupOverloadedException;
@@ -64,7 +65,6 @@ import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.RowMeta;
import org.apache.ignite.internal.storage.StorageClosedException;
import org.apache.ignite.internal.storage.index.IndexStorage;
-import
org.apache.ignite.internal.table.distributed.index.MetaIndexStatusChange;
import org.apache.ignite.internal.tx.TransactionIds;
import org.apache.ignite.internal.tx.TxState;
import org.apache.ignite.internal.util.CompletableFutures;
diff --git
a/modules/index/src/main/java/org/apache/ignite/internal/index/IndexBuilder.java
b/modules/index/src/main/java/org/apache/ignite/internal/index/IndexBuilder.java
index 1d3e8a4556d..77b38a11ecb 100644
---
a/modules/index/src/main/java/org/apache/ignite/internal/index/IndexBuilder.java
+++
b/modules/index/src/main/java/org/apache/ignite/internal/index/IndexBuilder.java
@@ -36,16 +36,16 @@ import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.metrics.MetricManager;
import org.apache.ignite.internal.network.InternalClusterNode;
import
org.apache.ignite.internal.partition.replicator.TableTxRwOperationTracker;
+import org.apache.ignite.internal.partition.replicator.index.IndexMeta;
+import org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus;
+import
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatusChange;
import
org.apache.ignite.internal.partition.replicator.network.command.BuildIndexCommand;
import
org.apache.ignite.internal.partition.replicator.network.replication.BuildIndexReplicaRequest;
import org.apache.ignite.internal.replicator.ReplicaService;
import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.index.IndexStorage;
-import org.apache.ignite.internal.table.distributed.index.IndexMeta;
import org.apache.ignite.internal.table.distributed.index.IndexMetaStorage;
-import org.apache.ignite.internal.table.distributed.index.MetaIndexStatus;
-import
org.apache.ignite.internal.table.distributed.index.MetaIndexStatusChange;
import org.apache.ignite.internal.util.IgniteSpinBusyLock;
import org.apache.ignite.internal.util.PendingComparableValuesTracker;
diff --git
a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexBuilderTest.java
b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexBuilderTest.java
index 22a27443c41..1138de2476d 100644
---
a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexBuilderTest.java
+++
b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexBuilderTest.java
@@ -54,6 +54,9 @@ import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.metrics.NoOpMetricManager;
import org.apache.ignite.internal.network.InternalClusterNode;
import
org.apache.ignite.internal.partition.replicator.TableTxRwOperationTracker;
+import org.apache.ignite.internal.partition.replicator.index.IndexMeta;
+import org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus;
+import
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatusChange;
import
org.apache.ignite.internal.partition.replicator.network.replication.BuildIndexReplicaRequest;
import org.apache.ignite.internal.replicator.ReplicaService;
import org.apache.ignite.internal.replicator.ZonePartitionId;
@@ -65,10 +68,7 @@ import org.apache.ignite.internal.storage.MvPartitionStorage;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.storage.impl.TestMvPartitionStorage;
import org.apache.ignite.internal.storage.index.IndexStorage;
-import org.apache.ignite.internal.table.distributed.index.IndexMeta;
import org.apache.ignite.internal.table.distributed.index.IndexMetaStorage;
-import org.apache.ignite.internal.table.distributed.index.MetaIndexStatus;
-import
org.apache.ignite.internal.table.distributed.index.MetaIndexStatusChange;
import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.util.PendingComparableValuesTracker;
import org.junit.jupiter.api.AfterEach;
diff --git
a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexMetaStorageMocks.java
b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexMetaStorageMocks.java
index 1dd8f16cf46..2d0df9688ff 100644
---
a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexMetaStorageMocks.java
+++
b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexMetaStorageMocks.java
@@ -24,9 +24,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.apache.ignite.internal.hlc.HybridTimestamp;
-import org.apache.ignite.internal.table.distributed.index.IndexMeta;
+import org.apache.ignite.internal.partition.replicator.index.IndexMeta;
+import
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatusChange;
import org.apache.ignite.internal.table.distributed.index.IndexMetaStorage;
-import
org.apache.ignite.internal.table.distributed.index.MetaIndexStatusChange;
class IndexMetaStorageMocks {
static void configureMocksForBuildingPhase(IndexMetaStorage
indexMetaStorage) {
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/IndexMeta.java
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/index/IndexMeta.java
similarity index 96%
rename from
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/IndexMeta.java
rename to
modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/index/IndexMeta.java
index 101410750f7..a6d758816b8 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/IndexMeta.java
+++
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/index/IndexMeta.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.table.distributed.index;
+package org.apache.ignite.internal.partition.replicator.index;
import static java.util.Collections.unmodifiableMap;
import static java.util.Collections.unmodifiableNavigableMap;
@@ -92,7 +92,7 @@ public class IndexMeta {
* @param indexId Catalog index ID.
* @param catalog Catalog version from which the {@code
catalogIndexDescriptor} was taken.
*/
- static IndexMeta of(int indexId, Catalog catalog) {
+ public static IndexMeta of(int indexId, Catalog catalog) {
CatalogIndexDescriptor catalogIndexDescriptor = catalog.index(indexId);
assert catalogIndexDescriptor != null : "indexId=" + indexId + ",
catalogVersion=" + catalog.version();
@@ -148,7 +148,7 @@ public class IndexMeta {
* @param newIndexName New index name.
* @return New instance of the index meta with only a new index name.
*/
- IndexMeta indexName(int catalogVersion, String newIndexName) {
+ public IndexMeta indexName(int catalogVersion, String newIndexName) {
return new IndexMeta(
catalogVersion,
indexId,
@@ -174,7 +174,7 @@ public class IndexMeta {
* @return New instance of the index meta with a change in the current
status and status history updates.
* @see Catalog#time()
*/
- IndexMeta status(MetaIndexStatus newStatus, int catalogVersion, long
activationTs) {
+ public IndexMeta status(MetaIndexStatus newStatus, int catalogVersion,
long activationTs) {
assert !statusChanges.containsKey(newStatus) :
String.format("newStatus=%s, catalogVersion=%d, indexName=%s",
newStatus, catalogVersion, indexName);
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/MetaIndexStatus.java
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/index/MetaIndexStatus.java
similarity index 95%
rename from
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/MetaIndexStatus.java
rename to
modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/index/MetaIndexStatus.java
index 9b3c162bd5c..a7c6d69a9ff 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/MetaIndexStatus.java
+++
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/index/MetaIndexStatus.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.table.distributed.index;
+package org.apache.ignite.internal.partition.replicator.index;
import java.util.HashSet;
import java.util.Set;
@@ -98,7 +98,7 @@ public enum MetaIndexStatus {
* @param code Code to use when searching.
* @throws IllegalArgumentException If there is no status with the
provided code.
*/
- static MetaIndexStatus findByCode(int code) {
+ public static MetaIndexStatus findByCode(int code) {
MetaIndexStatus status = VALUES_INDEXED_BY_CODE[code];
if (status == null) {
@@ -130,7 +130,7 @@ public enum MetaIndexStatus {
}
/** Returns the index status on an index removal event from a catalog,
based on the previous status. */
- static MetaIndexStatus statusOnRemoveIndex(MetaIndexStatus previousStatus)
{
+ public static MetaIndexStatus statusOnRemoveIndex(MetaIndexStatus
previousStatus) {
switch (previousStatus) {
case REGISTERED:
case BUILDING:
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/MetaIndexStatusChange.java
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/index/MetaIndexStatusChange.java
similarity index 97%
rename from
modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/MetaIndexStatusChange.java
rename to
modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/index/MetaIndexStatusChange.java
index 448627869b9..663c8185551 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/MetaIndexStatusChange.java
+++
b/modules/partition-replicator/src/main/java/org/apache/ignite/internal/partition/replicator/index/MetaIndexStatusChange.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.table.distributed.index;
+package org.apache.ignite.internal.partition.replicator.index;
import org.apache.ignite.internal.catalog.Catalog;
import org.apache.ignite.internal.tostring.S;
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/IndexMetaSerializer.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/IndexMetaSerializer.java
index a2aefed94d8..1ede6fa1efd 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/IndexMetaSerializer.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/IndexMetaSerializer.java
@@ -24,6 +24,9 @@ import java.util.EnumMap;
import java.util.Map;
import java.util.Map.Entry;
import org.apache.ignite.internal.hlc.HybridTimestamp;
+import org.apache.ignite.internal.partition.replicator.index.IndexMeta;
+import org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus;
+import
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatusChange;
import org.apache.ignite.internal.util.io.IgniteDataInput;
import org.apache.ignite.internal.util.io.IgniteDataOutput;
import org.apache.ignite.internal.versioned.VersionedSerializer;
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/IndexMetaStorage.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/IndexMetaStorage.java
index 9a6afb2df4c..1dfc926e76c 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/IndexMetaStorage.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/index/IndexMetaStorage.java
@@ -37,9 +37,9 @@ import static
org.apache.ignite.internal.metastorage.dsl.Conditions.value;
import static org.apache.ignite.internal.metastorage.dsl.Operations.noop;
import static org.apache.ignite.internal.metastorage.dsl.Operations.put;
import static org.apache.ignite.internal.metastorage.dsl.Operations.remove;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.READ_ONLY;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.REMOVED;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.statusOnRemoveIndex;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.READ_ONLY;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.REMOVED;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.statusOnRemoveIndex;
import static org.apache.ignite.internal.util.ByteUtils.intToBytesKeepingOrder;
import static org.apache.ignite.internal.util.CollectionUtils.difference;
import static
org.apache.ignite.internal.util.CompletableFutures.falseCompletedFuture;
@@ -81,6 +81,8 @@ import org.apache.ignite.internal.metastorage.Entry;
import org.apache.ignite.internal.metastorage.MetaStorageManager;
import org.apache.ignite.internal.metastorage.Revisions;
import org.apache.ignite.internal.metastorage.dsl.Operation;
+import org.apache.ignite.internal.partition.replicator.index.IndexMeta;
+import org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus;
import org.apache.ignite.internal.util.Cursor;
import org.apache.ignite.internal.versioned.VersionedSerialization;
import org.jetbrains.annotations.Nullable;
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/handlers/BuildIndexCommandHandler.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/handlers/BuildIndexCommandHandler.java
index 06027d7e9f0..1e3415cb76c 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/handlers/BuildIndexCommandHandler.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/handlers/BuildIndexCommandHandler.java
@@ -18,10 +18,10 @@
package org.apache.ignite.internal.table.distributed.raft.handlers;
import static java.util.Objects.requireNonNull;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.BUILDING;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.REGISTERED;
import static
org.apache.ignite.internal.partition.replicator.raft.CommandResult.EMPTY_APPLIED_RESULT;
import static
org.apache.ignite.internal.partition.replicator.raft.CommandResult.EMPTY_NOT_APPLIED_RESULT;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.BUILDING;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.REGISTERED;
import static org.apache.ignite.internal.util.CollectionUtils.last;
import java.util.List;
@@ -34,6 +34,8 @@ import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.lang.IgniteInternalException;
import org.apache.ignite.internal.logger.IgniteLogger;
import org.apache.ignite.internal.logger.Loggers;
+import org.apache.ignite.internal.partition.replicator.index.IndexMeta;
+import
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatusChange;
import
org.apache.ignite.internal.partition.replicator.network.command.BuildIndexCommand;
import
org.apache.ignite.internal.partition.replicator.network.command.BuildIndexCommandV2;
import
org.apache.ignite.internal.partition.replicator.network.command.BuildIndexCommandV3;
@@ -47,10 +49,8 @@ import org.apache.ignite.internal.schema.SchemaRegistry;
import org.apache.ignite.internal.storage.BinaryRowAndRowId;
import org.apache.ignite.internal.storage.RowId;
import org.apache.ignite.internal.table.distributed.StorageUpdateHandler;
-import org.apache.ignite.internal.table.distributed.index.IndexMeta;
import org.apache.ignite.internal.table.distributed.index.IndexMetaStorage;
import org.apache.ignite.internal.table.distributed.index.IndexUpdateHandler;
-import
org.apache.ignite.internal.table.distributed.index.MetaIndexStatusChange;
import org.jetbrains.annotations.Nullable;
/**
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/FullStateTransferIndexChooser.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/FullStateTransferIndexChooser.java
index 90d3b4e4261..d905ec420b5 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/FullStateTransferIndexChooser.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/FullStateTransferIndexChooser.java
@@ -44,10 +44,10 @@ import org.apache.ignite.internal.close.ManuallyCloseable;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.lowwatermark.LowWatermark;
import
org.apache.ignite.internal.lowwatermark.event.ChangeLowWatermarkEventParameters;
+import org.apache.ignite.internal.partition.replicator.index.IndexMeta;
+import org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus;
import
org.apache.ignite.internal.partition.replicator.raft.snapshot.PartitionMvStorageAccess;
-import org.apache.ignite.internal.table.distributed.index.IndexMeta;
import org.apache.ignite.internal.table.distributed.index.IndexMetaStorage;
-import org.apache.ignite.internal.table.distributed.index.MetaIndexStatus;
import org.apache.ignite.internal.util.IgniteSpinBusyLock;
/** Index chooser for full state transfer. */
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaBuildIndexProcessor.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaBuildIndexProcessor.java
index 2f0aeaa40e2..47b6cceae2a 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaBuildIndexProcessor.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/PartitionReplicaBuildIndexProcessor.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.table.distributed.replicator;
import static java.util.concurrent.CompletableFuture.failedFuture;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.REGISTERED;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.REGISTERED;
import static
org.apache.ignite.internal.table.distributed.replicator.ReplicatorUtils.latestIndexMetaInBuildingStatus;
import static
org.apache.ignite.internal.table.distributed.replicator.ReplicatorUtils.rwTxActiveCatalogVersion;
import static
org.apache.ignite.internal.util.CompletableFutures.falseCompletedFuture;
@@ -30,11 +30,11 @@ import
org.apache.ignite.internal.catalog.events.CatalogEvent;
import org.apache.ignite.internal.catalog.events.CatalogEventParameters;
import
org.apache.ignite.internal.catalog.events.StartBuildingIndexEventParameters;
import org.apache.ignite.internal.event.EventListener;
+import org.apache.ignite.internal.partition.replicator.index.IndexMeta;
+import
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatusChange;
import
org.apache.ignite.internal.partition.replicator.network.replication.ReadWriteReplicaRequest;
import org.apache.ignite.internal.replicator.message.ReplicaRequest;
-import org.apache.ignite.internal.table.distributed.index.IndexMeta;
import org.apache.ignite.internal.table.distributed.index.IndexMetaStorage;
-import
org.apache.ignite.internal.table.distributed.index.MetaIndexStatusChange;
import org.apache.ignite.internal.tx.TxManager;
import org.apache.ignite.internal.util.IgniteSpinBusyLock;
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/ReplicatorUtils.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/ReplicatorUtils.java
index 51165304321..f352d6599e8 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/ReplicatorUtils.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/ReplicatorUtils.java
@@ -23,8 +23,8 @@ import org.apache.ignite.internal.catalog.CatalogService;
import org.apache.ignite.internal.catalog.descriptors.CatalogIndexDescriptor;
import org.apache.ignite.internal.catalog.descriptors.CatalogIndexStatus;
import org.apache.ignite.internal.hlc.HybridTimestamp;
+import org.apache.ignite.internal.partition.replicator.index.IndexMeta;
import
org.apache.ignite.internal.partition.replicator.network.replication.ReadWriteReplicaRequest;
-import org.apache.ignite.internal.table.distributed.index.IndexMeta;
import org.apache.ignite.internal.table.distributed.index.IndexMetaStorage;
import org.apache.ignite.internal.tx.TransactionIds;
import org.jetbrains.annotations.Nullable;
diff --git
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/handlers/BuildIndexReplicaRequestHandler.java
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/handlers/BuildIndexReplicaRequestHandler.java
index 5476d275b8d..7d37a4922f1 100644
---
a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/handlers/BuildIndexReplicaRequestHandler.java
+++
b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/replicator/handlers/BuildIndexReplicaRequestHandler.java
@@ -17,17 +17,17 @@
package org.apache.ignite.internal.table.distributed.replicator.handlers;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.BUILDING;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.BUILDING;
import static
org.apache.ignite.internal.util.CompletableFutures.nullCompletedFuture;
import java.util.concurrent.CompletableFuture;
import
org.apache.ignite.internal.partition.replicator.ReplicationRaftCommandApplicator;
+import org.apache.ignite.internal.partition.replicator.index.IndexMeta;
+import
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatusChange;
import
org.apache.ignite.internal.partition.replicator.network.PartitionReplicationMessagesFactory;
import
org.apache.ignite.internal.partition.replicator.network.command.BuildIndexCommand;
import
org.apache.ignite.internal.partition.replicator.network.replication.BuildIndexReplicaRequest;
-import org.apache.ignite.internal.table.distributed.index.IndexMeta;
import org.apache.ignite.internal.table.distributed.index.IndexMetaStorage;
-import
org.apache.ignite.internal.table.distributed.index.MetaIndexStatusChange;
/**
* Handler for {@link BuildIndexReplicaRequest}.
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/BaseIndexMetaStorageTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/BaseIndexMetaStorageTest.java
index fd09a558f1e..69560dfb720 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/BaseIndexMetaStorageTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/BaseIndexMetaStorageTest.java
@@ -49,6 +49,9 @@ import
org.apache.ignite.internal.lowwatermark.TestLowWatermark;
import org.apache.ignite.internal.manager.ComponentContext;
import org.apache.ignite.internal.metastorage.Entry;
import org.apache.ignite.internal.metastorage.MetaStorageManager;
+import org.apache.ignite.internal.partition.replicator.index.IndexMeta;
+import org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus;
+import
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatusChange;
import org.apache.ignite.internal.testframework.BaseIgniteAbstractTest;
import org.apache.ignite.internal.util.ByteUtils;
import org.apache.ignite.internal.util.IgniteUtils;
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexMetaSerializerTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexMetaSerializerTest.java
index e57e1399621..39863c71b9a 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexMetaSerializerTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexMetaSerializerTest.java
@@ -17,18 +17,21 @@
package org.apache.ignite.internal.table.distributed.index;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.AVAILABLE;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.BUILDING;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.READ_ONLY;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.REGISTERED;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.REMOVED;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.STOPPING;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.AVAILABLE;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.BUILDING;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.READ_ONLY;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.REGISTERED;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.REMOVED;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.STOPPING;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.is;
import java.util.Base64;
import java.util.Map;
+import org.apache.ignite.internal.partition.replicator.index.IndexMeta;
+import org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus;
+import
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatusChange;
import org.apache.ignite.internal.versioned.VersionedSerialization;
import org.junit.jupiter.api.Test;
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexMetaStorageRecoveryTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexMetaStorageRecoveryTest.java
index 61069939229..0806076c96e 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexMetaStorageRecoveryTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexMetaStorageRecoveryTest.java
@@ -18,6 +18,12 @@
package org.apache.ignite.internal.table.distributed.index;
import static
org.apache.ignite.internal.catalog.CatalogTestUtils.createTestCatalogManagerWithInterceptor;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.AVAILABLE;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.BUILDING;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.READ_ONLY;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.REGISTERED;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.REMOVED;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.STOPPING;
import static org.apache.ignite.internal.table.TableTestUtils.INDEX_NAME;
import static org.apache.ignite.internal.table.TableTestUtils.PK_INDEX_NAME;
import static org.apache.ignite.internal.table.TableTestUtils.TABLE_NAME;
@@ -29,12 +35,6 @@ import static
org.apache.ignite.internal.table.TableTestUtils.makeIndexAvailable
import static org.apache.ignite.internal.table.TableTestUtils.removeIndex;
import static
org.apache.ignite.internal.table.TableTestUtils.renameSimpleTable;
import static
org.apache.ignite.internal.table.TableTestUtils.startBuildingIndex;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.AVAILABLE;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.BUILDING;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.READ_ONLY;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.REGISTERED;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.REMOVED;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.STOPPING;
import static
org.apache.ignite.internal.testframework.IgniteTestUtils.runAsync;
import static
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
import static org.apache.ignite.internal.util.IgniteUtils.startAsync;
@@ -57,6 +57,9 @@ import
org.apache.ignite.internal.metastorage.MetaStorageManager;
import
org.apache.ignite.internal.metastorage.impl.StandaloneMetaStorageManager;
import
org.apache.ignite.internal.metastorage.server.ReadOperationForCompactionTracker;
import
org.apache.ignite.internal.metastorage.server.persistence.RocksDbKeyValueStorage;
+import org.apache.ignite.internal.partition.replicator.index.IndexMeta;
+import org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus;
+import
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatusChange;
import org.apache.ignite.internal.testframework.ExecutorServiceExtension;
import org.apache.ignite.internal.testframework.InjectExecutorService;
import org.apache.ignite.internal.testframework.WorkDirectory;
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexMetaStorageTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexMetaStorageTest.java
index 52f6f3a9028..dab279df942 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexMetaStorageTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexMetaStorageTest.java
@@ -18,6 +18,12 @@
package org.apache.ignite.internal.table.distributed.index;
import static
org.apache.ignite.internal.catalog.CatalogTestUtils.createTestCatalogManager;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.AVAILABLE;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.BUILDING;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.READ_ONLY;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.REGISTERED;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.REMOVED;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.STOPPING;
import static org.apache.ignite.internal.table.TableTestUtils.INDEX_NAME;
import static org.apache.ignite.internal.table.TableTestUtils.PK_INDEX_NAME;
import static org.apache.ignite.internal.table.TableTestUtils.TABLE_NAME;
@@ -28,12 +34,6 @@ import static
org.apache.ignite.internal.table.TableTestUtils.makeIndexAvailable
import static org.apache.ignite.internal.table.TableTestUtils.removeIndex;
import static
org.apache.ignite.internal.table.TableTestUtils.renameSimpleTable;
import static
org.apache.ignite.internal.table.TableTestUtils.startBuildingIndex;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.AVAILABLE;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.BUILDING;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.READ_ONLY;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.REGISTERED;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.REMOVED;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.STOPPING;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsInAnyOrder;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -49,6 +49,9 @@ import java.util.Map;
import org.apache.ignite.internal.catalog.CatalogManager;
import org.apache.ignite.internal.metastorage.MetaStorageManager;
import
org.apache.ignite.internal.metastorage.impl.StandaloneMetaStorageManager;
+import org.apache.ignite.internal.partition.replicator.index.IndexMeta;
+import org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus;
+import
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatusChange;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexMetaTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexMetaTest.java
index 3956d3c73dc..76c13071120 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexMetaTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/IndexMetaTest.java
@@ -22,6 +22,9 @@ import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.nullValue;
import java.util.Map;
+import org.apache.ignite.internal.partition.replicator.index.IndexMeta;
+import org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus;
+import
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatusChange;
import org.junit.jupiter.api.Test;
class IndexMetaTest {
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/MetaIndexStatusTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/MetaIndexStatusTest.java
index 733cd167b06..4c2f32e7aca 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/MetaIndexStatusTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/index/MetaIndexStatusTest.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.table.distributed.index;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
+import org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus;
import org.junit.jupiter.api.Test;
class MetaIndexStatusTest {
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/PartitionCommandListenerTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/PartitionCommandListenerTest.java
index 2cf97e58337..080b832a639 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/PartitionCommandListenerTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/PartitionCommandListenerTest.java
@@ -20,9 +20,9 @@ package org.apache.ignite.internal.table.distributed.raft;
import static java.util.Collections.emptySet;
import static java.util.Collections.singletonMap;
import static java.util.UUID.randomUUID;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.BUILDING;
+import static
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus.REGISTERED;
import static
org.apache.ignite.internal.replicator.message.ReplicaMessageUtils.toTablePartitionIdMessage;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.BUILDING;
-import static
org.apache.ignite.internal.table.distributed.index.MetaIndexStatus.REGISTERED;
import static
org.apache.ignite.internal.testframework.IgniteTestUtils.deriveUuidFrom;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -71,6 +71,9 @@ import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.hlc.HybridClockImpl;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.network.ClusterService;
+import org.apache.ignite.internal.partition.replicator.index.IndexMeta;
+import org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus;
+import
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatusChange;
import
org.apache.ignite.internal.partition.replicator.network.PartitionReplicationMessagesFactory;
import
org.apache.ignite.internal.partition.replicator.network.command.BuildIndexCommand;
import
org.apache.ignite.internal.partition.replicator.network.command.BuildIndexCommandV3;
@@ -109,11 +112,8 @@ import org.apache.ignite.internal.storage.util.LockByRowId;
import org.apache.ignite.internal.table.TableTestUtils;
import org.apache.ignite.internal.table.distributed.StorageUpdateHandler;
import
org.apache.ignite.internal.table.distributed.TableSchemaAwareIndexStorage;
-import org.apache.ignite.internal.table.distributed.index.IndexMeta;
import org.apache.ignite.internal.table.distributed.index.IndexMetaStorage;
import org.apache.ignite.internal.table.distributed.index.IndexUpdateHandler;
-import org.apache.ignite.internal.table.distributed.index.MetaIndexStatus;
-import
org.apache.ignite.internal.table.distributed.index.MetaIndexStatusChange;
import
org.apache.ignite.internal.table.distributed.raft.handlers.BuildIndexCommandHandler;
import org.apache.ignite.internal.table.impl.DummyInternalTableImpl;
import org.apache.ignite.internal.table.impl.DummySchemaManagerImpl;
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java
index 446a53e9ccf..8be1565738d 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replication/PartitionReplicaListenerTest.java
@@ -143,6 +143,9 @@ import
org.apache.ignite.internal.network.SingleClusterNodeResolver;
import org.apache.ignite.internal.network.TopologyService;
import org.apache.ignite.internal.partition.replicator.ReplicaPrimacy;
import org.apache.ignite.internal.partition.replicator.ReplicaPrimacyEngine;
+import org.apache.ignite.internal.partition.replicator.index.IndexMeta;
+import org.apache.ignite.internal.partition.replicator.index.MetaIndexStatus;
+import
org.apache.ignite.internal.partition.replicator.index.MetaIndexStatusChange;
import
org.apache.ignite.internal.partition.replicator.network.PartitionReplicationMessagesFactory;
import
org.apache.ignite.internal.partition.replicator.network.command.CatalogVersionAware;
import
org.apache.ignite.internal.partition.replicator.network.command.FinishTxCommand;
@@ -213,11 +216,8 @@ import
org.apache.ignite.internal.table.distributed.IndexLocker;
import org.apache.ignite.internal.table.distributed.SortedIndexLocker;
import org.apache.ignite.internal.table.distributed.StorageUpdateHandler;
import
org.apache.ignite.internal.table.distributed.TableSchemaAwareIndexStorage;
-import org.apache.ignite.internal.table.distributed.index.IndexMeta;
import org.apache.ignite.internal.table.distributed.index.IndexMetaStorage;
import org.apache.ignite.internal.table.distributed.index.IndexUpdateHandler;
-import org.apache.ignite.internal.table.distributed.index.MetaIndexStatus;
-import
org.apache.ignite.internal.table.distributed.index.MetaIndexStatusChange;
import
org.apache.ignite.internal.table.distributed.replicator.PartitionReplicaListener;
import
org.apache.ignite.internal.table.distributed.replicator.StaleTransactionOperationException;
import org.apache.ignite.internal.table.impl.DummyInternalTableImpl;
diff --git
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replicator/ReplicatorUtilsTest.java
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replicator/ReplicatorUtilsTest.java
index 442d8d09c1a..612cd46abab 100644
---
a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replicator/ReplicatorUtilsTest.java
+++
b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/replicator/ReplicatorUtilsTest.java
@@ -55,8 +55,8 @@ import org.apache.ignite.internal.hlc.HybridClock;
import org.apache.ignite.internal.hlc.HybridClockImpl;
import org.apache.ignite.internal.hlc.HybridTimestamp;
import org.apache.ignite.internal.manager.ComponentContext;
+import org.apache.ignite.internal.partition.replicator.index.IndexMeta;
import
org.apache.ignite.internal.partition.replicator.network.replication.ReadWriteReplicaRequest;
-import org.apache.ignite.internal.table.distributed.index.IndexMeta;
import org.apache.ignite.internal.table.distributed.index.IndexMetaStorage;
import org.apache.ignite.internal.testframework.IgniteAbstractTest;
import org.junit.jupiter.api.Test;
