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/09/08 12:35:50 UTC
[18/36] ignite git commit: Merge branch 'ignite-3478' into ignite-3484
Merge branch 'ignite-3478' into ignite-3484
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bc9134c9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bc9134c9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bc9134c9
Branch: refs/heads/ignite-6149
Commit: bc9134c94b7a738dc1664e96ca6eabb059f1c268
Parents: cbada39 5a82c68
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 5 15:03:39 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 5 15:03:39 2017 +0300
----------------------------------------------------------------------
.../processors/cache/IgniteCacheOffheapManagerImpl.java | 2 +-
.../internal/processors/cache/tree/AbstractDataInnerIO.java | 7 ++++---
.../internal/processors/cache/tree/AbstractDataLeafIO.java | 8 ++++----
.../processors/cache/tree/AbstractPendingEntryInnerIO.java | 8 ++++----
.../processors/cache/tree/AbstractPendingEntryLeafIO.java | 8 ++++----
.../internal/processors/cache/tree/CacheDataRowStore.java | 6 +++---
.../ignite/internal/processors/cache/tree/CacheDataTree.java | 3 ++-
.../processors/cache/tree/CacheIdAwareDataInnerIO.java | 4 ++--
.../processors/cache/tree/CacheIdAwareDataLeafIO.java | 4 ++--
.../cache/tree/CacheIdAwarePendingEntryInnerIO.java | 4 ++--
.../cache/tree/CacheIdAwarePendingEntryLeafIO.java | 4 ++--
.../ignite/internal/processors/cache/tree/DataInnerIO.java | 8 ++++----
.../ignite/internal/processors/cache/tree/DataLeafIO.java | 8 ++++----
.../ignite/internal/processors/cache/tree/DataRow.java | 1 +
.../internal/processors/cache/tree/PendingEntriesTree.java | 6 +++---
.../internal/processors/cache/tree/PendingEntryInnerIO.java | 8 ++++----
.../internal/processors/cache/tree/PendingEntryLeafIO.java | 8 ++++----
.../java/org/apache/ignite/internal/util/lang/GridFunc.java | 1 +
18 files changed, 51 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bc9134c9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/AbstractDataInnerIO.java
index ac8767d,d5b28ef..8ad6666
--- 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
@@@ -46,26 -45,12 +47,26 @@@ public abstract class AbstractDataInner
assert row.link() != 0;
PageUtils.putLong(pageAddr, off, row.link());
- PageUtils.putInt(pageAddr, off + 8, row.hash());
+ off += 8;
+
+ PageUtils.putInt(pageAddr, off, row.hash());
+ off += 4;
if (storeCacheId()) {
- assert row.cacheId() != GridCacheUtils.UNDEFINED_CACHE_ID : row;
+ assert row.cacheId() != CU.UNDEFINED_CACHE_ID : row;
- PageUtils.putInt(pageAddr, off + 12, row.cacheId());
+ PageUtils.putInt(pageAddr, off, row.cacheId());
+ off += 4;
+ }
+
+ if (storeMvccVersion()) {
+ assert row.mvccUpdateTopologyVersion() > 0 : row;
+ assert row.mvccUpdateCounter() != TxMvccVersion.COUNTER_NA : row;
+
+ PageUtils.putLong(pageAddr, off, row.mvccUpdateTopologyVersion());
+ off += 8;
+
+ PageUtils.putLong(pageAddr, off, row.mvccUpdateCounter());
}
}