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/03/31 21:39:28 UTC
[1/2] ignite git commit: WIP
Repository: ignite
Updated Branches:
refs/heads/vozerov-gridfunc [created] 40f4adca4
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 7b2414f..c5eaf51 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -17,6 +17,104 @@
package org.apache.ignite.internal.util;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteClientDisconnectedException;
+import org.apache.ignite.IgniteDeploymentException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.IgniteInterruptedException;
+import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.cluster.ClusterGroupEmptyException;
+import org.apache.ignite.cluster.ClusterMetrics;
+import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.cluster.ClusterTopologyException;
+import org.apache.ignite.compute.ComputeTask;
+import org.apache.ignite.compute.ComputeTaskCancelledException;
+import org.apache.ignite.compute.ComputeTaskName;
+import org.apache.ignite.compute.ComputeTaskTimeoutException;
+import org.apache.ignite.configuration.AddressResolver;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.events.EventType;
+import org.apache.ignite.internal.GridKernalContext;
+import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
+import org.apache.ignite.internal.IgniteDeploymentCheckedException;
+import org.apache.ignite.internal.IgniteFutureCancelledCheckedException;
+import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.IgniteInterruptedCheckedException;
+import org.apache.ignite.internal.IgniteNodeAttributes;
+import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException;
+import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
+import org.apache.ignite.internal.compute.ComputeTaskCancelledCheckedException;
+import org.apache.ignite.internal.compute.ComputeTaskTimeoutCheckedException;
+import org.apache.ignite.internal.events.DiscoveryCustomEvent;
+import org.apache.ignite.internal.managers.communication.GridIoManager;
+import org.apache.ignite.internal.managers.deployment.GridDeploymentInfo;
+import org.apache.ignite.internal.mxbean.IgniteStandardMXBean;
+import org.apache.ignite.internal.processors.cache.GridCacheAttributes;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx;
+import org.apache.ignite.internal.transactions.IgniteTxHeuristicCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxOptimisticCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
+import org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException;
+import org.apache.ignite.internal.util.future.IgniteFutureImpl;
+import org.apache.ignite.internal.util.io.GridFilenameUtils;
+import org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryNativeLoader;
+import org.apache.ignite.internal.util.lang.GridClosureException;
+import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
+import org.apache.ignite.internal.util.lang.GridTuple;
+import org.apache.ignite.internal.util.typedef.C1;
+import org.apache.ignite.internal.util.typedef.CI1;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.G;
+import org.apache.ignite.internal.util.typedef.P1;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.SB;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.util.worker.GridWorker;
+import org.apache.ignite.lang.IgniteBiTuple;
+import org.apache.ignite.lang.IgniteClosure;
+import org.apache.ignite.lang.IgniteFutureCancelledException;
+import org.apache.ignite.lang.IgniteFutureTimeoutException;
+import org.apache.ignite.lang.IgniteOutClosure;
+import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.lang.IgniteProductVersion;
+import org.apache.ignite.lang.IgniteUuid;
+import org.apache.ignite.lifecycle.LifecycleAware;
+import org.apache.ignite.plugin.PluginProvider;
+import org.apache.ignite.plugin.extensions.communication.Message;
+import org.apache.ignite.plugin.extensions.communication.MessageWriter;
+import org.apache.ignite.spi.IgniteSpi;
+import org.apache.ignite.spi.IgniteSpiException;
+import org.apache.ignite.spi.discovery.DiscoverySpi;
+import org.apache.ignite.spi.discovery.DiscoverySpiOrderSupport;
+import org.apache.ignite.transactions.TransactionHeuristicException;
+import org.apache.ignite.transactions.TransactionOptimisticException;
+import org.apache.ignite.transactions.TransactionRollbackException;
+import org.apache.ignite.transactions.TransactionTimeoutException;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentHashMap8;
+import sun.misc.SharedSecrets;
+import sun.misc.URLClassPath;
+import sun.misc.Unsafe;
+
+import javax.management.DynamicMBean;
+import javax.management.JMException;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.X509TrustManager;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.DataInput;
@@ -128,103 +226,6 @@ import java.util.logging.Logger;
import java.util.regex.Pattern;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-import javax.management.DynamicMBean;
-import javax.management.JMException;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509TrustManager;
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.IgniteClientDisconnectedException;
-import org.apache.ignite.IgniteDeploymentException;
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.IgniteInterruptedException;
-import org.apache.ignite.IgniteLogger;
-import org.apache.ignite.IgniteSystemProperties;
-import org.apache.ignite.cluster.ClusterGroupEmptyException;
-import org.apache.ignite.cluster.ClusterMetrics;
-import org.apache.ignite.cluster.ClusterNode;
-import org.apache.ignite.cluster.ClusterTopologyException;
-import org.apache.ignite.compute.ComputeTask;
-import org.apache.ignite.compute.ComputeTaskCancelledException;
-import org.apache.ignite.compute.ComputeTaskName;
-import org.apache.ignite.compute.ComputeTaskTimeoutException;
-import org.apache.ignite.configuration.AddressResolver;
-import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.events.EventType;
-import org.apache.ignite.internal.GridKernalContext;
-import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
-import org.apache.ignite.internal.IgniteDeploymentCheckedException;
-import org.apache.ignite.internal.IgniteFutureCancelledCheckedException;
-import org.apache.ignite.internal.IgniteFutureTimeoutCheckedException;
-import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.IgniteInterruptedCheckedException;
-import org.apache.ignite.internal.IgniteNodeAttributes;
-import org.apache.ignite.internal.cluster.ClusterGroupEmptyCheckedException;
-import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException;
-import org.apache.ignite.internal.compute.ComputeTaskCancelledCheckedException;
-import org.apache.ignite.internal.compute.ComputeTaskTimeoutCheckedException;
-import org.apache.ignite.internal.events.DiscoveryCustomEvent;
-import org.apache.ignite.internal.managers.communication.GridIoManager;
-import org.apache.ignite.internal.managers.deployment.GridDeploymentInfo;
-import org.apache.ignite.internal.mxbean.IgniteStandardMXBean;
-import org.apache.ignite.internal.processors.cache.GridCacheAttributes;
-import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
-import org.apache.ignite.internal.processors.cache.version.GridCacheVersionEx;
-import org.apache.ignite.internal.transactions.IgniteTxHeuristicCheckedException;
-import org.apache.ignite.internal.transactions.IgniteTxOptimisticCheckedException;
-import org.apache.ignite.internal.transactions.IgniteTxRollbackCheckedException;
-import org.apache.ignite.internal.transactions.IgniteTxTimeoutCheckedException;
-import org.apache.ignite.internal.util.future.IgniteFutureImpl;
-import org.apache.ignite.internal.util.io.GridFilenameUtils;
-import org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryNativeLoader;
-import org.apache.ignite.internal.util.lang.GridClosureException;
-import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
-import org.apache.ignite.internal.util.lang.GridTuple;
-import org.apache.ignite.internal.util.typedef.C1;
-import org.apache.ignite.internal.util.typedef.CI1;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.G;
-import org.apache.ignite.internal.util.typedef.P1;
-import org.apache.ignite.internal.util.typedef.X;
-import org.apache.ignite.internal.util.typedef.internal.A;
-import org.apache.ignite.internal.util.typedef.internal.SB;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.util.worker.GridWorker;
-import org.apache.ignite.lang.IgniteBiTuple;
-import org.apache.ignite.lang.IgniteClosure;
-import org.apache.ignite.lang.IgniteFutureCancelledException;
-import org.apache.ignite.lang.IgniteFutureTimeoutException;
-import org.apache.ignite.lang.IgniteOutClosure;
-import org.apache.ignite.lang.IgnitePredicate;
-import org.apache.ignite.lang.IgniteProductVersion;
-import org.apache.ignite.lang.IgniteUuid;
-import org.apache.ignite.lifecycle.LifecycleAware;
-import org.apache.ignite.plugin.PluginProvider;
-import org.apache.ignite.plugin.extensions.communication.Message;
-import org.apache.ignite.plugin.extensions.communication.MessageWriter;
-import org.apache.ignite.spi.IgniteSpi;
-import org.apache.ignite.spi.IgniteSpiException;
-import org.apache.ignite.spi.discovery.DiscoverySpi;
-import org.apache.ignite.spi.discovery.DiscoverySpiOrderSupport;
-import org.apache.ignite.transactions.TransactionHeuristicException;
-import org.apache.ignite.transactions.TransactionOptimisticException;
-import org.apache.ignite.transactions.TransactionRollbackException;
-import org.apache.ignite.transactions.TransactionTimeoutException;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jsr166.ConcurrentHashMap8;
-import sun.misc.SharedSecrets;
-import sun.misc.URLClassPath;
-import sun.misc.Unsafe;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_DISABLE_HOSTNAME_VERIFIER;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_HOME;
@@ -5836,7 +5837,7 @@ public abstract class IgniteUtils {
Iterable<Field> fields = cached ? tup.get2() : Arrays.asList(cls.getDeclaredFields());
if (!cached) {
- tup = F.t2();
+ tup = new IgniteBiTuple<>();
tup.set1(cls);
}
@@ -8560,7 +8561,7 @@ public abstract class IgniteUtils {
throw new IgniteCheckedException("Addresses can not be resolved [addr=" + addrs +
", hostNames=" + hostNames + ']');
- return F.viewListReadOnly(res, F.<InetAddress>identity());
+ return Collections.unmodifiableList(res);
}
/**
@@ -8607,7 +8608,7 @@ public abstract class IgniteUtils {
res.add(new InetSocketAddress(addr, port));
}
- return F.viewListReadOnly(res, F.<InetSocketAddress>identity());
+ return Collections.unmodifiableList(res);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java
index e7b420e..9d3435f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/ipc/shmem/IpcSharedMemoryServerEndpoint.java
@@ -17,23 +17,6 @@
package org.apache.ignite.internal.util.ipc.shmem;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
-import java.io.RandomAccessFile;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.nio.channels.FileLock;
-import java.nio.channels.FileLockInterruptionException;
-import java.nio.channels.OverlappingFileLockException;
-import java.util.Collection;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicLong;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
@@ -55,6 +38,24 @@ import org.apache.ignite.resources.LoggerResource;
import org.apache.ignite.thread.IgniteThread;
import org.jetbrains.annotations.Nullable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+import java.io.RandomAccessFile;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.nio.channels.FileLock;
+import java.nio.channels.FileLockInterruptionException;
+import java.nio.channels.OverlappingFileLockException;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicLong;
+
/**
* Server shared memory IPC endpoint.
*/
@@ -381,8 +382,10 @@ public class IpcSharedMemoryServerEndpoint implements IpcServerEndpoint {
long idx = tokIdxGen.get();
if (tokIdxGen.compareAndSet(idx, idx + 2))
- return F.pair(new File(tokDir, TOKEN_FILE_NAME + idx + "-" + pid + "-" + size).getAbsolutePath(),
- new File(tokDir, TOKEN_FILE_NAME + (idx + 1) + "-" + pid + "-" + size).getAbsolutePath());
+ return new IgnitePair<>(
+ new File(tokDir, TOKEN_FILE_NAME + idx + "-" + pid + "-" + size).getAbsolutePath(),
+ new File(tokDir, TOKEN_FILE_NAME + (idx + 1) + "-" + pid + "-" + size).getAbsolutePath()
+ );
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/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 0678657..b7ef2d8 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
@@ -17,29 +17,6 @@
package org.apache.ignite.internal.util.lang;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.ConcurrentModificationException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.NavigableSet;
-import java.util.NoSuchElementException;
-import java.util.RandomAccess;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-import javax.cache.Cache;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.compute.ComputeJobResult;
@@ -77,6 +54,30 @@ import org.jsr166.ConcurrentHashMap8;
import org.jsr166.ConcurrentLinkedDeque8;
import org.jsr166.ThreadLocalRandom8;
+import javax.cache.Cache;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.ConcurrentModificationException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableSet;
+import java.util.NoSuchElementException;
+import java.util.RandomAccess;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+
/**
* Contains factory and utility methods for {@code closures}, {@code predicates}, and {@code tuples}.
* It also contains functional style collection comprehensions.
@@ -95,6 +96,7 @@ import org.jsr166.ThreadLocalRandom8;
* Also note, that in all methods with predicates, null predicate has a {@code true} meaning. So does
* the empty predicate array.
*/
+@SuppressWarnings("unchecked")
public class GridFunc {
/** */
private static final GridAbsClosure NOOP = new CA() {
@@ -152,14 +154,14 @@ public class GridFunc {
};
/** */
- public static final IgnitePredicate<Object> IS_NULL = new P1<Object>() {
+ private static final IgnitePredicate<Object> IS_NULL = new P1<Object>() {
@Override public boolean apply(Object o) {
return o == null;
}
};
/** */
- public static final IgnitePredicate<Object> IS_NOT_NULL = new P1<Object>() {
+ private static final IgnitePredicate<Object> IS_NOT_NULL = new P1<Object>() {
@Override public boolean apply(Object o) {
return o != null;
}
@@ -388,6 +390,7 @@ public class GridFunc {
* @param <T> Type of the collection.
* @return De-duped collection.
*/
+ @Deprecated
public static <T> Collection<T> dedup(Collection<? extends T> c) {
A.notNull(c, "c");
@@ -444,6 +447,7 @@ public class GridFunc {
*
* @return Reducer that calculates sum of integer elements.
*/
+ @Deprecated
public static IgniteReducer<Integer, Integer> sumIntReducer() {
return new R1<Integer, Integer>() {
private AtomicInteger sum = new AtomicInteger(0);
@@ -468,6 +472,7 @@ public class GridFunc {
*
* @return Reducer that calculates sum of long integer elements.
*/
+ @Deprecated
public static IgniteReducer<Long, Long> sumLongReducer() {
return new R1<Long, Long>() {
private AtomicLong sum = new AtomicLong(0);
@@ -492,6 +497,7 @@ public class GridFunc {
* @param toExcl Exclusive stop of the range.
* @return List containing numbers in range.
*/
+ @Deprecated
public static List<Integer> range(int fromIncl, int toExcl) {
A.ensure(fromIncl >= 0, "fromIncl >= 0");
A.ensure(toExcl >= 0, "toExcl >= 0");
@@ -514,6 +520,7 @@ public class GridFunc {
* @param delim Delimiter (optional).
* @return Reducer that concatenates strings using provided delimeter.
*/
+ @Deprecated
public static IgniteReducer<String, String> concatReducer(@Nullable final String delim) {
return new R1<String, String>() {
private SB sb = new SB();
@@ -574,6 +581,7 @@ public class GridFunc {
* @return Collections of data items casted to type {@code T}.
* @see org.apache.ignite.compute.ComputeJobResult#getData()
*/
+ @Deprecated
public static <T> Collection<T> jobResults(@Nullable Collection<? extends ComputeJobResult> res) {
if (isEmpty(res))
return Collections.emptyList();
@@ -647,6 +655,7 @@ public class GridFunc {
* @param msg Message to print.
* @return Absolute closure that print message.
*/
+ @Deprecated
public static GridAbsClosure println(final String msg) {
return new CA() {
@Override public void apply() {
@@ -700,6 +709,7 @@ public class GridFunc {
* @param <T> Type of the collection.
* @return Random value from the input collection.
*/
+ @Deprecated
public static <T> T rand(T... c) {
A.notNull(c, "c");
@@ -998,6 +1008,7 @@ public class GridFunc {
* @param <T> Type of collections.
* @return Collection of remaining elements.
*/
+ @Deprecated
public static <T> Collection<T> lose(Collection<T> c, boolean cp, @Nullable IgnitePredicate<? super T>... p) {
A.notNull(c, "c");
@@ -1038,6 +1049,7 @@ public class GridFunc {
* @return Filtered map.
*/
@SuppressWarnings({"unchecked"})
+ @Deprecated
public static <K, V> Map<K, V> lose(Map<K, V> m, boolean cp,
@Nullable IgnitePredicate<? super Map.Entry<K, V>>... p) {
A.notNull(m, "m");
@@ -1079,6 +1091,7 @@ public class GridFunc {
* @param <V> Type of map's values.
* @return Filtered map.
*/
+ @Deprecated
public static <K, V> Map<K, V> loseKeys(
Map<K, V> m,
boolean cp,
@@ -1104,6 +1117,7 @@ public class GridFunc {
* @param <V> Type of map's values.
* @return Filtered map.
*/
+ @Deprecated
public static <K, V> Map<K, V> loseValues(Map<K, V> m, boolean cp,
@Nullable final IgnitePredicate<? super V>... p) {
return lose(m, cp, new P1<Map.Entry<K, V>>() {
@@ -1157,6 +1171,7 @@ public class GridFunc {
* @param <T> Type of list.
* @return List of remaining elements
*/
+ @Deprecated
public static <T> List<T> filterList(List<T> c, boolean cp, @Nullable IgnitePredicate<T>... p) {
A.notNull(c, "c");
@@ -1276,6 +1291,7 @@ public class GridFunc {
* @param <T> Type of collections.
* @return Collection of retain elements.
*/
+ @Deprecated
public static <T0, T extends T0> Collection<T> retain(Collection<T> c, boolean cp,
@Nullable Collection<? extends T0> filter) {
A.notNull(c, "c");
@@ -1353,6 +1369,7 @@ public class GridFunc {
* @param <R> Output type.
* @return Curried closure.
*/
+ @Deprecated
public static <T, R> IgniteOutClosure<R> curry(final IgniteClosure<? super T, R> f, final T e) {
return new IgniteOutClosure<R>() {
@Override public R apply() {
@@ -1369,6 +1386,7 @@ public class GridFunc {
* @param <T> Input type.
* @return Curried closure.
*/
+ @Deprecated
public static <T> GridAbsClosure curry(final IgniteInClosure<? super T> f, final T e) {
return new GridAbsClosure() {
@Override public void apply() {
@@ -1564,6 +1582,7 @@ public class GridFunc {
* @param r Runnable to convert to closure. If {@code null} - no-op closure is returned.
* @return Closure that wraps given runnable. Note that wrapping closure always returns {@code null}.
*/
+ @Deprecated
public static GridAbsClosure as(@Nullable final Runnable r) {
return new CA() {
@Override public void apply() {
@@ -1705,6 +1724,7 @@ public class GridFunc {
* @return Light-weight view on given list with provided transformation.
*/
@SuppressWarnings("RedundantTypeArguments")
+ @Deprecated
public static <T1, T2> List<T2> viewListReadOnly(@Nullable final List<? extends T1> c,
final IgniteClosure<? super T1, T2> trans) {
A.notNull(trans, "trans");
@@ -1748,6 +1768,7 @@ public class GridFunc {
* @param p Optional predicates. If predicates are not provided - all elements will be in the view.
* @return View on given list with provided predicate.
*/
+ @Deprecated
public static <T1, T2> List<T2> transformList(Collection<? extends T1> c,
IgniteClosure<? super T1, T2> trans, @Nullable IgnitePredicate<? super T1>... p) {
A.notNull(c, "c", trans, "trans");
@@ -1978,6 +1999,7 @@ public class GridFunc {
* @param <V1> Type of the output map value.
* @return Light-weight view on given map with provided predicate and transformer.
*/
+ @Deprecated
public static <K0, K extends K0, V0, V extends V0, V1> Map<K, V1> viewReadOnly(@Nullable final Map<K, V> m,
final IgniteBiClosure<K, V, V1> trans, @Nullable final IgnitePredicate<? super K>... p) {
A.notNull(trans, "trans");
@@ -2305,12 +2327,12 @@ public class GridFunc {
* @see #newLinkedList()
* @see #newList()
* @see #newSet()
- * @see #newMap()
* @see #newAtomicLong()
* @see #newAtomicInt()
* @see #newAtomicRef()
* @see #newAtomicBoolean()
*/
+ @Deprecated
@Nullable public static <K, V> V returnIfAbsent(Map<? extends K, ? extends V> map, @Nullable K key,
@Nullable Callable<V> c) {
A.notNull(map, "map");
@@ -2345,6 +2367,7 @@ public class GridFunc {
* time its {@link org.apache.ignite.lang.IgniteOutClosure#apply()} method is called.
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public static <T> IgniteCallable<List<T>> newList() {
return (IgniteCallable<List<T>>)LIST_FACTORY;
}
@@ -2357,6 +2380,7 @@ public class GridFunc {
* @return Factory closure that creates new {@link AtomicInteger} instance
* initialized to {@code zero} every time its {@link org.apache.ignite.lang.IgniteOutClosure#apply()} method is called.
*/
+ @Deprecated
public static IgniteCallable<AtomicInteger> newAtomicInt() {
return ATOMIC_INT_FACTORY;
}
@@ -2369,6 +2393,7 @@ public class GridFunc {
* @return Factory closure that creates new {@link AtomicLong} instance
* initialized to {@code zero} every time its {@link org.apache.ignite.lang.IgniteOutClosure#apply()} method is called.
*/
+ @Deprecated
public static IgniteCallable<AtomicLong> newAtomicLong() {
return ATOMIC_LONG_FACTORY;
}
@@ -2383,6 +2408,7 @@ public class GridFunc {
* initialized to {@code null} every time its {@link org.apache.ignite.lang.IgniteOutClosure#apply()} method is called.
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public static <T> IgniteCallable<AtomicReference<T>> newAtomicRef() {
return (IgniteCallable<AtomicReference<T>>)ATOMIC_REF_FACTORY;
}
@@ -2395,6 +2421,7 @@ public class GridFunc {
* @return Factory closure that creates new {@link AtomicBoolean} instance
* initialized to {@code false} every time its {@link org.apache.ignite.lang.IgniteOutClosure#apply()} method is called.
*/
+ @Deprecated
public static IgniteCallable<AtomicBoolean> newAtomicBoolean() {
return ATOMIC_BOOL_FACTORY;
}
@@ -2408,6 +2435,7 @@ public class GridFunc {
* org.apache.ignite.lang.IgniteOutClosure#apply()} method is called.
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public static <T> IgniteCallable<LinkedList<T>> newLinkedList() {
return (IgniteCallable<LinkedList<T>>)LINKED_LIST_FACTORY;
}
@@ -2435,6 +2463,7 @@ public class GridFunc {
* time its {@link org.apache.ignite.lang.IgniteOutClosure#apply()} method is called.
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public static <K, V> IgniteCallable<Map<K, V>> newMap() {
return (IgniteCallable<Map<K, V>>)MAP_FACTORY;
}
@@ -2702,6 +2731,7 @@ public class GridFunc {
* @param p Predicate to check.
* @return {@code true} if given predicate is {@code ALWAYS_TRUE} predicate.
*/
+ @Deprecated
public static boolean isAlwaysTrue(IgnitePredicate p) {
return p == ALWAYS_TRUE;
}
@@ -2724,6 +2754,7 @@ public class GridFunc {
* @param p Predicate to check.
* @return {@code true} if given predicate is {@code ALWAYS_FALSE} predicate.
*/
+ @Deprecated
public static boolean isAlwaysFalse(IgnitePredicate p) {
return p == ALWAYS_FALSE;
}
@@ -2735,6 +2766,7 @@ public class GridFunc {
* @param p Predicate to check.
* @return {@code true} if given contains only {@code ALWAYS_FALSE} predicate.
*/
+ @Deprecated
public static boolean isAlwaysFalse(@Nullable IgnitePredicate[] p) {
return p != null && p.length == 1 && isAlwaysFalse(p[0]);
}
@@ -2745,6 +2777,7 @@ public class GridFunc {
* @param <T> Type of the free variable, i.e. the element the predicate is called on.
* @return Predicate that evaluates to {@code true} if its free variable is {@code null}.
*/
+ @Deprecated
public static <T> IgnitePredicate<T> isNull() {
return (IgnitePredicate<T>) IS_NULL;
}
@@ -2788,6 +2821,7 @@ public class GridFunc {
* @return Predicate that evaluates to {@code true} if its free variable is equal to
* {@code target} or both are {@code null}.
*/
+ @Deprecated
public static <T> IgnitePredicate<T> equalTo(@Nullable final T target) {
return new P1<T>() {
@Override public boolean apply(T t) {
@@ -2821,6 +2855,7 @@ public class GridFunc {
* @return Predicate that evaluates to {@code true} if its free variable is instance
* of the given class.
*/
+ @Deprecated
public static <T> IgnitePredicate<T> instanceOf(final Class<?> cls) {
A.notNull(cls, "cls");
@@ -2870,6 +2905,7 @@ public class GridFunc {
* @param <T> Type of the collection.
* @return Collections' first element or {@code null} in case if the collection is empty.
*/
+ @Deprecated
@Nullable public static <T> T last(@Nullable Iterable<? extends T> c) {
if (c == null)
return null;
@@ -2915,6 +2951,7 @@ public class GridFunc {
* @param <K> Key type.
* @return Maps' first key or {@code null} in case if the map is empty.
*/
+ @Deprecated
@Nullable public static <K> K firstKey(Map<K, ?> m) {
Iterator<K> it = m.keySet().iterator();
@@ -3010,6 +3047,7 @@ public class GridFunc {
* @param <T> Type of the free variable for the closure.
* @return Closure that return {@code toString()} value for its free variable.
*/
+ @Deprecated
public static <T> IgniteClosure<T, String> string() {
return new C1<T, String>() {
@Override public String apply(@Nullable T t) {
@@ -3044,6 +3082,7 @@ public class GridFunc {
* @return Modified target collection.
*/
@SuppressWarnings("unchecked")
+ @Deprecated
public static <T, C extends Collection<T>> C addAll(C c, Iterable<? extends T> it) {
if (it == null)
return c;
@@ -3062,6 +3101,7 @@ public class GridFunc {
* @param it Iterator to fetch.
* @return Modified target collection.
*/
+ @Deprecated
public static <T, C extends Collection<T>> C addAll(C c, Iterator<? extends T> it) {
if (it != null) {
while (it.hasNext())
@@ -3145,7 +3185,6 @@ public class GridFunc {
* @see #newLinkedList()
* @see #newList()
* @see #newSet()
- * @see #newMap()
* @see #newAtomicLong()
* @see #newAtomicInt()
* @see #newAtomicRef()
@@ -3211,6 +3250,7 @@ public class GridFunc {
* @param <Y> Type of the closure's return value.
* @return Single value as a result of collection reduction.
*/
+ @Deprecated
public static <X, Y> Y reduce(Iterable<? extends X> c, IgniteReducer<? super X, Y> f) {
A.notNull(c, "c", f, "f");
@@ -3234,6 +3274,7 @@ public class GridFunc {
* @param <X> Type of the free variable for the closure and type of the
* collection elements.
*/
+ @Deprecated
public static <X> void forEach(Iterable<? extends X> c, IgniteInClosure<? super X> f,
@Nullable IgnitePredicate<? super X>... p) {
A.notNull(c, "c", f, "f");
@@ -3256,6 +3297,7 @@ public class GridFunc {
* elements.
*/
@SuppressWarnings("RedundantTypeArguments")
+ @Deprecated
public static <X> void forEach(X[] c, IgniteInClosure<? super X> f, @Nullable IgnitePredicate<? super X>... p) {
A.notNull(c, "c", f, "f");
@@ -3270,6 +3312,7 @@ public class GridFunc {
* @param <T> Type of the free variable for the predicate and type of the collection elements.
* @return Collection to copy to.
*/
+ @Deprecated
public static <T> Collection<T> copy(Collection<T> to, T... from) {
A.notNull(to, "to", from, "from");
@@ -3288,6 +3331,7 @@ public class GridFunc {
* @param <T> Type of the free variable for the predicate and type of the collection elements.
* @return Collection to copy to.
*/
+ @Deprecated
public static <T> Collection<T> copy(Collection<T> to, Iterable<? extends T> from,
@Nullable IgnitePredicate<? super T>... p) {
A.notNull(to, "to", from, "from");
@@ -3344,6 +3388,7 @@ public class GridFunc {
* @param <Y> Type of the closure's return value.
* @return Transformed read only collection.
*/
+ @Deprecated
public static <X, Y> Collection<Y> transform(X[] c, IgniteClosure<? super X, Y> f) {
A.notNull(c, "c", f, "f");
@@ -3382,6 +3427,7 @@ public class GridFunc {
* value, {@code false} otherwise. Returns {@code false} if given set of predicates
* is {@code null} or empty.
*/
+ @Deprecated
public static <T> boolean isAny(@Nullable T t, @Nullable IgnitePredicate<? super T>... p) {
if (p != null)
for (IgnitePredicate<? super T> r : p)
@@ -3396,6 +3442,7 @@ public class GridFunc {
*
* @return Absolute (no-arg) closure that does nothing.
*/
+ @Deprecated
public static GridAbsClosure noop() {
return NOOP;
}
@@ -3438,6 +3485,7 @@ public class GridFunc {
* @return First element in given collection for which predicate evaluates to
* {@code true} - or {@code null} if such element cannot be found.
*/
+ @Deprecated
public static <V, Y> Y find(Iterable<? extends V> c, @Nullable Y dfltVal, IgniteClosure<? super V, Y> f,
@Nullable IgnitePredicate<? super V>... p) {
A.notNull(c, "c", f, "f");
@@ -3464,6 +3512,7 @@ public class GridFunc {
* @return {@code true} if collection {@code c1} contains at least one element from collection
* {@code c2}.
*/
+ @Deprecated
public static <T> boolean containsAny(@Nullable Collection<? extends T> c1, @Nullable Iterable<? extends T> c2) {
if (c1 != null && !c1.isEmpty() && c2 != null && c2.iterator().hasNext())
for (T t : c2)
@@ -3501,6 +3550,7 @@ public class GridFunc {
* @return {@code true} if collection {@code c1} contains all elements from collection
* {@code c2}.
*/
+ @Deprecated
public static <T> boolean containsAll(@Nullable Collection<? extends T> c1, @Nullable Iterable<? extends T> c2) {
if (c1 == null)
return false;
@@ -3521,6 +3571,7 @@ public class GridFunc {
* @param <T> Type of objects in pair.
* @return Pair of objects.
*/
+ @Deprecated
public static <T> IgnitePair<T> pair(@Nullable T t1, @Nullable T t2) {
return new IgnitePair<>(t1, t2);
}
@@ -3537,6 +3588,7 @@ public class GridFunc {
* evaluates to {@code true} - and second containing the elements for which predicate
* evaluates to {@code false}.
*/
+ @Deprecated
public static <V> IgniteBiTuple<Collection<V>, Collection<V>> partition(Iterable<? extends V> c,
IgnitePredicate<? super V> p) {
A.notNull(c, "c", p, "p");
@@ -3592,6 +3644,7 @@ public class GridFunc {
* @return Returns {@code true} if all given predicates evaluate to {@code true} for
* all elements. Returns {@code false} otherwise.
*/
+ @Deprecated
public static <V> boolean forAll(Iterable<? extends V> c, @Nullable IgnitePredicate<? super V>... p) {
A.notNull(c, "c");
@@ -3620,6 +3673,7 @@ public class GridFunc {
* @return Returns {@code true} if all given predicate evaluates to {@code true} for all
* entries. Returns {@code false} otherwise.
*/
+ @Deprecated
public static <K1, K extends K1, V1, V extends V1> boolean forAll(Map<K, V> m,
@Nullable IgnitePredicate<? super Map.Entry<K, V>>... p) {
A.notNull(m, "m");
@@ -3648,6 +3702,7 @@ public class GridFunc {
* @return Returns {@code true} if all given predicates evaluate to {@code true} for
* at least one element. Returns {@code false} otherwise.
*/
+ @Deprecated
public static <V> boolean forAny(Iterable<? extends V> c, @Nullable IgnitePredicate<? super V>... p) {
A.notNull(c, "c");
@@ -3696,6 +3751,7 @@ public class GridFunc {
* @param <B> Type of the folding value and return type of the closure.
* @return Value representing folded collection.
*/
+ @Deprecated
@Nullable public static <D, B> B fold(Iterable<? extends D> c, @Nullable B b,
@Nullable IgniteBiClosure<? super D, ? super B, B>... fs) {
A.notNull(c, "c");
@@ -3728,6 +3784,7 @@ public class GridFunc {
* @param <V> Type of the tuple.
* @return Newly created empty tuple.
*/
+ @Deprecated
public static <V> GridTuple<V> t1() {
return new GridTuple<>();
}
@@ -3752,6 +3809,7 @@ public class GridFunc {
* @param <V2> Type of the 2nd tuple parameter.
* @return Newly created empty tuple.
*/
+ @Deprecated
public static <V1, V2> IgniteBiTuple<V1, V2> t2() {
return new IgniteBiTuple<>();
}
@@ -3784,6 +3842,7 @@ public class GridFunc {
* @param <V4> Type of the 4th tuple parameter.
* @return Newly created tuple.
*/
+ @Deprecated
public static <V1, V2, V3, V4> GridTuple4<V1, V2, V3, V4> t(@Nullable V1 v1, @Nullable V2 v2, @Nullable V3 v3,
@Nullable V4 v4) {
return new GridTuple4<>(v1, v2, v3, v4);
@@ -3804,6 +3863,7 @@ public class GridFunc {
* @param <V5> Type of the 5th tuple parameter.
* @return Newly created tuple.
*/
+ @Deprecated
public static <V1, V2, V3, V4, V5> GridTuple5<V1, V2, V3, V4, V5> t(@Nullable V1 v1, @Nullable V2 v2,
@Nullable V3 v3, @Nullable V4 v4, @Nullable V5 v5) {
return new GridTuple5<>(v1, v2, v3, v4, v5);
@@ -3826,6 +3886,7 @@ public class GridFunc {
* @param <V6> Type of the 6th tuple parameter.
* @return Newly created tuple.
*/
+ @Deprecated
public static <V1, V2, V3, V4, V5, V6> GridTuple6<V1, V2, V3, V4, V5, V6> t(@Nullable V1 v1, @Nullable V2 v2,
@Nullable V3 v3, @Nullable V4 v4, @Nullable V5 v5, @Nullable V6 v6) {
return new GridTuple6<>(v1, v2, v3, v4, v5, v6);
@@ -3837,6 +3898,7 @@ public class GridFunc {
* @param objs Values for vararg tuple.
* @return Vararg tuple with given values.
*/
+ @Deprecated
public static GridTupleV tv(Object... objs) {
assert objs != null;
@@ -3851,6 +3913,7 @@ public class GridFunc {
* @param <V3> Type of the 3rd tuple parameter.
* @return Newly created empty tuple.
*/
+ @Deprecated
public static <V1, V2, V3> GridTuple3<V1, V2, V3> t3() {
return new GridTuple3<>();
}
@@ -3864,6 +3927,7 @@ public class GridFunc {
* @param <V4> Type of the 4th tuple parameter.
* @return Newly created empty tuple.
*/
+ @Deprecated
public static <V1, V2, V3, V4> GridTuple4<V1, V2, V3, V4> t4() {
return new GridTuple4<>();
}
@@ -3878,6 +3942,7 @@ public class GridFunc {
* @param <V5> Type of the 5th tuple parameter.
* @return Newly created empty tuple.
*/
+ @Deprecated
public static <V1, V2, V3, V4, V5> GridTuple5<V1, V2, V3, V4, V5> t5() {
return new GridTuple5<>();
}
@@ -3893,6 +3958,7 @@ public class GridFunc {
* @param <V6> Type of the 6th tuple parameter.
* @return Newly created empty tuple.
*/
+ @Deprecated
public static <V1, V2, V3, V4, V5, V6> GridTuple6<V1, V2, V3, V4, V5, V6> t6() {
return new GridTuple6<>();
}
@@ -3907,6 +3973,7 @@ public class GridFunc {
* @param <V> Value type.
* @return Resulting map.
*/
+ @Deprecated
public static <K, V> Map<K, V> zip(Collection<? extends K> keys, V dfltVal) {
A.notNull(keys, "keys");
@@ -3968,6 +4035,7 @@ public class GridFunc {
* @param <V> Value's type.
* @return Created map.
*/
+ @Deprecated
public static <K, V> Map<K, V> asMap(K k1, V v1, K k2, V v2, K k3, V v3) {
Map<K, V> map = new GridLeanMap<>(3);
@@ -3993,6 +4061,7 @@ public class GridFunc {
* @param <V> Value's type.
* @return Created map.
*/
+ @Deprecated
public static <K, V> Map<K, V> asMap(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4) {
Map<K, V> map = new GridLeanMap<>(4);
@@ -4021,6 +4090,7 @@ public class GridFunc {
* @param <V> Value's type.
* @return Created map.
*/
+ @Deprecated
public static <K, V> Map<K, V> asMap(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5) {
Map<K, V> map = new GridLeanMap<>(5);
@@ -4062,6 +4132,7 @@ public class GridFunc {
* @param <T> Element's type.
* @return Created set.
*/
+ @Deprecated
public static <T> Set<T> asSet(@Nullable T t) {
return t == null ? Collections.<T>emptySet() : Collections.singleton(t);
}
@@ -4074,6 +4145,7 @@ public class GridFunc {
* @return Created set.
*/
@SuppressWarnings( {"RedundantTypeArguments"})
+ @Deprecated
public static <T> Set<T> asSet(@Nullable T... t) {
if (t == null || t.length == 0)
return Collections.<T>emptySet();
@@ -4152,6 +4224,7 @@ public class GridFunc {
* @param val Value to find.
* @return {@code True} if array contains given value.
*/
+ @Deprecated
public static boolean contains(Integer[] arr, int val) {
for (Integer el : arr) {
if (el == val)
@@ -4167,6 +4240,7 @@ public class GridFunc {
* @return {@code True} if array contains given value.
*/
@SuppressWarnings("ForLoopReplaceableByForEach")
+ @Deprecated
public static boolean contains(long[] arr, long val) {
for (int i = 0; i < arr.length; i++) {
if (arr[i] == val)
@@ -4194,6 +4268,7 @@ public class GridFunc {
* @param c2 Second collection.
* @return {@code True} if both collections have equal elements in the same order.
*/
+ @Deprecated
public static boolean eqOrdered(@Nullable Collection<?> c1, @Nullable Collection<?> c2) {
if (c1 == c2)
return true;
@@ -4359,6 +4434,7 @@ public class GridFunc {
* duplicate the implementation will have to do double work.
* @return {@code True} if arrays are equal, {@code false} otherwise.
*/
+ @Deprecated
public static boolean eqArray(Object[] a1, Object[] a2, boolean sorted, boolean dups) {
if (a1 == a2)
return true;
@@ -4492,6 +4568,7 @@ public class GridFunc {
* @param s2 Set2.
* @return {@code True} if there is an intersection, {@code false} otherwise.
*/
+ @Deprecated
public static <E> boolean intersects(Iterable<E> s1, Collection<E>... s2) {
for (E e1 : s1) {
for (Collection<E> s : s2) {
@@ -4509,6 +4586,7 @@ public class GridFunc {
* @param futs Futures. If none provided - this method is no-op.
* @throws IgniteCheckedException If any of the futures failed.
*/
+ @Deprecated
public static <T> void awaitAll(@Nullable Collection<IgniteInternalFuture<T>> futs) throws IgniteCheckedException {
awaitAll(0, null, futs);
}
@@ -4520,6 +4598,7 @@ public class GridFunc {
* @param futs Futures. If none provided - this method is no-op.
* @throws IgniteCheckedException If any of the futures failed.
*/
+ @Deprecated
public static <T> void awaitAll(long timeout, @Nullable Collection<IgniteInternalFuture<T>> futs) throws IgniteCheckedException {
awaitAll(timeout, null, futs);
}
@@ -4535,6 +4614,7 @@ public class GridFunc {
* @return Reduced result if reducer is provided, {@code null} otherwise.
* @throws IgniteCheckedException If any of the futures failed.
*/
+ @Deprecated
@Nullable public static <T, R> R awaitAll(long timeout, @Nullable IgniteReducer<T, R> rdc,
@Nullable Collection<IgniteInternalFuture<T>> futs) throws IgniteCheckedException {
if (futs == null || futs.isEmpty())
@@ -4578,6 +4658,7 @@ public class GridFunc {
*
* @return Predicate for filtering unfinished futures.
*/
+ @Deprecated
public static IgnitePredicate<IgniteInternalFuture<?>> unfinishedFutures() {
return UNFINISHED_FUTURE;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple.java
index 2342239..0c2a5ce 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple.java
@@ -17,15 +17,16 @@
package org.apache.ignite.internal.util.lang;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
+
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.ignite.internal.util.tostring.GridToStringInclude;
-import org.apache.ignite.internal.util.typedef.internal.S;
-import org.jetbrains.annotations.Nullable;
/**
* Convenience class representing mutable tuple of a single value.
@@ -33,8 +34,6 @@ import org.jetbrains.annotations.Nullable;
* This class doesn't provide any synchronization for multi-threaded access
* and it is responsibility of the user of this class to provide outside
* synchronization, if needed.
- * @see GridFunc#t1()
- * @see GridFunc#t(Object)
*/
public class GridTuple<V> implements Iterable<V>, Cloneable, Externalizable {
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple3.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple3.java
index b999e2a..c04a50a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple3.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple3.java
@@ -17,16 +17,17 @@
package org.apache.ignite.internal.util.lang;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
+
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.ignite.internal.util.tostring.GridToStringInclude;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.internal.S;
-import org.jetbrains.annotations.Nullable;
/**
* Convenience class representing mutable tuple of three values.
@@ -34,8 +35,6 @@ import org.jetbrains.annotations.Nullable;
* This class doesn't provide any synchronization for multi-threaded access
* and it is responsibility of the user of this class to provide outside
* synchronization, if needed.
- * @see GridFunc#t3()
- * @see GridFunc#t(Object, Object, Object)
*/
public class GridTuple3<V1, V2, V3> implements Iterable<Object>, Externalizable, Cloneable {
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java
index c95a859..377d4de 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple4.java
@@ -17,16 +17,17 @@
package org.apache.ignite.internal.util.lang;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
+
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.ignite.internal.util.tostring.GridToStringInclude;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.internal.S;
-import org.jetbrains.annotations.Nullable;
/**
* Convenience class representing mutable tuple of four values.
@@ -34,8 +35,6 @@ import org.jetbrains.annotations.Nullable;
* This class doesn't provide any synchronization for multi-threaded access
* and it is responsibility of the user of this class to provide outside
* synchronization, if needed.
- * @see GridFunc#t4()
- * @see GridFunc#t(Object, Object, Object, Object)
*/
public class GridTuple4<V1, V2, V3, V4> implements Iterable<Object>, Externalizable, Cloneable {
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple5.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple5.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple5.java
index 9790f48..aedfa94 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple5.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple5.java
@@ -17,16 +17,17 @@
package org.apache.ignite.internal.util.lang;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
+
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.ignite.internal.util.tostring.GridToStringInclude;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.internal.S;
-import org.jetbrains.annotations.Nullable;
/**
* Convenience class representing mutable tuple of five values.
@@ -34,8 +35,6 @@ import org.jetbrains.annotations.Nullable;
* This class doesn't provide any synchronization for multi-threaded access
* and it is responsibility of the user of this class to provide outside
* synchronization, if needed.
- * @see GridFunc#t5()
- * @see GridFunc#t(Object, Object, Object, Object, Object)
*/
public class GridTuple5<V1, V2, V3, V4, V5> implements Iterable<Object>, Externalizable, Cloneable {
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple6.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple6.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple6.java
index 044944b..ba7464d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple6.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTuple6.java
@@ -17,16 +17,17 @@
package org.apache.ignite.internal.util.lang;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.jetbrains.annotations.Nullable;
+
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.ignite.internal.util.tostring.GridToStringInclude;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.internal.S;
-import org.jetbrains.annotations.Nullable;
/**
* Convenience class representing mutable tuple of six values.
@@ -34,8 +35,6 @@ import org.jetbrains.annotations.Nullable;
* This class doesn't provide any synchronization for multi-threaded access
* and it is responsibility of the user of this class to provide outside
* synchronization, if needed.
- * @see GridFunc#t5()
- * @see GridFunc#t(Object, Object, Object, Object, Object)
*/
public class GridTuple6<V1, V2, V3, V4, V5, V6> implements Iterable<Object>, Externalizable,
Cloneable {
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTupleV.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTupleV.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTupleV.java
index 225366a..b9034f5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTupleV.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridTupleV.java
@@ -17,6 +17,11 @@
package org.apache.ignite.internal.util.lang;
+import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.A;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
@@ -24,10 +29,6 @@ import java.io.ObjectOutput;
import java.util.Arrays;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.apache.ignite.internal.util.tostring.GridToStringInclude;
-import org.apache.ignite.internal.util.typedef.internal.A;
-import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.internal.util.typedef.internal.U;
/**
* Constructs a tuple over a given array.
@@ -37,6 +38,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
* synchronization, if needed.
* @see GridFunc#tv(Object...)
*/
+@Deprecated
public class GridTupleV implements Iterable<Object>, Externalizable, Cloneable {
/** */
private static final long serialVersionUID = 0L;
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerTask.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerTask.java
index 5c5e3d3..bdcb226 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/igfs/VisorIgfsProfilerTask.java
@@ -17,6 +17,15 @@
package org.apache.ignite.internal.visor.igfs;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteException;
+import org.apache.ignite.igfs.IgfsMode;
+import org.apache.ignite.internal.processors.task.GridInternal;
+import org.apache.ignite.internal.util.typedef.internal.S;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.internal.visor.VisorJob;
+import org.apache.ignite.internal.visor.VisorOneNodeTask;
+
import java.io.BufferedReader;
import java.io.IOException;
import java.nio.charset.Charset;
@@ -31,18 +40,10 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.igfs.IgfsMode;
-import org.apache.ignite.internal.processors.task.GridInternal;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.internal.S;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.internal.visor.VisorJob;
-import org.apache.ignite.internal.visor.VisorOneNodeTask;
import static org.apache.ignite.internal.igfs.common.IgfsLogger.DELIM_FIELD;
import static org.apache.ignite.internal.igfs.common.IgfsLogger.HDR;
@@ -174,13 +175,17 @@ public class VisorIgfsProfilerTask extends VisorOneNodeTask<String, Collection<V
private static final int LOG_COL_TOTAL_BYTES = 19;
/** List of log entries that should be parsed. */
- private static final Set<Integer> LOG_TYPES = F.asSet(
- TYPE_OPEN_IN,
- TYPE_OPEN_OUT,
- TYPE_RANDOM_READ,
- TYPE_CLOSE_IN,
- TYPE_CLOSE_OUT
- );
+ private static final Set<Integer> LOG_TYPES;
+
+ static {
+ LOG_TYPES = new HashSet<>();
+
+ LOG_TYPES.add(TYPE_OPEN_IN);
+ LOG_TYPES.add(TYPE_OPEN_OUT);
+ LOG_TYPES.add(TYPE_RANDOM_READ);
+ LOG_TYPES.add(TYPE_CLOSE_IN);
+ LOG_TYPES.add(TYPE_CLOSE_OUT);
+ }
/**
* Create job with given argument.
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
index 6843274..a5bcc22 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/collision/jobstealing/JobStealingCollisionSpi.java
@@ -17,19 +17,6 @@
package org.apache.ignite.spi.collision.jobstealing;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Queue;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.compute.ComputeJobContext;
@@ -56,6 +43,21 @@ import org.apache.ignite.spi.collision.CollisionSpi;
import org.jsr166.ConcurrentHashMap8;
import org.jsr166.ConcurrentLinkedDeque8;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Queue;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
import static org.apache.ignite.events.EventType.EVT_NODE_JOINED;
import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
@@ -416,11 +418,14 @@ public class JobStealingCollisionSpi extends IgniteSpiAdapter implements Collisi
/** {@inheritDoc} */
@Override public Map<String, Object> getNodeAttributes() throws IgniteSpiException {
- return F.<String, Object>asMap(
- createSpiAttributeName(WAIT_JOBS_THRESHOLD_NODE_ATTR), waitJobsThreshold,
- createSpiAttributeName(ACTIVE_JOBS_THRESHOLD_NODE_ATTR), activeJobsThreshold,
- createSpiAttributeName(MAX_STEALING_ATTEMPT_ATTR), maxStealingAttempts,
- createSpiAttributeName(MSG_EXPIRE_TIME_ATTR), msgExpireTime);
+ HashMap<String, Object> res = new HashMap<>(4);
+
+ res.put(createSpiAttributeName(WAIT_JOBS_THRESHOLD_NODE_ATTR), waitJobsThreshold);
+ res.put(createSpiAttributeName(ACTIVE_JOBS_THRESHOLD_NODE_ATTR), activeJobsThreshold);
+ res.put(createSpiAttributeName(MAX_STEALING_ATTEMPT_ATTR), maxStealingAttempts);
+ res.put(createSpiAttributeName(MSG_EXPIRE_TIME_ATTR), msgExpireTime);
+
+ return res;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
index 19858b3..280ed64 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -17,37 +17,6 @@
package org.apache.ignite.spi.communication.tcp;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.ConnectException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.SocketTimeoutException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.channels.SelectableChannel;
-import java.nio.channels.SocketChannel;
-import java.nio.channels.spi.AbstractInterruptibleChannel;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteClientDisconnectedException;
@@ -129,6 +98,38 @@ import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentLinkedDeque8;
import org.jsr166.LongAdder8;
+import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketTimeoutException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.SelectableChannel;
+import java.nio.channels.SocketChannel;
+import java.nio.channels.spi.AbstractInterruptibleChannel;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
@@ -1464,12 +1465,15 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter
Collection<InetSocketAddress> extAddrs = addrRslvr == null ? null :
U.resolveAddresses(addrRslvr, F.flat(Arrays.asList(addrs.get1(), addrs.get2())), boundTcpPort);
- return F.asMap(
- createSpiAttributeName(ATTR_ADDRS), addrs.get1(),
- createSpiAttributeName(ATTR_HOST_NAMES), addrs.get2(),
- createSpiAttributeName(ATTR_PORT), boundTcpPort,
- createSpiAttributeName(ATTR_SHMEM_PORT), boundTcpShmemPort >= 0 ? boundTcpShmemPort : null,
- createSpiAttributeName(ATTR_EXT_ADDRS), extAddrs);
+ HashMap<String, Object> res = new HashMap<>(5);
+
+ res.put(createSpiAttributeName(ATTR_ADDRS), addrs.get1());
+ res.put(createSpiAttributeName(ATTR_HOST_NAMES), addrs.get2());
+ res.put(createSpiAttributeName(ATTR_PORT), boundTcpPort);
+ res.put(createSpiAttributeName(ATTR_SHMEM_PORT), boundTcpShmemPort >= 0 ? boundTcpShmemPort : null);
+ res.put(createSpiAttributeName(ATTR_EXT_ADDRS), extAddrs);
+
+ return res;
}
catch (IOException | IgniteCheckedException e) {
throw new IgniteSpiException("Failed to resolve local host to addresses: " + locHost, e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index d6db66f..d41b962 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -17,45 +17,6 @@
package org.apache.ignite.spi.discovery.tcp;
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.net.ConnectException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketAddress;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Queue;
-import java.util.Set;
-import java.util.SortedMap;
-import java.util.TreeMap;
-import java.util.UUID;
-import java.util.concurrent.BlockingDeque;
-import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-import javax.net.ssl.SSLException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
@@ -128,6 +89,46 @@ import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryStatusCheckMessa
import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentHashMap8;
+import javax.net.ssl.SSLException;
+import java.io.BufferedInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketAddress;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
+import java.util.UUID;
+import java.util.concurrent.BlockingDeque;
+import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
import static org.apache.ignite.IgniteSystemProperties.IGNITE_DISCOVERY_HISTORY_SIZE;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID;
import static org.apache.ignite.IgniteSystemProperties.getInteger;
@@ -213,7 +214,7 @@ class ServerImpl extends TcpDiscoveryImpl {
private final Collection<SocketAddress> fromAddrs = new GridConcurrentHashSet<>();
/** Response on join request from coordinator (in case of duplicate ID or auth failure). */
- private final GridTuple<TcpDiscoveryAbstractMessage> joinRes = F.t1();
+ private final GridTuple<TcpDiscoveryAbstractMessage> joinRes = new GridTuple<>();
/** Mutex. */
private final Object mux = new Object();
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/test/java/org/apache/ignite/jvmtest/ConcurrentMapTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/jvmtest/ConcurrentMapTest.java b/modules/core/src/test/java/org/apache/ignite/jvmtest/ConcurrentMapTest.java
index 9bfa381..3a542fc 100644
--- a/modules/core/src/test/java/org/apache/ignite/jvmtest/ConcurrentMapTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/jvmtest/ConcurrentMapTest.java
@@ -17,6 +17,13 @@
package org.apache.ignite.jvmtest;
+import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.util.lang.IgnitePair;
+import org.apache.ignite.internal.util.typedef.X;
+import org.apache.ignite.testframework.GridTestUtils;
+import org.jsr166.ConcurrentHashMap8;
+import org.jsr166.ThreadLocalRandom8;
+
import java.util.Collection;
import java.util.LinkedList;
import java.util.Map;
@@ -26,13 +33,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.ignite.internal.IgniteInternalFuture;
-import org.apache.ignite.internal.util.lang.IgnitePair;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.X;
-import org.apache.ignite.testframework.GridTestUtils;
-import org.jsr166.ConcurrentHashMap8;
-import org.jsr166.ThreadLocalRandom8;
/**
*
@@ -66,7 +66,7 @@ public class ConcurrentMapTest {
int writes = testMap(100000, new ConcurrentHashMap8<String, Integer>(cap, 0.75f, lvl));
- ress.add(F.pair(lvl, writes));
+ ress.add(new IgnitePair<>(lvl, writes));
}
X.println("Test summary.");
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
index c7940c6..e2418be 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java
@@ -17,46 +17,6 @@
package org.apache.ignite.testframework;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.SoftReference;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.net.InetAddress;
-import java.net.MulticastSocket;
-import java.nio.file.attribute.PosixFilePermission;
-import java.security.GeneralSecurityException;
-import java.security.KeyStore;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Queue;
-import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-import javax.cache.CacheException;
-import javax.cache.configuration.Factory;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.ignite.Ignite;
@@ -102,6 +62,47 @@ import org.apache.ignite.testframework.config.GridTestProperties;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import javax.cache.CacheException;
+import javax.cache.configuration.Factory;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.SoftReference;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.net.InetAddress;
+import java.net.MulticastSocket;
+import java.nio.file.attribute.PosixFilePermission;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Queue;
+import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+
/**
* Utility class for tests.
*/
@@ -172,13 +173,14 @@ public final class GridTestUtils {
* @param sent Sent or received.
*/
public static void addMessage(UUID from, UUID to, Message msg, boolean sent) {
- IgnitePair<UUID> key = F.pair(from, to);
+ IgnitePair<UUID> key = new IgnitePair<>(from, to);
IgnitePair<Queue<Message>> val = msgMap.get(key);
if (val == null) {
IgnitePair<Queue<Message>> old = msgMap.putIfAbsent(key,
- val = F.<Queue<Message>>pair(new ConcurrentLinkedQueue<Message>(), new ConcurrentLinkedQueue<Message>()));
+ val = new IgnitePair<Queue<Message>>(
+ new ConcurrentLinkedQueue<Message>(), new ConcurrentLinkedQueue<Message>()));
if (old != null)
val = old;
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java
index dfd4611..329c605 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/hadoop/fs/IgniteHadoopIgfsSecondaryFileSystem.java
@@ -57,6 +57,7 @@ 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.concurrent.Callable;
@@ -234,8 +235,13 @@ public class IgniteHadoopIgfsSecondaryFileSystem implements IgfsSecondaryFileSys
if (perm == null)
perm = FsPermission.getDefault();
- return F.asMap(IgfsUtils.PROP_PERMISSION, String.format("%04o", perm.toShort()), IgfsUtils.PROP_USER_NAME,
- status.getOwner(), IgfsUtils.PROP_GROUP_NAME, status.getGroup());
+ HashMap<String, String> res = new HashMap<>(3);
+
+ res.put(IgfsUtils.PROP_PERMISSION, String.format("%04o", perm.toShort()));
+ res.put(IgfsUtils.PROP_USER_NAME, status.getOwner());
+ res.put(IgfsUtils.PROP_GROUP_NAME, status.getGroup());
+
+ return res;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java
index 769bdc4..5a567f6 100644
--- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java
+++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/shuffle/HadoopShuffle.java
@@ -17,9 +17,6 @@
package org.apache.ignite.internal.processors.hadoop.shuffle;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.internal.GridTopic;
@@ -39,6 +36,10 @@ import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiPredicate;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
/**
* Shuffle.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
index 3d9c10a..d21cf51 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQuerySplitter.java
@@ -17,20 +17,20 @@
package org.apache.ignite.internal.processors.query.h2.sql;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Set;
import org.apache.ignite.IgniteException;
import org.apache.ignite.internal.processors.cache.query.GridCacheSqlQuery;
import org.apache.ignite.internal.processors.cache.query.GridCacheTwoStepQuery;
import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing;
-import org.apache.ignite.internal.util.typedef.F;
import org.h2.jdbc.JdbcPreparedStatement;
import org.h2.util.IntArray;
import org.jetbrains.annotations.Nullable;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Set;
+
import static org.apache.ignite.internal.processors.query.h2.sql.GridSqlFunctionType.AVG;
import static org.apache.ignite.internal.processors.query.h2.sql.GridSqlFunctionType.CAST;
import static org.apache.ignite.internal.processors.query.h2.sql.GridSqlFunctionType.COUNT;
@@ -159,8 +159,9 @@ public class GridSqlQuerySplitter {
GridSqlSelect rdcQry = new GridSqlSelect().from(table(0));
// Split all select expressions into map-reduce parts.
- List<GridSqlElement> mapExps = F.addAll(new ArrayList<GridSqlElement>(mapQry.allColumns()),
- mapQry.columns(false));
+ List<GridSqlElement> mapExps = new ArrayList<>(mapQry.allColumns());
+
+ mapExps.addAll(mapQry.columns(false));
final int visibleCols = mapQry.visibleColumns();
final int havingCol = mapQry.havingColumn();
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
index e190c87..8d15656 100644
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlSelect.java
@@ -17,11 +17,12 @@
package org.apache.ignite.internal.processors.query.h2.sql;
-import java.util.ArrayList;
-import java.util.List;
import org.h2.util.StatementBuilder;
import org.h2.util.StringUtils;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Plain SELECT query.
*/
@@ -144,7 +145,7 @@ public class GridSqlSelect extends GridSqlQuery {
* @param visibleOnly If only visible expressions needed.
* @return Select clause expressions.
*/
- public Iterable<GridSqlElement> columns(boolean visibleOnly) {
+ public List<GridSqlElement> columns(boolean visibleOnly) {
assert visibleCols <= cols.size();
return visibleOnly && visibleCols != cols.size() ?
[2/2] ignite git commit: WIP
Posted by vo...@apache.org.
WIP
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/40f4adca
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/40f4adca
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/40f4adca
Branch: refs/heads/vozerov-gridfunc
Commit: 40f4adca411105478056cde220bdade3c9b976a5
Parents: bd509be
Author: thatcoach <pp...@list.ru>
Authored: Thu Mar 31 22:38:48 2016 +0300
Committer: thatcoach <pp...@list.ru>
Committed: Thu Mar 31 22:38:48 2016 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/GridLoggerProxy.java | 18 +-
.../apache/ignite/internal/IgniteKernal.java | 92 +++++----
.../deployment/GridDeploymentCommunication.java | 14 +-
.../discovery/GridDiscoveryManager.java | 71 +++----
.../processors/cache/GridCacheAdapter.java | 2 +-
.../processors/cache/GridCacheContext.java | 43 ++--
.../cache/GridCacheEvictionManager.java | 59 +++---
.../processors/cache/GridCacheLogger.java | 16 +-
.../GridCachePartitionExchangeManager.java | 55 ++---
.../processors/cache/GridCacheSwapManager.java | 6 +-
.../near/GridNearTxPrepareFutureAdapter.java | 15 +-
.../cache/query/GridCacheQueryManager.java | 2 +-
.../jdbc/GridCacheQueryJdbcValidationTask.java | 8 +-
.../cache/transactions/IgniteTxManager.java | 27 +--
.../closure/GridClosureProcessor.java | 51 +++--
.../datastructures/GridCacheAtomicLongImpl.java | 18 +-
.../GridCacheAtomicReferenceImpl.java | 19 +-
.../GridCacheAtomicSequenceImpl.java | 26 +--
.../GridCacheAtomicStampedImpl.java | 18 +-
.../GridCacheCountDownLatchImpl.java | 24 +--
.../datastructures/GridCacheQueueProxy.java | 24 +--
.../datastructures/GridCacheSemaphoreImpl.java | 26 +--
.../datastructures/GridCacheSetProxy.java | 22 +-
.../internal/processors/igfs/IgfsProcessor.java | 11 +-
.../processors/job/GridJobProcessor.java | 51 +++--
.../handlers/task/GridTaskCommandHandler.java | 31 +--
.../internal/util/GridExecutionStatistics.java | 106 ----------
.../ignite/internal/util/GridLeanSet.java | 6 +-
.../ignite/internal/util/IgniteUtils.java | 201 ++++++++++---------
.../shmem/IpcSharedMemoryServerEndpoint.java | 41 ++--
.../ignite/internal/util/lang/GridFunc.java | 135 ++++++++++---
.../ignite/internal/util/lang/GridTuple.java | 9 +-
.../ignite/internal/util/lang/GridTuple3.java | 11 +-
.../ignite/internal/util/lang/GridTuple4.java | 11 +-
.../ignite/internal/util/lang/GridTuple5.java | 11 +-
.../ignite/internal/util/lang/GridTuple6.java | 11 +-
.../ignite/internal/util/lang/GridTupleV.java | 10 +-
.../visor/igfs/VisorIgfsProfilerTask.java | 37 ++--
.../jobstealing/JobStealingCollisionSpi.java | 41 ++--
.../communication/tcp/TcpCommunicationSpi.java | 78 +++----
.../ignite/spi/discovery/tcp/ServerImpl.java | 81 ++++----
.../ignite/jvmtest/ConcurrentMapTest.java | 16 +-
.../ignite/testframework/GridTestUtils.java | 86 ++++----
.../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 10 +-
.../hadoop/shuffle/HadoopShuffle.java | 7 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 17 +-
.../processors/query/h2/sql/GridSqlSelect.java | 7 +-
47 files changed, 867 insertions(+), 814 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
index f6bddca..0964d29 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridLoggerProxy.java
@@ -17,22 +17,22 @@
package org.apache.ignite.internal;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.InvalidObjectException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.ObjectStreamException;
-import java.util.Collections;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
-import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.lifecycle.LifecycleAware;
import org.jetbrains.annotations.Nullable;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.Collections;
+
import static org.apache.ignite.IgniteSystemProperties.IGNITE_LOG_GRID_NAME;
/**
@@ -45,7 +45,7 @@ public class GridLoggerProxy implements IgniteLogger, LifecycleAware, Externaliz
/** */
private static ThreadLocal<IgniteBiTuple<String, Object>> stash = new ThreadLocal<IgniteBiTuple<String, Object>>() {
@Override protected IgniteBiTuple<String, Object> initialValue() {
- return F.t2();
+ return new IgniteBiTuple<>();
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/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 21fbc47..3fcc9bd 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,36 +17,6 @@
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.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.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;
@@ -169,6 +139,37 @@ import org.apache.ignite.spi.IgniteSpiVersionCheckException;
import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode;
import org.jetbrains.annotations.Nullable;
+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.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.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.IGNITE_CONFIG_URL;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_DAEMON;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_NO_ASCII;
@@ -572,8 +573,16 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
@Override public List<String> getLifecycleBeansFormatted() {
LifecycleBean[] beans = cfg.getLifecycleBeans();
- return F.isEmpty(beans) ? Collections.<String>emptyList() :
- (List<String>)F.transform(beans, F.<LifecycleBean>string());
+ if (F.isEmpty(beans))
+ return Collections.emptyList();
+ else {
+ List<String> res = new ArrayList<>(beans.length);
+
+ for (LifecycleBean bean : beans)
+ res.add(String.valueOf(bean));
+
+ return res;
+ }
}
/**
@@ -2241,17 +2250,20 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
private Iterable<Object> lifecycleAwares(IgniteConfiguration cfg) {
Collection<Object> objs = new ArrayList<>();
- if (!F.isEmpty(cfg.getLifecycleBeans()))
- F.copy(objs, cfg.getLifecycleBeans());
+ if (cfg.getLifecycleBeans() != null)
+ Collections.addAll(objs, cfg.getLifecycleBeans());
- if (!F.isEmpty(cfg.getSegmentationResolvers()))
- F.copy(objs, cfg.getSegmentationResolvers());
+ if (cfg.getSegmentationResolvers() != null)
+ Collections.addAll(objs, cfg.getSegmentationResolvers());
- if (cfg.getConnectorConfiguration() != null)
- F.copy(objs, cfg.getConnectorConfiguration().getMessageInterceptor(),
- cfg.getConnectorConfiguration().getSslContextFactory());
+ if (cfg.getConnectorConfiguration() != null) {
+ objs.add(cfg.getConnectorConfiguration().getMessageInterceptor());
+ objs.add(cfg.getConnectorConfiguration().getSslContextFactory());
+ }
- F.copy(objs, cfg.getMarshaller(), cfg.getGridLogger(), cfg.getMBeanServer());
+ objs.add(cfg.getMarshaller());
+ objs.add(cfg.getGridLogger());
+ objs.add(cfg.getMBeanServer());
return objs;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java
index 76bd6e3..bf3eede 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCommunication.java
@@ -17,11 +17,6 @@
package org.apache.ignite.internal.managers.deployment;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.UUID;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cluster.ClusterNode;
@@ -35,13 +30,18 @@ import org.apache.ignite.internal.util.GridBusyLock;
import org.apache.ignite.internal.util.GridByteArrayList;
import org.apache.ignite.internal.util.lang.GridTuple;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
-import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteNotPeerDeployable;
import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.marshaller.Marshaller;
import org.apache.ignite.plugin.extensions.communication.Message;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.UUID;
+
import static org.apache.ignite.events.EventType.EVT_NODE_FAILED;
import static org.apache.ignite.events.EventType.EVT_NODE_LEFT;
import static org.apache.ignite.internal.GridTopic.TOPIC_CLASSLOAD;
@@ -380,7 +380,7 @@ class GridDeploymentCommunication {
final Object qryMux = new Object();
- final GridTuple<GridDeploymentResponse> res = F.t1();
+ final GridTuple<GridDeploymentResponse> res = new GridTuple<>();
GridLocalEventListener discoLsnr = new GridLocalEventListener() {
@Override public void onEvent(Event evt) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index a254b73..18081c4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -17,40 +17,6 @@
package org.apache.ignite.internal.managers.discovery;
-import java.io.Externalizable;
-import java.io.Serializable;
-import java.lang.management.GarbageCollectorMXBean;
-import java.lang.management.ManagementFactory;
-import java.lang.management.MemoryMXBean;
-import java.lang.management.MemoryUsage;
-import java.lang.management.OperatingSystemMXBean;
-import java.lang.management.RuntimeMXBean;
-import java.lang.management.ThreadMXBean;
-import java.util.ArrayDeque;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NavigableMap;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.UUID;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ConcurrentNavigableMap;
-import java.util.concurrent.ConcurrentSkipListSet;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.zip.CRC32;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteClientDisconnectedException;
import org.apache.ignite.IgniteException;
@@ -115,6 +81,41 @@ import org.apache.ignite.thread.IgniteThread;
import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentHashMap8;
+import java.io.Externalizable;
+import java.io.Serializable;
+import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryMXBean;
+import java.lang.management.MemoryUsage;
+import java.lang.management.OperatingSystemMXBean;
+import java.lang.management.RuntimeMXBean;
+import java.lang.management.ThreadMXBean;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentNavigableMap;
+import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.zip.CRC32;
+
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID;
import static org.apache.ignite.events.EventType.EVT_CLIENT_NODE_DISCONNECTED;
@@ -1989,7 +1990,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
) {
assert node != null : data;
- evts.add(F.t(type, topVer, node, topSnapshot, data));
+ evts.add(new GridTuple5<>(type, topVer, node, topSnapshot, data));
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git 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
index 44c8b57..bb0af50 100644
--- 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
@@ -177,7 +177,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
private static final ThreadLocal<IgniteBiTuple<String, String>> stash = new ThreadLocal<IgniteBiTuple<String,
String>>() {
@Override protected IgniteBiTuple<String, String> initialValue() {
- return F.t2();
+ return new IgniteBiTuple<>();
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 5729959..7bf0f7a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -17,26 +17,6 @@
package org.apache.ignite.internal.processors.cache;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.InvalidObjectException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.ObjectStreamException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import javax.cache.Cache;
-import javax.cache.configuration.Factory;
-import javax.cache.expiry.EternalExpiryPolicy;
-import javax.cache.expiry.ExpiryPolicy;
-import javax.cache.processor.EntryProcessorResult;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.cache.CacheInterceptor;
@@ -105,6 +85,27 @@ import org.apache.ignite.plugin.security.SecurityException;
import org.apache.ignite.plugin.security.SecurityPermission;
import org.jetbrains.annotations.Nullable;
+import javax.cache.Cache;
+import javax.cache.configuration.Factory;
+import javax.cache.expiry.EternalExpiryPolicy;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.processor.EntryProcessorResult;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+
import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC;
import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL;
import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
@@ -125,7 +126,7 @@ public class GridCacheContext<K, V> implements Externalizable {
/** Deserialization stash. */
private static final ThreadLocal<IgniteBiTuple<String, String>> stash = new ThreadLocal<IgniteBiTuple<String, String>>() {
@Override protected IgniteBiTuple<String, String> initialValue() {
- return F.t2();
+ return new IgniteBiTuple<>();
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
index ae4a362..e57469b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java
@@ -17,29 +17,6 @@
package org.apache.ignite.internal.processors.cache;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.cache.CacheMemoryMode;
@@ -87,6 +64,30 @@ import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentHashMap8;
import org.jsr166.ConcurrentLinkedDeque8;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.apache.ignite.cache.CacheMemoryMode.OFFHEAP_TIERED;
import static org.apache.ignite.cache.CacheMode.LOCAL;
@@ -1984,11 +1985,15 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter {
if (log.isDebugEnabled())
log.debug("Building eviction future result [fut=" + this + ", timedOut=" + timedOut + ']');
- boolean err = F.forAny(resMap.values(), new P1<GridCacheEvictionResponse>() {
- @Override public boolean apply(GridCacheEvictionResponse res) {
- return res.evictError();
+ boolean err = false;
+
+ for (GridCacheEvictionResponse res : resMap.values()) {
+ if (res.evictError()) {
+ err = true;
+
+ break;
}
- });
+ }
if (err) {
Collection<UUID> ids = F.view(resMap.keySet(), new P1<UUID>() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLogger.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLogger.java
index 75547fb..e96ade6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLogger.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheLogger.java
@@ -17,20 +17,20 @@
package org.apache.ignite.internal.processors.cache;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.InvalidObjectException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.ObjectStreamException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
-import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
import org.jetbrains.annotations.Nullable;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+
/**
* Logger which automatically attaches {@code [cacheName]} to every log statement.
*/
@@ -43,7 +43,7 @@ class GridCacheLogger implements IgniteLogger, Externalizable {
private static ThreadLocal<IgniteBiTuple<String, GridCacheContext>> stash =
new ThreadLocal<IgniteBiTuple<String, GridCacheContext>>() {
@Override protected IgniteBiTuple<String, GridCacheContext> initialValue() {
- return F.t2();
+ return new IgniteBiTuple<>();
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 6de10c5..369a060 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@ -17,26 +17,6 @@
package org.apache.ignite.internal.processors.cache;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.NavigableMap;
-import java.util.Queue;
-import java.util.TreeMap;
-import java.util.UUID;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ConcurrentSkipListMap;
-import java.util.concurrent.LinkedBlockingDeque;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.events.DiscoveryEvent;
@@ -87,6 +67,28 @@ import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentHashMap8;
import org.jsr166.ConcurrentLinkedDeque8;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Queue;
+import java.util.TreeMap;
+import java.util.UUID;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.LinkedBlockingDeque;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_AFFINITY_HISTORY_SIZE;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_PRELOAD_RESEND_TIMEOUT;
@@ -1269,9 +1271,16 @@ public class GridCachePartitionExchangeManager<K, V> extends GridCacheSharedMana
timeout = cctx.gridConfig().getNetworkTimeout();
// After workers line up and before preloading starts we initialize all futures.
- if (log.isDebugEnabled())
- log.debug("Before waiting for exchange futures [futs" +
- F.view(exchFuts.values(), F.unfinishedFutures()) + ", worker=" + this + ']');
+ if (log.isDebugEnabled()) {
+ Collection<IgniteInternalFuture> unfinished = new HashSet<>();
+
+ for (GridDhtPartitionsExchangeFuture fut : exchFuts.values()) {
+ if (!fut.isDone())
+ unfinished.add(fut);
+ }
+
+ log.debug("Before waiting for exchange futures [futs" + unfinished + ", worker=" + this + ']');
+ }
// Take next exchange future.
exchFut = poll(futQ, timeout, this);
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
index d50bf0b..1808289 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
@@ -714,8 +714,8 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter {
if (!swapEnabled)
return null;
- final GridTuple<GridCacheSwapEntry> t = F.t1();
- final GridTuple<IgniteCheckedException> err = F.t1();
+ final GridTuple<GridCacheSwapEntry> t = new GridTuple<>();
+ final GridTuple<IgniteCheckedException> err = new GridTuple<>();
SwapKey swapKey = new SwapKey(key,
part,
@@ -1003,7 +1003,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter {
}
}
- final GridTuple<IgniteCheckedException> err = F.t1();
+ final GridTuple<IgniteCheckedException> err = new GridTuple<>();
swapMgr.removeAll(spaceName,
unprocessedKeys,
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
index ce4d2e0..eb9d6df 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareFutureAdapter.java
@@ -17,12 +17,6 @@
package org.apache.ignite.internal.processors.cache.distributed.near;
-import java.util.Collection;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
-import javax.cache.expiry.ExpiryPolicy;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedException;
@@ -44,6 +38,13 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteReducer;
import org.apache.ignite.lang.IgniteUuid;
+import javax.cache.expiry.ExpiryPolicy;
+import java.util.Collection;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+
import static org.apache.ignite.internal.processors.cache.GridCacheOperation.NOOP;
/**
@@ -155,7 +156,7 @@ public abstract class GridNearTxPrepareFutureAdapter extends
Map<UUID, Collection<UUID>> map = txMapping.transactionNodes();
if (map.size() == 1) {
- Map.Entry<UUID, Collection<UUID>> entry = F.firstEntry(map);
+ Map.Entry<UUID, Collection<UUID>> entry = map.entrySet().iterator().next();
assert entry != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
index df95e2e..1bdab8f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -1917,7 +1917,7 @@ public abstract class GridCacheQueryManager<K, V> extends GridCacheManagerAdapte
// Get metadata from remote nodes.
if (!nodes.isEmpty())
- rmtFut = cctx.closures().callAsyncNoFailover(BROADCAST, F.asSet(job), nodes, true);
+ rmtFut = cctx.closures().callAsyncNoFailover(BROADCAST, Collections.singleton(job), nodes, true);
// Get local metadata.
IgniteInternalFuture<Collection<CacheSqlMetadata>> locFut = cctx.closures().callLocalSafe(job, true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcValidationTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcValidationTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcValidationTask.java
index 717c82c..6ef0bdb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcValidationTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcValidationTask.java
@@ -17,8 +17,6 @@
package org.apache.ignite.internal.processors.cache.query.jdbc;
-import java.util.Collection;
-import java.util.List;
import org.apache.ignite.Ignite;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.compute.ComputeJob;
@@ -31,6 +29,10 @@ import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.jetbrains.annotations.Nullable;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
/**
* Task to validate connection. Checks that cache with provided name exists in grid.
*/
@@ -42,7 +44,7 @@ public class GridCacheQueryJdbcValidationTask extends ComputeTaskSplitAdapter<St
@Override protected Collection<? extends ComputeJob> split(int gridSize,
@Nullable final String cacheName) {
// Register big data usage.
- return F.asSet(new ComputeJobAdapter() {
+ return Collections.singleton(new ComputeJobAdapter() {
@IgniteInstanceResource
private Ignite ignite;
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
index 28a7cc0..5f485c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java
@@ -17,18 +17,6 @@
package org.apache.ignite.internal.processors.cache.transactions;
-import java.io.Externalizable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicInteger;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteClientDisconnectedException;
import org.apache.ignite.IgniteException;
@@ -77,6 +65,19 @@ import org.jetbrains.annotations.Nullable;
import org.jsr166.ConcurrentHashMap8;
import org.jsr166.ConcurrentLinkedHashMap;
+import java.io.Externalizable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
import static org.apache.ignite.IgniteSystemProperties.IGNITE_MAX_COMPLETED_TX_COUNT;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_SLOW_TX_WARN_TIMEOUT;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_TX_SALVAGE_TIMEOUT;
@@ -837,7 +838,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter {
}
}
- return F.pair(
+ return new IgnitePair<>(
committed == null ? Collections.<GridCacheVersion>emptyList() : committed,
rolledback == null ? Collections.<GridCacheVersion>emptyList() : rolledback);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
index c6883dc..0715a40 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/closure/GridClosureProcessor.java
@@ -17,18 +17,6 @@
package org.apache.ignite.internal.processors.closure;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Executor;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.TimeUnit;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.binary.BinaryObjectException;
@@ -74,6 +62,20 @@ import org.apache.ignite.resources.LoadBalancerResource;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Executor;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.TimeUnit;
+
import static org.apache.ignite.compute.ComputeJobResultPolicy.FAILOVER;
import static org.apache.ignite.compute.ComputeJobResultPolicy.REDUCE;
import static org.apache.ignite.internal.processors.task.GridTaskThreadContextKey.TC_NO_FAILOVER;
@@ -1106,6 +1108,25 @@ public class GridClosureProcessor extends GridProcessorAdapter {
}
/**
+ * Get collection of actual results.
+ *
+ * @param res Initial results.
+ * @return Converted results.
+ */
+ private static <R> Collection<R> jobResults(List<ComputeJobResult> res) {
+ if (res == null)
+ return Collections.emptyList();
+ else {
+ List<R> res0 = new ArrayList<>(res.size());
+
+ for (int i = 0; i < res.size(); i++)
+ res0.add(res.get(i).<R>getData());
+
+ return res0;
+ }
+ }
+
+ /**
*
*/
private class JobMapper {
@@ -1462,7 +1483,7 @@ public class GridClosureProcessor extends GridProcessorAdapter {
/** {@inheritDoc} */
@Override public Collection<R> reduce(List<ComputeJobResult> res) {
- return F.jobResults(res);
+ return jobResults(res);
}
}
@@ -1602,7 +1623,7 @@ public class GridClosureProcessor extends GridProcessorAdapter {
/** {@inheritDoc} */
@Override public Collection<R> reduce(List<ComputeJobResult> res) throws IgniteException {
- return F.jobResults(res);
+ return jobResults(res);
}
}
@@ -1713,7 +1734,7 @@ public class GridClosureProcessor extends GridProcessorAdapter {
/** {@inheritDoc} */
@Override public Collection<R> reduce(List<ComputeJobResult> res) {
- return F.jobResults(res);
+ return jobResults(res);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
index 64fbcde..1cd8861 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicLongImpl.java
@@ -17,25 +17,25 @@
package org.apache.ignite.internal.processors.datastructures;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.InvalidObjectException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.ObjectStreamException;
-import java.util.concurrent.Callable;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
-import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.concurrent.Callable;
+
import static org.apache.ignite.internal.util.typedef.internal.CU.retryTopologySafe;
import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
@@ -51,7 +51,7 @@ public final class GridCacheAtomicLongImpl implements GridCacheAtomicLongEx, Ext
private static final ThreadLocal<IgniteBiTuple<GridKernalContext, String>> stash =
new ThreadLocal<IgniteBiTuple<GridKernalContext, String>>() {
@Override protected IgniteBiTuple<GridKernalContext, String> initialValue() {
- return F.t2();
+ return new IgniteBiTuple<>();
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
index e044138..5a4480c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
@@ -17,13 +17,6 @@
package org.apache.ignite.internal.processors.datastructures;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.InvalidObjectException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.ObjectStreamException;
-import java.util.concurrent.Callable;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.GridKernalContext;
@@ -36,9 +29,17 @@ import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.concurrent.Callable;
+
+import static org.apache.ignite.internal.processors.cache.GridCacheUtils.retryTopologySafe;
import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
-import static org.apache.ignite.internal.processors.cache.GridCacheUtils.retryTopologySafe;
/**
* Cache atomic reference implementation.
@@ -51,7 +52,7 @@ public final class GridCacheAtomicReferenceImpl<T> implements GridCacheAtomicRef
private static final ThreadLocal<IgniteBiTuple<GridKernalContext, String>> stash =
new ThreadLocal<IgniteBiTuple<GridKernalContext, String>>() {
@Override protected IgniteBiTuple<GridKernalContext, String> initialValue() {
- return F.t2();
+ return new IgniteBiTuple<>();
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
index 956265b..b32678c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
@@ -17,17 +17,6 @@
package org.apache.ignite.internal.processors.datastructures;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.InvalidObjectException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.ObjectStreamException;
-import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.GridKernalContext;
@@ -36,7 +25,6 @@ import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.util.future.GridFinishedFuture;
-import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.A;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.S;
@@ -44,6 +32,18 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
import org.jetbrains.annotations.Nullable;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.apache.ignite.internal.util.typedef.internal.CU.retryTopologySafe;
import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
@@ -60,7 +60,7 @@ public final class GridCacheAtomicSequenceImpl implements GridCacheAtomicSequenc
private static final ThreadLocal<IgniteBiTuple<GridKernalContext, String>> stash =
new ThreadLocal<IgniteBiTuple<GridKernalContext, String>>() {
@Override protected IgniteBiTuple<GridKernalContext, String> initialValue() {
- return F.t2();
+ return new IgniteBiTuple<>();
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
index f7a82a9..522d296 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
@@ -17,13 +17,6 @@
package org.apache.ignite.internal.processors.datastructures;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.InvalidObjectException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.ObjectStreamException;
-import java.util.concurrent.Callable;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.GridKernalContext;
@@ -32,13 +25,20 @@ import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
import org.apache.ignite.internal.util.F0;
import org.apache.ignite.internal.util.tostring.GridToStringBuilder;
-import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
import org.apache.ignite.lang.IgniteClosure;
import org.apache.ignite.lang.IgnitePredicate;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.concurrent.Callable;
+
import static org.apache.ignite.internal.util.typedef.internal.CU.retryTopologySafe;
import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
@@ -54,7 +54,7 @@ public final class GridCacheAtomicStampedImpl<T, S> implements GridCacheAtomicSt
private static final ThreadLocal<IgniteBiTuple<GridKernalContext, String>> stash =
new ThreadLocal<IgniteBiTuple<GridKernalContext, String>>() {
@Override protected IgniteBiTuple<GridKernalContext, String> initialValue() {
- return F.t2();
+ return new IgniteBiTuple<>();
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java
index c984ab3..65352b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheCountDownLatchImpl.java
@@ -17,29 +17,29 @@
package org.apache.ignite.internal.processors.datastructures;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.InvalidObjectException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.ObjectStreamException;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
-import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.A;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
import static org.apache.ignite.internal.util.typedef.internal.CU.retryTopologySafe;
import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
@@ -55,7 +55,7 @@ public final class GridCacheCountDownLatchImpl implements GridCacheCountDownLatc
private static final ThreadLocal<IgniteBiTuple<GridKernalContext, String>> stash =
new ThreadLocal<IgniteBiTuple<GridKernalContext, String>>() {
@Override protected IgniteBiTuple<GridKernalContext, String> initialValue() {
- return F.t2();
+ return new IgniteBiTuple<>();
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueProxy.java
index c869743..2745a96 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheQueueProxy.java
@@ -17,22 +17,11 @@
package org.apache.ignite.internal.processors.datastructures;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.InvalidObjectException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.ObjectStreamException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.concurrent.Callable;
-import java.util.concurrent.TimeUnit;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteQueue;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheGateway;
-import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
@@ -40,6 +29,17 @@ import org.apache.ignite.lang.IgniteCallable;
import org.apache.ignite.lang.IgniteRunnable;
import org.jetbrains.annotations.Nullable;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+
/**
* Cache queue proxy.
*/
@@ -51,7 +51,7 @@ public class GridCacheQueueProxy<T> implements IgniteQueue<T>, Externalizable {
private static final ThreadLocal<IgniteBiTuple<GridKernalContext, String>> stash =
new ThreadLocal<IgniteBiTuple<GridKernalContext, String>>() {
@Override protected IgniteBiTuple<GridKernalContext, String> initialValue() {
- return F.t2();
+ return new IgniteBiTuple<>();
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreImpl.java
index 2c60e8b..61327e2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSemaphoreImpl.java
@@ -17,17 +17,6 @@
package org.apache.ignite.internal.processors.datastructures;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.AbstractQueuedSynchronizer;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteInterruptedException;
@@ -36,13 +25,24 @@ import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
import org.apache.ignite.internal.processors.cache.transactions.IgniteInternalTx;
-import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.A;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.AbstractQueuedSynchronizer;
+
import static org.apache.ignite.internal.processors.cache.GridCacheUtils.retryTopologySafe;
import static org.apache.ignite.transactions.TransactionConcurrency.PESSIMISTIC;
import static org.apache.ignite.transactions.TransactionIsolation.REPEATABLE_READ;
@@ -62,7 +62,7 @@ public final class GridCacheSemaphoreImpl implements GridCacheSemaphoreEx, Exter
private static final ThreadLocal<IgniteBiTuple<GridKernalContext, String>> stash =
new ThreadLocal<IgniteBiTuple<GridKernalContext, String>>() {
@Override protected IgniteBiTuple<GridKernalContext, String> initialValue() {
- return F.t2();
+ return new IgniteBiTuple<>();
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetProxy.java
index 219bb4d..326ebb6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheSetProxy.java
@@ -17,22 +17,12 @@
package org.apache.ignite.internal.processors.datastructures;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.InvalidObjectException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.ObjectStreamException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.concurrent.Callable;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteSet;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheGateway;
import org.apache.ignite.internal.util.GridSpinBusyLock;
-import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
@@ -40,6 +30,16 @@ import org.apache.ignite.lang.IgniteCallable;
import org.apache.ignite.lang.IgniteRunnable;
import org.jetbrains.annotations.NotNull;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.InvalidObjectException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.ObjectStreamException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.concurrent.Callable;
+
/**
* Cache set proxy.
*/
@@ -51,7 +51,7 @@ public class GridCacheSetProxy<T> implements IgniteSet<T>, Externalizable {
private static final ThreadLocal<IgniteBiTuple<GridKernalContext, String>> stash =
new ThreadLocal<IgniteBiTuple<GridKernalContext, String>>() {
@Override protected IgniteBiTuple<GridKernalContext, String> initialValue() {
- return F.t2();
+ return new IgniteBiTuple<>();
}
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
index 778de99..ffadbd8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsProcessor.java
@@ -36,7 +36,6 @@ import org.apache.ignite.internal.IgniteNodeAttributes;
import org.apache.ignite.internal.processors.query.GridQueryProcessor;
import org.apache.ignite.internal.util.ipc.IpcServerEndpoint;
import org.apache.ignite.internal.util.typedef.C1;
-import org.apache.ignite.internal.util.typedef.CI1;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -138,11 +137,11 @@ public class IgfsProcessor extends IgfsProcessorAdapter {
final Map<String, CacheConfiguration> cacheCfgs = new HashMap<>();
- F.forEach(gridCfg.getCacheConfiguration(), new CI1<CacheConfiguration>() {
- @Override public void apply(CacheConfiguration c) {
- cacheCfgs.put(c.getName(), c);
- }
- });
+ assert gridCfg.getCacheConfiguration() != null;
+
+ for (CacheConfiguration ccfg : gridCfg.getCacheConfiguration()) {
+ cacheCfgs.put(ccfg.getName(), ccfg);
+ }
Collection<IgfsAttributes> attrVals = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
index 906d298..b25e09c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
@@ -17,21 +17,6 @@
package org.apache.ignite.internal.processors.job;
-import java.io.Serializable;
-import java.util.AbstractCollection;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteDeploymentException;
import org.apache.ignite.IgniteException;
@@ -66,8 +51,6 @@ import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashMap;
import org.apache.ignite.internal.util.GridBoundedConcurrentLinkedHashSet;
import org.apache.ignite.internal.util.GridConcurrentHashSet;
import org.apache.ignite.internal.util.GridSpinReadWriteLock;
-import org.apache.ignite.internal.util.typedef.CI1;
-import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.P1;
import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.S;
@@ -82,6 +65,22 @@ import org.jsr166.ConcurrentHashMap8;
import org.jsr166.ConcurrentLinkedHashMap;
import org.jsr166.LongAdder8;
+import java.io.Serializable;
+import java.util.AbstractCollection;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_JOBS_HISTORY_SIZE;
import static org.apache.ignite.events.EventType.EVT_JOB_FAILED;
@@ -433,7 +432,7 @@ public class GridJobProcessor extends GridProcessorAdapter {
throw new IgniteCheckedException("Node that originated task execution has left grid: " + taskNodeId);
// Tuple: error message-response.
- final IgniteBiTuple<String, GridJobSiblingsResponse> t = F.t2();
+ final IgniteBiTuple<String, GridJobSiblingsResponse> t = new IgniteBiTuple<>();
final Lock lock = new ReentrantLock();
final Condition cond = lock.newCondition();
@@ -609,19 +608,15 @@ public class GridJobProcessor extends GridProcessorAdapter {
// If we don't have jobId then we have to iterate
if (jobId == null) {
if (!jobAlwaysActivate) {
- // If job gets removed from passive jobs it never gets activated.
- F.forEach(passiveJobs.values(), new CI1<GridJobWorker>() {
- @Override public void apply(GridJobWorker job) {
+ for (GridJobWorker job : passiveJobs.values()) {
+ if (idsMatch.apply(job))
cancelPassiveJob(job);
- }
- }, idsMatch);
+ }
}
-
- F.forEach(activeJobs.values(), new CI1<GridJobWorker>() {
- @Override public void apply(GridJobWorker job) {
+ for (GridJobWorker job : activeJobs.values()) {
+ if (idsMatch.apply(job))
cancelActiveJob(job, sys);
- }
- }, idsMatch);
+ }
}
else {
if (!jobAlwaysActivate) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
index 6937196..de321e2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/task/GridTaskCommandHandler.java
@@ -17,20 +17,6 @@
package org.apache.ignite.internal.processors.rest.handlers.task;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.locks.Condition;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.cluster.ClusterGroup;
@@ -66,6 +52,21 @@ import org.apache.ignite.lang.IgniteUuid;
import org.apache.ignite.resources.IgniteInstanceResource;
import org.jetbrains.annotations.Nullable;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_REST_MAX_TASK_RESULTS;
import static org.apache.ignite.IgniteSystemProperties.getInteger;
@@ -420,7 +421,7 @@ public class GridTaskCommandHandler extends GridRestCommandHandlerAdapter {
return F.t("Task result holder has left grid: " + resHolderId, null);
// Tuple: error message-response.
- final IgniteBiTuple<String, GridTaskResultResponse> t = F.t2();
+ final IgniteBiTuple<String, GridTaskResultResponse> t = new IgniteBiTuple<>();
final Lock lock = new ReentrantLock();
final Condition cond = lock.newCondition();
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/util/GridExecutionStatistics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridExecutionStatistics.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridExecutionStatistics.java
deleted file mode 100644
index a23fe28..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridExecutionStatistics.java
+++ /dev/null
@@ -1,106 +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.internal.util;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.X;
-import org.apache.ignite.internal.util.typedef.internal.U;
-import org.apache.ignite.lang.IgniteBiTuple;
-import org.jsr166.ConcurrentHashMap8;
-
-/**
- * Accumulates execution statistics for named pieces of code.
- */
-public class GridExecutionStatistics {
- /** */
- private String name;
-
- /** Map of execution counters. */
- private ConcurrentMap<String, AtomicInteger> cntMap = new ConcurrentHashMap8<>();
-
- /** Map of execution durations. */
- private ConcurrentMap<String, AtomicLong> durationMap = new ConcurrentHashMap8<>();
-
- /** Execution start time for the current thread. */
- private ThreadLocal<IgniteBiTuple<String, Long>> startTime = new ThreadLocal<IgniteBiTuple<String, Long>>() {
- @Override protected IgniteBiTuple<String, Long> initialValue() {
- return F.t(null, 0L);
- }
- };
-
- /**
- * @param name Statistics name.
- */
- public GridExecutionStatistics(String name) {
- this.name = name;
- }
-
- /**
- * @param name Execution name.
- */
- public void watchExecution(String name) {
- assert name != null;
-
- startTime.get().put(name, U.currentTimeMillis());
- }
-
- /**
- * Stop watching execution started previously in the same thread.
- */
- public void stopWatching() {
- String name = startTime.get().get1();
-
- long time = startTime.get().get2();
-
- AtomicInteger cnt = F.addIfAbsent(cntMap, name, F.newAtomicInt());
-
- assert cnt != null;
-
- cnt.incrementAndGet();
-
- AtomicLong d = F.addIfAbsent(durationMap, name, F.newAtomicLong());
-
- assert d != null;
-
- d.addAndGet(U.currentTimeMillis() - time);
- }
-
- /**
- * Prints statistics.
- */
- public void print() {
- X.println("*** Execution statistics: " + name);
-
- for (Map.Entry<String, AtomicInteger> e : cntMap.entrySet()) {
- int cnt = e.getValue().get();
-
- assert cnt > 0;
-
- long totalDuration = durationMap.get(e.getKey()).get();
-
- long avgDuration = totalDuration / cnt;
-
- X.println("\t" + e.getKey() + "->[executions=" + cnt +
- ", average duration=" + avgDuration + ", total duration=" + totalDuration + "]");
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/40f4adca/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanSet.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanSet.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanSet.java
index e2283e7..f9e7bb2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanSet.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLeanSet.java
@@ -17,11 +17,12 @@
package org.apache.ignite.internal.util;
-import java.util.Collection;
-import java.util.Map;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.S;
+import java.util.Collection;
+import java.util.Map;
+
/**
* Lean set implementation. Internally this set is based on {@link GridLeanMap}.
*
@@ -57,6 +58,7 @@ public class GridLeanSet<E> extends GridSetWrapper<E> implements Cloneable {
*
* @param c Collection to add.
*/
+ @Deprecated
public GridLeanSet(Collection<E> c) {
super(new GridLeanMap<>(F.zip(c, VAL)));
}