You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/01/03 21:17:25 UTC
[09/11] ignite git commit: IGNITE-2264: Correct LinkedHashMap sizes.
IGNITE-2264: Correct LinkedHashMap sizes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6b7300e1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6b7300e1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6b7300e1
Branch: refs/heads/ignite-2264
Commit: 6b7300e11b41555d5a2deefc9768e75c79c01c9b
Parents: f5bd048
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Sun Jan 3 23:25:19 2016 +0400
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Sun Jan 3 23:25:19 2016 +0400
----------------------------------------------------------------------
.../cache/distributed/dht/GridPartitionedGetFuture.java | 2 +-
.../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 5 ++---
.../processors/cache/distributed/near/GridNearGetFuture.java | 2 +-
.../processors/cache/local/atomic/GridLocalAtomicCache.java | 5 ++---
.../processors/cache/transactions/IgniteTxLocalAdapter.java | 2 +-
.../org/apache/ignite/internal/processors/igfs/IgfsImpl.java | 2 +-
.../ignite/internal/processors/igfs/IgfsInputStreamImpl.java | 3 +--
.../java/org/apache/ignite/internal/util/IgniteUtils.java | 3 ++-
.../ignite/internal/visor/cache/VisorCacheTypeMetadata.java | 8 ++++----
9 files changed, 15 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6b7300e1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
index 19df1c2..2600943 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
@@ -486,7 +486,7 @@ public class GridPartitionedGetFuture<K, V> extends CacheDistributedGetFutureAda
LinkedHashMap<KeyCacheObject, Boolean> old = mappings.get(node);
if (old == null)
- mappings.put(node, old = new LinkedHashMap<>(3, 1f));
+ mappings.put(node, old = U.newLinkedHashMap(3));
old.put(key, false);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6b7300e1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 587d316..4293838 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -23,7 +23,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -1643,7 +1642,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
if (putMap == null) {
- putMap = new LinkedHashMap<>(size, 1.0f);
+ putMap = U.newLinkedHashMap(size);
writeVals = new ArrayList<>(size);
}
@@ -1688,7 +1687,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
assert updated != null;
if (putMap == null) {
- putMap = new LinkedHashMap<>(size, 1.0f);
+ putMap = U.newLinkedHashMap(size);
writeVals = new ArrayList<>(size);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6b7300e1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
index c547a88..6f0285e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -608,7 +608,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
LinkedHashMap<KeyCacheObject, Boolean> old = mappings.get(affNode);
if (old == null)
- mappings.put(affNode, old = new LinkedHashMap<>(3, 1f));
+ mappings.put(affNode, old = U.newLinkedHashMap(3));
old.put(key, addRdr);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6b7300e1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
index 22c8f81..760aefb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -23,7 +23,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -1232,7 +1231,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
}
if (putMap == null) {
- putMap = new LinkedHashMap<>(size, 1.0f);
+ putMap = U.newLinkedHashMap(size);
writeVals = new ArrayList<>(size);
}
@@ -1268,7 +1267,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> {
}
if (putMap == null) {
- putMap = new LinkedHashMap<>(size, 1.0f);
+ putMap = U.newLinkedHashMap(size);
writeVals = new ArrayList<>(size);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6b7300e1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index 21ff0cf..166cb86 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -735,7 +735,7 @@ public abstract class IgniteTxLocalAdapter extends IgniteTxAdapter implements Ig
if (writeStore.isWriteThrough()) {
if (putMap == null)
- putMap = new LinkedHashMap<>(writeMap().size(), 1.0f);
+ putMap = U.newLinkedHashMap(writeMap().size());
putMap.put(key, F.<Object, GridCacheVersion>t(val, ver));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6b7300e1/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
index 680e660..5add384 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java
@@ -213,7 +213,7 @@ public final class IgfsImpl implements IgfsEx {
dfltMode = cfg.getDefaultMode();
Map<String, IgfsMode> cfgModes = new LinkedHashMap<>();
- Map<String, IgfsMode> dfltModes = new LinkedHashMap<>(4, 1.0f);
+ Map<String, IgfsMode> dfltModes = U.newLinkedHashMap(4);
if (cfg.isInitializeDefaultPathModes()) {
dfltModes.put("/ignite/primary", PRIMARY);
http://git-wip-us.apache.org/repos/asf/ignite/blob/6b7300e1/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
index 62f8034..8a0eeb5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsInputStreamImpl.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.processors.igfs;
import java.io.EOFException;
import java.io.IOException;
import java.util.Arrays;
-import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
@@ -142,7 +141,7 @@ public class IgfsInputStreamImpl extends IgfsInputStreamAdapter {
maxLocCacheSize = (prefetchBlocks > 0 ? prefetchBlocks : 1) * 3 / 2;
- locCache = new LinkedHashMap<>(maxLocCacheSize, 1.0f);
+ locCache = U.newLinkedHashMap(maxLocCacheSize);
pendingFuts = new GridConcurrentHashSet<>(prefetchBlocks > 0 ? prefetchBlocks : 1);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6b7300e1/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 a92ccab..7f20fb8 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
@@ -5024,7 +5024,8 @@ public abstract class IgniteUtils {
if (size == -1)
return null;
- LinkedHashMap<K, V> map = new LinkedHashMap<>(size, 1.0f);
+ /// TODO: CAREFUL!
+ LinkedHashMap<K, V> map = U.newLinkedHashMap(size);
for (int i = 0; i < size; i++)
map.put((K)in.readObject(), (V)in.readObject());
http://git-wip-us.apache.org/repos/asf/ignite/blob/6b7300e1/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeMetadata.java
index ec7a114..1d12869 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheTypeMetadata.java
@@ -190,7 +190,7 @@ public class VisorCacheTypeMetadata implements Serializable {
Collection<QueryIndex> qryIdxs = q.getIndexes();
- metadata.grps = new LinkedHashMap<>(qryIdxs.size());
+ metadata.grps = U.newLinkedHashMap(qryIdxs.size());
for (QueryIndex qryIdx : qryIdxs) {
LinkedHashMap<String, Boolean> qryIdxFlds = qryIdx.getFields();
@@ -253,7 +253,7 @@ public class VisorCacheTypeMetadata implements Serializable {
* @return Map with string class name.
*/
private static Map<String, String> convertFieldsMap(Map<String, Class<?>> base) {
- Map<String, String> res = new LinkedHashMap<>(base.size());
+ Map<String, String> res = U.newLinkedHashMap(base.size());
for (Map.Entry<String, Class<?>> e : base.entrySet())
res.put(e.getKey(), U.compact(e.getValue().getName()));
@@ -269,11 +269,11 @@ public class VisorCacheTypeMetadata implements Serializable {
*/
private static Map<String, LinkedHashMap<String, IgniteBiTuple<String, Boolean>>> convertGrpsMap(
Map<String, LinkedHashMap<String, IgniteBiTuple<Class<?>, Boolean>>> base) {
- Map<String, LinkedHashMap<String, IgniteBiTuple<String, Boolean>>> res = new LinkedHashMap<>(base.size());
+ Map<String, LinkedHashMap<String, IgniteBiTuple<String, Boolean>>> res = U.newLinkedHashMap(base.size());
for (Map.Entry<String, LinkedHashMap<String, IgniteBiTuple<Class<?>, Boolean>>> e : base.entrySet()) {
LinkedHashMap<String, IgniteBiTuple<Class<?>, Boolean>> intBase = e.getValue();
- LinkedHashMap<String, IgniteBiTuple<String, Boolean>> intRes = new LinkedHashMap<>(intBase.size());
+ LinkedHashMap<String, IgniteBiTuple<String, Boolean>> intRes = U.newLinkedHashMap(intBase.size());
for (Map.Entry<String, IgniteBiTuple<Class<?>, Boolean>> intE : intBase.entrySet()) {
IgniteBiTuple<Class<?>, Boolean> val = intE.getValue();