Minors.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/48601580 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/48601580 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/48601580 Branch: refs/heads/ignite-10291 Commit: 48601580e0a87bf2c5c759f736fce3543a5e105c Parents: 898e82a Author: devozerov <[email protected]> Authored: Wed Nov 28 15:29:37 2018 +0300 Committer: devozerov <[email protected]> Committed: Wed Nov 28 15:29:37 2018 +0300 ---------------------------------------------------------------------- .../processors/cache/IgniteCacheOffheapManagerImpl.java | 3 ++- .../processors/cache/persistence/GridCacheOffheapManager.java | 3 ++- .../testframework/junits/common/GridCommonAbstractTest.java | 2 +- .../ignite/internal/processors/query/h2/IgniteH2Indexing.java | 7 +++---- 4 files changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/48601580/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java index eeae562..7a91563 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java @@ -1154,7 +1154,8 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager } /** {@inheritDoc} */ - @Override public boolean rootPageForIndexExists(int cacheId, String idxName, int segment) { + @Override public boolean rootPageForIndexExists(int cacheId, String idxName, int segment) + throws IgniteCheckedException { assert false : "Should not be called in in-memory mode."; return false; http://git-wip-us.apache.org/repos/asf/ignite/blob/48601580/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java index 73bf50a..b807342 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java @@ -846,7 +846,8 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple } /** {@inheritDoc} */ - @Override public boolean rootPageForIndexExists(int cacheId, String idxName, int segment) { + @Override public boolean rootPageForIndexExists(int cacheId, String idxName, int segment) + throws IgniteCheckedException { return indexStorage.cacheIndexExists(cacheId, idxName, segment); } http://git-wip-us.apache.org/repos/asf/ignite/blob/48601580/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java index c931a0d..883dca7 100755 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java @@ -1725,7 +1725,7 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { /** * */ - protected void cleanPersistenceDir() throws Exception { + protected static void cleanPersistenceDir() throws Exception { assertTrue("Grids are not stopped", F.isEmpty(G.allGrids())); U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), "cp", false)); http://git-wip-us.apache.org/repos/asf/ignite/blob/48601580/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index 6582516..9dc15e6 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@ -2717,14 +2717,14 @@ public class IgniteH2Indexing implements GridQueryIndexing { // Closure prepared, do rebuild. final GridWorkerFuture<?> fut = new GridWorkerFuture<>(); - markIndexRebuild(cctx.name(), clo, true); + markIndexRebuild(cctx.name(), true); GridWorker worker = new GridWorker(ctx.igniteInstanceName(), "index-rebuild-worker-" + cctx.name(), log) { @Override protected void body() { try { rebuildIndexesFromHash0(cctx, clo); - markIndexRebuild(cctx.name(), clo, false); + markIndexRebuild(cctx.name(), false); fut.onDone(); } @@ -2768,11 +2768,10 @@ public class IgniteH2Indexing implements GridQueryIndexing { * @param cacheName Cache name. * @param val Value. */ - private void markIndexRebuild(String cacheName, IndexRebuildClosure clo, boolean val) { + private void markIndexRebuild(String cacheName, boolean val) { for (H2TableDescriptor tblDesc : tables(cacheName)) { assert tblDesc.table() != null; - // TODO: Mark only some indexes. tblDesc.table().markRebuildFromHashInProgress(val); } }
