ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [49/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-158
Date Tue, 03 Feb 2015 12:31:45 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5680e9fd/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5680e9fd/modules/core/src/main/java/org/apache/ignite/cluster/ClusterGroup.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5680e9fd/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
index fafb23c,ac9040a..84520ec
--- a/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/ClusterGroupAdapter.java
@@@ -18,10 -18,7 +18,8 @@@
  package org.apache.ignite.internal;
  
  import org.apache.ignite.*;
 +import org.apache.ignite.cache.*;
  import org.apache.ignite.cluster.*;
- import org.apache.ignite.internal.processors.cache.*;
- import org.apache.ignite.lang.*;
  import org.apache.ignite.internal.executor.*;
  import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.internal.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5680e9fd/modules/core/src/main/java/org/apache/ignite/internal/IgniteClusterAsyncImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5680e9fd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index c68fa6d,dccb2c3..393a3fc
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@@ -3833,15 -3851,13 +3851,13 @@@ public abstract class GridCacheAdapter<
       */
      IgniteInternalFuture<?> globalLoadCacheAsync(@Nullable IgniteBiPredicate<K,
V> p, @Nullable Object... args)
          throws IgniteCheckedException {
 -        ClusterGroup nodes = ctx.kernalContext().grid().cluster().forCache(ctx.name());
 +        ClusterGroup nodes = ctx.kernalContext().grid().cluster().forCacheNodes(ctx.name());
  
-         IgniteCompute comp = ctx.kernalContext().grid().compute(nodes).withNoFailover();
- 
-         comp = comp.withAsync();
+         ctx.kernalContext().task().setThreadContext(TC_NO_FAILOVER, true);
  
-         comp.broadcast(new LoadCacheClosure<>(ctx.name(), p, args));
- 
-         return comp.future();
+         return ctx.kernalContext().closure().callAsync(BROADCAST,
+             Arrays.asList(new LoadCacheClosure<>(ctx.name(), p, args)),
+             nodes.nodes());
      }
  
      /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5680e9fd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
index e3636d5,6e8be16..cf3da57
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
@@@ -256,10 -257,10 +257,10 @@@ public class GridCacheContinuousQueryAd
          if (prj == null)
              prj = ctx.grid();
  
 -        prj = prj.forCache(ctx.name());
 +        prj = prj.forCacheNodes(ctx.name());
  
          if (prj.nodes().isEmpty())
-             throw new ClusterTopologyException("Failed to execute query (projection is empty):
" + this);
+             throw new ClusterTopologyCheckedException("Failed to execute query (projection
is empty): " + this);
  
          CacheMode mode = ctx.config().getCacheMode();
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5680e9fd/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
index 4e9222e,dc91d2a..462cf8e
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/dataload/IgniteDataLoaderImpl.java
@@@ -283,10 -296,10 +296,10 @@@ public class IgniteDataLoaderImpl<K, V
          if (isolated())
              return;
  
 -        ClusterNode node = F.first(ctx.grid().forCache(cacheName).nodes());
 +        ClusterNode node = F.first(ctx.grid().forCacheNodes(cacheName).nodes());
  
          if (node == null)
-             throw new IgniteCheckedException("Failed to get node for cache: " + cacheName);
+             throw new IgniteException("Failed to get node for cache: " + cacheName);
  
          GridCacheAttributes a = U.cacheAttributes(node, cacheName);
  

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5680e9fd/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5680e9fd/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
----------------------------------------------------------------------


Mime
View raw message