Merge branch 'sprint-1' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-24
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
modules/core/src/test/java/org/apache/ignite/session/GridSessionLoadSelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b910a4c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b910a4c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b910a4c4
Branch: refs/heads/ignite-sql
Commit: b910a4c423eded1b9d62c0ee4f3d54c16896a22b
Parents: 8bef53e
Author: Yakov Zhdanov <[email protected]>
Authored: Tue Jan 27 10:38:19 2015 +0300
Committer: Yakov Zhdanov <[email protected]>
Committed: Tue Jan 27 10:38:19 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/managers/communication/GridIoManager.java | 3 +--
.../distributed/dht/preloader/GridDhtPartitionDemandPool.java | 6 ++++--
.../ignite/internal/processors/task/GridTaskProcessor.java | 2 +-
.../apache/ignite/internal/processors/task/GridTaskWorker.java | 1 -
4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b910a4c4/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
index 8e17cb1..8ef4853 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java
@@ -1177,8 +1177,7 @@ public class GridIoManager extends
GridManagerAdapter<CommunicationSpi<Serializa
boolean ordered,
long timeout,
boolean skipOnTimeout
- )
- throws IgniteCheckedException {
+ ) throws IgniteCheckedException {
assert nodes != null;
assert topic != null;
assert msg != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b910a4c4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
index 5011e35..9c7652c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java
@@ -569,6 +569,8 @@ public class GridDhtPartitionDemandPool<K, V> {
*/
private Set<Integer> demandFromNode(ClusterNode node, final long
topVer, GridDhtPartitionDemandMessage<K, V> d,
GridDhtPartitionsExchangeFuture<K, V> exchFut) throws
InterruptedException, IgniteCheckedException {
+ GridDhtPartitionTopology<K, V> top = cctx.dht().topology();
+
cntr++;
d.topic(topic(cntr));
@@ -690,7 +692,7 @@ public class GridDhtPartitionDemandPool<K, V> {
int p = e.getKey();
if (cctx.affinity().localNode(p, topVer)) {
- GridDhtLocalPartition<K, V> part =
cctx.dht().topology().localPartition(p, topVer, true);
+ GridDhtLocalPartition<K, V> part =
top.localPartition(p, topVer, true);
assert part != null;
@@ -734,7 +736,7 @@ public class GridDhtPartitionDemandPool<K, V> {
if (last) {
remaining.remove(p);
- cctx.dht().topology().own(part);
+ top.own(part);
if (log.isDebugEnabled())
log.debug("Finished preloading
partition: " + part);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b910a4c4/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
index 2ecb4b4..9a36a5b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
@@ -60,7 +60,7 @@ public class GridTaskProcessor extends GridProcessorAdapter {
private final IgniteMarshaller marsh;
/** */
- public final ConcurrentMap<IgniteUuid, GridTaskWorker<?, ?>> tasks =
GridConcurrentFactory.newMap();
+ private final ConcurrentMap<IgniteUuid, GridTaskWorker<?, ?>> tasks =
GridConcurrentFactory.newMap();
/** */
private boolean stopping;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b910a4c4/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
index a921346..0631a8e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskWorker.java
@@ -27,7 +27,6 @@ import org.apache.ignite.lang.*;
import org.apache.ignite.marshaller.*;
import org.apache.ignite.resources.*;
import org.apache.ignite.internal.managers.deployment.*;
-import org.apache.ignite.internal.processors.job.*;
import org.apache.ignite.internal.processors.timeout.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
