You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/01/12 09:58:33 UTC
ignite git commit: Tree meta page.
Repository: ignite
Updated Branches:
refs/heads/ignite-gg-11810-1 [created] cc32779c5
Tree meta page.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cc32779c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cc32779c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cc32779c
Branch: refs/heads/ignite-gg-11810-1
Commit: cc32779c534ee4b9fa5b93ac3a0896dc54f187e7
Parents: c1d5081
Author: sboikov <sb...@gridgain.com>
Authored: Thu Jan 12 12:58:35 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jan 12 12:58:35 2017 +0300
----------------------------------------------------------------------
.../cache/IgniteCacheOffheapManagerImpl.java | 6 +-
.../cache/database/MetadataStorage.java | 3 +-
.../cache/database/tree/BPlusTree.java | 199 +++++++++++--------
.../cache/database/tree/io/BPlusMetaIO.java | 2 +-
.../processors/database/BPlusTreeSelfTest.java | 2 +-
.../processors/query/h2/database/H2Tree.java | 3 +-
6 files changed, 120 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc32779c/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 e9a7b8e..3352000 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
@@ -1165,8 +1165,7 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple
this.rowStore = rowStore;
this.cctx = cctx;
- if (initNew)
- initNew();
+ initTree(initNew);
}
/** {@inheritDoc} */
@@ -1444,8 +1443,7 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter imple
this.cctx = cctx;
- if (initNew)
- initNew();
+ initTree(initNew);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc32779c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/MetadataStorage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/MetadataStorage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/MetadataStorage.java
index 6d7b60c..faf7608 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/MetadataStorage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/MetadataStorage.java
@@ -181,8 +181,7 @@ public class MetadataStorage implements MetaStore {
this.allocPartId = allocPartId;
this.allocSpace = allocSpace;
- if (initNew)
- initNew();
+ initTree(initNew);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc32779c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
index e91dda9..b77ea50 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
@@ -54,7 +54,9 @@ import org.apache.ignite.internal.processors.cache.database.tree.io.PageIO;
import org.apache.ignite.internal.processors.cache.database.tree.reuse.ReuseBag;
import org.apache.ignite.internal.processors.cache.database.tree.reuse.ReuseList;
import org.apache.ignite.internal.processors.cache.database.tree.util.PageHandler;
-import org.apache.ignite.internal.util.*;
+import org.apache.ignite.internal.util.GridArrays;
+import org.apache.ignite.internal.util.GridLongList;
+import org.apache.ignite.internal.util.IgniteTree;
import org.apache.ignite.internal.util.lang.GridCursor;
import org.apache.ignite.internal.util.lang.GridTreePrinter;
import org.apache.ignite.internal.util.typedef.F;
@@ -104,6 +106,9 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
private final long metaPageId;
/** */
+ private volatile TreeMetaData treeMeta;
+
+ /** */
private final boolean canGetRowFromInner;
/** */
@@ -248,7 +253,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
return NOT_FOUND;
}
- assert !io.isLeaf();
+ assert !io.isLeaf() : io;
// If idx == cnt then we go right down, else left down: getLeft(cnt) == getRight(cnt - 1).
g.pageId = inner(io).getLeft(pageAddr, idx);
@@ -531,6 +536,12 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
if (needWalDeltaRecord(meta))
wal.log(new MetaPageCutRootRecord(cacheId, meta.id()));
+ int newLvl = lvl - 1;
+
+ assert io.getRootLevel(pageAddr) == newLvl;
+
+ treeMeta = new TreeMetaData(newLvl, io.getFirstPageId(pageAddr, newLvl));
+
return TRUE;
}
};
@@ -551,6 +562,11 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
if (needWalDeltaRecord(meta))
wal.log(new MetaPageAddRootRecord(cacheId, meta.id(), rootPageId));
+ assert io.getRootLevel(pageAddr) == lvl;
+ assert io.getFirstPageId(pageAddr, lvl) == rootPageId;
+
+ treeMeta = new TreeMetaData(lvl, rootPageId);
+
return TRUE;
}
};
@@ -569,6 +585,11 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
if (needWalDeltaRecord(meta))
wal.log(new MetaPageInitRootRecord(cacheId, meta.id(), rootId));
+ assert io.getRootLevel(pageAddr) == 0;
+ assert io.getFirstPageId(pageAddr, 0) == rootId;
+
+ treeMeta = new TreeMetaData(0, rootId);
+
return TRUE;
}
};
@@ -633,39 +654,58 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
}
/**
- * Initialize new index.
+ * Initialize new tree.
*
+ * @param initNew {@code True} if new tree should be created.
* @throws IgniteCheckedException If failed.
*/
- protected final void initNew() throws IgniteCheckedException {
- // Allocate the first leaf page, it will be our root.
- long rootId = allocatePage(null);
+ protected final void initTree(boolean initNew) throws IgniteCheckedException {
+ if (initNew) {
+ // Allocate the first leaf page, it will be our root.
+ long rootId = allocatePage(null);
+
+ try (Page root = page(rootId)) {
+ initPage(pageMem, root, this, latestLeafIO(), wal);
+ }
+
+ // Initialize meta page with new root page.
+ try (Page meta = page(metaPageId)) {
+ Bool res = writePage(pageMem, meta, this, initRoot, BPlusMetaIO.VERSIONS.latest(), wal, rootId, 0, FALSE);
- try (Page root = page(rootId)) {
- initPage(pageMem, root, this, latestLeafIO(), wal);
+ assert res == TRUE: res;
+ }
}
+ else {
+ try (Page meta = page(metaPageId)) {
+ long pageAddr = readLock(meta); // Meta can't be removed.
- // Initialize meta page with new root page.
- try (Page meta = page(metaPageId)) {
- Bool res = writePage(pageMem, meta, this, initRoot, BPlusMetaIO.VERSIONS.latest(), wal, rootId, 0, FALSE);
+ assert pageAddr != 0 : "Failed to read lock meta page [page=" + meta + ", metaPageId=" +
+ U.hexLong(metaPageId) + ']';
+
+ try {
+ BPlusMetaIO io = BPlusMetaIO.VERSIONS.forPage(pageAddr);
+
+ int rootLvl = io.getRootLevel(pageAddr);
+ long rootId = io.getFirstPageId(pageAddr, rootLvl);
- assert res == TRUE: res;
+ treeMeta = new TreeMetaData(rootLvl, rootId);
+ }
+ finally {
+ readUnlock(meta, pageAddr);
+ }
+ }
}
}
/**
- * @param meta Meta page.
* @return Root level.
*/
- private int getRootLevel(Page meta) {
- long pageAddr = readLock(meta); // Meta can't be removed.
+ private int getRootLevel() {
+ TreeMetaData meta0 = treeMeta;
- try {
- return BPlusMetaIO.VERSIONS.forPage(pageAddr).getRootLevel(pageAddr);
- }
- finally {
- readUnlock(meta, pageAddr);
- }
+ assert meta0 != null;
+
+ return meta0.rootLvl;
}
/**
@@ -790,25 +830,20 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
* @throws IgniteCheckedException If failed.
*/
private void doFind(Get g) throws IgniteCheckedException {
- try {
- for (;;) { // Go down with retries.
- g.init();
+ for (;;) { // Go down with retries.
+ g.init();
- switch (findDown(g, g.rootId, 0L, g.rootLvl)) {
- case RETRY:
- case RETRY_ROOT:
- checkInterrupted();
+ switch (findDown(g, g.rootId, 0L, g.rootLvl)) {
+ case RETRY:
+ case RETRY_ROOT:
+ checkInterrupted();
- continue;
+ continue;
- default:
- return;
- }
+ default:
+ return;
}
}
- finally {
- g.releaseMeta();
- }
}
/**
@@ -904,7 +939,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
int rootLvl;
try (Page meta = page(metaPageId)) {
- rootLvl = getRootLevel(meta);
+ rootLvl = getRootLevel();
if (rootLvl < 0)
fail("Root level: " + rootLvl);
@@ -1096,7 +1131,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
fail("Negative count: " + cnt);
if (io.isLeaf()) {
- if (cnt == 0 && getRootLevel(meta) != 0)
+ if (cnt == 0 && getRootLevel() != 0)
fail("Empty leaf page.");
}
else {
@@ -1290,7 +1325,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
// If not found, then the tree grew beyond our call stack -> retry from the actual root.
if (res == RETRY || res == NOT_FOUND) {
- int root = getRootLevel(r.meta);
+ int root = getRootLevel();
boolean checkRes = r.checkTailLevel(root);
@@ -1321,7 +1356,6 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
}
finally {
r.releaseTail();
- r.releaseMeta();
r.reuseFreePages();
}
@@ -1466,9 +1500,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
public final int rootLevel() throws IgniteCheckedException {
checkDestroyed();
- try (Page meta = page(metaPageId)) {
- return getRootLevel(meta);
- }
+ return getRootLevel();
}
/**
@@ -1551,7 +1583,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
// It must be impossible to have an insert higher than the current root,
// because we are making decision about creating new root while keeping
// write lock on current root, so it can't concurrently change.
- assert p.btmLvl <= getRootLevel(p.meta);
+ assert p.btmLvl <= getRootLevel();
checkInterrupted();
@@ -1574,9 +1606,6 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
catch (AssertionError e) {
throw new AssertionError("Assertion error on row: " + row, e);
}
- finally {
- p.releaseMeta();
- }
}
/**
@@ -1898,9 +1927,6 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
/** Starting point root ID. May be outdated. Must be modified only in {@link Get#init()}. */
protected long rootId;
- /** Meta page. Initialized by {@link Get#init()}, released by {@link Get#releaseMeta()}. */
- protected Page meta;
-
/** */
protected L row;
@@ -1928,31 +1954,15 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
/**
* Initialize operation.
*
- * !!! Symmetrically with this method must be called {@link Get#releaseMeta()} in {@code finally} block.
- *
* @throws IgniteCheckedException If failed.
*/
final void init() throws IgniteCheckedException {
- if (meta == null)
- meta = page(metaPageId);
-
- int rootLvl;
- long rootId;
-
- long pageAddr = readLock(meta); // Meta can't be removed.
+ TreeMetaData meta0 = treeMeta;
- assert pageAddr != 0 : "Failed to read lock meta page [page=" + meta + ", metaPageId=" +
- U.hexLong(metaPageId) + ']';
-
- try {
- BPlusMetaIO io = BPlusMetaIO.VERSIONS.forPage(pageAddr);
+ assert meta0 != null;
- rootLvl = io.getRootLevel(pageAddr);
- rootId = io.getFirstPageId(pageAddr, rootLvl);
- }
- finally {
- readUnlock(meta, pageAddr);
- }
+ rootLvl = meta0.rootLvl;
+ rootId = meta0.rootId;
restartFromRoot(rootId, rootLvl, globalRmvId.get());
}
@@ -1997,16 +2007,6 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
}
/**
- * Release meta page.
- */
- final void releaseMeta() {
- if (meta != null) {
- meta.close();
- meta = null;
- }
- }
-
- /**
* @param page Page.
* @param lvl Level.
* @return {@code true} If we can release the given page.
@@ -2269,7 +2269,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
wal.log(new FixCountRecord(cacheId, page.id(), cnt - 1));
}
- if (!hadFwd && lvl == getRootLevel(meta)) { // We are splitting root.
+ if (!hadFwd && lvl == getRootLevel()) { // We are splitting root.
long newRootId = allocatePage(bag);
try (Page newRoot = page(newRootId)) {
@@ -2303,9 +2303,11 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
}
}
- Bool res = writePage(pageMem, meta, BPlusTree.this, addRoot, newRootId, lvl + 1, FALSE);
+ try (Page meta = page(metaPageId)) {
+ Bool res = writePage(pageMem, meta, BPlusTree.this, addRoot, newRootId, lvl + 1, FALSE);
- assert res == TRUE: res;
+ assert res == TRUE : res;
+ }
return null; // We've just moved link up to root, nothing to return here.
}
@@ -2624,7 +2626,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
assert needReplaceInner != TRUE;
- if (tail.getCount() == 0 && tail.lvl != 0 && getRootLevel(meta) == tail.lvl) {
+ if (tail.getCount() == 0 && tail.lvl != 0 && getRootLevel() == tail.lvl) {
// Free root if it became empty after merge.
cutRoot(tail.lvl);
freePage(tail.page, tail.buf, false);
@@ -2995,9 +2997,11 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
* @throws IgniteCheckedException If failed.
*/
private void cutRoot(int lvl) throws IgniteCheckedException {
- Bool res = writePage(pageMem, meta, BPlusTree.this, cutRoot, null, lvl, FALSE);
+ try (Page meta = page(metaPageId)) {
+ Bool res = writePage(pageMem, meta, BPlusTree.this, cutRoot, null, lvl, FALSE);
- assert res == TRUE: res;
+ assert res == TRUE : res;
+ }
}
/**
@@ -3781,6 +3785,31 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
}
/**
+ *
+ */
+ private static class TreeMetaData {
+ /** */
+ final int rootLvl;
+
+ /** */
+ final long rootId;
+
+ /**
+ * @param rootLvl Root level.
+ * @param rootId Root page ID.
+ */
+ TreeMetaData(int rootLvl, long rootId) {
+ this.rootLvl = rootLvl;
+ this.rootId = rootId;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(TreeMetaData.class, this);
+ }
+ }
+
+ /**
* Operation result.
*/
enum Result {
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc32779c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusMetaIO.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusMetaIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusMetaIO.java
index 5925547..8850863 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusMetaIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusMetaIO.java
@@ -104,7 +104,7 @@ public class BPlusMetaIO extends PageIO {
* @param pageId Page ID.
*/
private void setFirstPageId(long pageAddr, int lvl, long pageId) {
- assert lvl >= 0 && lvl < getLevelsCount(pageAddr);
+ assert lvl >= 0 && lvl < getLevelsCount(pageAddr) : lvl;
PageUtils.putLong(pageAddr, offset(lvl), pageId);
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc32779c/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
index b683fd5..2d9c693 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/BPlusTreeSelfTest.java
@@ -1228,7 +1228,7 @@ public class BPlusTreeSelfTest extends GridCommonAbstractTest {
PageIO.registerTest(latestInnerIO(), latestLeafIO());
- initNew();
+ initTree(true);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc32779c/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2Tree.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2Tree.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2Tree.java
index 5c60b16..19e05ed 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2Tree.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2Tree.java
@@ -63,8 +63,7 @@ public abstract class H2Tree extends BPlusTree<SearchRow, GridH2Row> {
this.rowStore = rowStore;
- if (initNew)
- initNew();
+ initTree(initNew);
}
/**