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/02/20 15:49:00 UTC
ignite git commit: IGNITE-2273: Slight optimization to array
allocations during ArrayList creation. This closes #433.
Repository: ignite
Updated Branches:
refs/heads/master 582fe5643 -> 57ac909de
IGNITE-2273: Slight optimization to array allocations during ArrayList creation. This closes #433.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/57ac909d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/57ac909d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/57ac909d
Branch: refs/heads/master
Commit: 57ac909de7325d9ebd5b4dacf0e9f6392ca60609
Parents: 582fe56
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Sat Feb 20 17:46:28 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Sat Feb 20 17:46:28 2016 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/IgniteComputeImpl.java | 4 ++--
.../ignite/internal/managers/GridManagerAdapter.java | 4 ++--
.../internal/processors/cache/GridCacheAdapter.java | 5 +++--
.../cache/distributed/dht/GridDhtTxRemote.java | 11 +++++++----
.../cache/distributed/near/GridNearTxRemote.java | 9 +++++++--
.../transactions/IgniteTxImplicitSingleStateImpl.java | 5 ++---
.../transactions/IgniteTxRemoteSingleStateImpl.java | 6 ++----
7 files changed, 25 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/57ac909d/modules/core/src/main/java/org/apache/ignite/internal/IgniteComputeImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteComputeImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteComputeImpl.java
index d6e9a8d..15ad15f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteComputeImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteComputeImpl.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.io.ObjectStreamException;
-import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.Callable;
@@ -264,7 +264,7 @@ public class IgniteComputeImpl extends AsyncSupportAdapter<IgniteCompute>
guard();
try {
- return saveOrGet(ctx.closure().callAsync(BROADCAST, Arrays.asList(job), prj.nodes()));
+ return saveOrGet(ctx.closure().callAsync(BROADCAST, Collections.singletonList(job), prj.nodes()));
}
catch (IgniteCheckedException e) {
throw U.convertException(e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/57ac909d/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
index 21a80c3..0318b12 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.managers;
import java.io.Serializable;
import java.util.Collection;
+import java.util.Collections;
import java.util.Map;
import java.util.UUID;
import javax.cache.expiry.Duration;
@@ -58,7 +59,6 @@ import org.apache.ignite.spi.IgniteSpiNoop;
import org.apache.ignite.spi.IgniteSpiTimeoutObject;
import org.jetbrains.annotations.Nullable;
-import static java.util.Arrays.asList;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.apache.ignite.internal.managers.communication.GridIoPolicy.SYSTEM_POOL;
@@ -370,7 +370,7 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan
if (msg instanceof Message)
ctx.io().send(node, topic, (Message)msg, SYSTEM_POOL);
else
- ctx.io().sendUserMessage(asList(node), msg, topic, false, 0);
+ ctx.io().sendUserMessage(Collections.singletonList(node), msg, topic, false, 0);
}
catch (IgniteCheckedException e) {
throw unwrapException(e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/57ac909d/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 535bc9d..9827dad 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
@@ -3765,7 +3765,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
if (!F.isEmpty(oldNodes.nodes())) {
ComputeTaskInternalFuture oldNodesFut = ctx.kernalContext().closure().callAsync(BROADCAST,
- Arrays.asList(new LoadCacheClosure<>(ctx.name(), p, args, plc)),
+ Collections.singletonList(new LoadCacheClosure<>(ctx.name(), p, args, plc)),
oldNodes.nodes());
fut.add(oldNodesFut);
@@ -3773,7 +3773,8 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
if (!F.isEmpty(newNodes.nodes())) {
ComputeTaskInternalFuture newNodesFut = ctx.kernalContext().closure().callAsync(BROADCAST,
- Arrays.asList(new LoadCacheJob<>(ctx.name(), ctx.affinity().affinityTopologyVersion(), p, args, plc)),
+ Collections.singletonList(
+ new LoadCacheJob<>(ctx.name(), ctx.affinity().affinityTopologyVersion(), p, args, plc)),
newNodes.nodes());
fut.add(newNodesFut);
http://git-wip-us.apache.org/repos/asf/ignite/blob/57ac909d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
index 85a5759..343515d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxRemote.java
@@ -18,10 +18,9 @@
package org.apache.ignite.internal.processors.cache.distributed.dht;
import java.io.Externalizable;
-import java.util.Arrays;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.Iterator;
import java.util.Map;
import java.util.UUID;
import javax.cache.processor.EntryProcessor;
@@ -29,7 +28,6 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.CacheObject;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
-import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
import org.apache.ignite.internal.processors.cache.GridCacheOperation;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.KeyCacheObject;
@@ -231,7 +229,12 @@ public class GridDhtTxRemote extends GridDistributedTxRemoteAdapter {
/** {@inheritDoc} */
@Override public Collection<UUID> masterNodeIds() {
- return Arrays.asList(nearNodeId, nodeId);
+ Collection<UUID> res = new ArrayList<>(2);
+
+ res.add(nearNodeId);
+ res.add(nodeId);
+
+ return res;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/57ac909d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java
index a3f959d..9c52c80 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxRemote.java
@@ -18,7 +18,7 @@
package org.apache.ignite.internal.processors.cache.distributed.near;
import java.io.Externalizable;
-import java.util.Arrays;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
@@ -255,7 +255,12 @@ public class GridNearTxRemote extends GridDistributedTxRemoteAdapter {
/** {@inheritDoc} */
@Override public Collection<UUID> masterNodeIds() {
- return Arrays.asList(nodeId, nearNodeId);
+ Collection<UUID> res = new ArrayList<>(2);
+
+ res.add(nodeId);
+ res.add(nearNodeId);
+
+ return res;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/57ac909d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxImplicitSingleStateImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxImplicitSingleStateImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxImplicitSingleStateImpl.java
index 3e0231e..baa029f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxImplicitSingleStateImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxImplicitSingleStateImpl.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.processors.cache.transactions;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
@@ -213,7 +212,7 @@ public class IgniteTxImplicitSingleStateImpl extends IgniteTxLocalStateAdapter {
/** {@inheritDoc} */
@Override public Collection<IgniteTxEntry> writeEntries() {
- return entry != null ? Arrays.asList(entry) : Collections.<IgniteTxEntry>emptyList();
+ return entry != null ? Collections.singletonList(entry) : Collections.<IgniteTxEntry>emptyList();
}
/** {@inheritDoc} */
@@ -238,7 +237,7 @@ public class IgniteTxImplicitSingleStateImpl extends IgniteTxLocalStateAdapter {
/** {@inheritDoc} */
@Override public Collection<IgniteTxEntry> allEntries() {
- return entry != null ? Arrays.asList(entry) : Collections.<IgniteTxEntry>emptyList();
+ return entry != null ? Collections.singletonList(entry) : Collections.<IgniteTxEntry>emptyList();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/57ac909d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java
index a68006b..d356fb6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxRemoteSingleStateImpl.java
@@ -17,10 +17,8 @@
package org.apache.ignite.internal.processors.cache.transactions;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import org.apache.ignite.internal.util.typedef.F;
@@ -70,7 +68,7 @@ public class IgniteTxRemoteSingleStateImpl extends IgniteTxRemoteStateAdapter {
/** {@inheritDoc} */
@Override public Collection<IgniteTxEntry> writeEntries() {
- return entry != null ? Arrays.asList(entry) : Collections.<IgniteTxEntry>emptyList();
+ return entry != null ? Collections.singletonList(entry) : Collections.<IgniteTxEntry>emptyList();
}
/** {@inheritDoc} */
@@ -96,7 +94,7 @@ public class IgniteTxRemoteSingleStateImpl extends IgniteTxRemoteStateAdapter {
/** {@inheritDoc} */
@Override public Collection<IgniteTxEntry> allEntries() {
- return entry != null ? Arrays.asList(entry) : Collections.<IgniteTxEntry>emptyList();
+ return entry != null ? Collections.singletonList(entry) : Collections.<IgniteTxEntry>emptyList();
}
/** {@inheritDoc} */