diff options
8 files changed, 30 insertions, 38 deletions
diff --git a/predicate-search/src/main/java/com/yahoo/search/predicate/PredicateIndexBuilder.java b/predicate-search/src/main/java/com/yahoo/search/predicate/PredicateIndexBuilder.java index d9153b24a87..f7ba462f7f2 100644 --- a/predicate-search/src/main/java/com/yahoo/search/predicate/PredicateIndexBuilder.java +++ b/predicate-search/src/main/java/com/yahoo/search/predicate/PredicateIndexBuilder.java @@ -28,7 +28,6 @@ import java.util.Set; import java.util.TreeMap; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; /** * A builder for {@link PredicateIndex}. @@ -178,7 +177,7 @@ public class PredicateIndexBuilder { .forEach(entry -> boundsIndexBuilder.insert(entry.getKey(), new Posting(docId, intervalStoreBuilder.insert( - entry.getValue().stream().flatMap(IntervalWithBounds::stream).collect(toList()))))); + entry.getValue().stream().flatMap(IntervalWithBounds::stream).toList())))); } private void indexDocumentConjunctions( diff --git a/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/HitsVerificationBenchmark.java b/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/HitsVerificationBenchmark.java index f58360307aa..82387cbc665 100644 --- a/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/HitsVerificationBenchmark.java +++ b/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/HitsVerificationBenchmark.java @@ -35,7 +35,6 @@ import java.util.stream.Stream; import static com.yahoo.search.predicate.benchmarks.HitsVerificationBenchmark.BenchmarkArguments.*; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; /** * A test that runs outputs the hits for each query into result file. @@ -108,7 +107,7 @@ public class HitsVerificationBenchmark { private static int writeHits(int i, Stream<Hit> hitStream, BufferedWriter writer) { try { - List<Hit> hits = hitStream.collect(toList()); + List<Hit> hits = hitStream.toList(); writer.append(Integer.toString(i)) .append(": ") .append(hits.stream() diff --git a/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/PredicateIndexBenchmark.java b/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/PredicateIndexBenchmark.java index 38f139cba9a..5f500b816cf 100644 --- a/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/PredicateIndexBenchmark.java +++ b/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/PredicateIndexBenchmark.java @@ -43,7 +43,6 @@ import java.util.concurrent.atomic.AtomicInteger; import static com.yahoo.search.predicate.benchmarks.PredicateIndexBenchmark.BenchmarkArguments.Algorithm; import static com.yahoo.search.predicate.benchmarks.PredicateIndexBenchmark.BenchmarkArguments.Format; -import static java.util.stream.Collectors.toList; /** * A benchmark that tests the indexing and search performance. @@ -187,7 +186,7 @@ public class PredicateIndexBenchmark { runners.add(new QueryRunner(shuffledQueries, index.searcher())); } long start = System.currentTimeMillis(); - List<Future<ResultMetrics>> futureResults = runners.stream().map(executor::submit).collect(toList()); + List<Future<ResultMetrics>> futureResults = runners.stream().map(executor::submit).toList(); waitAndShutdown(runtime, executor); long searchTime = System.currentTimeMillis() - start; getResult(futureResults).writeMetrics(output, searchTime); diff --git a/predicate-search/src/main/java/com/yahoo/search/predicate/serialization/PredicateQuerySerializer.java b/predicate-search/src/main/java/com/yahoo/search/predicate/serialization/PredicateQuerySerializer.java index 018f037603d..655ebaaafd3 100644 --- a/predicate-search/src/main/java/com/yahoo/search/predicate/serialization/PredicateQuerySerializer.java +++ b/predicate-search/src/main/java/com/yahoo/search/predicate/serialization/PredicateQuerySerializer.java @@ -14,7 +14,6 @@ import java.io.StringWriter; import java.io.Writer; import java.util.List; -import static java.util.stream.Collectors.toList; /** * Converts {@link PredicateQuery} to and from JSON @@ -99,7 +98,7 @@ public class PredicateQuerySerializer { return reader.lines() .limit(maxQueryCount) .map(serializer::fromJSON) - .collect(toList()); + .toList(); } } diff --git a/predicate-search/src/main/java/com/yahoo/search/predicate/utils/VespaQueryParser.java b/predicate-search/src/main/java/com/yahoo/search/predicate/utils/VespaQueryParser.java index d5ab21114d9..60d24744b63 100644 --- a/predicate-search/src/main/java/com/yahoo/search/predicate/utils/VespaQueryParser.java +++ b/predicate-search/src/main/java/com/yahoo/search/predicate/utils/VespaQueryParser.java @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.List; import java.util.function.BiConsumer; -import static java.util.stream.Collectors.toList; /** * Parses query file containing Vespa queries using the deprecated predicate format (query properties - not YQL). @@ -29,7 +28,7 @@ public class VespaQueryParser { List<PredicateQuery> queries = reader.lines() .limit(maxQueryCount) .map(VespaQueryParser::parseQueryFromQueryProperties) - .collect(toList()); + .toList(); return queries; } } diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/PredicateIndexTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/PredicateIndexTest.java index a8aef273f3c..3634804c415 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/PredicateIndexTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/PredicateIndexTest.java @@ -7,7 +7,6 @@ import org.junit.jupiter.api.Test; import java.io.IOException; import static com.yahoo.search.predicate.serialization.SerializationTestHelper.assertSerializationDeserializationMatches; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; /** @@ -28,9 +27,9 @@ public class PredicateIndexTest { PredicateQuery query = new PredicateQuery(); query.addFeature("country", "no"); query.addFeature("gender", "male"); - assertEquals("[1]", searcher.search(query).collect(toList()).toString()); + assertEquals("[1]", searcher.search(query).toList().toString()); query.addFeature("gender", "female"); - assertEquals("[1, 67108862]", searcher.search(query).collect(toList()).toString()); + assertEquals("[1, 67108862]", searcher.search(query).toList().toString()); } @Test @@ -43,7 +42,7 @@ public class PredicateIndexTest { PredicateQuery query = new PredicateQuery(); query.addFeature("country", "no"); query.addFeature("gender", "female"); - assertEquals("[1]", searcher.search(query).collect(toList()).toString()); + assertEquals("[1]", searcher.search(query).toList().toString()); } { PredicateIndexBuilder builder = new PredicateIndexBuilder(10); @@ -53,7 +52,7 @@ public class PredicateIndexTest { PredicateIndex.Searcher searcher = index.searcher(); PredicateQuery query = new PredicateQuery(); - assertEquals("[43]", searcher.search(query).collect(toList()).toString()); + assertEquals("[43]", searcher.search(query).toList().toString()); query.addFeature("country", "no"); assertEquals(0, searcher.search(query).count()); } @@ -87,7 +86,7 @@ public class PredicateIndexTest { query.addFeature("country", "no", 0x3); assertEquals(0, searcher.search(query).count()); query.addFeature("gender", "male", 0x6); - assertEquals("[[42,0x2]]", searcher.search(query).collect(toList()).toString()); + assertEquals("[[42,0x2]]", searcher.search(query).toList().toString()); } @Test @@ -100,9 +99,9 @@ public class PredicateIndexTest { PredicateQuery query = new PredicateQuery(); query.addFeature("gender", "male"); query.addRangeFeature("age", 36); - assertEquals("[1]", searcher.search(query).collect(toList()).toString()); + assertEquals("[1]", searcher.search(query).toList().toString()); query.addFeature("gender", "female"); - assertEquals("[1, 2]", searcher.search(query).collect(toList()).toString()); + assertEquals("[1, 2]", searcher.search(query).toList().toString()); } @Test @@ -113,7 +112,7 @@ public class PredicateIndexTest { PredicateIndex index = builder.build(); PredicateIndex.Searcher searcher = index.searcher(); PredicateQuery query = new PredicateQuery(); - assertEquals("[1]", searcher.search(query).collect(toList()).toString()); + assertEquals("[1]", searcher.search(query).toList().toString()); } @Test @@ -126,7 +125,7 @@ public class PredicateIndexTest { PredicateQuery query = new PredicateQuery(); query.addFeature("a", "b"); query.addFeature("c", "d"); - assertEquals("[42]", searcher.search(query).collect(toList()).toString()); + assertEquals("[42]", searcher.search(query).toList().toString()); } @Test diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/BoundsPostingListTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/BoundsPostingListTest.java index 2bde0401c51..064b29da544 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/BoundsPostingListTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/BoundsPostingListTest.java @@ -7,7 +7,6 @@ import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.*; /** @@ -36,7 +35,7 @@ public class BoundsPostingListTest { boundsList.add(new IntervalWithBounds((i + 1) << 16 | 0xffff, bounds)); } docIds.add(id); - dataRefs.add(builder.insert(boundsList.stream().flatMap(IntervalWithBounds::stream).collect(toList()))); + dataRefs.add(builder.insert(boundsList.stream().flatMap(IntervalWithBounds::stream).toList())); } PredicateIntervalStore store = builder.build(); diff --git a/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateSearchTest.java b/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateSearchTest.java index 433d69e88a2..d6172f39480 100644 --- a/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateSearchTest.java +++ b/predicate-search/src/test/java/com/yahoo/search/predicate/index/PredicateSearchTest.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static java.util.stream.Collectors.toList; import static org.junit.jupiter.api.Assertions.assertEquals; /** @@ -33,7 +32,7 @@ public class PredicateSearchTest { entry(0, 0x000100ff), entry(1, 0x00010001, 0x000200ff), entry(2, 0x00010042))); - assertEquals(Arrays.asList(new Hit(0), new Hit(1)).toString(), search.stream().collect(toList()).toString()); + assertEquals(Arrays.asList(new Hit(0), new Hit(1)).toString(), search.stream().toList().toString()); } @Test @@ -44,7 +43,7 @@ public class PredicateSearchTest { SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x000100ff), entry(1, 0x000100ff))); - assertEquals(Arrays.asList(new Hit(1)).toString(), search.stream().collect(toList()).toString()); + assertEquals(Arrays.asList(new Hit(1)).toString(), search.stream().toList().toString()); } @Test @@ -55,7 +54,7 @@ public class PredicateSearchTest { entry(0, 0x00010001)), postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x000200ff))); - assertEquals(Arrays.asList(new Hit(0)).toString(), search.stream().collect(toList()).toString()); + assertEquals(Arrays.asList(new Hit(0)).toString(), search.stream().toList().toString()); } @Test @@ -68,7 +67,7 @@ public class PredicateSearchTest { postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(1, 0x000100ff), entry(2, 0x000100ff))); - assertEquals(Arrays.asList(new Hit(1), new Hit(2), new Hit(3)).toString(), search.stream().collect(toList()).toString()); + assertEquals(Arrays.asList(new Hit(1), new Hit(2), new Hit(3)).toString(), search.stream().toList().toString()); } @Test @@ -76,7 +75,7 @@ public class PredicateSearchTest { PredicateSearch search = createPredicateSearch( new byte[0], postingList(SubqueryBitmap.ALL_SUBQUERIES)); - assertEquals(Arrays.asList().toString(), search.stream().collect(toList()).toString()); + assertEquals(Arrays.asList().toString(), search.stream().toList().toString()); } @Test @@ -88,7 +87,7 @@ public class PredicateSearchTest { entry(1, 0x000100ff)), postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(2, 0x000100ff))); - assertEquals(Arrays.asList(new Hit(0), new Hit(1), new Hit(2)).toString(), search.stream().collect(toList()).toString()); + assertEquals(Arrays.asList(new Hit(0), new Hit(1), new Hit(2)).toString(), search.stream().toList().toString()); } @Test @@ -112,7 +111,7 @@ public class PredicateSearchTest { entry(3, 0x000100ff))); assertEquals( Arrays.asList(new Hit(0), new Hit(1), new Hit(2), new Hit(3)).toString(), - search.stream().collect(toList()).toString()); + search.stream().toList().toString()); } @Test @@ -122,7 +121,7 @@ public class PredicateSearchTest { postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x00010001), entry(1, 0x000200ff))); - assertEquals(Arrays.asList().toString(), search.stream().collect(toList()).toString()); + assertEquals(Arrays.asList().toString(), search.stream().toList().toString()); } @Test @@ -135,7 +134,7 @@ public class PredicateSearchTest { entry(0, 0x000300ff)), postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x00020002))); - assertEquals(Arrays.asList(new Hit(0)).toString(), search.stream().collect(toList()).toString()); + assertEquals(Arrays.asList(new Hit(0)).toString(), search.stream().toList().toString()); } @Test @@ -144,7 +143,7 @@ public class PredicateSearchTest { new byte[]{1}, postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x00010001, 0x00020002, 0x00030003, 0x000100ff, 0x00040004, 0x00050005, 0x00060006))); - assertEquals(Arrays.asList(new Hit(0)).toString(), search.stream().collect(toList()).toString()); + assertEquals(Arrays.asList(new Hit(0)).toString(), search.stream().toList().toString()); } @Test @@ -155,7 +154,7 @@ public class PredicateSearchTest { entry(0, 0x00010001)), postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x00010000, 0x00ff0001))); - assertEquals(Arrays.asList().toString(), search.stream().collect(toList()).toString()); + assertEquals(Arrays.asList().toString(), search.stream().toList().toString()); } @Test @@ -164,7 +163,7 @@ public class PredicateSearchTest { new byte[]{1}, postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x00010000, 0x00ff0001))); - assertEquals(Arrays.asList(new Hit(0)).toString(), search.stream().collect(toList()).toString()); + assertEquals(Arrays.asList(new Hit(0)).toString(), search.stream().toList().toString()); } @Test @@ -173,7 +172,7 @@ public class PredicateSearchTest { new byte[]{1}, postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x00020001, 0x00ff0001))); - assertEquals(Arrays.asList().toString(), search.stream().collect(toList()).toString()); + assertEquals(Arrays.asList().toString(), search.stream().toList().toString()); } @Test @@ -184,7 +183,7 @@ public class PredicateSearchTest { entry(0, 0x00010001)), postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x00fe0001, 0x00ff00fe))); - assertEquals(Arrays.asList(new Hit(0)).toString(), search.stream().collect(toList()).toString()); + assertEquals(Arrays.asList(new Hit(0)).toString(), search.stream().toList().toString()); } @Test @@ -203,7 +202,7 @@ public class PredicateSearchTest { entry(0, 0x00010008, 0x00060006)), postingList(SubqueryBitmap.ALL_SUBQUERIES, entry(0, 0x00020002, 0x000700ff))); - assertEquals(Arrays.asList(new Hit(0)).toString(), search.stream().collect(toList()).toString()); + assertEquals(Arrays.asList(new Hit(0)).toString(), search.stream().toList().toString()); } private static PredicateSearch createPredicateSearch(byte[] minFeatures, PostingList... postingLists) { |