Repository: ignite Updated Branches: refs/heads/ignite-5932 f8180b259 -> 7049fe5af
ignite-5932 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7049fe5a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7049fe5a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7049fe5a Branch: refs/heads/ignite-5932 Commit: 7049fe5af798d2b75e841b23b215c1a92d3bf870 Parents: f8180b2 Author: sboikov <sboi...@gridgain.com> Authored: Mon Oct 16 11:42:06 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Oct 16 11:42:06 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/IgniteCacheOffheapManagerImpl.java | 2 +- .../processors/cache/tree/AbstractDataInnerIO.java | 11 +++++++---- .../processors/cache/tree/AbstractDataLeafIO.java | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7049fe5a/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 5213f27..246827a 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 @@ -1630,7 +1630,7 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager while (cur.next()) { CacheDataRow row = cur.get(); - assert row.link() != 0; + assert row.link() != 0 : row; boolean rmvd = dataTree.removex(row); http://git-wip-us.apache.org/repos/asf/ignite/blob/7049fe5a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java index fc82cbb..31aa2ca 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java @@ -81,6 +81,9 @@ public abstract class AbstractDataInnerIO extends BPlusInnerIO<CacheSearchRow> i long mvccTopVer = getMvccCoordinatorVersion(pageAddr, idx); long mvccCntr = getMvccCounter(pageAddr, idx); + assert unmaskCoordinatorVersion(mvccTopVer) > 0 : mvccTopVer; + assert mvccCntr != COUNTER_NA; + return ((CacheDataTree)tree).rowStore().mvccRow(cacheId, hash, link, @@ -122,15 +125,15 @@ public abstract class AbstractDataInnerIO extends BPlusInnerIO<CacheSearchRow> i if (storeMvccVersion()) { long mvccTopVer = rowIo.getMvccCoordinatorVersion(srcPageAddr, srcIdx); - long mvcCntr = rowIo.getMvccCounter(srcPageAddr, srcIdx); + long mvccCntr = rowIo.getMvccCounter(srcPageAddr, srcIdx); - assert mvccTopVer > 0 : mvccTopVer; - assert mvcCntr != COUNTER_NA; + assert unmaskCoordinatorVersion(mvccTopVer) > 0 : mvccTopVer; + assert mvccCntr != COUNTER_NA; PageUtils.putLong(dstPageAddr, off, mvccTopVer); off += 8; - PageUtils.putLong(dstPageAddr, off, mvcCntr); + PageUtils.putLong(dstPageAddr, off, mvccCntr); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/7049fe5a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataLeafIO.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataLeafIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataLeafIO.java index c956d22..47d8a6f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataLeafIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataLeafIO.java @@ -99,7 +99,7 @@ public abstract class AbstractDataLeafIO extends BPlusLeafIO<CacheSearchRow> imp long mvccUpdateTopVer = ((RowLinkIO)srcIo).getMvccCoordinatorVersion(srcPageAddr, srcIdx); long mvccUpdateCntr = ((RowLinkIO)srcIo).getMvccCounter(srcPageAddr, srcIdx); - assert mvccUpdateTopVer >=0 : mvccUpdateCntr; + assert unmaskCoordinatorVersion(mvccUpdateTopVer) > 0 : mvccUpdateCntr; assert mvccUpdateCntr != COUNTER_NA; PageUtils.putLong(dstPageAddr, off, mvccUpdateTopVer);
