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

apolovtsev 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 c2d9711e0e IGNITE-17626 Cleanup API for destroying indexes (#3244)
c2d9711e0e is described below

commit c2d9711e0ea33c79390bfaf2c5d877809b3e9339
Author: Alexander Polovtcev <alex.polovt...@gmail.com>
AuthorDate: Thu Feb 22 10:28:51 2024 +0200

    IGNITE-17626 Cleanup API for destroying indexes (#3244)
---
 .../ignite/internal/index/IndexManagerTest.java    |  4 +--
 .../internal/storage/engine/MvTableStorage.java    |  4 +--
 .../internal/storage/index/HashIndexStorage.java   | 12 ---------
 .../index/ThreadAssertingHashIndexStorage.java     | 10 --------
 .../storage/AbstractMvTableStorageTest.java        |  2 --
 .../internal/storage/impl/TestMvTableStorage.java  | 18 ++++++++-----
 .../index/AbstractHashIndexStorageTest.java        | 30 ++++++++++------------
 .../index/hash/PageMemoryHashIndexStorage.java     |  6 -----
 .../mv/AbstractPageMemoryMvPartitionStorage.java   |  2 +-
 .../PersistentPageMemoryMvTableStorageTest.java    |  8 ++++++
 .../VolatilePageMemoryMvTableStorageTest.java      |  8 ++++++
 .../AbstractPageMemoryHashIndexStorageTest.java    |  8 ++++++
 .../ignite/internal/storage/rocksdb/HashIndex.java |  3 ++-
 .../rocksdb/index/RocksDbHashIndexStorage.java     | 20 ---------------
 .../storage/rocksdb/RocksDbMvTableStorageTest.java |  8 ++++++
 .../rocksdb/index/RocksDbHashIndexStorageTest.java |  9 +++++++
 16 files changed, 73 insertions(+), 79 deletions(-)

diff --git 
a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexManagerTest.java
 
b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexManagerTest.java
index 10f8c94ebd..3dfdf67abd 100644
--- 
a/modules/index/src/test/java/org/apache/ignite/internal/index/IndexManagerTest.java
+++ 
b/modules/index/src/test/java/org/apache/ignite/internal/index/IndexManagerTest.java
@@ -216,7 +216,7 @@ public class IndexManagerTest extends 
BaseIgniteAbstractTest {
         verify(tableViewInternal, never()).unregisterIndex(anyInt());
     }
 
-    @Disabled("https://issues.apache.org/jira/browse/IGNITE-17626";)
+    @Disabled("https://issues.apache.org/jira/browse/IGNITE-21576";)
     @Test
     void testDestroyIndex() throws Exception {
         createIndex(TABLE_NAME, INDEX_NAME);
@@ -234,7 +234,7 @@ public class IndexManagerTest extends 
BaseIgniteAbstractTest {
         verify(mvTableStorage).destroyIndex(indexId);
     }
 
-    @Disabled("https://issues.apache.org/jira/browse/IGNITE-17626";)
+    @Disabled("https://issues.apache.org/jira/browse/IGNITE-21576";)
     @Test
     void testIndexDestroyedWithTable() throws Exception {
         createIndex(TABLE_NAME, INDEX_NAME);
diff --git 
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/MvTableStorage.java
 
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/MvTableStorage.java
index eb3e91ab62..2068045183 100644
--- 
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/MvTableStorage.java
+++ 
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/engine/MvTableStorage.java
@@ -116,9 +116,9 @@ public interface MvTableStorage extends ManuallyCloseable {
     HashIndexStorage getOrCreateHashIndex(int partitionId, 
StorageHashIndexDescriptor indexDescriptor);
 
     /**
-     * Destroys the index under the given name and all data in it.
+     * Destroys the index with the given ID and all data in it.
      *
-     * <p>This method is a no-op if the index under the given name does not 
exist.
+     * <p>This method is a no-op if the index with the given ID does not exist.
      *
      * @param indexId Index ID.
      */
diff --git 
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/HashIndexStorage.java
 
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/HashIndexStorage.java
index 0b13c0994c..38dc0ceb3b 100644
--- 
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/HashIndexStorage.java
+++ 
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/HashIndexStorage.java
@@ -17,10 +17,7 @@
 
 package org.apache.ignite.internal.storage.index;
 
-import java.util.UUID;
 import org.apache.ignite.internal.storage.RowId;
-import org.apache.ignite.internal.storage.StorageException;
-import org.apache.ignite.internal.storage.engine.MvTableStorage;
 
 /**
  * Storage for a Hash Index.
@@ -33,13 +30,4 @@ public interface HashIndexStorage extends IndexStorage {
      * Returns the Index Descriptor of this storage.
      */
     StorageHashIndexDescriptor indexDescriptor();
-
-    /**
-     * Removes all data from this index.
-     *
-     * @throws StorageException If failed to destory index.
-     * @deprecated IGNITE-17626 Synchronous API should be removed. {@link 
MvTableStorage#destroyIndex(UUID)} must be the only public option.
-     */
-    @Deprecated
-    void destroy() throws StorageException;
 }
diff --git 
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/ThreadAssertingHashIndexStorage.java
 
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/ThreadAssertingHashIndexStorage.java
index 5e1ca534c1..aeff2b20c0 100644
--- 
a/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/ThreadAssertingHashIndexStorage.java
+++ 
b/modules/storage-api/src/main/java/org/apache/ignite/internal/storage/index/ThreadAssertingHashIndexStorage.java
@@ -17,9 +17,6 @@
 
 package org.apache.ignite.internal.storage.index;
 
-import static 
org.apache.ignite.internal.worker.ThreadAssertions.assertThreadAllowsToWrite;
-
-import org.apache.ignite.internal.storage.StorageException;
 import org.apache.ignite.internal.worker.ThreadAssertions;
 
 /**
@@ -41,11 +38,4 @@ public class ThreadAssertingHashIndexStorage extends 
ThreadAssertingIndexStorage
     public StorageHashIndexDescriptor indexDescriptor() {
         return indexStorage.indexDescriptor();
     }
-
-    @Override
-    public void destroy() throws StorageException {
-        assertThreadAllowsToWrite();
-
-        indexStorage.destroy();
-    }
 }
diff --git 
a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java
 
b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java
index 7a5b193692..84261c519d 100644
--- 
a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java
+++ 
b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/AbstractMvTableStorageTest.java
@@ -85,7 +85,6 @@ import org.apache.ignite.internal.type.NativeTypes;
 import org.apache.ignite.internal.util.Cursor;
 import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -255,7 +254,6 @@ public abstract class AbstractMvTableStorageTest extends 
BaseMvStoragesTest {
     /**
      * Tests destroying an index.
      */
-    @Disabled("https://issues.apache.org/jira/browse/IGNITE-17626";)
     @Test
     public void testDestroyIndex() {
         MvPartitionStorage partitionStorage = 
getOrCreateMvPartition(PARTITION_ID);
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 b168858b64..285d5895e8 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
@@ -127,7 +127,7 @@ public class TestMvTableStorage implements MvTableStorage {
         mvPartitionStorage.destroy();
 
         for (HashIndices hashIndices : hashIndicesById.values()) {
-            HashIndexStorage removedHashIndexStorage = 
hashIndices.storageByPartitionId.remove(mvPartitionStorage.partitionId);
+            TestHashIndexStorage removedHashIndexStorage = 
hashIndices.storageByPartitionId.remove(mvPartitionStorage.partitionId);
 
             if (removedHashIndexStorage != null) {
                 removedHashIndexStorage.destroy();
@@ -135,10 +135,10 @@ public class TestMvTableStorage implements MvTableStorage 
{
         }
 
         for (SortedIndices sortedIndices : sortedIndicesById.values()) {
-            SortedIndexStorage removedSortedIndexStorage = 
sortedIndices.storageByPartitionId.remove(mvPartitionStorage.partitionId);
+            TestSortedIndexStorage removedSortedIndexStorage = 
sortedIndices.storageByPartitionId.remove(mvPartitionStorage.partitionId);
 
             if (removedSortedIndexStorage != null) {
-                ((TestSortedIndexStorage) removedSortedIndexStorage).destroy();
+                removedSortedIndexStorage.destroy();
             }
         }
 
@@ -179,12 +179,16 @@ public class TestMvTableStorage implements MvTableStorage 
{
 
     @Override
     public CompletableFuture<Void> destroyIndex(int indexId) {
-        sortedIndicesById.remove(indexId);
+        HashIndices hashIndices = hashIndicesById.remove(indexId);
 
-        HashIndices hashIndex = hashIndicesById.remove(indexId);
+        if (hashIndices != null) {
+            
hashIndices.storageByPartitionId.values().forEach(TestHashIndexStorage::destroy);
+        }
 
-        if (hashIndex != null) {
-            
hashIndex.storageByPartitionId.values().forEach(HashIndexStorage::destroy);
+        SortedIndices sortedIndices = sortedIndicesById.remove(indexId);
+
+        if (sortedIndices != null) {
+            
sortedIndices.storageByPartitionId.values().forEach(TestSortedIndexStorage::destroy);
         }
 
         return nullCompletedFuture();
diff --git 
a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractHashIndexStorageTest.java
 
b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractHashIndexStorageTest.java
index 8d01b5d4be..0b3bc8c8b9 100644
--- 
a/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractHashIndexStorageTest.java
+++ 
b/modules/storage-api/src/testFixtures/java/org/apache/ignite/internal/storage/index/AbstractHashIndexStorageTest.java
@@ -19,9 +19,12 @@ package org.apache.ignite.internal.storage.index;
 
 import static java.util.stream.Collectors.toList;
 import static 
org.apache.ignite.internal.catalog.descriptors.CatalogIndexStatus.AVAILABLE;
+import static 
org.apache.ignite.internal.testframework.matchers.CompletableFutureMatcher.willCompleteSuccessfully;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.nullValue;
+import static org.hamcrest.Matchers.sameInstance;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.ArgumentMatchers.eq;
@@ -34,7 +37,6 @@ import 
org.apache.ignite.internal.catalog.descriptors.CatalogTableDescriptor;
 import org.apache.ignite.internal.storage.RowId;
 import org.apache.ignite.internal.storage.index.impl.BinaryTupleRowSerializer;
 import org.apache.ignite.sql.ColumnType;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -69,11 +71,15 @@ public abstract class AbstractHashIndexStorageTest extends 
AbstractIndexStorageT
         return index.indexDescriptor();
     }
 
-    @Disabled("https://issues.apache.org/jira/browse/IGNITE-17626";)
     @Test
     public void testDestroy() {
         HashIndexStorage index = createIndexStorage(INDEX_NAME, 
ColumnType.INT32, ColumnType.STRING);
-        var serializer = new BinaryTupleRowSerializer(indexDescriptor(index));
+
+        int indexId = index.indexDescriptor().id();
+
+        assertThat(tableStorage.getIndex(TEST_PARTITION, indexId), 
is(sameInstance(index)));
+
+        var serializer = new BinaryTupleRowSerializer(index.indexDescriptor());
 
         IndexRow row1 = serializer.serializeRow(new Object[]{ 1, "foo" }, new 
RowId(TEST_PARTITION));
         IndexRow row2 = serializer.serializeRow(new Object[]{ 1, "foo" }, new 
RowId(TEST_PARTITION));
@@ -85,25 +91,17 @@ public abstract class AbstractHashIndexStorageTest extends 
AbstractIndexStorageT
 
         CompletableFuture<Void> destroyFuture = 
tableStorage.destroyIndex(index.indexDescriptor().id());
 
-        waitForDurableCompletion(destroyFuture);
+        assertThat(destroyFuture, willCompleteSuccessfully());
+
+        assertThat(tableStorage.getIndex(TEST_PARTITION, indexId), 
is(nullValue()));
+
+        index = createIndexStorage(INDEX_NAME, ColumnType.INT32, 
ColumnType.STRING);
 
-        //TODO IGNITE-17626 Index must be invalid, we should assert that 
getIndex returns null and that in won't surface upon restart.
-        // "destroy" is not "clear", you know. Maybe "getAndCreateIndex" will 
do it for the test, idk
         assertThat(getAll(index, row1), is(empty()));
         assertThat(getAll(index, row2), is(empty()));
         assertThat(getAll(index, row3), is(empty()));
     }
 
-    private void waitForDurableCompletion(CompletableFuture<?> future) {
-        while (true) {
-            if (future.isDone()) {
-                return;
-            }
-
-            partitionStorage.flush().join();
-        }
-    }
-
     protected IndexRow createIndexRow(BinaryTupleRowSerializer serializer, 
RowId rowId, Object... values) {
         return serializer.serializeRow(values, rowId);
     }
diff --git 
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/PageMemoryHashIndexStorage.java
 
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/PageMemoryHashIndexStorage.java
index ab6b0fc7f8..b367e8aff7 100644
--- 
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/PageMemoryHashIndexStorage.java
+++ 
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/index/hash/PageMemoryHashIndexStorage.java
@@ -144,12 +144,6 @@ public class PageMemoryHashIndexStorage extends 
AbstractPageMemoryIndexStorage<H
         });
     }
 
-    @Override
-    public void destroy() throws StorageException {
-        // TODO: IGNITE-17626 Remove it
-        throw new UnsupportedOperationException();
-    }
-
     /**
      * Starts destruction of the data stored by this index partition.
      *
diff --git 
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/AbstractPageMemoryMvPartitionStorage.java
 
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/AbstractPageMemoryMvPartitionStorage.java
index 7ec51123ca..20209d009b 100644
--- 
a/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/AbstractPageMemoryMvPartitionStorage.java
+++ 
b/modules/storage-page-memory/src/main/java/org/apache/ignite/internal/storage/pagememory/mv/AbstractPageMemoryMvPartitionStorage.java
@@ -182,7 +182,7 @@ public abstract class AbstractPageMemoryMvPartitionStorage 
implements MvPartitio
                     } else {
                         assert indexDescriptor == null;
 
-                        //TODO: IGNITE-17626 Drop the index synchronously.
+                        //TODO: IGNITE-21583 Drop the index synchronously.
                     }
                 }
 
diff --git 
a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryMvTableStorageTest.java
 
b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryMvTableStorageTest.java
index 6e7d3a6e16..0803520158 100644
--- 
a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryMvTableStorageTest.java
+++ 
b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/PersistentPageMemoryMvTableStorageTest.java
@@ -38,6 +38,7 @@ import 
org.apache.ignite.internal.testframework.WorkDirectoryExtension;
 import org.apache.ignite.internal.util.IgniteUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -91,4 +92,11 @@ public class PersistentPageMemoryMvTableStorageTest extends 
AbstractMvTableStora
                 willCompleteSuccessfully()
         );
     }
+
+    @Disabled("https://issues.apache.org/jira/browse/IGNITE-21583";)
+    @Test
+    @Override
+    public void testDestroyIndex() {
+        super.testDestroyIndex();
+    }
 }
diff --git 
a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryMvTableStorageTest.java
 
b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryMvTableStorageTest.java
index 370fccc77a..d17025edfe 100644
--- 
a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryMvTableStorageTest.java
+++ 
b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/VolatilePageMemoryMvTableStorageTest.java
@@ -53,6 +53,7 @@ import org.apache.ignite.internal.type.NativeTypes;
 import org.apache.ignite.internal.util.IgniteUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -241,6 +242,13 @@ public class VolatilePageMemoryMvTableStorageTest extends 
AbstractMvTableStorage
         assertIndexDataDestructionCompletes(emptyIndexPagesBeforeDestroy);
     }
 
+    @Disabled("https://issues.apache.org/jira/browse/IGNITE-21583";)
+    @Test
+    @Override
+    public void testDestroyIndex() {
+        super.testDestroyIndex();
+    }
+
     private VolatilePageMemoryDataRegion dataRegion() {
         return ((VolatilePageMemoryTableStorage) tableStorage).dataRegion();
     }
diff --git 
a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/AbstractPageMemoryHashIndexStorageTest.java
 
b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/AbstractPageMemoryHashIndexStorageTest.java
index 171b0d2fb8..1aedfd660e 100644
--- 
a/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/AbstractPageMemoryHashIndexStorageTest.java
+++ 
b/modules/storage-page-memory/src/test/java/org/apache/ignite/internal/storage/pagememory/index/AbstractPageMemoryHashIndexStorageTest.java
@@ -33,6 +33,7 @@ import org.apache.ignite.internal.storage.index.IndexRow;
 import org.apache.ignite.internal.storage.index.impl.BinaryTupleRowSerializer;
 import 
org.apache.ignite.internal.storage.pagememory.configuration.schema.BasePageMemoryStorageEngineConfiguration;
 import org.apache.ignite.sql.ColumnType;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -93,4 +94,11 @@ abstract class AbstractPageMemoryHashIndexStorageTest 
extends AbstractHashIndexS
 
         assertThat(getAll(index, createIndexRow(serializer, new 
RowId(TEST_PARTITION), 1, "foo")), empty());
     }
+
+    @Disabled("https://issues.apache.org/jira/browse/IGNITE-21583";)
+    @Test
+    @Override
+    public void testDestroy() {
+        super.testDestroy();
+    }
 }
diff --git 
a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/HashIndex.java
 
b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/HashIndex.java
index 3fc9c0261d..d7bb4b7f2a 100644
--- 
a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/HashIndex.java
+++ 
b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/HashIndex.java
@@ -61,7 +61,8 @@ class HashIndex {
      * Removes all data associated with the index.
      */
     void destroy() {
-        storages.values().forEach(RocksDbHashIndexStorage::destroy);
+        // TODO: implement, see 
https://issues.apache.org/jira/browse/IGNITE-21574.
+        throw new UnsupportedOperationException("Not implemented yet");
     }
 
     /**
diff --git 
a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbHashIndexStorage.java
 
b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbHashIndexStorage.java
index 15e2f6478c..07d2159dca 100644
--- 
a/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbHashIndexStorage.java
+++ 
b/modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbHashIndexStorage.java
@@ -40,7 +40,6 @@ import org.apache.ignite.internal.util.HashUtils;
 import org.rocksdb.RocksDBException;
 import org.rocksdb.WriteBatch;
 import org.rocksdb.WriteBatchWithIndex;
-import org.rocksdb.WriteOptions;
 
 /**
  * {@link HashIndexStorage} implementation based on RocksDB.
@@ -152,25 +151,6 @@ public class RocksDbHashIndexStorage extends 
AbstractRocksDbIndexStorage impleme
         });
     }
 
-    @Override
-    public void destroy() {
-        busy(() -> {
-            throwExceptionIfStorageInProgressOfRebalance(state.get(), 
this::createStorageInfo);
-
-            byte[] rangeEnd = incrementPrefix(constantPrefix);
-
-            assert rangeEnd != null;
-
-            try (WriteOptions writeOptions = new 
WriteOptions().setDisableWAL(true)) {
-                indexCf.db().deleteRange(indexCf.handle(), writeOptions, 
constantPrefix, rangeEnd);
-
-                return null;
-            } catch (RocksDBException e) {
-                throw new StorageException("Unable to remove data from hash 
index. Index ID: " + descriptor.id(), e);
-            }
-        });
-    }
-
     private byte[] rocksPrefix(BinaryTuple prefix) {
         return rocksPrefix(prefix, 0).array();
     }
diff --git 
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvTableStorageTest.java
 
b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvTableStorageTest.java
index f971749324..bb38e9f2df 100644
--- 
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvTableStorageTest.java
+++ 
b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/RocksDbMvTableStorageTest.java
@@ -42,6 +42,7 @@ import 
org.apache.ignite.internal.testframework.WorkDirectoryExtension;
 import org.apache.ignite.internal.util.IgniteUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
@@ -161,4 +162,11 @@ public class RocksDbMvTableStorageTest extends 
AbstractMvTableStorageTest {
     void storageAdvertisesItIsPersistent() {
         assertThat(tableStorage.isVolatile(), is(false));
     }
+
+    @Disabled("https://issues.apache.org/jira/browse/IGNITE-21574";)
+    @Test
+    @Override
+    public void testDestroyIndex() {
+        super.testDestroyIndex();
+    }
 }
diff --git 
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbHashIndexStorageTest.java
 
b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbHashIndexStorageTest.java
index 745d5fc3cb..f9bdc2d5fa 100644
--- 
a/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbHashIndexStorageTest.java
+++ 
b/modules/storage-rocksdb/src/test/java/org/apache/ignite/internal/storage/rocksdb/index/RocksDbHashIndexStorageTest.java
@@ -33,6 +33,8 @@ import 
org.apache.ignite.internal.testframework.WorkDirectoryExtension;
 import org.apache.ignite.internal.util.IgniteUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 /**
@@ -70,4 +72,11 @@ public class RocksDbHashIndexStorageTest extends 
AbstractHashIndexStorageTest {
                 engine == null ? null : engine::stop
         );
     }
+
+    @Disabled("https://issues.apache.org/jira/browse/IGNITE-21574";)
+    @Test
+    @Override
+    public void testDestroy() {
+        super.testDestroy();
+    }
 }

Reply via email to