ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [05/25] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-5075
Date Thu, 01 Jun 2017 15:44:12 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-5075

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/query/QueryUtils.java


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

Branch: refs/heads/ignite-5075-pds
Commit: 4ef76013b161ed6f238fd79a48d4986896eaf81b
Parents: d429c3e
Author: sboikov <sboikov@gridgain.com>
Authored: Wed May 31 15:47:00 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed May 31 15:47:00 2017 +0300

----------------------------------------------------------------------
 .../dht/preloader/GridDhtPartitionDemander.java       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/4ef76013/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
index 78da020..c4c628f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
@@ -395,7 +395,7 @@ public class GridDhtPartitionDemander {
 
                 Collection<Integer> parts= e.getValue().partitions();
 
-                assert parts != null : "Partitions are null [grp=" + grp.name() + ", fromNode="
+ nodeId + "]";
+                assert parts != null : "Partitions are null [grp=" + grp.cacheOrGroupName()
+ ", fromNode=" + nodeId + "]";
 
                 fut.remaining.put(nodeId, new T2<>(U.currentTimeMillis(), parts));
             }
@@ -439,14 +439,14 @@ public class GridDhtPartitionDemander {
 
                     final int finalCnt = cnt;
 
-                            cctx.kernalContext().closure().runLocalSafe(new Runnable() {
-@Override public void run() {
-                        try {
+                    ctx.kernalContext().closure().runLocalSafe(new Runnable() {
+                        @Override public void run() {
+                            try {
                                 if (!fut.isDone()) {
-                        ctx.io().sendOrderedMessage(node,
-                            rebalanceTopics.get(finalCnt), initD, grp.ioPolicy(), initD.timeout());
+                                    ctx.io().sendOrderedMessage(node,
+                                        rebalanceTopics.get(finalCnt), initD, grp.ioPolicy(),
initD.timeout());
 
-// Cleanup required in case partitions demanded in parallel with cancellation.
+                                    // Cleanup required in case partitions demanded in parallel
with cancellation.
                                     synchronized (fut) {
                                         if (fut.isDone())
                                             fut.cleanupRemoteContexts(node.id());


Mime
View raw message