ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [05/50] [abbrv] incubator-ignite git commit: # ignite-299 : Use ConcurrentMap instead of ClusterNodeLocalMap (change usages and delete interface)
Date Thu, 26 Feb 2015 14:02:44 GMT
# ignite-299 : Use ConcurrentMap instead of ClusterNodeLocalMap (change usages and delete interface)


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

Branch: refs/heads/ignite-11
Commit: 4ba5d0e0d278e64f7ae48518e60a9d973f8ca02c
Parents: be52911
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Fri Feb 20 16:25:59 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Fri Feb 20 16:25:59 2015 +0300

----------------------------------------------------------------------
 .../ComputeFibonacciContinuationExample.java    |  3 +-
 .../java/org/apache/ignite/IgniteCluster.java   |  3 +-
 .../ignite/cluster/ClusterNodeLocalMap.java     | 36 --------------------
 .../cluster/ClusterNodeLocalMapImpl.java        | 16 +++++++--
 .../cluster/IgniteClusterAsyncImpl.java         |  3 +-
 .../internal/cluster/IgniteClusterImpl.java     |  4 +--
 .../cache/GridCacheQueryCommandHandler.java     |  7 ++--
 .../VisorComputeToggleMonitoringTask.java       |  4 +--
 .../visor/node/VisorNodeDataCollectorJob.java   |  4 +--
 .../node/VisorNodeEventsCollectorTask.java      |  3 +-
 .../visor/query/VisorQueryCleanupTask.java      |  4 +--
 .../visor/query/VisorQueryNextPageTask.java     |  6 ++--
 .../internal/visor/query/VisorQueryTask.java    |  4 +--
 .../internal/visor/util/VisorTaskUtils.java     |  3 +-
 .../ignite/internal/GridNodeLocalSelfTest.java  |  4 +--
 .../GridCacheConcurrentTxMultiNodeTest.java     |  2 +-
 .../ignite/loadtests/dsi/GridDsiPerfJob.java    |  3 +-
 .../marshaller/GridMarshallerAbstractTest.java  |  6 ++--
 .../tests/p2p/GridP2PAwareTestUserResource.java |  5 +--
 .../tests/p2p/GridTestMessageListener.java      |  4 +--
 20 files changed, 50 insertions(+), 74 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba5d0e0/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java
b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java
index c1792b6..ea96b43 100644
--- a/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/computegrid/ComputeFibonacciContinuationExample.java
@@ -28,6 +28,7 @@ import org.jetbrains.annotations.*;
 
 import java.math.*;
 import java.util.*;
+import java.util.concurrent.*;
 
 /**
  * This example demonstrates how to use continuation feature of Ignite by
@@ -123,7 +124,7 @@ public final class ComputeFibonacciContinuationExample {
                     return n == 0 ? BigInteger.ZERO : BigInteger.ONE;
 
                 // Node-local storage.
-                ClusterNodeLocalMap<Long, IgniteFuture<BigInteger>> locMap =
ignite.cluster().nodeLocalMap();
+                ConcurrentMap<Long, IgniteFuture<BigInteger>> locMap = ignite.cluster().nodeLocalMap();
 
                 // Check if value is cached in node-local-map first.
                 fut1 = locMap.get(n - 1);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba5d0e0/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
index 820250e..8669559 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCluster.java
@@ -25,6 +25,7 @@ import org.jetbrains.annotations.*;
 
 import java.io.*;
 import java.util.*;
+import java.util.concurrent.*;
 
 /**
  * {@code GridCluster} also provides a handle on {@link #nodeLocalMap()} which provides map-like
functionality
@@ -60,7 +61,7 @@ public interface IgniteCluster extends ClusterGroup, IgniteAsyncSupport
{
      *
      * @return Node local storage instance for the local node.
      */
-    public <K, V> ClusterNodeLocalMap<K, V> nodeLocalMap();
+    public <K, V> ConcurrentMap<K, V> nodeLocalMap();
 
     /**
      * Pings a remote node.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba5d0e0/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNodeLocalMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNodeLocalMap.java
b/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNodeLocalMap.java
deleted file mode 100644
index e01539a..0000000
--- a/modules/core/src/main/java/org/apache/ignite/cluster/ClusterNodeLocalMap.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.cluster;
-
-import java.util.concurrent.*;
-
-/**
- * Defines interface for node-local storage.
- * <p>
- * {@code GridNodeLocalMap} is similar to {@link ThreadLocal} in a way that its values are
not
- * distributed and kept only on local node (similar like {@link ThreadLocal} values are attached
to the
- * current thread only). Node-local values are used primarily by jobs executed from the remote
- * nodes to keep intermediate state on the local node between executions.
- * <p>
- * {@code GridNodeLocalMap} essentially is a {@link ConcurrentMap} with a few additional
methods,
- * so it is fairly trivial to use.
- * <p>
- * You can get an instance of {@code GridNodeLocalMap} by calling {@link org.apache.ignite.IgniteCluster#nodeLocalMap()}
method.
- */
-public interface ClusterNodeLocalMap<K, V> extends ConcurrentMap<K, V> {
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba5d0e0/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java
index f3c5866..1dcc88f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/ClusterNodeLocalMapImpl.java
@@ -17,17 +17,27 @@
 
 package org.apache.ignite.internal.cluster;
 
-import org.apache.ignite.cluster.*;
+import org.apache.ignite.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
 import org.jdk8.backport.*;
 
 import java.io.*;
+import java.util.concurrent.*;
 
 /**
- *
+ * Implementation for node-local storage.
+ * <p>
+ * {@code ClusterNodeLocalMapImpl} is similar to {@link ThreadLocal} in a way that its values
are not
+ * distributed and kept only on local node (similar like {@link ThreadLocal} values are attached
to the
+ * current thread only). Node-local values are used primarily by jobs executed from the remote
+ * nodes to keep intermediate state on the local node between executions.
+ * <p>
+ * {@code ClusterNodeLocalMapImpl} is a {@link ConcurrentMap} so it is trivial to use.
+ * <p>
+ * You can get an instance of {@code ClusterNodeLocalMapImpl} by calling {@link IgniteCluster#nodeLocalMap()}
method.
  */
-public class ClusterNodeLocalMapImpl<K, V> extends ConcurrentHashMap8<K, V> implements
ClusterNodeLocalMap<K, V>,
+public class ClusterNodeLocalMapImpl<K, V> extends ConcurrentHashMap8<K, V> implements
ConcurrentMap<K, V>,
     Externalizable {
     /** */
     private static final long serialVersionUID = 0L;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba5d0e0/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
index abd1a38..960bacd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterAsyncImpl.java
@@ -27,6 +27,7 @@ import org.jetbrains.annotations.*;
 
 import java.io.*;
 import java.util.*;
+import java.util.concurrent.*;
 
 /**
  *
@@ -66,7 +67,7 @@ public class IgniteClusterAsyncImpl extends AsyncSupportAdapter<IgniteCluster>
     }
 
     /** {@inheritDoc} */
-    @Override public <K, V> ClusterNodeLocalMap<K, V> nodeLocalMap() {
+    @Override public <K, V> ConcurrentMap<K, V> nodeLocalMap() {
         return cluster.nodeLocalMap();
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba5d0e0/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
index a9b569a..c79fed8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cluster/IgniteClusterImpl.java
@@ -51,7 +51,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements IgniteClus
 
     /** Node local store. */
     @GridToStringExclude
-    private ClusterNodeLocalMap nodeLoc;
+    private ConcurrentMap nodeLoc;
 
     /**
      * Required by {@link Externalizable}.
@@ -101,7 +101,7 @@ public class IgniteClusterImpl extends ClusterGroupAdapter implements
IgniteClus
 
     /** {@inheritDoc} */
     @SuppressWarnings("unchecked")
-    @Override public <K, V> ClusterNodeLocalMap<K, V> nodeLocalMap() {
+    @Override public <K, V> ConcurrentMap<K, V> nodeLocalMap() {
         guard();
 
         try {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba5d0e0/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
index 93e3363..50d82e6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.rest.handlers.cache;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.query.*;
@@ -331,8 +330,7 @@ public class GridCacheQueryCommandHandler extends GridRestCommandHandlerAdapter
             else
                 fut = (GridCacheQueryFutureAdapter<?, ?, ?>)qry.execute(req.queryArguments());
 
-            ClusterNodeLocalMap<QueryExecutionKey, QueryFutureWrapper> locMap =
-                g.cluster().nodeLocalMap();
+            ConcurrentMap<QueryExecutionKey, QueryFutureWrapper> locMap = g.cluster().nodeLocalMap();
 
             QueryFutureWrapper wrapper = new QueryFutureWrapper(fut);
 
@@ -367,8 +365,7 @@ public class GridCacheQueryCommandHandler extends GridRestCommandHandlerAdapter
 
         /** {@inheritDoc} */
         @Override public GridRestResponse call() throws Exception {
-            ClusterNodeLocalMap<QueryExecutionKey, QueryFutureWrapper> locMap =
-                g.cluster().nodeLocalMap();
+            ConcurrentMap<QueryExecutionKey, QueryFutureWrapper> locMap = g.cluster().nodeLocalMap();
 
             return fetchQueryResults(req.queryId(), locMap.get(new QueryExecutionKey(req.queryId())),
                 locMap, g.cluster().localNode().id());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba5d0e0/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeToggleMonitoringTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeToggleMonitoringTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeToggleMonitoringTask.java
index b857eee..62f1be7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeToggleMonitoringTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/compute/VisorComputeToggleMonitoringTask.java
@@ -17,7 +17,6 @@
 
 package org.apache.ignite.internal.visor.compute;
 
-import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.internal.processors.task.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
@@ -26,6 +25,7 @@ import org.apache.ignite.lang.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;
+import java.util.concurrent.*;
 
 import static org.apache.ignite.internal.visor.compute.VisorComputeMonitoringHolder.*;
 import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
@@ -75,7 +75,7 @@ public class VisorComputeToggleMonitoringTask extends
             if (checkExplicitTaskMonitoring(ignite))
                 return true;
             else {
-                ClusterNodeLocalMap<String, VisorComputeMonitoringHolder> storage =
ignite.cluster().nodeLocalMap();
+                ConcurrentMap<String, VisorComputeMonitoringHolder> storage = ignite.cluster().nodeLocalMap();
 
                 VisorComputeMonitoringHolder holder = storage.get(COMPUTE_MONITORING_HOLDER_KEY);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba5d0e0/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
index e576704..43a987c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeDataCollectorJob.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.visor.node;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.igfs.*;
@@ -33,6 +32,7 @@ import org.apache.ignite.internal.visor.streamer.*;
 import org.apache.ignite.streamer.*;
 
 import java.util.*;
+import java.util.concurrent.*;
 
 import static org.apache.ignite.internal.processors.cache.GridCacheUtils.*;
 import static org.apache.ignite.internal.visor.compute.VisorComputeMonitoringHolder.*;
@@ -84,7 +84,7 @@ public class VisorNodeDataCollectorJob extends VisorJob<VisorNodeDataCollectorTa
                 res.taskMonitoringEnabled(arg.taskMonitoringEnabled());
 
                 if (arg.taskMonitoringEnabled()) {
-                    ClusterNodeLocalMap<String, VisorComputeMonitoringHolder> storage
= ignite.cluster().nodeLocalMap();
+                    ConcurrentMap<String, VisorComputeMonitoringHolder> storage = ignite.cluster().nodeLocalMap();
 
                     VisorComputeMonitoringHolder holder = storage.get(COMPUTE_MONITORING_HOLDER_KEY);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba5d0e0/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java
index b280b04..bf13c1b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorNodeEventsCollectorTask.java
@@ -30,6 +30,7 @@ import org.jetbrains.annotations.*;
 
 import java.io.*;
 import java.util.*;
+import java.util.concurrent.*;
 
 import static org.apache.ignite.events.EventType.*;
 import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
@@ -263,7 +264,7 @@ public class VisorNodeEventsCollectorTask extends VisorMultiNodeTask<VisorNodeEv
         @Override protected Collection<? extends VisorGridEvent> run(final VisorNodeEventsCollectorTaskArg
arg) {
             final long startEvtTime = arg.timeArgument() == null ? 0L : System.currentTimeMillis()
- arg.timeArgument();
 
-            final ClusterNodeLocalMap<String, Long> nl = ignite.cluster().nodeLocalMap();
+            final ConcurrentMap<String, Long> nl = ignite.cluster().nodeLocalMap();
 
             final Long startEvtOrder = arg.keyOrder() != null && nl.containsKey(arg.keyOrder())
?
                 nl.get(arg.keyOrder()) : -1L;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba5d0e0/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
index fbc26bc..11e5c81 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryCleanupTask.java
@@ -25,6 +25,7 @@ import org.apache.ignite.internal.visor.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;
+import java.util.concurrent.*;
 
 import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
 
@@ -85,8 +86,7 @@ public class VisorQueryCleanupTask extends VisorMultiNodeTask<Map<UUID,
Collecti
 
         /** {@inheritDoc} */
         @Override protected Void run(Collection<String> qryIds) {
-            ClusterNodeLocalMap<String, VisorQueryTask.VisorFutureResultSetHolder>
locMap =
-                ignite.cluster().nodeLocalMap();
+            ConcurrentMap<String, VisorQueryTask.VisorFutureResultSetHolder> locMap
= ignite.cluster().nodeLocalMap();
 
             for (String qryId : qryIds)
                 locMap.remove(qryId);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba5d0e0/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
index a33a1a9..d922ad1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryNextPageTask.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.internal.visor.query;
 
 import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.task.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
@@ -26,6 +25,7 @@ import org.apache.ignite.internal.visor.*;
 import org.apache.ignite.lang.*;
 
 import java.util.*;
+import java.util.concurrent.*;
 
 /**
  * Task for collecting next page previously executed SQL or SCAN query.
@@ -71,7 +71,7 @@ public class VisorQueryNextPageTask extends VisorOneNodeTask<IgniteBiTuple<Strin
         private VisorQueryResult nextSqlPage(IgniteBiTuple<String, Integer> arg) throws
IgniteCheckedException {
             long start = U.currentTimeMillis();
 
-            ClusterNodeLocalMap<String, VisorQueryTask.VisorFutureResultSetHolder<List<?>>>
storage =
+            ConcurrentMap<String, VisorQueryTask.VisorFutureResultSetHolder<List<?>>>
storage =
                 ignite.cluster().nodeLocalMap();
 
             VisorQueryTask.VisorFutureResultSetHolder<List<?>> t = storage.get(arg.get1());
@@ -95,7 +95,7 @@ public class VisorQueryNextPageTask extends VisorOneNodeTask<IgniteBiTuple<Strin
         private VisorQueryResult nextScanPage(IgniteBiTuple<String, Integer> arg) throws
IgniteCheckedException {
             long start = U.currentTimeMillis();
 
-            ClusterNodeLocalMap<String, VisorQueryTask.VisorFutureResultSetHolder<Map.Entry<Object,
Object>>> storage =
+            ConcurrentMap<String, VisorQueryTask.VisorFutureResultSetHolder<Map.Entry<Object,
Object>>> storage =
                 ignite.cluster().nodeLocalMap();
 
             VisorQueryTask.VisorFutureResultSetHolder<Map.Entry<Object, Object>>
t = storage.get(arg.get1());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba5d0e0/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
index 30420f6..0068b8c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.visor.query;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.*;
-import org.apache.ignite.cluster.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.cache.query.*;
@@ -33,6 +32,7 @@ import org.apache.ignite.lang.*;
 import java.io.*;
 import java.sql.*;
 import java.util.*;
+import java.util.concurrent.*;
 
 import static org.apache.ignite.internal.visor.query.VisorQueryUtils.*;
 import static org.apache.ignite.internal.visor.util.VisorTaskUtils.*;
@@ -282,7 +282,7 @@ public class VisorQueryTask extends VisorOneNodeTask<VisorQueryTask.VisorQueryAr
         private void scheduleResultSetHolderRemoval(final String id) {
             ((IgniteKernal)ignite).context().timeout().addTimeoutObject(new GridTimeoutObjectAdapter(RMV_DELAY)
{
                 @Override public void onTimeout() {
-                    ClusterNodeLocalMap<String, VisorFutureResultSetHolder> storage
= ignite.cluster().nodeLocalMap();
+                    ConcurrentMap<String, VisorFutureResultSetHolder> storage = ignite.cluster().nodeLocalMap();
 
                     VisorFutureResultSetHolder<?> t = storage.get(id);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba5d0e0/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
index 348ed33..2593372 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/util/VisorTaskUtils.java
@@ -41,6 +41,7 @@ import java.nio.charset.*;
 import java.nio.file.*;
 import java.text.*;
 import java.util.*;
+import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
 import static java.lang.System.*;
@@ -361,7 +362,7 @@ public class VisorTaskUtils {
         assert ignite != null;
         assert evtTypes != null && evtTypes.length > 0;
 
-        ClusterNodeLocalMap<String, Long> nl = ignite.cluster().nodeLocalMap();
+        ConcurrentMap<String, Long> nl = ignite.cluster().nodeLocalMap();
 
         final long lastOrder = getOrElse(nl, evtOrderKey, -1L);
         final long throttle = getOrElse(nl, evtThrottleCntrKey, 0L);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba5d0e0/modules/core/src/test/java/org/apache/ignite/internal/GridNodeLocalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeLocalSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeLocalSelfTest.java
index bcdd3a8..9c8084f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeLocalSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeLocalSelfTest.java
@@ -18,12 +18,12 @@
 package org.apache.ignite.internal;
 
 import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
 import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.testframework.junits.common.*;
 
 import java.util.*;
+import java.util.concurrent.*;
 
 /**
  * This test will test node local storage.
@@ -49,7 +49,7 @@ public class GridNodeLocalSelfTest extends GridCommonAbstractTest {
 
         GridTuple3 key = F.t(keyNum, keyStr, keyDate);
 
-        ClusterNodeLocalMap<Object, Object> nl = g.cluster().nodeLocalMap();
+        ConcurrentMap<Object, Object> nl = g.cluster().nodeLocalMap();
 
         nl.put(keyStr, "Hello world!");
         nl.put(key, 12);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba5d0e0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
index 6c21b28..a7a918d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
@@ -432,7 +432,7 @@ public class GridCacheConcurrentTxMultiNodeTest extends GridCommonAbstractTest
{
 
         /** {@inheritDoc} */
         @Override public Object execute() {
-            ClusterNodeLocalMap<String, T2<AtomicLong, AtomicLong>> nodeLoc =
ignite.cluster().nodeLocalMap();
+            ConcurrentMap<String, T2<AtomicLong, AtomicLong>> nodeLoc = ignite.cluster().nodeLocalMap();
 
             T2<AtomicLong, AtomicLong> cntrs = nodeLoc.get("cntrs");
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba5d0e0/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java
b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java
index 89e2106..56f2b22 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/dsi/GridDsiPerfJob.java
@@ -19,7 +19,6 @@ package org.apache.ignite.loadtests.dsi;
 
 import org.apache.ignite.*;
 import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
 import org.apache.ignite.compute.*;
 import org.apache.ignite.internal.*;
 import org.apache.ignite.internal.processors.cache.distributed.dht.*;
@@ -90,7 +89,7 @@ public class GridDsiPerfJob extends ComputeJobAdapter {
      */
     @SuppressWarnings("ConstantConditions")
     @Override public Object execute() {
-        ClusterNodeLocalMap<String, T2<AtomicLong, AtomicLong>> nodeLoc = ignite.cluster().nodeLocalMap();
+        ConcurrentMap<String, T2<AtomicLong, AtomicLong>> nodeLoc = ignite.cluster().nodeLocalMap();
 
         T2<AtomicLong, AtomicLong> cntrs = nodeLoc.get("cntrs");
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba5d0e0/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
index a7f4f73..28985c3 100644
--- a/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java
@@ -520,13 +520,13 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest
     }
 
     /**
-     * Tests marshal {@link org.apache.ignite.cluster.ClusterNodeLocalMap} instance.
+     * Tests marshal {@link ClusterNodeLocalMapImpl} instance.
      *
      * @throws Exception If test failed.
      */
     @SuppressWarnings("unchecked")
     public void testNodeLocalMarshalling() throws Exception {
-        ClusterNodeLocalMap<String, String> loc = grid().cluster().nodeLocalMap();
+        ConcurrentMap<String, String> loc = grid().cluster().nodeLocalMap();
 
         String key = "test-key";
         String val = "test-val";
@@ -550,7 +550,7 @@ public abstract class GridMarshallerAbstractTest extends GridCommonAbstractTest
 
         outBean.checkNullResources();
 
-        loc = (ClusterNodeLocalMap<String, String>)outBean.getObjectField();
+        loc = (ConcurrentMap<String, String>)outBean.getObjectField();
 
         assert loc.size() == 1;
         assert val.equals(loc.get(key));

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba5d0e0/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PAwareTestUserResource.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PAwareTestUserResource.java
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PAwareTestUserResource.java
index 562f651..1e04056 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PAwareTestUserResource.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridP2PAwareTestUserResource.java
@@ -18,9 +18,10 @@
 package org.apache.ignite.tests.p2p;
 
 import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
 import org.apache.ignite.resources.*;
 
+import java.util.concurrent.*;
+
 /**
  * User resource, that increases node-local counters
  * on deploy and undeploy.
@@ -46,7 +47,7 @@ public class GridP2PAwareTestUserResource {
      * @param key Key for the value to be incremented.
      */
     private <T> void concurrentIncrement(T key) {
-        ClusterNodeLocalMap<T, Integer> nodeLoc = ignite.cluster().nodeLocalMap();
+        ConcurrentMap<T, Integer> nodeLoc = ignite.cluster().nodeLocalMap();
 
         Integer cntr = nodeLoc.get(key);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba5d0e0/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridTestMessageListener.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridTestMessageListener.java
b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridTestMessageListener.java
index a906d1c..6b22945 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridTestMessageListener.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/GridTestMessageListener.java
@@ -18,11 +18,11 @@
 package org.apache.ignite.tests.p2p;
 
 import org.apache.ignite.*;
-import org.apache.ignite.cluster.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.resources.*;
 
 import java.util.*;
+import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
 /**
@@ -38,7 +38,7 @@ public class GridTestMessageListener implements P2<UUID, Object> {
         ignite.log().info("Received message [nodeId=" + nodeId + ", locNodeId=" + ignite.cluster().localNode().id()
+
             ", msg=" + msg + ']');
 
-        ClusterNodeLocalMap<String, AtomicInteger> map = ignite.cluster().nodeLocalMap();
+        ConcurrentMap<String, AtomicInteger> map = ignite.cluster().nodeLocalMap();
 
         AtomicInteger cnt = map.get("msgCnt");
 


Mime
View raw message