This is an automated email from the ASF dual-hosted git repository.
sboikov pushed a commit to branch ignite-invokeAll
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/ignite-invokeAll by this push:
new 84b431c invokeAll
84b431c is described below
commit 84b431c25ba2e7168f0bc2d4eedaf259e09db564
Author: sboikov <sboi...@apache.org>
AuthorDate: Wed Feb 20 09:23:19 2019 +0300
invokeAll
---
.../distributed/dht/atomic/GridDhtAtomicCache.java | 27 ++++++++++------------
.../processors/cache/tree/CacheDataTree.java | 5 ++++
2 files changed, 17 insertions(+), 15 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 9c8ae3e..5f694be 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -2663,7 +2663,6 @@ public class GridDhtAtomicCache<K, V> extends
GridDhtCacheAdapter<K, V> {
c.rdrs,
c.reqIdx,
updRes,
- dhtFut,
affAssignment,
sndPrevVal);
}
@@ -2733,7 +2732,6 @@ public class GridDhtAtomicCache<K, V> extends
GridDhtCacheAdapter<K, V> {
readers,
i,
updRes,
- dhtFut,
affAssignment,
sndPrevVal);
}
@@ -2756,11 +2754,12 @@ public class GridDhtAtomicCache<K, V> extends
GridDhtCacheAdapter<K, V> {
GridDhtCacheEntry.ReaderId[] readers,
int idx,
GridCacheUpdateAtomicResult updRes,
- GridDhtAtomicAbstractUpdateFuture dhtFut,
AffinityAssignment affAssignment,
boolean sndPrevVal
) throws GridCacheEntryRemovedException
{
+ GridDhtAtomicAbstractUpdateFuture dhtFut = dhtUpdRes.dhtFuture();
+
GridCacheOperation op = req.operation();
if (dhtFut != null) {
@@ -2858,11 +2857,11 @@ public class GridDhtAtomicCache<K, V> extends
GridDhtCacheAdapter<K, V> {
dhtUpdRes.returnValue(retVal = new
GridCacheReturn(nearNode.isLocal()));
retVal.addEntryProcessResult(ctx,
- entry.key(),
- null,
- compRes.get1(),
- compRes.get2(),
- req.keepBinary());
+ entry.key(),
+ null,
+ compRes.get1(),
+ compRes.get2(),
+ req.keepBinary());
}
}
else {
@@ -2870,13 +2869,11 @@ public class GridDhtAtomicCache<K, V> extends
GridDhtCacheAdapter<K, V> {
if (retVal == null) {
CacheObject ret = updRes.oldValue();
- if (retVal == null) {
- dhtUpdRes.returnValue(retVal = new GridCacheReturn(ctx,
- nearNode.isLocal(),
- req.keepBinary(),
- req.returnValue() ? ret : null,
- updRes.success()));
- }
+ dhtUpdRes.returnValue(new GridCacheReturn(ctx,
+ nearNode.isLocal(),
+ req.keepBinary(),
+ req.returnValue() ? ret : null,
+ updRes.success()));
}
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java
index d2b72ec..947b589 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/tree/CacheDataTree.java
@@ -117,6 +117,11 @@ public class CacheDataTree extends
BPlusTree<CacheSearchRow, CacheDataRow> {
rowsComparator = new Comparator<CacheSearchRow>() {
@Override public int compare(CacheSearchRow row1, CacheSearchRow
row2) {
try {
+ int cmp = Integer.compare(row1.hash(), row2.hash());
+
+ if (cmp != 0)
+ return cmp;
+
return compareKeyBytes(
row1.key().valueBytes(grp.cacheObjectContext()),
row2.key().valueBytes(grp.cacheObjectContext()));
