You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by al...@apache.org on 2022/07/13 15:13:28 UTC

[ignite] branch master updated: IGNITE-17364 Move control utility index tasks from indexing to the core module - Fixes #10155.

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

alexpl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new cc819bb4f9c IGNITE-17364 Move control utility index tasks from indexing to the core module - Fixes #10155.
cc819bb4f9c is described below

commit cc819bb4f9c0f2ad983f29a6e1e205a533f98176
Author: Aleksey Plekhanov <pl...@gmail.com>
AuthorDate: Wed Jul 13 18:08:54 2022 +0300

    IGNITE-17364 Move control utility index tasks from indexing to the core module - Fixes #10155.
    
    Signed-off-by: Aleksey Plekhanov <pl...@gmail.com>
---
 .../integration/IndexDdlIntegrationTest.java       |   5 +-
 .../commandline/cache/CacheIndexesList.java        |   3 +-
 .../cache/CacheScheduleIndexesRebuild.java         |   3 +-
 .../util/GridCommandHandlerBrokenIndexTest.java    | 144 ++++++---------
 ...GridCommandHandlerScheduleIndexRebuildTest.java |  31 +---
 .../internal/cache/query/index/IndexProcessor.java |  12 +-
 .../cache/query/index/IndexQueryProcessor.java     |   2 +-
 .../defragmentation/IndexingDefragmentation.java   |   2 +-
 .../managers/indexing/IndexesRebuildTask.java      |   2 +-
 .../internal/visor/cache/index/IndexListTask.java  |  41 ++---
 .../cache/index/ScheduleIndexRebuildTask.java      |  29 +--
 .../visor/verify/ValidateIndexesClosure.java       | 196 ++++++++-------------
 .../visor/verify/ValidateIndexesContext.java       |   0
 .../visor/verify/VisorValidateIndexesTask.java     |   0
 .../cache/index/AbstractRebuildIndexTest.java      |   3 +-
 .../inlinecolumn/ComputeInlineSizeTest.java        |  11 +-
 16 files changed, 159 insertions(+), 325 deletions(-)

diff --git a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/IndexDdlIntegrationTest.java b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/IndexDdlIntegrationTest.java
index 9087105622d..a8b0e42c881 100644
--- a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/IndexDdlIntegrationTest.java
+++ b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/IndexDdlIntegrationTest.java
@@ -25,7 +25,6 @@ import org.apache.ignite.internal.cache.query.index.Index;
 import org.apache.ignite.internal.cache.query.index.SortOrder;
 import org.apache.ignite.internal.cache.query.index.sorted.IndexKeyDefinition;
 import org.apache.ignite.internal.cache.query.index.sorted.inline.InlineIndex;
-import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
 import org.apache.ignite.internal.processors.query.IgniteSQLException;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.lang.IgnitePredicate;
@@ -199,9 +198,7 @@ public class IndexDdlIntegrationTest extends AbstractDdlIntegrationTest {
     private Collection<Index> indexes(String cacheName) {
         IgniteEx node = grid(0);
 
-        IgniteInternalCache<?, ?> cache = node.cachex(cacheName);
-
-        return node.context().indexProcessor().indexes(cache.context());
+        return node.context().indexProcessor().indexes(cacheName);
     }
 
     /** */
diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/cache/CacheIndexesList.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/cache/CacheIndexesList.java
index 13d5d679d53..3e4d826f3a3 100644
--- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/cache/CacheIndexesList.java
+++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/cache/CacheIndexesList.java
@@ -36,6 +36,7 @@ import org.apache.ignite.internal.commandline.cache.argument.IndexListCommandArg
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.internal.visor.cache.index.IndexListInfoContainer;
+import org.apache.ignite.internal.visor.cache.index.IndexListTask;
 import org.apache.ignite.internal.visor.cache.index.IndexListTaskArg;
 
 import static org.apache.ignite.internal.commandline.CommandLogger.optional;
@@ -88,7 +89,7 @@ public class CacheIndexesList extends AbstractCommand<CacheIndexesList.Arguments
 
         try (GridClient client = Command.startClient(clientCfg)) {
             taskRes = TaskExecutor.executeTaskByNameOnNode(client,
-                "org.apache.ignite.internal.visor.cache.index.IndexListTask", taskArg, nodeId, clientCfg);
+                IndexListTask.class.getName(), taskArg, nodeId, clientCfg);
         }
 
         printIndexes(taskRes, logger);
diff --git a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/cache/CacheScheduleIndexesRebuild.java b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/cache/CacheScheduleIndexesRebuild.java
index 31bf521c3fe..0fd0341ddfb 100644
--- a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/cache/CacheScheduleIndexesRebuild.java
+++ b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/cache/CacheScheduleIndexesRebuild.java
@@ -37,6 +37,7 @@ import org.apache.ignite.internal.commandline.argument.CommandArgUtils;
 import org.apache.ignite.internal.commandline.cache.argument.IndexRebuildCommandArg;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.visor.cache.index.ScheduleIndexRebuildTask;
 import org.apache.ignite.internal.visor.cache.index.ScheduleIndexRebuildTaskArg;
 import org.apache.ignite.internal.visor.cache.index.ScheduleIndexRebuildTaskRes;
 import org.jetbrains.annotations.Nullable;
@@ -101,7 +102,7 @@ public class CacheScheduleIndexesRebuild extends AbstractCommand<CacheScheduleIn
 
             taskRes = TaskExecutor.executeTaskByNameOnNode(
                 client,
-                "org.apache.ignite.internal.visor.cache.index.ScheduleIndexRebuildTask",
+                ScheduleIndexRebuildTask.class.getName(),
                 new ScheduleIndexRebuildTaskArg(args.cacheToIndexes, args.cacheGroups),
                 nodeId,
                 clientCfg
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerBrokenIndexTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerBrokenIndexTest.java
index f3cc9ebc4f0..1f8f996910e 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerBrokenIndexTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerBrokenIndexTest.java
@@ -18,31 +18,25 @@
 package org.apache.ignite.util;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.regex.Pattern;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.cache.query.index.Index;
+import org.apache.ignite.internal.cache.query.index.IndexName;
+import org.apache.ignite.internal.cache.query.index.sorted.IndexRow;
+import org.apache.ignite.internal.cache.query.index.sorted.QueryIndexDefinition;
+import org.apache.ignite.internal.cache.query.index.sorted.SortedIndexDefinition;
+import org.apache.ignite.internal.cache.query.index.sorted.inline.IndexQueryContext;
+import org.apache.ignite.internal.cache.query.index.sorted.inline.InlineIndexImpl;
+import org.apache.ignite.internal.cache.query.index.sorted.inline.InlineIndexTree;
 import org.apache.ignite.internal.processors.cache.CacheGroupContext;
 import org.apache.ignite.internal.processors.cache.GridCacheContext;
-import org.apache.ignite.internal.processors.query.GridQueryProcessor;
-import org.apache.ignite.internal.processors.query.GridQueryTypeDescriptor;
-import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing;
-import org.apache.ignite.internal.processors.query.h2.database.H2TreeIndexBase;
-import org.apache.ignite.internal.processors.query.h2.opt.GridH2Table;
-import org.apache.ignite.internal.processors.query.h2.opt.H2CacheRow;
-import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.lang.GridCursor;
 import org.apache.ignite.internal.util.typedef.internal.CU;
-import org.apache.ignite.spi.indexing.IndexingQueryCacheFilter;
 import org.apache.ignite.testframework.ListeningTestLogger;
 import org.apache.ignite.testframework.LogListener;
-import org.h2.engine.Session;
-import org.h2.index.Cursor;
-import org.h2.index.Index;
-import org.h2.index.IndexType;
-import org.h2.result.SearchRow;
-import org.h2.table.IndexColumn;
 import org.junit.Test;
 
 import static org.apache.ignite.internal.commandline.CommandHandler.EXIT_CODE_OK;
@@ -94,7 +88,7 @@ public class GridCommandHandlerBrokenIndexTest extends GridCommandHandlerCluster
     /**
      * Tests Cursor initialisation failure by adding artificial index that will fail in required way.
      *
-     * @see H2TreeIndexBase#find(Session, SearchRow, SearchRow)
+     * @see InlineIndexImpl#find(IndexRow, IndexRow, boolean, boolean, int, IndexQueryContext)
      */
     @Test
     public void testIndexFindFail() throws Exception {
@@ -149,38 +143,33 @@ public class GridCommandHandlerBrokenIndexTest extends GridCommandHandlerCluster
 
         assertNotNull(grpCtx);
 
-        GridQueryProcessor qry = ignite.context().query();
-
-        IgniteH2Indexing indexing = (IgniteH2Indexing)qry.getIndexing();
-
-        outer:
-        for (GridCacheContext ctx : grpCtx.caches()) {
-            Collection<GridQueryTypeDescriptor> types = qry.types(ctx.name());
-
-            if (!F.isEmpty(types)) {
-                for (GridQueryTypeDescriptor type : types) {
-                    GridH2Table gridH2Tbl = indexing.schemaManager().dataTable(ctx.name(), type.tableName());
-
-                    if (gridH2Tbl == null)
-                        continue;
-
-                    ArrayList<Index> indexes = gridH2Tbl.getIndexes();
-
-                    BadIndex bi = null;
-
-                    for (Index idx : indexes) {
-                        if (idx instanceof H2TreeIndexBase) {
-                            bi = new BadIndex(gridH2Tbl, IDX_NAME, idx.getIndexColumns(), idx.getIndexType());
-
-                            break;
-                        }
-                    }
-
-                    if (bi != null) {
-                        indexes.add(bi);
-
-                        break outer;
-                    }
+        for (GridCacheContext<?, ?> ctx : grpCtx.caches()) {
+            for (Index idx : ignite.context().indexProcessor().indexes(ctx.name())) {
+                InlineIndexImpl idx0 = idx.unwrap(InlineIndexImpl.class);
+
+                if (idx0 != null) {
+                    SortedIndexDefinition idxDef = idx0.indexDefinition();
+                    IndexName idxName = idxDef.idxName();
+
+                    SortedIndexDefinition badIdxDef = new QueryIndexDefinition(
+                        idxDef.rowDescriptor(),
+                        new IndexName(idxName.cacheName(), idxName.schemaName(), idxName.tableName(), IDX_NAME),
+                        idxDef.treeName(),
+                        idxDef.idxRowCache(),
+                        idxDef.primary(),
+                        idxDef.affinity(),
+                        idxDef.indexKeyDefinitions(),
+                        idxDef.inlineSize(),
+                        idxDef.keyTypeSettings()
+                    );
+
+                    ignite.context().indexProcessor().createIndex(
+                        ctx,
+                        (c, d) -> new BadIndex(c, (SortedIndexDefinition)d, new InlineIndexTree[] {idx0.segment(0)}),
+                        badIdxDef
+                    );
+
+                    return;
                 }
             }
         }
@@ -189,57 +178,22 @@ public class GridCommandHandlerBrokenIndexTest extends GridCommandHandlerCluster
     /**
      * Artificial index that throws exception on {@code find()}.
      */
-    private class BadIndex extends H2TreeIndexBase {
-        /**
-         * Constructor.
-         */
-        protected BadIndex(GridH2Table tbl, String name, IndexColumn[] cols, IndexType type) {
-            super(tbl, name, cols, type);
-        }
-
-        /** */
-        @Override public int inlineSize() {
-            return 0;
-        }
-
-        /** */
-        @Override public H2CacheRow put(H2CacheRow row) {
-            return null;
-        }
-
+    private static class BadIndex extends InlineIndexImpl {
         /** */
-        @Override public boolean putx(H2CacheRow row) {
-            return false;
+        public BadIndex(GridCacheContext<?, ?> cctx, SortedIndexDefinition def, InlineIndexTree[] segments) {
+            super(cctx, def, segments, null);
         }
 
-        /** */
-        @Override public boolean removex(SearchRow row) {
-            return false;
-        }
-
-        /** */
-        @Override public int segmentsCount() {
-            return 0;
-        }
-
-        /** */
-        @Override public long totalRowCount(IndexingQueryCacheFilter partsFilter) {
-            return 0;
-        }
-
-        /** */
-        @Override public Cursor find(Session session, SearchRow first, SearchRow last) {
+        /** {@inheritDoc} */
+        @Override public GridCursor<IndexRow> find(
+            IndexRow lower,
+            IndexRow upper,
+            boolean lowIncl,
+            boolean upIncl,
+            int segment,
+            IndexQueryContext qryCtx
+        ) {
             throw new RuntimeException(EXCEPTION_MSG);
         }
-
-        /** */
-        @Override public Cursor findFirstOrLast(Session session, boolean first) {
-            return null;
-        }
-
-        /** */
-        @Override public long getRowCount(Session session) {
-            return 0;
-        }
     }
 }
diff --git a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerScheduleIndexRebuildTest.java b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerScheduleIndexRebuildTest.java
index c2d558249e8..c0be4054c11 100644
--- a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerScheduleIndexRebuildTest.java
+++ b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerScheduleIndexRebuildTest.java
@@ -25,22 +25,18 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 import org.apache.ignite.cluster.ClusterState;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.cache.query.index.Index;
 import org.apache.ignite.internal.cache.query.index.sorted.maintenance.MaintenanceRebuildIndexTarget;
-import org.apache.ignite.internal.processors.query.GridQueryProcessor;
-import org.apache.ignite.internal.processors.query.GridQueryTypeDescriptor;
-import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing;
-import org.apache.ignite.internal.processors.query.h2.database.H2TreeIndexBase;
-import org.apache.ignite.internal.processors.query.h2.opt.GridH2Table;
 import org.apache.ignite.internal.util.typedef.G;
 import org.apache.ignite.internal.util.typedef.internal.CU;
 import org.apache.ignite.maintenance.MaintenanceTask;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.apache.ignite.testframework.ListeningTestLogger;
-import org.h2.index.Index;
 import org.junit.Test;
 
 import static java.util.Collections.singletonMap;
@@ -572,25 +568,8 @@ public class GridCommandHandlerScheduleIndexRebuildTest extends GridCommandHandl
      * @return Indexes of the cache.
      */
     private Set<String> indexes(IgniteEx node, String cache) {
-        GridQueryProcessor qry = node.context().query();
-
-        IgniteH2Indexing indexing = (IgniteH2Indexing)qry.getIndexing();
-
-        Set<String> indexes = new HashSet<>();
-
-        for (GridQueryTypeDescriptor type : qry.types(cache)) {
-            GridH2Table gridH2Tbl = indexing.schemaManager().dataTable(type.schemaName(), type.tableName());
-
-            if (gridH2Tbl == null)
-                continue;
-
-            for (Index idx : gridH2Tbl.getIndexes()) {
-                // We need only indexes that can be rebuilt.
-                if (idx instanceof H2TreeIndexBase)
-                    indexes.add(idx.getName());
-            }
-        }
-
-        return indexes;
+        return node.context().indexProcessor().treeIndexes(cache, false).stream()
+            .map(Index::name)
+            .collect(Collectors.toSet());
     }
 }
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexProcessor.java
index bf86f23a898..ef5b2a70b14 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexProcessor.java
@@ -376,14 +376,14 @@ public class IndexProcessor extends GridProcessorAdapter {
     /**
      * Returns collection of indexes for specified cache.
      *
-     * @param cctx Cache context.
+     * @param cacheName Cache name.
      * @return Collection of indexes for specified cache.
      */
-    public Collection<Index> indexes(GridCacheContext<?, ?> cctx) {
+    public Collection<Index> indexes(String cacheName) {
         ddlLock.readLock().lock();
 
         try {
-            Map<String, Index> idxs = cacheToIdx.get(cctx.name());
+            Map<String, Index> idxs = cacheToIdx.get(cacheName);
 
             if (idxs == null)
                 return Collections.emptyList();
@@ -587,11 +587,11 @@ public class IndexProcessor extends GridProcessorAdapter {
     /**
      * Collect indexes for rebuild.
      *
-     * @param cctx Cache context.
+     * @param cacheName Cache name.
      * @param createdOnly Get only created indexes (not restored from dick).
      */
-    public List<InlineIndex> treeIndexes(GridCacheContext cctx, boolean createdOnly) {
-        Collection<Index> idxs = indexes(cctx);
+    public List<InlineIndex> treeIndexes(String cacheName, boolean createdOnly) {
+        Collection<Index> idxs = indexes(cacheName);
 
         List<InlineIndex> treeIdxs = new ArrayList<>();
 
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexQueryProcessor.java
index f9fddd06967..6128171bf45 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/IndexQueryProcessor.java
@@ -231,7 +231,7 @@ public class IndexQueryProcessor {
         String tableName,
         IndexQueryDesc idxQryDesc
     ) throws IgniteCheckedException {
-        Collection<Index> idxs = idxProc.indexes(cctx);
+        Collection<Index> idxs = idxProc.indexes(cctx.name());
 
         for (Index idx: idxs) {
             SortedSegmentedIndex sortedIdx = assertSortedIndex(idx, idxQryDesc);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/defragmentation/IndexingDefragmentation.java b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/defragmentation/IndexingDefragmentation.java
index c899ac819a4..4f1a38a1d95 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/defragmentation/IndexingDefragmentation.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/defragmentation/IndexingDefragmentation.java
@@ -223,7 +223,7 @@ public class IndexingDefragmentation {
         for (GridCacheContext<?, ?> cctx: gctx.caches()) {
             Map<String, TableIndexes> idxs = new HashMap<>();
 
-            List<InlineIndex> indexes = indexing.treeIndexes(cctx, false);
+            List<InlineIndex> indexes = indexing.treeIndexes(cctx.name(), false);
 
             for (InlineIndex idx: indexes) {
                 String table = indexing.indexDefinition(idx.id()).idxName().tableName();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/IndexesRebuildTask.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/IndexesRebuildTask.java
index 7d27bf3d3ee..898de50d033 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/IndexesRebuildTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/IndexesRebuildTask.java
@@ -75,7 +75,7 @@ public class IndexesRebuildTask {
             clo = row -> cctx.queries().store(row, null, mvccEnabled);
         }
         else {
-            Collection<InlineIndex> toRebuild = cctx.kernalContext().indexProcessor().treeIndexes(cctx, !force);
+            Collection<InlineIndex> toRebuild = cctx.kernalContext().indexProcessor().treeIndexes(cctx.name(), !force);
 
             if (F.isEmpty(toRebuild))
                 return null;
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexListTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexListTask.java
similarity index 72%
rename from modules/indexing/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexListTask.java
rename to modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexListTask.java
index 3935a0e1bf7..dbcc505aa4e 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexListTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/IndexListTask.java
@@ -17,23 +17,17 @@
 
 package org.apache.ignite.internal.visor.cache.index;
 
-import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 import org.apache.ignite.IgniteException;
+import org.apache.ignite.internal.cache.query.index.Index;
+import org.apache.ignite.internal.cache.query.index.sorted.inline.InlineIndexImpl;
 import org.apache.ignite.internal.processors.cache.GridCacheContext;
-import org.apache.ignite.internal.processors.query.GridQueryProcessor;
-import org.apache.ignite.internal.processors.query.GridQueryTypeDescriptor;
-import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing;
-import org.apache.ignite.internal.processors.query.h2.database.H2TreeIndexBase;
-import org.apache.ignite.internal.processors.query.h2.opt.GridH2Table;
 import org.apache.ignite.internal.processors.task.GridInternal;
 import org.apache.ignite.internal.visor.VisorJob;
 import org.apache.ignite.internal.visor.VisorOneNodeTask;
-import org.h2.index.Index;
-import org.h2.table.Column;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -78,11 +72,7 @@ public class IndexListTask extends VisorOneNodeTask<IndexListTaskArg, Set<IndexL
 
             Set<IndexListInfoContainer> idxInfos = new HashSet<>();
 
-            GridQueryProcessor qry = ignite.context().query();
-
-            IgniteH2Indexing indexing = (IgniteH2Indexing)qry.getIndexing();
-
-            for (GridCacheContext ctx : ignite.context().cache().context().cacheContexts()) {
+            for (GridCacheContext<?, ?> ctx : ignite.context().cache().context().cacheContexts()) {
                 final String cacheName = ctx.name();
 
                 final String grpName = ctx.config().getGroupName();
@@ -94,19 +84,16 @@ public class IndexListTask extends VisorOneNodeTask<IndexListTaskArg, Set<IndexL
                 if (!isNameValid(cachesPtrn, cacheName))
                     continue;
 
-                for (GridQueryTypeDescriptor type : qry.types(cacheName)) {
-                    GridH2Table gridH2Tbl = indexing.schemaManager().dataTable(cacheName, type.tableName());
+                Collection<Index> idxs = ignite.context().indexProcessor().indexes(cacheName);
 
-                    if (gridH2Tbl == null)
+                for (Index idx : idxs) {
+                    if (!isNameValid(indexesPtrn, idx.name()))
                         continue;
 
-                    for (Index idx : gridH2Tbl.getIndexes()) {
-                        if (!isNameValid(indexesPtrn, idx.getName()))
-                            continue;
+                    InlineIndexImpl idx0 = idx.unwrap(InlineIndexImpl.class);
 
-                        if (idx instanceof H2TreeIndexBase)
-                            idxInfos.add(constructContainer(ctx, idx));
-                    }
+                    if (idx0 != null)
+                        idxInfos.add(constructContainer(ctx, idx0));
                 }
             }
 
@@ -119,12 +106,12 @@ public class IndexListTask extends VisorOneNodeTask<IndexListTaskArg, Set<IndexL
         }
 
         /** */
-        private static IndexListInfoContainer constructContainer(GridCacheContext ctx, Index idx) {
+        private static IndexListInfoContainer constructContainer(GridCacheContext<?, ?> ctx, InlineIndexImpl idx) {
             return new IndexListInfoContainer(
                 ctx,
-                idx.getName(),
-                Arrays.stream(idx.getColumns()).map(Column::getName).collect(Collectors.toList()),
-                idx.getTable().getName()
+                idx.indexDefinition().idxName().idxName(),
+                idx.indexDefinition().indexKeyDefinitions().keySet(),
+                idx.indexDefinition().idxName().tableName()
             );
         }
 
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/cache/index/ScheduleIndexRebuildTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/ScheduleIndexRebuildTask.java
similarity index 88%
rename from modules/indexing/src/main/java/org/apache/ignite/internal/visor/cache/index/ScheduleIndexRebuildTask.java
rename to modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/ScheduleIndexRebuildTask.java
index 4760e2e2878..927cfbbe5db 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/cache/index/ScheduleIndexRebuildTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/index/ScheduleIndexRebuildTask.java
@@ -29,21 +29,16 @@ import java.util.stream.Collectors;
 import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.IgniteException;
 import org.apache.ignite.compute.ComputeJobResult;
+import org.apache.ignite.internal.cache.query.index.Index;
 import org.apache.ignite.internal.processors.cache.CacheGroupContext;
 import org.apache.ignite.internal.processors.cache.GridCacheContext;
 import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
-import org.apache.ignite.internal.processors.query.GridQueryProcessor;
-import org.apache.ignite.internal.processors.query.GridQueryTypeDescriptor;
-import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing;
-import org.apache.ignite.internal.processors.query.h2.database.H2TreeIndexBase;
-import org.apache.ignite.internal.processors.query.h2.opt.GridH2Table;
 import org.apache.ignite.internal.processors.task.GridInternal;
 import org.apache.ignite.internal.util.typedef.internal.CU;
 import org.apache.ignite.internal.visor.VisorJob;
 import org.apache.ignite.internal.visor.VisorMultiNodeTask;
 import org.apache.ignite.maintenance.MaintenanceRegistry;
 import org.apache.ignite.maintenance.MaintenanceTask;
-import org.h2.index.Index;
 import org.jetbrains.annotations.Nullable;
 
 import static org.apache.ignite.internal.cache.query.index.sorted.maintenance.MaintenanceRebuildIndexUtils.mergeTasks;
@@ -182,25 +177,9 @@ public class ScheduleIndexRebuildTask
          * @return Indexes of the cache.
          */
         private Set<String> indexes(String cache) {
-            GridQueryProcessor qry = ignite.context().query();
-
-            IgniteH2Indexing indexing = (IgniteH2Indexing)qry.getIndexing();
-
-            Set<String> indexes = new HashSet<>();
-
-            for (GridQueryTypeDescriptor type : qry.types(cache)) {
-                GridH2Table gridH2Tbl = indexing.schemaManager().dataTable(type.schemaName(), type.tableName());
-
-                if (gridH2Tbl == null)
-                    continue;
-
-                for (Index idx : gridH2Tbl.getIndexes()) {
-                    if (idx instanceof H2TreeIndexBase)
-                        indexes.add(idx.getName());
-                }
-            }
-
-            return indexes;
+            return ignite.context().indexProcessor().treeIndexes(cache, false).stream()
+                .map(Index::name)
+                .collect(Collectors.toSet());
         }
     }
 
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
similarity index 87%
rename from modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
rename to modules/core/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
index 1397ee39007..38aa89918ed 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesClosure.java
@@ -40,6 +40,11 @@ import org.apache.ignite.IgniteInterruptedException;
 import org.apache.ignite.IgniteLogger;
 import org.apache.ignite.internal.GridKernalContext;
 import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.cache.query.index.Index;
+import org.apache.ignite.internal.cache.query.index.sorted.IndexRow;
+import org.apache.ignite.internal.cache.query.index.sorted.IndexRowImpl;
+import org.apache.ignite.internal.cache.query.index.sorted.inline.IndexQueryContext;
+import org.apache.ignite.internal.cache.query.index.sorted.inline.InlineIndexImpl;
 import org.apache.ignite.internal.processors.cache.CacheGroupContext;
 import org.apache.ignite.internal.processors.cache.CacheObjectUtils;
 import org.apache.ignite.internal.processors.cache.DynamicCacheDescriptor;
@@ -61,16 +66,8 @@ import org.apache.ignite.internal.processors.cache.verify.GridNotIdleException;
 import org.apache.ignite.internal.processors.cache.verify.IdleVerifyUtility;
 import org.apache.ignite.internal.processors.cache.verify.PartitionKey;
 import org.apache.ignite.internal.processors.query.GridQueryProcessor;
-import org.apache.ignite.internal.processors.query.GridQueryTypeDescriptor;
 import org.apache.ignite.internal.processors.query.QueryTypeDescriptorImpl;
-import org.apache.ignite.internal.processors.query.h2.ConnectionManager;
-import org.apache.ignite.internal.processors.query.h2.H2Utils;
-import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing;
-import org.apache.ignite.internal.processors.query.h2.database.H2TreeIndexBase;
-import org.apache.ignite.internal.processors.query.h2.opt.GridH2RowDescriptor;
-import org.apache.ignite.internal.processors.query.h2.opt.GridH2Table;
-import org.apache.ignite.internal.processors.query.h2.opt.H2CacheRow;
-import org.apache.ignite.internal.processors.query.h2.opt.QueryContext;
+import org.apache.ignite.internal.util.lang.GridCursor;
 import org.apache.ignite.internal.util.lang.GridIterator;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.internal.util.typedef.T2;
@@ -81,11 +78,6 @@ import org.apache.ignite.lang.IgniteCallable;
 import org.apache.ignite.lang.IgniteInClosure;
 import org.apache.ignite.resources.IgniteInstanceResource;
 import org.apache.ignite.resources.LoggerResource;
-import org.h2.engine.Session;
-import org.h2.index.Cursor;
-import org.h2.index.Index;
-import org.h2.jdbc.JdbcConnection;
-import org.h2.message.DbException;
 import org.jetbrains.annotations.Nullable;
 
 import static java.util.Collections.emptyMap;
@@ -270,15 +262,12 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
         IdleVerifyUtility.IdleChecker idleChecker = new IdleVerifyUtility.IdleChecker(ignite, partsWithCntrsPerGrp);
 
         List<T2<CacheGroupContext, GridDhtLocalPartition>> partArgs = new ArrayList<>();
-        List<T2<GridCacheContext, Index>> idxArgs = new ArrayList<>();
+        List<T2<GridCacheContext, InlineIndexImpl>> idxArgs = new ArrayList<>();
 
         totalCacheGrps = grpIds.size();
 
         Map<Integer, IndexIntegrityCheckIssue> integrityCheckResults = integrityCheckIndexesPartitions(grpIds, idleChecker);
 
-        GridQueryProcessor qryProcessor = ignite.context().query();
-        IgniteH2Indexing h2Indexing = (IgniteH2Indexing)qryProcessor.getIndexing();
-
         for (Integer grpId : grpIds) {
             CacheGroupContext grpCtx = ignite.context().cache().cacheGroup(grpId);
 
@@ -292,21 +281,13 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
                 String cacheName = ctx.name();
 
                 if (cacheNames == null || cacheNames.contains(cacheName)) {
-                    Collection<GridQueryTypeDescriptor> types = qryProcessor.types(cacheName);
+                    Collection<Index> idxs = ignite.context().indexProcessor().indexes(cacheName);
 
-                    if (F.isEmpty(types))
-                        continue;
+                    for (Index idx : idxs) {
+                        InlineIndexImpl idx0 = idx.unwrap(InlineIndexImpl.class);
 
-                    for (GridQueryTypeDescriptor type : types) {
-                        GridH2Table gridH2Tbl = h2Indexing.schemaManager().dataTable(type.schemaName(), type.tableName());
-
-                        if (isNull(gridH2Tbl))
-                            continue;
-
-                        for (Index idx : gridH2Tbl.getIndexes()) {
-                            if (idx instanceof H2TreeIndexBase)
-                                idxArgs.add(new T2<>(ctx, idx));
-                        }
+                        if (idx0 != null)
+                            idxArgs.add(new T2<>(ctx, idx0));
                     }
                 }
             }
@@ -323,7 +304,7 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
         List<Future<Map<String, ValidateIndexesPartitionResult>>> procIdxFutures = new ArrayList<>(idxArgs.size());
 
         List<T3<CacheGroupContext, GridDhtLocalPartition, Future<CacheSize>>> cacheSizeFutures = new ArrayList<>(partArgs.size());
-        List<T3<GridCacheContext, Index, Future<T2<Throwable, Long>>>> idxSizeFutures = new ArrayList<>(idxArgs.size());
+        List<T3<GridCacheContext, InlineIndexImpl, Future<T2<Throwable, Long>>>> idxSizeFutures = new ArrayList<>(idxArgs.size());
 
         partArgs.forEach(k -> procPartFutures.add(processPartitionAsync(k.get1(), k.get2())));
 
@@ -337,9 +318,9 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
                 cacheSizeFutures.add(new T3<>(cacheGrpCtx, locPart, calcCacheSizeAsync(cacheGrpCtx, locPart)));
             }
 
-            for (T2<GridCacheContext, Index> idxArg : idxArgs) {
+            for (T2<GridCacheContext, InlineIndexImpl> idxArg : idxArgs) {
                 GridCacheContext cacheCtx = idxArg.get1();
-                Index idx = idxArg.get2();
+                InlineIndexImpl idx = idxArg.get2();
 
                 idxSizeFutures.add(new T3<>(cacheCtx, idx, calcIndexSizeAsync(cacheCtx, idx, idleChecker)));
             }
@@ -559,23 +540,16 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
 
             if (hasMvcc) {
                 for (GridCacheContext<?, ?> context : grpCtx.caches()) {
-                    try (Session session = mvccSession(context)) {
-                        MvccSnapshot mvccSnapshot = null;
-
-                        boolean mvccEnabled = context.mvccEnabled();
-
-                        if (mvccEnabled)
-                            mvccSnapshot = ((QueryContext)session.getVariable(H2Utils.QCTX_VARIABLE_NAME).getObject()).mvccSnapshot();
+                    IndexQueryContext qryCtx = mvccQueryContext(context);
 
-                        GridIterator<CacheDataRow> iterator = grpCtx.offheap().cachePartitionIterator(
-                            context.cacheId(),
-                            part.id(),
-                            mvccSnapshot,
-                            null
-                        );
+                    GridIterator<CacheDataRow> iterator = grpCtx.offheap().cachePartitionIterator(
+                        context.cacheId(),
+                        part.id(),
+                        qryCtx.mvccSnapshot(),
+                        null
+                    );
 
-                        processPartIterator(grpCtx, partRes, session, iterator);
-                    }
+                    processPartIterator(grpCtx, partRes, qryCtx, iterator);
                 }
             }
             else
@@ -613,14 +587,14 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
      *
      * @param grpCtx Cache group context.
      * @param partRes Result object.
-     * @param session H2 session.
+     * @param qryCtx Index query context.
      * @param it Partition iterator.
      * @throws IgniteCheckedException
      */
     private void processPartIterator(
         CacheGroupContext grpCtx,
         ValidateIndexesPartitionResult partRes,
-        Session session,
+        IndexQueryContext qryCtx,
         GridIterator<CacheDataRow> it
     ) throws IgniteCheckedException {
         boolean enoughIssues = false;
@@ -692,28 +666,24 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
             if (res == null)
                 continue; // Tolerate - (k, v) is just not indexed.
 
-            IgniteH2Indexing indexing = (IgniteH2Indexing)qryProcessor.getIndexing();
-
-            GridH2Table gridH2Tbl = indexing.schemaManager().dataTable(cacheCtx.name(), res.tableName());
-
-            if (gridH2Tbl == null)
-                continue; // Tolerate - (k, v) is just not indexed.
-
-            GridH2RowDescriptor gridH2RowDesc = gridH2Tbl.rowDescriptor();
-
-            H2CacheRow h2Row = new H2CacheRow(gridH2RowDesc, row);
-
-            ArrayList<Index> indexes = gridH2Tbl.getIndexes();
+            Collection<Index> indexes = ignite.context().indexProcessor().indexes(cacheCtx.name());
 
             for (Index idx : indexes) {
                 if (validateCtx.isCancelled())
                     break;
 
-                if (!(idx instanceof H2TreeIndexBase))
+                InlineIndexImpl idx0 = idx.unwrap(InlineIndexImpl.class);
+
+                if (idx0 == null)
+                    continue;
+
+                if (!F.eq(idx0.indexDefinition().idxName().tableName(), res.tableName()))
                     continue;
 
+                IndexRow idxRow = new IndexRowImpl(idx0.segment(0).rowHandler(), row);
+
                 try {
-                    Cursor cursor = idx.find(session, h2Row, h2Row);
+                    GridCursor<IndexRow> cursor = idx0.find(idxRow, idxRow, true, true, qryCtx);
 
                     if (cursor == null || !cursor.next())
                         throw new IgniteCheckedException("Key is present in CacheDataTree, but can't be found in SQL index.");
@@ -723,7 +693,7 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
                         grpCtx.cacheObjectContext(), row.key(), true, true);
 
                     IndexValidationIssue is = new IndexValidationIssue(
-                        o.toString(), cacheCtx.name(), idx.getName(), t);
+                        o.toString(), cacheCtx.name(), idx.name(), t);
 
                     log.error("Failed to lookup key: " + is.toString(), t);
 
@@ -734,40 +704,24 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
     }
 
     /**
-     * Get session with MVCC snapshot and QueryContext.
+     * Get QueryContext for MVCC snapshot.
      *
      * @param cctx Cache context.
-     * @return Session with QueryContext and MVCC snapshot.
+     * @return QueryContext for MVCC snapshot.
      * @throws IgniteCheckedException If failed.
      */
-    private Session mvccSession(GridCacheContext<?, ?> cctx) throws IgniteCheckedException {
-        Session session = null;
-
+    private IndexQueryContext mvccQueryContext(GridCacheContext<?, ?> cctx) throws IgniteCheckedException {
         boolean mvccEnabled = cctx.mvccEnabled();
 
         if (mvccEnabled) {
-            ConnectionManager connMgr = ((IgniteH2Indexing)ignite.context().query().getIndexing()).connections();
-
-            JdbcConnection connection = (JdbcConnection)connMgr.connection().connection();
-
-            session = (Session)connection.getSession();
-
             MvccQueryTracker tracker = MvccUtils.mvccTracker(cctx, true);
 
             MvccSnapshot mvccSnapshot = tracker.snapshot();
 
-            final QueryContext qctx = new QueryContext(
-                0,
-                cacheName -> null,
-                null,
-                mvccSnapshot,
-                null,
-                true
-            );
-
-            session.setVariable(H2Utils.QCTX_VARIABLE_NAME, new H2Utils.ValueRuntimeSimpleObject<>(qctx));
+            return new IndexQueryContext(cacheName -> null, null, mvccSnapshot);
         }
-        return session;
+
+        return null;
     }
 
     /**
@@ -798,7 +752,7 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
      * @param idleChecker Idle check closure.
      */
     private Future<Map<String, ValidateIndexesPartitionResult>> processIndexAsync(
-        T2<GridCacheContext, Index> cacheCtxWithIdx,
+        T2<GridCacheContext, InlineIndexImpl> cacheCtxWithIdx,
         IgniteInClosure<Integer> idleChecker
     ) {
         return calcExecutor.submit(new Callable<Map<String, ValidateIndexesPartitionResult>>() {
@@ -821,7 +775,7 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
      * @param idleChecker Idle check closure.
      */
     private Map<String, ValidateIndexesPartitionResult> processIndex(
-        T2<GridCacheContext, Index> cacheCtxWithIdx,
+        T2<GridCacheContext, InlineIndexImpl> cacheCtxWithIdx,
         IgniteInClosure<Integer> idleChecker
     ) {
         if (validateCtx.isCancelled())
@@ -829,22 +783,22 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
 
         GridCacheContext ctx = cacheCtxWithIdx.get1();
 
-        Index idx = cacheCtxWithIdx.get2();
+        InlineIndexImpl idx = cacheCtxWithIdx.get2();
 
         ValidateIndexesPartitionResult idxValidationRes = new ValidateIndexesPartitionResult();
 
         boolean enoughIssues = false;
 
-        Cursor cursor = null;
+        GridCursor<IndexRow> cursor = null;
 
-        try (Session session = mvccSession(cacheCtxWithIdx.get1())) {
-            cursor = idx.find(session, null, null);
+        try {
+            cursor = idx.find(null, null, true, true, mvccQueryContext(cacheCtxWithIdx.get1()));
 
             if (cursor == null)
                 throw new IgniteCheckedException("Can't iterate through index: " + idx);
         }
         catch (Throwable t) {
-            IndexValidationIssue is = new IndexValidationIssue(null, ctx.name(), idx.getName(), t);
+            IndexValidationIssue is = new IndexValidationIssue(null, ctx.name(), idx.name(), t);
 
             log.error("Find in index failed: " + is.toString());
 
@@ -862,14 +816,14 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
         KeyCacheObject previousKey = null;
 
         while (!enoughIssues && !validateCtx.isCancelled()) {
-            KeyCacheObject h2key = null;
+            KeyCacheObject key = null;
 
             try {
                 try {
                     if (!cursor.next())
                         break;
                 }
-                catch (DbException e) {
+                catch (Exception e) {
                     if (X.hasCause(e, CorruptedTreeException.class))
                         throw new IgniteCheckedException("Key is present in SQL index, but is missing in corresponding " +
                             "data page. Previous successfully read key: " +
@@ -880,7 +834,7 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
                     throw e;
                 }
 
-                H2CacheRow h2Row = (H2CacheRow)cursor.get();
+                IndexRow idxRow = cursor.get();
 
                 if (skipConditions) {
                     if (bothSkipConditions) {
@@ -903,30 +857,30 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
                     }
                 }
 
-                h2key = h2Row.key();
+                key = idxRow.cacheDataRow().key();
 
-                if (h2Row.link() != 0L) {
-                    CacheDataRow cacheDataStoreRow = ctx.group().offheap().read(ctx, h2key);
+                if (idxRow.cacheDataRow().link() != 0L) {
+                    CacheDataRow cacheDataStoreRow = ctx.group().offheap().read(ctx, key);
 
                     if (cacheDataStoreRow == null)
                         throw new IgniteCheckedException("Key is present in SQL index, but can't be found in CacheDataTree.");
                 }
                 else
-                    throw new IgniteCheckedException("Invalid index row, possibly deleted " + h2Row);
+                    throw new IgniteCheckedException("Invalid index row, possibly deleted " + idxRow);
             }
             catch (Throwable t) {
                 Object o = CacheObjectUtils.unwrapBinaryIfNeeded(
-                    ctx.cacheObjectContext(), h2key, true, true);
+                    ctx.cacheObjectContext(), key, true, true);
 
                 IndexValidationIssue is = new IndexValidationIssue(
-                    String.valueOf(o), ctx.name(), idx.getName(), t);
+                    String.valueOf(o), ctx.name(), idx.name(), t);
 
                 log.error("Failed to lookup key: " + is.toString());
 
                 enoughIssues |= idxValidationRes.reportIssue(is);
             }
             finally {
-                previousKey = h2key;
+                previousKey = key;
             }
         }
 
@@ -938,7 +892,7 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
             group.groupId(),
             ctx.name(),
             ctx.cacheId(),
-            idx.getName()
+            idx.name()
         );
 
         idleChecker.apply(group.groupId());
@@ -1019,7 +973,6 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
                 GridIterator<CacheDataRow> partIter = grpCtx.offheap().partitionIterator(partId);
 
                 GridQueryProcessor qryProcessor = ignite.context().query();
-                IgniteH2Indexing h2Indexing = (IgniteH2Indexing)qryProcessor.getIndexing();
 
                 while (partIter.hasNextX() && !failCalcCacheSizeGrpIds.contains(grpId)) {
                     CacheDataRow cacheDataRow = partIter.nextX();
@@ -1050,11 +1003,6 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
 
                     String tableName = qryTypeDesc.tableName();
 
-                    GridH2Table gridH2Tbl = h2Indexing.schemaManager().dataTable(cacheName, tableName);
-
-                    if (isNull(gridH2Tbl))
-                        continue; // Tolerate - (k, v) is just not indexed.
-
                     cacheSizeByTbl.computeIfAbsent(cacheCtx.cacheId(), i -> new HashMap<>())
                         .computeIfAbsent(tableName, s -> new AtomicLong()).incrementAndGet();
                 }
@@ -1101,12 +1049,10 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
      */
     private Future<T2<Throwable, Long>> calcIndexSizeAsync(
         GridCacheContext cacheCtx,
-        Index idx,
+        InlineIndexImpl idx,
         IgniteInClosure<Integer> idleChecker
     ) {
-        return calcExecutor.submit(() -> {
-            return calcIndexSize(cacheCtx, idx, idleChecker);
-        });
+        return calcExecutor.submit(() -> calcIndexSize(cacheCtx, idx, idleChecker));
     }
 
     /**
@@ -1119,7 +1065,7 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
      */
     private T2<Throwable, Long> calcIndexSize(
         GridCacheContext cacheCtx,
-        Index idx,
+        InlineIndexImpl idx,
         IgniteInClosure<Integer> idleChecker
     ) {
         if (validateCtx.isCancelled())
@@ -1130,11 +1076,11 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
                 return new T2<>(null, 0L);
 
             String cacheName = cacheCtx.name();
-            String tblName = idx.getTable().getName();
-            String idxName = idx.getName();
+            String tblName = idx.indexDefinition().idxName().tableName();
+            String idxName = idx.indexDefinition().idxName().idxName();
 
             try {
-                long indexSize = ignite.context().query().getIndexing().indexSize(cacheName, tblName, idxName);
+                long indexSize = idx.totalCount();
 
                 idleChecker.apply(cacheCtx.groupId());
 
@@ -1187,7 +1133,7 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
      */
     private void checkSizes(
         List<T3<CacheGroupContext, GridDhtLocalPartition, Future<CacheSize>>> cacheSizesFutures,
-        List<T3<GridCacheContext, Index, Future<T2<Throwable, Long>>>> idxSizeFutures,
+        List<T3<GridCacheContext, InlineIndexImpl, Future<T2<Throwable, Long>>>> idxSizeFutures,
         Map<String, ValidateIndexesCheckSizeResult> checkSizeRes
     ) throws ExecutionException, InterruptedException {
         if (!checkSizes)
@@ -1215,7 +1161,7 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
             }
         }
 
-        for (T3<GridCacheContext, Index, Future<T2<Throwable, Long>>> idxSizeFut : idxSizeFutures) {
+        for (T3<GridCacheContext, InlineIndexImpl, Future<T2<Throwable, Long>>> idxSizeFut : idxSizeFutures) {
             GridCacheContext cacheCtx = idxSizeFut.get1();
 
             int grpId = cacheCtx.groupId();
@@ -1223,8 +1169,8 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
             if (failCalcCacheSizeGrpIds.contains(grpId))
                 continue;
 
-            Index idx = idxSizeFut.get2();
-            String tblName = idx.getTable().getName();
+            InlineIndexImpl idx = idxSizeFut.get2();
+            String tblName = idx.indexDefinition().idxName().tableName();
 
             AtomicLong cacheSizeObj = cacheSizeTotal.get(grpId).cacheSizePerTbl
                 .getOrDefault(cacheCtx.cacheId(), emptyMap()).get(tblName);
@@ -1243,7 +1189,7 @@ public class ValidateIndexesClosure implements IgniteCallable<VisorValidateIndex
                 checkSizeRes.computeIfAbsent(
                     "[" + cacheGrpInfo(cacheCtx.group()) + ", " + cacheInfo(cacheCtx) + ", tableName=" + tblName + "]",
                     s -> new ValidateIndexesCheckSizeResult(cacheSizeByTbl, new ArrayList<>()))
-                    .issues().add(new ValidateIndexesCheckSizeIssue(idx.getName(), idxSize, err));
+                    .issues().add(new ValidateIndexesCheckSizeIssue(idx.name(), idxSize, err));
             }
         }
     }
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesContext.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesContext.java
similarity index 100%
rename from modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesContext.java
rename to modules/core/src/main/java/org/apache/ignite/internal/visor/verify/ValidateIndexesContext.java
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/VisorValidateIndexesTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorValidateIndexesTask.java
similarity index 100%
rename from modules/indexing/src/main/java/org/apache/ignite/internal/visor/verify/VisorValidateIndexesTask.java
rename to modules/core/src/main/java/org/apache/ignite/internal/visor/verify/VisorValidateIndexesTask.java
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/AbstractRebuildIndexTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/AbstractRebuildIndexTest.java
index 0c5f9675c28..6789350a280 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/AbstractRebuildIndexTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/AbstractRebuildIndexTest.java
@@ -50,7 +50,6 @@ import static org.apache.ignite.cluster.ClusterState.ACTIVE;
 import static org.apache.ignite.internal.processors.cache.index.IgniteH2IndexingEx.addIdxCreateCacheRowConsumer;
 import static org.apache.ignite.internal.processors.cache.index.IndexesRebuildTaskEx.addCacheRowConsumer;
 import static org.apache.ignite.internal.processors.cache.index.IndexingTestUtils.nodeName;
-import static org.apache.ignite.testframework.GridTestUtils.cacheContext;
 import static org.apache.ignite.testframework.GridTestUtils.deleteIndexBin;
 import static org.apache.ignite.testframework.GridTestUtils.getFieldValue;
 
@@ -356,7 +355,7 @@ public abstract class AbstractRebuildIndexTest extends GridCommonAbstractTest {
      * @return Index.
      */
     @Nullable protected Index index(IgniteEx n, IgniteCache<Integer, Person> cache, String idxName) {
-        return n.context().indexProcessor().indexes(cacheContext(cache)).stream()
+        return n.context().indexProcessor().indexes(cache.getName()).stream()
             .filter(i -> idxName.equals(i.name()))
             .findAny()
             .orElse(null);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/inlinecolumn/ComputeInlineSizeTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/inlinecolumn/ComputeInlineSizeTest.java
index d1e185a6c5f..00aea1f076b 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/inlinecolumn/ComputeInlineSizeTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/database/inlinecolumn/ComputeInlineSizeTest.java
@@ -41,8 +41,6 @@ import org.apache.ignite.internal.cache.query.index.sorted.inline.types.ShortInl
 import org.apache.ignite.internal.cache.query.index.sorted.inline.types.TimeInlineIndexKeyType;
 import org.apache.ignite.internal.cache.query.index.sorted.inline.types.TimestampInlineIndexKeyType;
 import org.apache.ignite.internal.cache.query.index.sorted.inline.types.UuidInlineIndexKeyType;
-import org.apache.ignite.internal.processors.cache.GridCacheContext;
-import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
 import org.apache.ignite.internal.processors.cache.index.AbstractIndexingCommonTest;
 import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
 import org.apache.ignite.internal.util.typedef.F;
@@ -164,7 +162,7 @@ public class ComputeInlineSizeTest extends AbstractIndexingCommonTest {
 
     /** */
     private void checkIdxsInlineSizes() {
-        Collection<Index> idx = ignite.context().indexProcessor().indexes(context());
+        Collection<Index> idx = ignite.context().indexProcessor().indexes(CACHE);
 
         Map<String, Integer> expInlineSize = new HashMap<>();
 
@@ -199,13 +197,6 @@ public class ComputeInlineSizeTest extends AbstractIndexingCommonTest {
         ignite.context().query().querySqlFields(new SqlFieldsQuery(qry), false, false);
     }
 
-    /** */
-    private GridCacheContext<Long, Person> context() {
-        IgniteInternalCache<Long, Person> c = ignite.cachex(CACHE);
-
-        return c.context();
-    }
-
     /** */
     public static class Person {
         /** */