Apache Lucene open-source search software
Introduce AllGroupsCollectorManager (#15557)
gaobinlong4492860cae3a
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txtindex c1fc63c1c0a..5fcc0877813 100644--- a/lucene/CHANGES.txt+++ b/lucene/CHANGES.txt@@ -530,6 +530,8 @@ Improvements* GITHUB#15570: Disallow invalid offset 0 for LZ4 decompression (Marcono1234)+* GITHUB#15557: Introduce AllGroupsCollectorManager to parallelize search when using AllGroupsCollector. (Binlong Gao)+Optimizations---------------------* GITHUB#15140: Optimize TopScoreDocCollector with TernaryLongHeap for improved performance over Binary-LongHeap. (Ramakrishna Chilaka)diff --git a/lucene/grouping/src/java/org/apache/lucene/search/grouping/AllGroupsCollectorManager.java b/lucene/grouping/src/java/org/apache/lucene/search/grouping/AllGroupsCollectorManager.javanew file mode 100644index 00000000000..7424eee3a5e--- /dev/null+++ b/lucene/grouping/src/java/org/apache/lucene/search/grouping/AllGroupsCollectorManager.java@@ -0,0 +1,56 @@+/*+ * Licensed to the Apache Software Foundation (ASF) under one or more+ * contributor license agreements. See the NOTICE file distributed with+ * this work for additional information regarding copyright ownership.+ * The ASF licenses this file to You under the Apache License, Version 2.0+ * (the "License"); you may not use this file except in compliance with+ * the License. You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */+package org.apache.lucene.search.grouping;++import java.util.Collection;+import java.util.HashSet;+import java.util.function.Supplier;+import java.util.stream.Collectors;+import org.apache.lucene.search.CollectorManager;++/**+ * A CollectorManager implementation for AllGroupsCollector.+ *+ * @lucene.experimental+ */+public class AllGroupsCollectorManager<T>+ implements CollectorManager<AllGroupsCollector<T>, Collection<T>> {++ private final Supplier<GroupSelector<T>> groupSelectorFactory;++ /**+ * Creates a new AllGroupsCollectorManager.+ *+ * @param groupSelectorFactory factory to create group selectors for each collector+ */+ public AllGroupsCollectorManager(Supplier<GroupSelector<T>> groupSelectorFactory) {+ this.groupSelectorFactory = groupSelectorFactory;+ }++ @Override+ public AllGroupsCollector<T> newCollector() {+ return new AllGroupsCollector<>(groupSelectorFactory.get());+ }++ @Override+ public Collection<T> reduce(Collection<AllGroupsCollector<T>> collectors) {+ // Merge groups from all collectors+ return collectors.stream()+ .flatMap(c -> c.getGroups().stream())+ .collect(Collectors.toCollection(HashSet::new));+ }+}diff --git a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupsCollector.java b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupsCollector.javaindex 220c4ed761a..cddc4eed69a 100644--- a/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupsCollector.java+++ b/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestAllGroupsCollector.java@@ -16,7 +16,9 @@*/package org.apache.lucene.search.grouping;+import java.util.Collection;import java.util.HashMap;+import java.util.Map;import org.apache.lucene.document.Document;import org.apache.lucene.document.Field;import org.apache.lucene.document.FieldType;@@ -100,17 +102,22 @@ public class TestAllGroupsCollector extends LuceneTestCase {IndexSearcher indexSearcher = newSearcher(w.getReader());w.close();- AllGroupsCollector<?> allGroupsCollector = createRandomCollector(groupField);- indexSearcher.search(new TermQuery(new Term("content", "random")), allGroupsCollector);- assertEquals(4, allGroupsCollector.getGroupCount());+ AllGroupsCollectorManager<?> allGroupsCollectorManager =+ createRandomCollectorManager(groupField);+ Collection<?> groups =+ indexSearcher.search(+ new TermQuery(new Term("content", "random")), allGroupsCollectorManager);+ assertEquals(4, groups.size());- allGroupsCollector = createRandomCollector(groupField);- indexSearcher.search(new TermQuery(new Term("content", "some")), allGroupsCollector);- assertEquals(3, allGroupsCollector.getGroupCount());+ allGroupsCollectorManager = createRandomCollectorManager(groupField);+ groups =+ indexSearcher.search(new TermQuery(new Term("content", "some")), allGroupsCollectorManager);+ assertEquals(3, groups.size());- allGroupsCollector = createRandomCollector(groupField);- indexSearcher.search(new TermQuery(new Term("content", "blob")), allGroupsCollector);- assertEquals(2, allGroupsCollector.getGroupCount());+ allGroupsCollectorManager = createRandomCollectorManager(groupField);+ groups =+ indexSearcher.search(new TermQuery(new Term("content", "blob")), allGroupsCollectorManager);+ assertEquals(2, groups.size());indexSearcher.getIndexReader().close();dir.close();@@ -121,12 +128,13 @@ public class TestAllGroupsCollector extends LuceneTestCase {doc.add(new SortedDocValuesField(groupField, new BytesRef(value)));}- private AllGroupsCollector<?> createRandomCollector(String groupField) {+ private AllGroupsCollectorManager<?> createRandomCollectorManager(String groupField) {if (random().nextBoolean()) {- return new AllGroupsCollector<>(new TermGroupSelector(groupField));+ return new AllGroupsCollectorManager<>(() -> new TermGroupSelector(groupField));} else {ValueSource vs = new BytesRefFieldSource(groupField);- return new AllGroupsCollector<>(new ValueSourceGroupSelector(vs, new HashMap<>()));+ Map<Object, Object> context = new HashMap<>();+ return new AllGroupsCollectorManager<>(() -> new ValueSourceGroupSelector(vs, context));}}}