Merge remote-tracking branch 'remotes/origin/master' into ignite-db-x-10884
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridNoStorageCacheMap.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxStoreExceptionAbstractSelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5083e05c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5083e05c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5083e05c
Branch: refs/heads/ignite-db-x-10884
Commit: 5083e05cdb83db88bea38914ad60ce997eb0ddb6
Parents: d69d41e
Author: sboikov <[email protected]>
Authored: Thu Apr 28 16:01:32 2016 +0300
Committer: sboikov <[email protected]>
Committed: Thu Apr 28 16:01:32 2016 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheMapEntry.java | 6 -----
.../processors/cache/GridNoStorageCacheMap.java | 5 +---
.../distributed/dht/GridDhtCacheAdapter.java | 3 ---
.../dht/GridDhtPartitionTopologyImpl.java | 4 ++++
.../IgniteCacheObjectProcessorImpl.java | 25 --------------------
5 files changed, 5 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5083e05c/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 11285f5..513ae0f 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
@@ -2254,12 +2254,6 @@ public abstract class GridCacheMapEntry extends
GridMetadataAwareAdapter impleme
CacheObject evtVal = updated;
CacheObject evtOldVal = oldVal;
- if (isOffHeapValuesOnly()) {
- evtVal = cctx.toCacheObject(cctx.unwrapTemporary(evtVal));
-
- evtOldVal =
cctx.toCacheObject(cctx.unwrapTemporary(evtOldVal));
- }
-
cctx.continuousQueries().onEntryUpdated(lsnrs, key, evtVal,
evtOldVal, internal,
partition(), primary, false, updateCntr0, fut, topVer);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5083e05c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java
index 2532882..d49b016 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridNoStorageCacheMap.java
@@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.Set;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtCacheEntry;
-import
org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtOffHeapCacheEntry;
import org.jetbrains.annotations.Nullable;
/**
@@ -48,9 +47,7 @@ public class GridNoStorageCacheMap implements
GridCacheConcurrentMap {
@Override public GridCacheMapEntry
putEntryIfObsoleteOrAbsent(AffinityTopologyVersion topVer, KeyCacheObject key,
@Nullable CacheObject val, boolean create, boolean touch) {
if (create)
- return ctx.useOffheapEntry() ?
- new GridDhtOffHeapCacheEntry(ctx, topVer, key, key.hashCode(),
val) :
- new GridDhtCacheEntry(ctx, topVer, key, key.hashCode(), val);
+ return new GridDhtCacheEntry(ctx, topVer, key, key.hashCode(),
val);
else
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5083e05c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index 0f5cc83..eee1008 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -247,9 +247,6 @@ public abstract class GridDhtCacheAdapter<K, V> extends
GridDistributedCacheAdap
int hash,
CacheObject val
) {
- if (ctx.useOffheapEntry())
- return new GridDhtOffHeapCacheEntry(ctx, topVer, key,
hash, val);
-
return new GridDhtCacheEntry(ctx, topVer, key, hash, val);
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/5083e05c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index b427f81..241d3ac 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -674,6 +674,8 @@ class GridDhtPartitionTopologyImpl implements
GridDhtPartitionTopology {
if (!create)
return null;
+ boolean created = false;
+
lock.writeLock().lock();
try {
@@ -701,6 +703,8 @@ class GridDhtPartitionTopologyImpl implements
GridDhtPartitionTopology {
if (updateSeq)
this.updateSeq.incrementAndGet();
+ create = true;
+
if (log.isDebugEnabled())
log.debug("Created local partition: " + loc);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5083e05c/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
index ee7c157..b899034 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java
@@ -138,31 +138,6 @@ public class IgniteCacheObjectProcessorImpl extends
GridProcessorAdapter impleme
}
/** {@inheritDoc} */
- @Override public CacheObject toCacheObject(GridCacheContext ctx, long
valPtr, boolean tmp)
- throws IgniteCheckedException {
- assert valPtr != 0;
-
- int size = GridUnsafe.getInt(valPtr);
-
- byte type = GridUnsafe.getByte(valPtr + 4);
-
- byte[] bytes = U.copyMemory(valPtr + 5, size);
-
- if (ctx.kernalContext().config().isPeerClassLoadingEnabled() &&
- ctx.offheapTiered() &&
- type != CacheObject.TYPE_BYTE_ARR) {
- IgniteUuid valClsLdrId = U.readGridUuid(valPtr + 5 + size);
-
- ClassLoader ldr =
- valClsLdrId != null ? ctx.deploy().getClassLoader(valClsLdrId)
: ctx.deploy().localLoader();
-
- return toCacheObject(ctx.cacheObjectContext(),
unmarshal(ctx.cacheObjectContext(), bytes, ldr), false);
- }
- else
- return toCacheObject(ctx.cacheObjectContext(), type, bytes);
- }
-
- /** {@inheritDoc} */
@Override public CacheObject toCacheObject(CacheObjectContext ctx, byte
type, byte[] bytes) {
switch (type) {
case CacheObject.TYPE_BYTE_ARR:
