simplify initialization

Alluxio · Jun 18, 2016 · c6781fc · c6781fc
1 parent f2d1ad4
commit c6781fc
Showing 1 changed file with 9 additions and 15 deletions.
diff --git a/core/common/src/main/java/alluxio/collections/IndexedSet.java b/core/common/src/main/java/alluxio/collections/IndexedSet.java
@@ -12,8 +12,10 @@
 package alluxio.collections;
 
 import com.google.common.base.Preconditions;
+import com.google.common.collect.Iterables;
 
 import java.util.AbstractSet;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -137,7 +139,7 @@ public interface FieldIndex<T> {
   }
 
   /**
-   * An interface extending {@link FieldIndex}, represents a unique index. A Unique index is an
+   * An interface extending {@link FieldIndex}, represents a unique index. A unique index is an
    * index where each index value only maps to one object.
    *
    * @param <T> type of objects in this {@link IndexedSet}
@@ -166,13 +168,10 @@ public IndexedSet(FieldIndex<T> field, FieldIndex<T>... otherFields) {
     int uniqueIndexLength = 0;
     int nonUniqueIndexLength = 0;
 
-    if (field instanceof UniqueFieldIndex) {
+    Iterable<FieldIndex<T>> fields =
-      uniqueIndexLength = 1;
+        Iterables.concat(Arrays.asList(field), Arrays.asList(otherFields));
-    } else {
-      nonUniqueIndexLength = 1;
-    }
 
-    for (FieldIndex<T> fieldIndex : otherFields) {
+    for (FieldIndex<T> fieldIndex : fields) {
       if (fieldIndex instanceof UniqueFieldIndex) {
         uniqueIndexLength++;
       } else {
@@ -184,21 +183,15 @@ public IndexedSet(FieldIndex<T> field, FieldIndex<T>... otherFields) {
     Map<NonUniqueFieldIndex<T>, ConcurrentHashMap<Object, ConcurrentHashSet<T>>> indexMapNonUnique =
         null;
     Map<UniqueFieldIndex<T>, ConcurrentHashMap<Object, T>> indexMapUnique = null;
+
     if (uniqueIndexLength > 0) {
       indexMapUnique = new HashMap<>(uniqueIndexLength);
     }
     if (nonUniqueIndexLength > 0) {
       indexMapNonUnique = new HashMap<>(nonUniqueIndexLength);
     }
 
-    if (field instanceof UniqueFieldIndex) {
+    for (FieldIndex<T> fieldIndex : fields) {
-      indexMapUnique.put((UniqueFieldIndex) field, new ConcurrentHashMap<Object, T>(8, 0.95f, 8));
-    } else {
-      indexMapNonUnique.put((NonUniqueFieldIndex<T>) field,
-          new ConcurrentHashMap<Object, ConcurrentHashSet<T>>(8, 0.95f, 8));
-    }
-
-    for (FieldIndex<T> fieldIndex : otherFields) {
       if (fieldIndex instanceof UniqueFieldIndex) {
         indexMapUnique.put(
             (UniqueFieldIndex<T>) fieldIndex, new ConcurrentHashMap<Object, T>(8, 0.95f, 8));
@@ -208,6 +201,7 @@ public IndexedSet(FieldIndex<T> field, FieldIndex<T>... otherFields) {
             new ConcurrentHashMap<Object, ConcurrentHashSet<T>>(8, 0.95f, 8));
       }
     }
+
     // read only, so it is thread safe and allows concurrent access.
     if (uniqueIndexLength > 0) {
       mIndexMapUnique = Collections.unmodifiableMap(indexMapUnique);