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/04/05 14:59:47 UTC
ignite git commit: tmp
Repository: ignite
Updated Branches:
refs/heads/ignite-4811-no-start-ver 64959753f -> 30f5fc115
tmp
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/30f5fc11
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/30f5fc11
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/30f5fc11
Branch: refs/heads/ignite-4811-no-start-ver
Commit: 30f5fc1155a92b4a75936f1579985e219ea92abf
Parents: 6495975
Author: sboikov <sb...@gridgain.com>
Authored: Wed Apr 5 17:59:34 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Apr 5 17:59:34 2017 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheMapEntry.java | 18 +++++++++---------
modules/yardstick/config/ignite-base-config.xml | 2 --
2 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/30f5fc11/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 846c633..abfc06b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -141,7 +141,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
/** Start version. */
@GridToStringInclude
- protected final long startVer;
+ protected long startVer;
/** Version. */
@GridToStringInclude
@@ -188,15 +188,15 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
this.hash = hash;
this.cctx = cctx;
- val = cctx.kernalContext().cacheObjects().prepareForCache(val, cctx);
+ this.val = cctx.kernalContext().cacheObjects().prepareForCache(val, cctx);
- synchronized (this) {
- value(val);
- }
-
- ver = cctx.versions().next();
+// synchronized (this) {
+// value(val);
+// }
- startVer = ver.order();
+// ver = cctx.versions().next();
+//
+// startVer = ver.order();
}
/** {@inheritDoc} */
@@ -294,7 +294,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
* @return {@code True} if start version.
*/
public boolean isStartVersion() {
- return ver.nodeOrder() == cctx.localNode().order() && ver.order() == startVer;
+ return ver == null;//ver.nodeOrder() == cctx.localNode().order() && ver.order() == startVer;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/30f5fc11/modules/yardstick/config/ignite-base-config.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/ignite-base-config.xml b/modules/yardstick/config/ignite-base-config.xml
index 2ef3ba6..4416657 100644
--- a/modules/yardstick/config/ignite-base-config.xml
+++ b/modules/yardstick/config/ignite-base-config.xml
@@ -119,8 +119,6 @@
<property name="atomicityMode" value="ATOMIC"/>
- <property name="swapEnabled" value="false"/>
-
<property name="memoryMode" value="OFFHEAP_TIERED"/>
<property name="indexedTypes">