ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [28/50] ignite git commit: ignite-db - more fixes
Date Thu, 28 Apr 2016 08:52:58 GMT
ignite-db - more fixes


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/92e53151
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/92e53151
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/92e53151

Branch: refs/heads/ignite-db-x-10884
Commit: 92e53151f1e8d71aa950011aaa5a08317058fb67
Parents: a11f9f0
Author: S.Vladykin <svladykin@gridgain.com>
Authored: Tue Apr 26 07:29:21 2016 +0300
Committer: S.Vladykin <svladykin@gridgain.com>
Committed: Tue Apr 26 07:29:21 2016 +0300

----------------------------------------------------------------------
 .../processors/cache/database/tree/BPlusTree.java       | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/92e53151/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 eb91602..6173d72 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
@@ -414,13 +414,15 @@ public abstract class BPlusTree<L, T extends L> {
             boolean found = idx >= 0;
 
             if (found) {
-                // We can not miss the inner value on down move because of `triangle` invariant,
thus it must be TRUE.
-                assert r.needReplaceInner == TRUE: r.needReplaceInner;
-                assert idx <= Short.MAX_VALUE : idx;
+                if (io.canGetRow()) {
+                    // We can not miss the inner value on down move because of `triangle`
invariant, thus it must be TRUE.
+                    assert r.needReplaceInner == TRUE : r.needReplaceInner;
+                    assert idx <= Short.MAX_VALUE : idx;
 
-                r.innerIdx = (short)idx;
+                    r.innerIdx = (short)idx;
 
-                r.needReplaceInner = READY;
+                    r.needReplaceInner = READY;
+                }
             }
             else {
                 idx = -idx - 1;


Mime
View raw message