ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [5/5] ignite git commit: ignite-5272-tx
Date Thu, 08 Jun 2017 20:19:42 GMT
ignite-5272-tx


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8b687216
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8b687216
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8b687216

Branch: refs/heads/ignite-5272-tx
Commit: 8b687216d2075becff62c5d5731c9690bb00a74a
Parents: f610651
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Jun 8 23:19:09 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Jun 8 23:19:09 2017 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheIoManager.java   |  2 --
 .../cache/distributed/dht/GridDhtCacheAdapter.java      |  1 +
 .../distributed/dht/GridPartitionedSingleGetFuture.java | 12 +++++-------
 3 files changed, 6 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8b687216/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index 81d5b39..278964a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -390,8 +390,6 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter
{
 
             unmarshall(nodeId, cacheMsg);
 
-            log.info("Message: " + cacheMsg);
-
             if (cacheMsg.classError() != null)
                 processFailedMessage(nodeId, cacheMsg, c);
             else

http://git-wip-us.apache.org/repos/asf/ignite/blob/8b687216/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 6427140..38d0108 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
@@ -797,6 +797,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
      * @param reader Reader node ID.
      * @param msgId Message ID.
      * @param keys Keys to get.
+     * @param addReaders Add readers flag.
      * @param readThrough Read through flag.
      * @param topVer Topology version.
      * @param subjId Subject ID.

http://git-wip-us.apache.org/repos/asf/ignite/blob/8b687216/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
index a6883e9..4d0fa29 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
@@ -221,7 +221,7 @@ public class GridPartitionedSingleGetFuture extends GridCacheFutureAdapter<Objec
             return;
 
         if (node.isLocal()) {
-            final GridDhtFuture<Collection<GridCacheEntryInfo>> fut = cctx.dht().getDhtSingleAsync(node.id(),
+            final GridDhtFuture<GridCacheEntryInfo> fut = cctx.dht().getDhtSingleAsync(node.id(),
                 -1,
                 key,
                 false,
@@ -246,14 +246,12 @@ public class GridPartitionedSingleGetFuture extends GridCacheFutureAdapter<Objec
                 map(updTopVer);
             }
             else {
-                fut.listen(new CI1<IgniteInternalFuture<Collection<GridCacheEntryInfo>>>()
{
-                    @Override public void apply(IgniteInternalFuture<Collection<GridCacheEntryInfo>>
fut) {
+                fut.listen(new CI1<IgniteInternalFuture<GridCacheEntryInfo>>()
{
+                    @Override public void apply(IgniteInternalFuture<GridCacheEntryInfo>
fut) {
                         try {
-                            Collection<GridCacheEntryInfo> infos = fut.get();
+                            GridCacheEntryInfo info = fut.get();
 
-                            assert F.isEmpty(infos) || infos.size() == 1 : infos;
-
-                            setResult(F.first(infos));
+                            setResult(info);
                         }
                         catch (Exception e) {
                             U.error(log, "Failed to get values from dht cache [fut=" + fut
+ "]", e);


Mime
View raw message