From 89fbf25a8c1ce831a5fd1e0a418b6008be044bd9 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Sat, 15 Jun 2019 22:53:07 +0200 Subject: Use eclipse collections as gs collection was rebranded to eclipse and received continous development. --- .../search/predicate/index/CachedPostingListCounter.java | 8 ++++---- .../java/com/yahoo/search/predicate/index/SimpleIndex.java | 6 +++--- .../search/predicate/index/conjunction/ConjunctionIndex.java | 12 ++++++------ .../predicate/index/conjunction/ConjunctionIndexBuilder.java | 6 +++--- .../search/predicate/index/CachedPostingListCounterTest.java | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) (limited to 'predicate-search/src') diff --git a/predicate-search/src/main/java/com/yahoo/search/predicate/index/CachedPostingListCounter.java b/predicate-search/src/main/java/com/yahoo/search/predicate/index/CachedPostingListCounter.java index 91599da5483..9356e86aa2f 100644 --- a/predicate-search/src/main/java/com/yahoo/search/predicate/index/CachedPostingListCounter.java +++ b/predicate-search/src/main/java/com/yahoo/search/predicate/index/CachedPostingListCounter.java @@ -2,9 +2,9 @@ package com.yahoo.search.predicate.index; import com.google.common.collect.MinMaxPriorityQueue; -import com.gs.collections.api.tuple.primitive.ObjectLongPair; -import com.gs.collections.impl.map.mutable.primitive.ObjectIntHashMap; -import com.gs.collections.impl.map.mutable.primitive.ObjectLongHashMap; +import org.eclipse.collections.api.tuple.primitive.ObjectLongPair; +import org.eclipse.collections.impl.map.mutable.primitive.ObjectIntHashMap; +import org.eclipse.collections.impl.map.mutable.primitive.ObjectLongHashMap; import java.util.ArrayList; import java.util.Arrays; @@ -119,7 +119,7 @@ public class CachedPostingListCounter { private static class Entry implements Comparable { public final int[] docIds; - public final double cost; + final double cost; private Entry(int[] docIds, long frequency) { this.docIds = docIds; diff --git a/predicate-search/src/main/java/com/yahoo/search/predicate/index/SimpleIndex.java b/predicate-search/src/main/java/com/yahoo/search/predicate/index/SimpleIndex.java index 64583273e77..3e1ed7ad9e4 100644 --- a/predicate-search/src/main/java/com/yahoo/search/predicate/index/SimpleIndex.java +++ b/predicate-search/src/main/java/com/yahoo/search/predicate/index/SimpleIndex.java @@ -1,10 +1,10 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate.index; -import com.gs.collections.api.map.primitive.LongObjectMap; -import com.gs.collections.api.tuple.primitive.LongObjectPair; -import com.gs.collections.impl.map.mutable.primitive.LongObjectHashMap; import com.yahoo.search.predicate.serialization.SerializationHelper; +import org.eclipse.collections.api.map.primitive.LongObjectMap; +import org.eclipse.collections.api.tuple.primitive.LongObjectPair; +import org.eclipse.collections.impl.map.mutable.primitive.LongObjectHashMap; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/predicate-search/src/main/java/com/yahoo/search/predicate/index/conjunction/ConjunctionIndex.java b/predicate-search/src/main/java/com/yahoo/search/predicate/index/conjunction/ConjunctionIndex.java index 5a100ea9cf5..d062af43f22 100644 --- a/predicate-search/src/main/java/com/yahoo/search/predicate/index/conjunction/ConjunctionIndex.java +++ b/predicate-search/src/main/java/com/yahoo/search/predicate/index/conjunction/ConjunctionIndex.java @@ -1,17 +1,17 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate.index.conjunction; -import com.gs.collections.api.map.primitive.IntObjectMap; -import com.gs.collections.api.map.primitive.LongObjectMap; -import com.gs.collections.api.tuple.primitive.IntObjectPair; -import com.gs.collections.api.tuple.primitive.LongObjectPair; -import com.gs.collections.impl.map.mutable.primitive.IntObjectHashMap; -import com.gs.collections.impl.map.mutable.primitive.LongObjectHashMap; import com.yahoo.document.predicate.FeatureConjunction; import com.yahoo.search.predicate.PredicateQuery; import com.yahoo.search.predicate.SubqueryBitmap; import com.yahoo.search.predicate.serialization.SerializationHelper; import com.yahoo.search.predicate.utils.PrimitiveArraySorter; +import org.eclipse.collections.api.map.primitive.IntObjectMap; +import org.eclipse.collections.api.map.primitive.LongObjectMap; +import org.eclipse.collections.api.tuple.primitive.IntObjectPair; +import org.eclipse.collections.api.tuple.primitive.LongObjectPair; +import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap; +import org.eclipse.collections.impl.map.mutable.primitive.LongObjectHashMap; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/predicate-search/src/main/java/com/yahoo/search/predicate/index/conjunction/ConjunctionIndexBuilder.java b/predicate-search/src/main/java/com/yahoo/search/predicate/index/conjunction/ConjunctionIndexBuilder.java index a6a03177018..8e3261a4cf8 100644 --- a/predicate-search/src/main/java/com/yahoo/search/predicate/index/conjunction/ConjunctionIndexBuilder.java +++ b/predicate-search/src/main/java/com/yahoo/search/predicate/index/conjunction/ConjunctionIndexBuilder.java @@ -3,9 +3,9 @@ package com.yahoo.search.predicate.index.conjunction; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; -import com.gs.collections.api.map.primitive.IntObjectMap; -import com.gs.collections.impl.map.mutable.primitive.IntObjectHashMap; -import com.gs.collections.impl.map.mutable.primitive.LongObjectHashMap; +import org.eclipse.collections.api.map.primitive.IntObjectMap; +import org.eclipse.collections.impl.map.mutable.primitive.IntObjectHashMap; +import org.eclipse.collections.impl.map.mutable.primitive.LongObjectHashMap; import java.util.ArrayList; import java.util.HashMap; diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/CachedPostingListCounterTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/CachedPostingListCounterTest.java index a3dfd00149c..31777959704 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/CachedPostingListCounterTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/CachedPostingListCounterTest.java @@ -1,8 +1,8 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.predicate.index; -import com.gs.collections.impl.map.mutable.primitive.ObjectIntHashMap; import org.apache.commons.lang.ArrayUtils; +import org.eclipse.collections.impl.map.mutable.primitive.ObjectIntHashMap; import org.junit.Test; import java.util.ArrayList; -- cgit v1.2.3