Repository: ignite Updated Branches: refs/heads/ignite-10291 8a2a8610a -> d0c2ee7a0
Removed "exists". Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7749dc7e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7749dc7e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7749dc7e Branch: refs/heads/ignite-10291 Commit: 7749dc7e34ffadfeee43d79e4098fdbe8085ddeb Parents: 8a2a861 Author: devozerov <[email protected]> Authored: Wed Nov 28 17:00:15 2018 +0300 Committer: devozerov <[email protected]> Committed: Wed Nov 28 17:00:15 2018 +0300 ---------------------------------------------------------------------- .../processors/cache/IgniteCacheOffheapManager.java | 11 ----------- .../processors/cache/IgniteCacheOffheapManagerImpl.java | 8 -------- .../cache/persistence/GridCacheOffheapManager.java | 6 ------ .../processors/cache/persistence/IndexStorage.java | 11 ----------- .../processors/cache/persistence/IndexStorageImpl.java | 12 ------------ .../processors/query/h2/database/H2TreeIndex.java | 12 ------------ 6 files changed, 60 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7749dc7e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java index 409d387..ed3697a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java @@ -602,17 +602,6 @@ public interface IgniteCacheOffheapManager { public void dropRootPageForIndex(int cacheId, String idxName, int segment) throws IgniteCheckedException; /** - * Check if index root page exists. - * - * @param cacheId Cache ID. - * @param idxName Index name. - * @param segment Segment. - * @return {@code True} if exists. - * @throws IgniteCheckedException If failed. - */ - public boolean rootPageForIndexExists(int cacheId, String idxName, int segment) throws IgniteCheckedException; - - /** * @param idxName Index name. * @return Reuse list for index tree. * @throws IgniteCheckedException If failed. http://git-wip-us.apache.org/repos/asf/ignite/blob/7749dc7e/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 7a91563..ca14f68 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,14 +1154,6 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager } /** {@inheritDoc} */ - @Override public boolean rootPageForIndexExists(int cacheId, String idxName, int segment) - throws IgniteCheckedException { - assert false : "Should not be called in in-memory mode."; - - return false; - } - - /** {@inheritDoc} */ @Override public ReuseList reuseListForIndex(String idxName) { return grp.reuseList(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/7749dc7e/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 b807342..e1bd8dd 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,12 +846,6 @@ public class GridCacheOffheapManager extends IgniteCacheOffheapManagerImpl imple } /** {@inheritDoc} */ - @Override public boolean rootPageForIndexExists(int cacheId, String idxName, int segment) - throws IgniteCheckedException { - return indexStorage.cacheIndexExists(cacheId, idxName, segment); - } - - /** {@inheritDoc} */ @Override public ReuseList reuseListForIndex(String idxName) { return reuseList; } http://git-wip-us.apache.org/repos/asf/ignite/blob/7749dc7e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IndexStorage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IndexStorage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IndexStorage.java index 1e656ef..295ff00 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IndexStorage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IndexStorage.java @@ -65,17 +65,6 @@ public interface IndexStorage { public RootPage dropIndex(String idxName) throws IgniteCheckedException; /** - * Check if cache index exists. - * - * @param cacheId Cache ID. - * @param idxName Index name. - * @param segment Segment. - * @return {@code True} if exists. - * @throws IgniteCheckedException If failed. - */ - public boolean cacheIndexExists(Integer cacheId, String idxName, int segment) throws IgniteCheckedException; - - /** * Destroy this meta store. * * @throws IgniteCheckedException If failed. http://git-wip-us.apache.org/repos/asf/ignite/blob/7749dc7e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IndexStorageImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IndexStorageImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IndexStorageImpl.java index 4235cae..059d32f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IndexStorageImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IndexStorageImpl.java @@ -167,18 +167,6 @@ public class IndexStorageImpl implements IndexStorage { } /** {@inheritDoc} */ - @Override public boolean cacheIndexExists(Integer cacheId, String idxName, int segment) - throws IgniteCheckedException { - String maskedIdxName = maskCacheIndexName(cacheId, idxName, segment); - - byte[] idxNameBytes = maskedIdxName.getBytes(StandardCharsets.UTF_8); - - IndexItem row = metaTree.findOne(new IndexItem(idxNameBytes, 0)); - - return row != null; - } - - /** {@inheritDoc} */ @Override public void destroy() throws IgniteCheckedException { metaTree.destroy(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/7749dc7e/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java index 25a5c61..c5e8823 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java @@ -566,18 +566,6 @@ public class H2TreeIndex extends GridH2IndexBase { cctx.offheap().dropRootPageForIndex(cctx.cacheId(), treeName, segIdx); } - /** - * Check if index meta page exists. - * - * @param segIdx Segment index. - * @return {@code True} if exists. - * @throws IgniteCheckedException If failed. - */ - // TODO: Remove? - private boolean metaPageExists(int segIdx) throws IgniteCheckedException { - return cctx.offheap().rootPageForIndexExists(cctx.cacheId(), treeName, segIdx); - } - /** {@inheritDoc} */ @Override public void refreshColumnIds() { super.refreshColumnIds();
