You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by tk...@apache.org on 2023/01/24 10:41:53 UTC

[ignite-3] branch main updated: IGNITE-18086 Add index building in IncomingSnapshotCopier (#1565)

This is an automated email from the ASF dual-hosted git repository.

tkalkirill 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 a5d97d06b2 IGNITE-18086 Add index building in IncomingSnapshotCopier (#1565)
a5d97d06b2 is described below

commit a5d97d06b2f2c3ea3a22f0818c5fc3fcac442549
Author: Kirill Tkalenko <tk...@yandex.ru>
AuthorDate: Tue Jan 24 13:41:44 2023 +0300

    IGNITE-18086 Add index building in IncomingSnapshotCopier (#1565)
---
 .../internal/storage/impl/TestMvTableStorage.java  |   3 +-
 .../internal/table/distributed/TableManager.java   |  16 ++-
 .../distributed/raft/snapshot/PartitionAccess.java |   4 +-
 .../raft/snapshot/PartitionAccessImpl.java         |  32 +++++-
 .../snapshot/incoming/IncomingSnapshotCopier.java  |   5 +-
 .../raft/snapshot/PartitionAccessImplTest.java     | 109 ++++++++++++++++++---
 .../incoming/IncomingSnapshotCopierTest.java       |   7 +-
 7 files changed, 149 insertions(+), 27 deletions(-)

diff --git a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestMvTableStorage.java b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestMvTableStorage.java
index c416ed4053..c2d196aff2 100644
--- a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestMvTableStorage.java
+++ b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/impl/TestMvTableStorage.java
@@ -20,6 +20,7 @@ package org.apache.ignite.internal.storage.impl;
 import static java.util.concurrent.CompletableFuture.allOf;
 import static java.util.concurrent.CompletableFuture.completedFuture;
 import static org.apache.ignite.internal.storage.util.StorageUtils.createMissingMvPartitionErrorMessage;
+import static org.mockito.Mockito.spy;
 
 import java.util.Map;
 import java.util.Objects;
@@ -103,7 +104,7 @@ public class TestMvTableStorage implements MvTableStorage {
 
     @Override
     public MvPartitionStorage getOrCreateMvPartition(int partitionId) throws StorageException {
-        return partitions.computeIfAbsent(partitionId, TestMvPartitionStorage::new);
+        return partitions.computeIfAbsent(partitionId, partId -> spy(new TestMvPartitionStorage(partId)));
     }
 
     @Override
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 6d97769316..2e40b60fdd 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
@@ -755,7 +755,8 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
                                         RaftGroupOptions groupOptions = groupOptionsForPartition(
                                                 internalTbl.storage(),
                                                 internalTbl.txStateStorage(),
-                                                partitionKey(internalTbl, partId)
+                                                partitionKey(internalTbl, partId),
+                                                table
                                         );
 
                                         Peer serverPeer = newConfiguration.peer(localMemberName);
@@ -907,7 +908,8 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
     private RaftGroupOptions groupOptionsForPartition(
             MvTableStorage mvTableStorage,
             TxStateTableStorage txStateTableStorage,
-            PartitionKey partitionKey
+            PartitionKey partitionKey,
+            TableImpl tableImpl
     ) {
         RaftGroupOptions raftGroupOptions;
 
@@ -923,7 +925,12 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
         raftGroupOptions.snapshotStorageFactory(new PartitionSnapshotStorageFactory(
                 clusterService.topologyService(),
                 outgoingSnapshotsManager,
-                new PartitionAccessImpl(partitionKey, mvTableStorage, txStateTableStorage),
+                new PartitionAccessImpl(
+                        partitionKey,
+                        mvTableStorage,
+                        txStateTableStorage,
+                        () -> tableImpl.indexStorageAdapters(partitionKey.partitionId()).get().values()
+                ),
                 incomingSnapshotsExecutor
         ));
 
@@ -1838,7 +1845,8 @@ public class TableManager extends Producer<TableEvent, TableEventParameters> imp
                         RaftGroupOptions groupOptions = groupOptionsForPartition(
                                 internalTable.storage(),
                                 internalTable.txStateStorage(),
-                                partitionKey(internalTable, partId)
+                                partitionKey(internalTable, partId),
+                                tbl
                         );
 
                         RaftGroupListener raftGrpLsnr = new PartitionListener(
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionAccess.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionAccess.java
index 825185af39..d0297e96c4 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionAccess.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionAccess.java
@@ -110,7 +110,7 @@ public interface PartitionAccess {
      * @throws TxIdMismatchException If there's another pending update associated with different transaction id.
      * @throws StorageException If failed to write data.
      */
-    void addWrite(RowId rowId, TableRow row, UUID txId, UUID commitTableId, int commitPartitionId);
+    void addWrite(RowId rowId, @Nullable TableRow row, UUID txId, UUID commitTableId, int commitPartitionId);
 
     /**
      * Creates a committed version. In details: - if there is no uncommitted version, a new committed version is added - if there is an
@@ -122,7 +122,7 @@ public interface PartitionAccess {
      * @param commitTimestamp Timestamp to associate with committed value.
      * @throws StorageException If failed to write data.
      */
-    void addWriteCommitted(RowId rowId, TableRow row, HybridTimestamp commitTimestamp);
+    void addWriteCommitted(RowId rowId, @Nullable TableRow row, HybridTimestamp commitTimestamp);
 
     /**
      * Updates the last applied index, term, and RAFT configuration.
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionAccessImpl.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionAccessImpl.java
index 0d0dc0315b..2b28e74334 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionAccessImpl.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionAccessImpl.java
@@ -19,8 +19,10 @@ package org.apache.ignite.internal.table.distributed.raft.snapshot;
 
 import static org.apache.ignite.internal.table.distributed.TableManager.FULL_RABALANCING_STARTED;
 
+import java.util.Collection;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
+import java.util.function.Supplier;
 import org.apache.ignite.internal.hlc.HybridTimestamp;
 import org.apache.ignite.internal.schema.TableRow;
 import org.apache.ignite.internal.storage.MvPartitionStorage;
@@ -29,6 +31,7 @@ import org.apache.ignite.internal.storage.ReadResult;
 import org.apache.ignite.internal.storage.RowId;
 import org.apache.ignite.internal.storage.StorageException;
 import org.apache.ignite.internal.storage.engine.MvTableStorage;
+import org.apache.ignite.internal.table.distributed.TableSchemaAwareIndexStorage;
 import org.apache.ignite.internal.tx.TxMeta;
 import org.apache.ignite.internal.tx.storage.state.TxStateStorage;
 import org.apache.ignite.internal.tx.storage.state.TxStateTableStorage;
@@ -47,21 +50,26 @@ public class PartitionAccessImpl implements PartitionAccess {
 
     private final TxStateTableStorage txStateTableStorage;
 
+    private final Supplier<Collection<TableSchemaAwareIndexStorage>> indexes;
+
     /**
      * Constructor.
      *
      * @param partitionKey Partition key.
      * @param mvTableStorage Multi version table storage.
      * @param txStateTableStorage Table transaction state storage.
+     * @param indexes Index storages supplier.
      */
     public PartitionAccessImpl(
             PartitionKey partitionKey,
             MvTableStorage mvTableStorage,
-            TxStateTableStorage txStateTableStorage
+            TxStateTableStorage txStateTableStorage,
+            Supplier<Collection<TableSchemaAwareIndexStorage>> indexes
     ) {
         this.partitionKey = partitionKey;
         this.mvTableStorage = mvTableStorage;
         this.txStateTableStorage = txStateTableStorage;
+        this.indexes = indexes;
     }
 
     @Override
@@ -133,19 +141,27 @@ public class PartitionAccessImpl implements PartitionAccess {
     }
 
     @Override
-    public void addWrite(RowId rowId, TableRow row, UUID txId, UUID commitTableId, int commitPartitionId) {
+    public void addWrite(RowId rowId, @Nullable TableRow row, UUID txId, UUID commitTableId, int commitPartitionId) {
         MvPartitionStorage mvPartitionStorage = getMvPartitionStorage(partitionId());
 
-        mvPartitionStorage.runConsistently(() -> mvPartitionStorage.addWrite(rowId, row, txId, commitTableId, commitPartitionId));
+        mvPartitionStorage.runConsistently(() -> {
+            mvPartitionStorage.addWrite(rowId, row, txId, commitTableId, commitPartitionId);
+
+            addToIndexes(row, rowId);
+
+            return null;
+        });
     }
 
     @Override
-    public void addWriteCommitted(RowId rowId, TableRow row, HybridTimestamp commitTimestamp) {
+    public void addWriteCommitted(RowId rowId, @Nullable TableRow row, HybridTimestamp commitTimestamp) {
         MvPartitionStorage mvPartitionStorage = getMvPartitionStorage(partitionId());
 
         mvPartitionStorage.runConsistently(() -> {
             mvPartitionStorage.addWriteCommitted(rowId, row, commitTimestamp);
 
+            addToIndexes(row, rowId);
+
             return null;
         });
     }
@@ -213,4 +229,12 @@ public class PartitionAccessImpl implements PartitionAccess {
 
         return txStateStorage;
     }
+
+    private void addToIndexes(@Nullable TableRow tableRow, RowId rowId) {
+        if (tableRow == null) {
+            return;
+        }
+
+        indexes.get().forEach(index -> index.put(tableRow, rowId));
+    }
 }
diff --git a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/incoming/IncomingSnapshotCopier.java b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/incoming/IncomingSnapshotCopier.java
index da5f4a9c13..f8a698b5d1 100644
--- a/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/incoming/IncomingSnapshotCopier.java
+++ b/modules/table/src/main/java/org/apache/ignite/internal/table/distributed/raft/snapshot/incoming/IncomingSnapshotCopier.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.table.distributed.raft.snapshot.incoming;
 
 import static java.util.concurrent.CompletableFuture.completedFuture;
 
+import java.nio.ByteBuffer;
 import java.util.UUID;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
@@ -265,7 +266,9 @@ public class IncomingSnapshotCopier extends SnapshotCopier {
                 for (int i = 0; i < entry.rowVersions().size(); i++) {
                     HybridTimestamp timestamp = i < entry.timestamps().size() ? entry.timestamps().get(i) : null;
 
-                    TableRow tableRow = new TableRow(entry.rowVersions().get(i).rewind());
+                    ByteBuffer rowVersion = entry.rowVersions().get(i);
+
+                    TableRow tableRow = rowVersion == null ? null : new TableRow(rowVersion.rewind());
 
                     PartitionAccess partition = partitionSnapshotStorage.partition();
 
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionAccessImplTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionAccessImplTest.java
index 7991fcc7a4..1d50cac5a1 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionAccessImplTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/PartitionAccessImplTest.java
@@ -18,14 +18,24 @@
 package org.apache.ignite.internal.table.distributed.raft.snapshot;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.util.List;
 import java.util.UUID;
 import org.apache.ignite.internal.configuration.testframework.ConfigurationExtension;
 import org.apache.ignite.internal.configuration.testframework.InjectConfiguration;
-import org.apache.ignite.internal.schema.configuration.TableConfiguration;
+import org.apache.ignite.internal.hlc.HybridTimestamp;
+import org.apache.ignite.internal.schema.TableRow;
 import org.apache.ignite.internal.schema.configuration.TablesConfiguration;
 import org.apache.ignite.internal.storage.MvPartitionStorage;
+import org.apache.ignite.internal.storage.RowId;
 import org.apache.ignite.internal.storage.impl.TestMvTableStorage;
+import org.apache.ignite.internal.table.distributed.TableSchemaAwareIndexStorage;
 import org.apache.ignite.internal.tx.storage.state.TxStateStorage;
 import org.apache.ignite.internal.tx.storage.state.test.TestTxStateTableStorage;
 import org.junit.jupiter.api.Test;
@@ -38,11 +48,12 @@ import org.junit.jupiter.api.extension.ExtendWith;
 public class PartitionAccessImplTest {
     private static final int TEST_PARTITION_ID = 0;
 
-    @Test
-    void testMinMaxLastAppliedIndex(@InjectConfiguration("mock.tables.foo {}") TablesConfiguration tablesConfig) {
-        TableConfiguration tableCfg = tablesConfig.tables().get("foo");
+    @InjectConfiguration("mock.tables.foo {}")
+    private TablesConfiguration tablesConfig;
 
-        TestMvTableStorage mvTableStorage = new TestMvTableStorage(tableCfg, tablesConfig);
+    @Test
+    void testMinMaxLastAppliedIndex() {
+        TestMvTableStorage mvTableStorage = new TestMvTableStorage(tablesConfig.tables().get("foo"), tablesConfig);
         TestTxStateTableStorage txStateTableStorage = new TestTxStateTableStorage();
 
         MvPartitionStorage mvPartitionStorage = mvTableStorage.getOrCreateMvPartition(TEST_PARTITION_ID);
@@ -51,7 +62,8 @@ public class PartitionAccessImplTest {
         PartitionAccess partitionAccess = new PartitionAccessImpl(
                 new PartitionKey(UUID.randomUUID(), TEST_PARTITION_ID),
                 mvTableStorage,
-                txStateTableStorage
+                txStateTableStorage,
+                List::of
         );
 
         assertEquals(0, partitionAccess.minLastAppliedIndex());
@@ -80,10 +92,8 @@ public class PartitionAccessImplTest {
     }
 
     @Test
-    void testMinMaxLastAppliedTerm(@InjectConfiguration("mock.tables.foo {}") TablesConfiguration tablesConfig) {
-        TableConfiguration tableCfg = tablesConfig.tables().get("foo");
-
-        TestMvTableStorage mvTableStorage = new TestMvTableStorage(tableCfg, tablesConfig);
+    void testMinMaxLastAppliedTerm() {
+        TestMvTableStorage mvTableStorage = new TestMvTableStorage(tablesConfig.tables().get("foo"), tablesConfig);
         TestTxStateTableStorage txStateTableStorage = new TestTxStateTableStorage();
 
         MvPartitionStorage mvPartitionStorage = mvTableStorage.getOrCreateMvPartition(TEST_PARTITION_ID);
@@ -92,7 +102,8 @@ public class PartitionAccessImplTest {
         PartitionAccess partitionAccess = new PartitionAccessImpl(
                 new PartitionKey(UUID.randomUUID(), TEST_PARTITION_ID),
                 mvTableStorage,
-                txStateTableStorage
+                txStateTableStorage,
+                List::of
         );
 
         assertEquals(0, partitionAccess.minLastAppliedTerm());
@@ -119,4 +130,78 @@ public class PartitionAccessImplTest {
         assertEquals(15, partitionAccess.minLastAppliedTerm());
         assertEquals(20, partitionAccess.maxLastAppliedTerm());
     }
+
+    @Test
+    void testAddWrite() {
+        TestMvTableStorage mvTableStorage = new TestMvTableStorage(tablesConfig.tables().get("foo"), tablesConfig);
+
+        MvPartitionStorage mvPartitionStorage = mvTableStorage.getOrCreateMvPartition(TEST_PARTITION_ID);
+
+        TableSchemaAwareIndexStorage indexStorage = mock(TableSchemaAwareIndexStorage.class);
+
+        PartitionAccess partitionAccess = new PartitionAccessImpl(
+                new PartitionKey(UUID.randomUUID(), TEST_PARTITION_ID),
+                mvTableStorage,
+                new TestTxStateTableStorage(),
+                () -> List.of(indexStorage)
+        );
+
+        RowId rowId = new RowId(TEST_PARTITION_ID);
+        TableRow tableRow = mock(TableRow.class);
+        UUID txId = UUID.randomUUID();
+        UUID commitTableId = UUID.randomUUID();
+
+        partitionAccess.addWrite(rowId, tableRow, txId, commitTableId, TEST_PARTITION_ID);
+
+        verify(mvPartitionStorage, times(1)).addWrite(eq(rowId), eq(tableRow), eq(txId), eq(commitTableId), eq(TEST_PARTITION_ID));
+
+        verify(indexStorage, times(1)).put(eq(tableRow), eq(rowId));
+
+        // Let's check with a null tableRow.
+        tableRow = null;
+
+        reset(mvPartitionStorage, indexStorage);
+
+        partitionAccess.addWrite(rowId, tableRow, txId, commitTableId, TEST_PARTITION_ID);
+
+        verify(mvPartitionStorage, times(1)).addWrite(eq(rowId), eq(tableRow), eq(txId), eq(commitTableId), eq(TEST_PARTITION_ID));
+
+        verify(indexStorage, never()).put(eq(tableRow), eq(rowId));
+    }
+
+    @Test
+    void testAddWriteCommitted() {
+        TestMvTableStorage mvTableStorage = new TestMvTableStorage(tablesConfig.tables().get("foo"), tablesConfig);
+
+        MvPartitionStorage mvPartitionStorage = mvTableStorage.getOrCreateMvPartition(TEST_PARTITION_ID);
+
+        TableSchemaAwareIndexStorage indexStorage = mock(TableSchemaAwareIndexStorage.class);
+
+        PartitionAccess partitionAccess = new PartitionAccessImpl(
+                new PartitionKey(UUID.randomUUID(), TEST_PARTITION_ID),
+                mvTableStorage,
+                new TestTxStateTableStorage(),
+                () -> List.of(indexStorage)
+        );
+
+        RowId rowId = new RowId(TEST_PARTITION_ID);
+        TableRow tableRow = mock(TableRow.class);
+
+        partitionAccess.addWriteCommitted(rowId, tableRow, HybridTimestamp.MAX_VALUE);
+
+        verify(mvPartitionStorage, times(1)).addWriteCommitted(eq(rowId), eq(tableRow), eq(HybridTimestamp.MAX_VALUE));
+
+        verify(indexStorage, times(1)).put(eq(tableRow), eq(rowId));
+
+        // Let's check with a null tableRow.
+        tableRow = null;
+
+        reset(mvPartitionStorage, indexStorage);
+
+        partitionAccess.addWriteCommitted(rowId, tableRow, HybridTimestamp.MAX_VALUE);
+
+        verify(mvPartitionStorage, times(1)).addWriteCommitted(eq(rowId), eq(tableRow), eq(HybridTimestamp.MAX_VALUE));
+
+        verify(indexStorage, never()).put(eq(tableRow), eq(rowId));
+    }
 }
diff --git a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/incoming/IncomingSnapshotCopierTest.java b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/incoming/IncomingSnapshotCopierTest.java
index 2580d4a5f1..bba3b0400d 100644
--- a/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/incoming/IncomingSnapshotCopierTest.java
+++ b/modules/table/src/test/java/org/apache/ignite/internal/table/distributed/raft/snapshot/incoming/IncomingSnapshotCopierTest.java
@@ -119,7 +119,7 @@ public class IncomingSnapshotCopierTest {
 
     private final ExecutorService executorService = Executors.newSingleThreadExecutor();
 
-    @InjectConfiguration(value = "mock.tables.foo {}")
+    @InjectConfiguration("mock.tables.foo {}")
     private TablesConfiguration tablesConfig;
 
     private final ClusterNode clusterNode = mock(ClusterNode.class);
@@ -132,7 +132,7 @@ public class IncomingSnapshotCopierTest {
     }
 
     @Test
-    void test() throws Exception {
+    void test() {
         MvPartitionStorage outgoingMvPartitionStorage = new TestMvPartitionStorage(TEST_PARTITION);
         TxStateStorage outgoingTxStatePartitionStorage = new TestTxStateStorage();
 
@@ -271,7 +271,8 @@ public class IncomingSnapshotCopierTest {
                 new PartitionAccessImpl(
                         new PartitionKey(UUID.randomUUID(), TEST_PARTITION),
                         incomingTableStorage,
-                        incomingTxStateTableStorage
+                        incomingTxStateTableStorage,
+                        List::of
                 ),
                 mock(SnapshotMeta.class),
                 executorService