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/18 14:20:44 UTC
[4/5] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-3477' into ignite-gg-11810-2
Merge remote-tracking branch 'remotes/origin/ignite-3477' into ignite-gg-11810-2
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/01b15acc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/01b15acc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/01b15acc
Branch: refs/heads/ignite-gg-11810-2
Commit: 01b15acc729d39e0825c4aee2df2b5931adb95a1
Parents: 13bb2de b8d435b
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jan 18 17:19:51 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jan 18 17:19:51 2017 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheMapEntry.java | 31 -------------
.../processors/cache/GridCacheProcessor.java | 9 ++--
.../cache/IgniteCacheOffheapManagerImpl.java | 48 ++++++++++++++++++++
.../cache/database/tree/BPlusTree.java | 3 ++
.../query/h2/opt/GridH2TreeIndex.java | 2 +-
5 files changed, 58 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/01b15acc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
index 9221990,63a5072..aab5a75
--- 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
@@@ -926,7 -926,9 +926,9 @@@ public class IgniteCacheOffheapManagerI
}
if (pendingEntries != null && expireTime != 0)
- pendingEntries.put(new PendingRow(expireTime, dataRow.link()));
+ pendingEntries.putx(new PendingRow(expireTime, dataRow.link()));
+
+ updateIgfsMetrics(key, (old != null ? old.value() : null), val);
}
finally {
busyLock.leaveBusy();
http://git-wip-us.apache.org/repos/asf/ignite/blob/01b15acc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java
----------------------------------------------------------------------