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/02/01 11:26:12 UTC
[1/2] ignite git commit: ignite-3477 Do not use anonymous classes.
Repository: ignite
Updated Branches:
refs/heads/ignite-3477 954d01734 -> 423408f29
ignite-3477 Do not use anonymous classes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/051b3904
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/051b3904
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/051b3904
Branch: refs/heads/ignite-3477
Commit: 051b3904695c20c219493f8d2821c57e8ec11459
Parents: 587a05e
Author: sboikov <sb...@gridgain.com>
Authored: Wed Feb 1 14:11:22 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Feb 1 14:11:22 2017 +0300
----------------------------------------------------------------------
.../cache/database/freelist/PagesList.java | 8 +-
.../cache/database/tree/BPlusTree.java | 98 +++++++++++++++++---
2 files changed, 92 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/051b3904/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/PagesList.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/PagesList.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/PagesList.java
index 6ad976e..48e0eb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/PagesList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/freelist/PagesList.java
@@ -84,7 +84,13 @@ public abstract class PagesList extends DataStructure {
protected final String name;
/** */
- private final PageHandler<Void, Boolean> cutTail = new PageHandler<Void, Boolean>() {
+ private final PageHandler<Void, Boolean> cutTail = new CutTail();
+
+ /**
+ *
+ */
+ private class CutTail extends PageHandler<Void, Boolean> {
+ /** {@inheritDoc} */
@Override public Boolean run(Page page, PageIO pageIo, long pageAddr, Void ignore, int bucket)
throws IgniteCheckedException {
assert getPageId(pageAddr) == page.id();
http://git-wip-us.apache.org/repos/asf/ignite/blob/051b3904/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 07829bf..a0dff8c 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
@@ -209,7 +209,13 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
};
/** */
- private final GetPageHandler<Get> askNeighbor = new GetPageHandler<Get>() {
+ private final GetPageHandler<Get> askNeighbor = new AskNeighbor();
+
+ /**
+ *
+ */
+ private class AskNeighbor extends GetPageHandler<Get> {
+ /** {@inheritDoc} */
@Override public Result run0(Page page, long pageAddr, BPlusIO<L> io, Get g, int isBack) {
assert !io.isLeaf(); // Inner page.
@@ -236,7 +242,13 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
};
/** */
- private final GetPageHandler<Get> search = new GetPageHandler<Get>() {
+ private final GetPageHandler<Get> search = new Search();
+
+ /**
+ *
+ */
+ private class Search extends GetPageHandler<Get> {
+ /** {@inheritDoc} */
@Override public Result run0(Page page, long pageAddr, BPlusIO<L> io, Get g, int lvl)
throws IgniteCheckedException {
// Check the triangle invariant.
@@ -312,9 +324,15 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
};
/** */
- private final GetPageHandler<Put> replace = new GetPageHandler<Put>() {
+ private final GetPageHandler<Put> replace = new Replace();
+
+ /**
+ *
+ */
+ private class Replace extends GetPageHandler<Put> {
+ /** {@inheritDoc} */
@Override public Result run0(Page page, long pageAddr, BPlusIO<L> io, Put p, int lvl)
- throws IgniteCheckedException {
+ throws IgniteCheckedException {
// Check the triangle invariant.
if (io.getForward(pageAddr) != p.fwdId)
return RETRY;
@@ -354,7 +372,13 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
};
/** */
- private final GetPageHandler<Put> insert = new GetPageHandler<Put>() {
+ private final GetPageHandler<Put> insert = new Insert();
+
+ /**
+ *
+ */
+ private class Insert extends GetPageHandler<Put> {
+ /** {@inheritDoc} */
@Override public Result run0(Page page, long pageAddr, BPlusIO<L> io, Put p, int lvl)
throws IgniteCheckedException {
assert p.btmLvl == lvl : "we must always insert at the bottom level: " + p.btmLvl + " " + lvl;
@@ -394,7 +418,13 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
};
/** */
- private final GetPageHandler<Remove> rmvFromLeaf = new GetPageHandler<Remove>() {
+ private final GetPageHandler<Remove> rmvFromLeaf = new RemoveFromLeaf();
+
+ /**
+ *
+ */
+ private class RemoveFromLeaf extends GetPageHandler<Remove> {
+ /** {@inheritDoc} */
@Override public Result run0(Page leaf, long pageAddr, BPlusIO<L> io, Remove r, int lvl)
throws IgniteCheckedException {
assert lvl == 0 : lvl; // Leaf.
@@ -466,7 +496,13 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
};
/** */
- private final GetPageHandler<Remove> lockBackAndRmvFromLeaf = new GetPageHandler<Remove>() {
+ private final GetPageHandler<Remove> lockBackAndRmvFromLeaf = new LockBackAndRmvFromLeaf();
+
+ /**
+ *
+ */
+ private class LockBackAndRmvFromLeaf extends GetPageHandler<Remove> {
+ /** {@inheritDoc} */
@Override protected Result run0(Page back, long pageAddr, BPlusIO<L> io, Remove r, int lvl)
throws IgniteCheckedException {
// Check that we have consistent view of the world.
@@ -485,7 +521,13 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
};
/** */
- private final GetPageHandler<Remove> lockBackAndTail = new GetPageHandler<Remove>() {
+ private final GetPageHandler<Remove> lockBackAndTail = new LockBackAndTail();
+
+ /**
+ *
+ */
+ private class LockBackAndTail extends GetPageHandler<Remove> {
+ /** {@inheritDoc} */
@Override public Result run0(Page back, long pageAddr, BPlusIO<L> io, Remove r, int lvl)
throws IgniteCheckedException {
// Check that we have consistent view of the world.
@@ -503,7 +545,13 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
};
/** */
- private final GetPageHandler<Remove> lockTailForward = new GetPageHandler<Remove>() {
+ private final GetPageHandler<Remove> lockTailForward = new LockTailForward();
+
+ /**
+ *
+ */
+ private class LockTailForward extends GetPageHandler<Remove> {
+ /** {@inheritDoc} */
@Override protected Result run0(Page page, long pageAddr, BPlusIO<L> io, Remove r, int lvl)
throws IgniteCheckedException {
r.addTail(page, pageAddr, io, lvl, Tail.FORWARD);
@@ -513,7 +561,13 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
};
/** */
- private final GetPageHandler<Remove> lockTail = new GetPageHandler<Remove>() {
+ private final GetPageHandler<Remove> lockTail = new LockTail();
+
+ /**
+ *
+ */
+ private class LockTail extends GetPageHandler<Remove> {
+ /** {@inheritDoc} */
@Override public Result run0(Page page, long pageAddr, BPlusIO<L> io, Remove r, int lvl)
throws IgniteCheckedException {
assert lvl > 0 : lvl; // We are not at the bottom.
@@ -537,7 +591,13 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
};
/** */
- private final PageHandler<Void, Bool> cutRoot = new PageHandler<Void, Bool>() {
+ private final PageHandler<Void, Bool> cutRoot = new CutRoot();
+
+ /**
+ *
+ */
+ private class CutRoot extends PageHandler<Void, Bool> {
+ /** {@inheritDoc} */
@Override public Bool run(Page meta, PageIO iox, long pageAddr, Void ignore, int lvl)
throws IgniteCheckedException {
// Safe cast because we should never recycle meta page until the tree is destroyed.
@@ -561,7 +621,13 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
};
/** */
- private final PageHandler<Long, Bool> addRoot = new PageHandler<Long, Bool>() {
+ private final PageHandler<Long, Bool> addRoot = new AddRoot();
+
+ /**
+ *
+ */
+ private class AddRoot extends PageHandler<Long, Bool> {
+ /** {@inheritDoc} */
@Override public Bool run(Page meta, PageIO iox, long pageAddr, Long rootPageId, int lvl)
throws IgniteCheckedException {
assert rootPageId != null;
@@ -586,7 +652,13 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
};
/** */
- private final PageHandler<Long, Bool> initRoot = new PageHandler<Long, Bool>() {
+ private final PageHandler<Long, Bool> initRoot = new InitRoot();
+
+ /**
+ *
+ */
+ private class InitRoot extends PageHandler<Long, Bool> {
+ /** {@inheritDoc} */
@Override public Bool run(Page meta, PageIO iox, long pageAddr, Long rootId, int lvl)
throws IgniteCheckedException {
assert rootId != null;
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-3477' into ignite-3477
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/ignite-3477' into ignite-3477
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/423408f2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/423408f2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/423408f2
Branch: refs/heads/ignite-3477
Commit: 423408f298b27ab19acee08553c5f9b39cc6ded8
Parents: 051b390 954d017
Author: sboikov <sb...@gridgain.com>
Authored: Wed Feb 1 14:25:31 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Feb 1 14:25:31 2017 +0300
----------------------------------------------------------------------
.../dht/preloader/GridDhtPartitionDemander.java | 58 ++++---
.../ignite/internal/util/IgniteUtils.java | 16 ++
.../near/IgniteCacheNearOnlyTxTest.java | 3 +-
...ContinuousQueryFailoverAbstractSelfTest.java | 14 +-
.../TxOptimisticDeadlockDetectionTest.java | 12 +-
.../junits/common/GridCommonAbstractTest.java | 170 ++++++++++++++++---
6 files changed, 217 insertions(+), 56 deletions(-)
----------------------------------------------------------------------