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 2015/12/29 14:55:59 UTC
[2/3] ignite git commit: IGNITE-2263: Removing unused stuff.
IGNITE-2263: Removing unused stuff.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e91d6e61
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e91d6e61
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e91d6e61
Branch: refs/heads/ignite-2263
Commit: e91d6e614c20da3a2fe6a6163e059f40ce772e7e
Parents: 2a66f56
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Tue Dec 29 16:39:59 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Tue Dec 29 16:39:59 2015 +0300
----------------------------------------------------------------------
.../internal/processors/igfs/IgfsProcessor.java | 8 +-
.../ignite/internal/util/lang/GridFunc.java | 195 -------------------
2 files changed, 2 insertions(+), 201 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e91d6e61/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 5b8cf86..b313084 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
@@ -45,7 +45,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;
@@ -128,11 +127,8 @@ 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);
- }
- });
+ for (CacheConfiguration c : gridCfg.getCacheConfiguration())
+ cacheCfgs.put(c.getName(), c);
Collection<IgfsAttributes> attrVals = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/ignite/blob/e91d6e61/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 525269b..3e7b122 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
@@ -232,17 +232,6 @@ public class GridFunc {
};
/** */
- private static final IgniteCallable<?> ATOMIC_REF_FACTORY = new IgniteCallable<AtomicReference>() {
- @Override public AtomicReference call() {
- return new AtomicReference();
- }
-
- @Override public String toString() {
- return "Atomic reference factory.";
- }
- };
-
- /** */
private static final IgniteCallable<?> MAP_FACTORY = new IgniteCallable<Map>() {
@Override public Map call() {
return new HashMap();
@@ -2130,40 +2119,6 @@ public class GridFunc {
}
/**
- * Utility map getter. This method analogous to {@link #addIfAbsent(Map, Object, Callable)}
- * method but this one doesn't put the default value into the map when key is not found.
- *
- * @param map Map to get value from.
- * @param key Map key (can be {@code null}).
- * @param c Optional factory closure for the default value to be returned in
- * when {@code key} is not found. If closure is not provided - {@code null} will be returned.
- * @param <K> Map key type.
- * @param <V> Map value type.
- * @return Value for the {@code key} or default value produced by {@code c} if key is not
- * found (or {@code null} if key is not found and closure is not provided).
- * @throws GridClosureException Thrown in case when callable throws exception.
- * @see #newLinkedList()
- * @see #newList()
- * @see #newSet()
- * @see #newMap()
- * @see #newAtomicLong()
- * @see #newAtomicInt()
- * @see #newAtomicRef()
- * @see #newAtomicBoolean()
- */
- @Nullable public static <K, V> V returnIfAbsent(Map<? extends K, ? extends V> map, @Nullable K key,
- @Nullable Callable<V> c) {
- A.notNull(map, "map");
-
- try {
- return !map.containsKey(key) ? c == null ? null : c.call() : map.get(key);
- }
- catch (Exception e) {
- throw wrap(e);
- }
- }
-
- /**
* Returns a factory closure that creates new {@link ConcurrentLinkedDeque8} instance.
* Note that this method does not create a new closure but returns a static one.
*
@@ -2214,45 +2169,6 @@ public class GridFunc {
}
/**
- * Returns a factory closure that creates new {@link AtomicReference} instance
- * initialized to {@code null}. Note that this method does not create a new closure
- * but returns a static one.
- *
- * @param <T> Type of the atomic reference.
- * @return Factory closure that creates new {@link AtomicReference} instance
- * initialized to {@code null} every time its {@link org.apache.ignite.lang.IgniteOutClosure#apply()} method is called.
- */
- @SuppressWarnings("unchecked")
- public static <T> IgniteCallable<AtomicReference<T>> newAtomicRef() {
- return (IgniteCallable<AtomicReference<T>>)ATOMIC_REF_FACTORY;
- }
-
- /**
- * Returns a factory closure that creates new {@link AtomicBoolean} instance
- * initialized to {@code false}. Note that this method does not create a new
- * closure but returns a static one.
- *
- * @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.
- */
- public static IgniteCallable<AtomicBoolean> newAtomicBoolean() {
- return ATOMIC_BOOL_FACTORY;
- }
-
- /**
- * Returns a factory closure that creates new {@link LinkedList} instance.
- * Note that this method does not create a new closure but returns a static one.
- *
- * @param <T> Type parameters for the created {@link LinkedList}.
- * @return Factory closure that creates new {@link LinkedList} instance every time its {@link
- * org.apache.ignite.lang.IgniteOutClosure#apply()} method is called.
- */
- @SuppressWarnings("unchecked")
- public static <T> IgniteCallable<LinkedList<T>> newLinkedList() {
- return (IgniteCallable<LinkedList<T>>)LINKED_LIST_FACTORY;
- }
-
- /**
* Returns a factory closure that creates new {@link Set} instance. Note that this
* method does not create a new closure but returns a static one.
*
@@ -2983,14 +2899,11 @@ public class GridFunc {
* found (or {@code null} if key is not found and closure is not provided). Note that
* in case when key is not found the default value will be put into the map.
* @throws GridClosureException Thrown in case when callable throws exception.
- * @see #newLinkedList()
* @see #newList()
* @see #newSet()
* @see #newMap()
* @see #newAtomicLong()
* @see #newAtomicInt()
- * @see #newAtomicRef()
- * @see #newAtomicBoolean()
*/
@Nullable public static <K, V> V addIfAbsent(Map<? super K, V> map, @Nullable K key,
@Nullable Callable<? extends V> c) {
@@ -3085,25 +2998,6 @@ public class GridFunc {
}
/**
- * Calls given {@code side-effect only} closure over the each element of the provided array.
- *
- * @param c Array to call closure over.
- * @param f Side-effect only closure to call over the array.
- * @param p Optional set of predicates. Only if collection element evaluates
- * to {@code true} for given predicates the closure will be applied to it.
- * If no predicates provided - closure will be applied to all collection
- * elements.
- * @param <X> Type of the free variable for the closure and type of the array
- * elements.
- */
- @SuppressWarnings("RedundantTypeArguments")
- public static <X> void forEach(X[] c, IgniteInClosure<? super X> f, @Nullable IgnitePredicate<? super X>... p) {
- A.notNull(c, "c", f, "f");
-
- F.<X>forEach(asList(c), f, p);
- }
-
- /**
* Adds (copies) to given collection all elements in <tt>'from'</tt> array.
*
* @param to Collection to copy to.
@@ -4260,95 +4154,6 @@ public class GridFunc {
}
/**
- * Checks if two collections passed in intersect.
- *
- * @param <E> Element type.
- * @param s1 Set1.
- * @param s2 Set2.
- * @return {@code True} if there is an intersection, {@code false} otherwise.
- */
- public static <E> boolean intersects(Iterable<E> s1, Collection<E>... s2) {
- for (E e1 : s1) {
- for (Collection<E> s : s2) {
- if (s.contains(e1))
- return true;
- }
- }
-
- return false;
- }
-
- /**
- * Waits until all passed futures will be executed.
- *
- * @param futs Futures. If none provided - this method is no-op.
- * @throws IgniteCheckedException If any of the futures failed.
- */
- public static <T> void awaitAll(@Nullable Collection<IgniteInternalFuture<T>> futs) throws IgniteCheckedException {
- awaitAll(0, null, futs);
- }
-
- /**
- * Waits until all passed futures will be executed.
- *
- * @param timeout Timeout for waiting ({@code 0} for forever).
- * @param futs Futures. If none provided - this method is no-op.
- * @throws IgniteCheckedException If any of the futures failed.
- */
- public static <T> void awaitAll(long timeout, @Nullable Collection<IgniteInternalFuture<T>> futs) throws IgniteCheckedException {
- awaitAll(timeout, null, futs);
- }
-
- /**
- * Awaits for all futures to complete and optionally reduces all results into one.
- *
- * @param timeout Timeout for waiting ({@code 0} for forever).
- * @param rdc Optional reducer. If not {@code null}, then results will be reduced into one.
- * @param futs List of futures to wait for.
- * @param <T> Return type of the futures.
- * @param <R> Return type of the reducer.
- * @return Reduced result if reducer is provided, {@code null} otherwise.
- * @throws IgniteCheckedException If any of the futures failed.
- */
- @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())
- return null;
-
- long end = timeout == 0 ? Long.MAX_VALUE : U.currentTimeMillis() + timeout;
-
- // Overflow.
- if (end < 0)
- end = Long.MAX_VALUE;
-
- // Note that it is important to wait in the natural order of collection and
- // not via listen method, because caller may actually add to this collection
- // concurrently while this method is in progress.
- for (IgniteInternalFuture<T> fut : futs) {
- T t;
-
- if (timeout > 0) {
- long left = end - U.currentTimeMillis();
-
- if (left <= 0 && !fut.isDone())
- throw new IgniteFutureTimeoutCheckedException("Timed out waiting for all futures: " + futs);
-
- if (fut.isDone() && left < 0)
- left = 0;
-
- t = fut.get(left);
- }
- else
- t = fut.get();
-
- if (rdc != null)
- rdc.collect(t);
- }
-
- return rdc == null ? null : rdc.reduce();
- }
-
- /**
* Returns predicate for filtering unfinished futures.
*
* @return Predicate for filtering unfinished futures.