You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/01/02 10:21:48 UTC
[09/13] ignite git commit: IGNITE-2263: DANGEROUS! Removed
"cachesx(Predicate ...)" method from kernal, now it is cachesx().
IGNITE-2263: DANGEROUS! Removed "cachesx(Predicate ...)" method from kernal, now it is cachesx().
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/357ea8a7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/357ea8a7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/357ea8a7
Branch: refs/heads/ignite-2263
Commit: 357ea8a769516e552d8047d3f372c2be90692e89
Parents: 1f7ce26
Author: thatcoach <pp...@list.ru>
Authored: Sat Jan 2 12:06:49 2016 +0300
Committer: thatcoach <pp...@list.ru>
Committed: Sat Jan 2 12:06:49 2016 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/IgniteEx.java | 6 +-
.../apache/ignite/internal/IgniteKernal.java | 158 ++++++-------------
.../ignite/internal/util/lang/GridFunc.java | 37 -----
.../GridConcurrentWeakHashSetSelfTest.java | 19 ++-
.../junits/multijvm/IgniteProcessProxy.java | 46 ++----
.../HadoopDefaultMapReducePlannerSelfTest.java | 18 +--
.../cache/WaitMapExchangeFinishCallable.java | 9 +-
.../IgniteFailoverAbstractBenchmark.java | 2 +-
8 files changed, 89 insertions(+), 206 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/357ea8a7/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
index e3859c5..000db78 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteEx.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal;
-import java.util.Collection;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteFileSystem;
import org.apache.ignite.cluster.ClusterNode;
@@ -28,6 +27,8 @@ import org.apache.ignite.internal.processors.hadoop.Hadoop;
import org.apache.ignite.lang.IgnitePredicate;
import org.jetbrains.annotations.Nullable;
+import java.util.Collection;
+
/**
* Extended Grid interface which provides some additional methods required for kernal and Visor.
*/
@@ -64,10 +65,9 @@ public interface IgniteEx extends Ignite {
* Gets configured cache instance that satisfy all provided predicates including non-public caches. If no
* predicates provided - all configured caches will be returned.
*
- * @param p Predicates. If none provided - all configured caches will be returned.
* @return Configured cache instances that satisfy all provided predicates.
*/
- public Collection<IgniteInternalCache<?, ?>> cachesx(@Nullable IgnitePredicate<? super IgniteInternalCache<?, ?>>... p);
+ public Collection<IgniteInternalCache<?, ?>> cachesx();
/**
* Checks if the event type is user-recordable.
http://git-wip-us.apache.org/repos/asf/ignite/blob/357ea8a7/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 7fc0313..4bd8a38 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -17,62 +17,7 @@
package org.apache.ignite.internal;
-import java.io.Externalizable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InvalidObjectException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.lang.management.ManagementFactory;
-import java.lang.management.RuntimeMXBean;
-import java.lang.ref.WeakReference;
-import java.lang.reflect.Constructor;
-import java.text.DateFormat;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Timer;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import javax.management.JMException;
-import javax.management.ObjectName;
-import org.apache.ignite.IgniteAtomicLong;
-import org.apache.ignite.IgniteAtomicReference;
-import org.apache.ignite.IgniteAtomicSequence;
-import org.apache.ignite.IgniteAtomicStamped;
-import org.apache.ignite.IgniteBinary;
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.IgniteClientDisconnectedException;
-import org.apache.ignite.IgniteCompute;
-import org.apache.ignite.IgniteCountDownLatch;
-import org.apache.ignite.IgniteDataStreamer;
-import org.apache.ignite.IgniteEvents;
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.IgniteFileSystem;
-import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.IgniteMessaging;
-import org.apache.ignite.IgniteQueue;
-import org.apache.ignite.IgniteScheduler;
-import org.apache.ignite.IgniteSemaphore;
-import org.apache.ignite.IgniteServices;
-import org.apache.ignite.IgniteSet;
-import org.apache.ignite.IgniteSystemProperties;
-import org.apache.ignite.IgniteTransactions;
-import org.apache.ignite.Ignition;
+import org.apache.ignite.*;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cluster.ClusterGroup;
import org.apache.ignite.cluster.ClusterMetrics;
@@ -83,6 +28,8 @@ import org.apache.ignite.configuration.CollectionConfiguration;
import org.apache.ignite.configuration.ConnectorConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
+import org.apache.ignite.internal.binary.BinaryEnumCache;
+import org.apache.ignite.internal.binary.BinaryMarshaller;
import org.apache.ignite.internal.cluster.ClusterGroupAdapter;
import org.apache.ignite.internal.cluster.IgniteClusterEx;
import org.apache.ignite.internal.managers.GridManager;
@@ -96,8 +43,6 @@ import org.apache.ignite.internal.managers.failover.GridFailoverManager;
import org.apache.ignite.internal.managers.indexing.GridIndexingManager;
import org.apache.ignite.internal.managers.loadbalancer.GridLoadBalancerManager;
import org.apache.ignite.internal.managers.swapspace.GridSwapSpaceManager;
-import org.apache.ignite.internal.binary.BinaryEnumCache;
-import org.apache.ignite.internal.binary.BinaryMarshaller;
import org.apache.ignite.internal.processors.GridProcessor;
import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
@@ -153,7 +98,6 @@ import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.SB;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteFuture;
-import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.lang.IgniteProductVersion;
import org.apache.ignite.lifecycle.LifecycleAware;
import org.apache.ignite.lifecycle.LifecycleBean;
@@ -171,57 +115,45 @@ import org.apache.ignite.spi.IgniteSpiVersionCheckException;
import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
import org.jetbrains.annotations.Nullable;
-import static org.apache.ignite.IgniteSystemProperties.IGNITE_CONFIG_URL;
-import static org.apache.ignite.IgniteSystemProperties.IGNITE_DAEMON;
-import static org.apache.ignite.IgniteSystemProperties.IGNITE_NO_ASCII;
-import static org.apache.ignite.IgniteSystemProperties.IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID;
-import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK;
-import static org.apache.ignite.IgniteSystemProperties.IGNITE_STARVATION_CHECK_INTERVAL;
-import static org.apache.ignite.IgniteSystemProperties.IGNITE_SUCCESS_FILE;
-import static org.apache.ignite.IgniteSystemProperties.IGNITE_UPDATE_NOTIFIER;
-import static org.apache.ignite.IgniteSystemProperties.getBoolean;
-import static org.apache.ignite.IgniteSystemProperties.snapshot;
-import static org.apache.ignite.internal.GridKernalState.DISCONNECTED;
-import static org.apache.ignite.internal.GridKernalState.STARTED;
-import static org.apache.ignite.internal.GridKernalState.STARTING;
-import static org.apache.ignite.internal.GridKernalState.STOPPED;
-import static org.apache.ignite.internal.GridKernalState.STOPPING;
-import static org.apache.ignite.internal.IgniteComponentType.IGFS;
-import static org.apache.ignite.internal.IgniteComponentType.IGFS_HELPER;
-import static org.apache.ignite.internal.IgniteComponentType.SCHEDULE;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_BUILD_DATE;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_BUILD_VER;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_CLIENT_MODE;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_CONSISTENCY_CHECK_SKIPPED;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_DAEMON;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_DEPLOYMENT_MODE;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_GRID_NAME;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_IPS;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_JIT_NAME;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_JMX_PORT;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_JVM_ARGS;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_JVM_PID;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_LANG_RUNTIME;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MACS;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MARSHALLER;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MARSHALLER_COMPACT_FOOTER;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_MARSHALLER_USE_DFLT_SUID;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_NODE_CONSISTENT_ID;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_PEER_CLASSLOADING;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_PHY_RAM;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_PREFIX;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_RESTART_ENABLED;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_REST_PORT_RANGE;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_SPI_CLASS;
-import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_USER_NAME;
-import static org.apache.ignite.internal.IgniteVersionUtils.ACK_VER_STR;
-import static org.apache.ignite.internal.IgniteVersionUtils.BUILD_TSTAMP_STR;
-import static org.apache.ignite.internal.IgniteVersionUtils.COPYRIGHT;
-import static org.apache.ignite.internal.IgniteVersionUtils.REV_HASH_STR;
-import static org.apache.ignite.internal.IgniteVersionUtils.VER;
-import static org.apache.ignite.internal.IgniteVersionUtils.VER_STR;
-import static org.apache.ignite.lifecycle.LifecycleEventType.AFTER_NODE_START;
-import static org.apache.ignite.lifecycle.LifecycleEventType.BEFORE_NODE_START;
+import javax.management.JMException;
+import javax.management.ObjectName;
+import java.io.Externalizable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.Constructor;
+import java.text.DateFormat;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Timer;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
+import static org.apache.ignite.IgniteSystemProperties.*;
+import static org.apache.ignite.internal.GridKernalState.*;
+import static org.apache.ignite.internal.IgniteComponentType.*;
+import static org.apache.ignite.internal.IgniteNodeAttributes.*;
+import static org.apache.ignite.internal.IgniteVersionUtils.*;
+import static org.apache.ignite.lifecycle.LifecycleEventType.*;
/**
* Ignite kernal.
@@ -2748,11 +2680,13 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
}
/** {@inheritDoc} */
- @Override public Collection<IgniteInternalCache<?, ?>> cachesx(IgnitePredicate<? super IgniteInternalCache<?, ?>>[] p) {
+ @Override public Collection<IgniteInternalCache<?, ?>> cachesx() {
guard();
try {
- return F.retain(ctx.cache().caches(), true, p);
+ Collection<IgniteInternalCache<?, ?>> caches = ctx.cache().caches();
+
+ return new ArrayList<>(caches);
}
finally {
unguard();
http://git-wip-us.apache.org/repos/asf/ignite/blob/357ea8a7/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
index 96fbf47..2033d62 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java
@@ -927,43 +927,6 @@ public class GridFunc {
}
/**
- * Retains all elements in input collection that are contained in {@code filter}.
- *
- * @param c Input collection.
- * @param cp If {@code true} method creates collection not modifying input, otherwise does
- * <tt>in-place</tt> modifications.
- * @param filter Filter collection. If filter collection is {@code null} or empty -
- * an empty collection will be returned.
- * @param <T> Type of collections.
- * @return Collection of retain elements.
- */
- public static <T0, T extends T0> Collection<T> retain(Collection<T> c, boolean cp,
- @Nullable Collection<? extends T0> filter) {
- A.notNull(c, "c");
-
- return retain(c, cp, in(filter));
- }
-
- /**
- * Retains all elements in input collection that are evaluated to {@code true}
- * by the given predicate.
- *
- * @param c Input collection.
- * @param cp If {@code true} method creates collection not modifying input, otherwise does
- * <tt>in-place</tt> modifications.
- * @param p Predicates to filter by. If no predicates provides - all elements
- * will be retained.
- * @param <T> Type of collections.
- * @return Collection of retain elements.
- */
- public static <T> Collection<T> retain(Collection<T> c, boolean cp, IgnitePredicate<? super T> p) {
- A.notNull(c, "c");
- A.notNull(p, "p");
-
- return lose(c, cp, not(p));
- }
-
- /**
* Retains all elements in input collection that are evaluated to {@code true}
* by all given predicates.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/357ea8a7/modules/core/src/test/java/org/apache/ignite/lang/utils/GridConcurrentWeakHashSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/lang/utils/GridConcurrentWeakHashSetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/lang/utils/GridConcurrentWeakHashSetSelfTest.java
index 9a6d3ca..5d346a7 100644
--- a/modules/core/src/test/java/org/apache/ignite/lang/utils/GridConcurrentWeakHashSetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/lang/utils/GridConcurrentWeakHashSetSelfTest.java
@@ -17,11 +17,6 @@
package org.apache.ignite.lang.utils;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-import java.util.concurrent.CountDownLatch;
import org.apache.ignite.internal.util.GridConcurrentWeakHashSet;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
@@ -29,6 +24,13 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.testframework.junits.common.GridCommonTest;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.concurrent.CountDownLatch;
+
/**
* Test for {@link GridConcurrentWeakHashSet}.
*/
@@ -94,7 +96,12 @@ public class GridConcurrentWeakHashSetSelfTest extends GridCommonAbstractTest {
assert set.retainAll(c);
assert !set.retainAll(c);
- Collection<Integer> c2 = F.retain(c1, true, c);
+ Collection<Integer> c2 = new ArrayList<>();
+
+ for (Integer val : c1) {
+ if (c.contains(val))
+ c2.add(val);
+ }
assert set.containsAll(c2);
assert !set.containsAll(c1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/357ea8a7/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
index fed42e1..b107a5c 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteProcessProxy.java
@@ -17,37 +17,7 @@
package org.apache.ignite.testframework.junits.multijvm;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteAtomicLong;
-import org.apache.ignite.IgniteAtomicReference;
-import org.apache.ignite.IgniteAtomicSequence;
-import org.apache.ignite.IgniteAtomicStamped;
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteCompute;
-import org.apache.ignite.IgniteCountDownLatch;
-import org.apache.ignite.IgniteSemaphore;
-import org.apache.ignite.IgniteDataStreamer;
-import org.apache.ignite.IgniteEvents;
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.IgniteFileSystem;
-import org.apache.ignite.IgniteIllegalStateException;
-import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.IgniteMessaging;
-import org.apache.ignite.IgniteBinary;
-import org.apache.ignite.IgniteQueue;
-import org.apache.ignite.IgniteScheduler;
-import org.apache.ignite.IgniteServices;
-import org.apache.ignite.IgniteSet;
-import org.apache.ignite.IgniteTransactions;
+import org.apache.ignite.*;
import org.apache.ignite.cache.affinity.Affinity;
import org.apache.ignite.cluster.ClusterGroup;
import org.apache.ignite.cluster.ClusterNode;
@@ -73,7 +43,6 @@ import org.apache.ignite.internal.util.typedef.internal.A;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteCallable;
import org.apache.ignite.lang.IgniteInClosure;
-import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.lang.IgniteProductVersion;
import org.apache.ignite.lang.IgniteRunnable;
import org.apache.ignite.plugin.IgnitePlugin;
@@ -82,6 +51,16 @@ import org.apache.ignite.resources.IgniteInstanceResource;
import org.apache.ignite.testframework.junits.IgniteTestResources;
import org.jetbrains.annotations.Nullable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+
/**
* Ignite proxy for ignite instance at another JVM.
*/
@@ -301,8 +280,7 @@ public class IgniteProcessProxy implements IgniteEx {
}
/** {@inheritDoc} */
- @Override public Collection<IgniteInternalCache<?, ?>> cachesx(
- @Nullable IgnitePredicate<? super IgniteInternalCache<?, ?>>... p) {
+ @Override public Collection<IgniteInternalCache<?, ?>> cachesx() {
throw new UnsupportedOperationException("Operation isn't supported yet.");
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/357ea8a7/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java
index 2bdf28c..46d1045 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/HadoopDefaultMapReducePlannerSelfTest.java
@@ -17,13 +17,6 @@
package org.apache.ignite.internal.processors.hadoop;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteFileSystem;
import org.apache.ignite.IgniteSpringBean;
@@ -54,12 +47,19 @@ import org.apache.ignite.internal.processors.igfs.IgfsPaths;
import org.apache.ignite.internal.processors.igfs.IgfsStatus;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.lang.IgniteFuture;
-import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.testframework.GridTestNode;
import org.apache.ignite.testframework.GridTestUtils;
import org.jetbrains.annotations.Nullable;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
/**
*
*/
@@ -986,7 +986,7 @@ public class HadoopDefaultMapReducePlannerSelfTest extends HadoopAbstractSelfTes
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
- @Override public Collection<IgniteInternalCache<?, ?>> cachesx(@Nullable IgnitePredicate<? super IgniteInternalCache<?, ?>>... p) {
+ @Override public Collection<IgniteInternalCache<?, ?>> cachesx() {
return null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/357ea8a7/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/WaitMapExchangeFinishCallable.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/WaitMapExchangeFinishCallable.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/WaitMapExchangeFinishCallable.java
index ac91b51..5e0586a 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/WaitMapExchangeFinishCallable.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/WaitMapExchangeFinishCallable.java
@@ -17,9 +17,6 @@
package org.apache.ignite.yardstick.cache;
-import java.util.Collection;
-import java.util.Map;
-import java.util.UUID;
import org.apache.ignite.Ignite;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
@@ -30,6 +27,10 @@ import org.apache.ignite.lang.IgniteCallable;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.yardstickframework.BenchmarkUtils;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+
/**
*
*/
@@ -40,7 +41,7 @@ public class WaitMapExchangeFinishCallable implements IgniteCallable<Void> {
/** {@inheritDoc} */
@Override public Void call() throws Exception {
- Collection<IgniteInternalCache<?, ?>> cachesx = ((IgniteKernal)ignite).cachesx(null);
+ Collection<IgniteInternalCache<?, ?>> cachesx = ((IgniteKernal)ignite).cachesx();
for (IgniteInternalCache<?, ?> cache : cachesx) {
try {
http://git-wip-us.apache.org/repos/asf/ignite/blob/357ea8a7/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteFailoverAbstractBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteFailoverAbstractBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteFailoverAbstractBenchmark.java
index 1a700c2..a4f5823 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteFailoverAbstractBenchmark.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/failover/IgniteFailoverAbstractBenchmark.java
@@ -184,7 +184,7 @@ public abstract class IgniteFailoverAbstractBenchmark<K, V> extends IgniteCacheA
while (true) {
boolean partitionsExchangeFinished = true;
- for (IgniteInternalCache<?, ?> cache : kernal.cachesx(null)) {
+ for (IgniteInternalCache<?, ?> cache : kernal.cachesx()) {
log.info("Checking cache: " + cache.name());
GridCacheAdapter<?, ?> c = kernal.internalCache(cache.name());