From bb2d6c128ff74d6164c5c60ac952074c1b5a5b94 Mon Sep 17 00:00:00 2001 From: Mikhail Khludnev Date: Mon, 3 Jul 2017 15:53:57 +0300 Subject: [PATCH] LUCENE-7871: fixing CHANGES.txt, mark it as Lucene 7.0 bug fix. --- lucene/CHANGES.txt | 3 +++ .../java/org/apache/lucene/search/join/BlockJoinSelector.java | 2 +- solr/CHANGES.txt | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 909b6ce4fff..88e1779689c 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -105,6 +105,9 @@ Bug Fixes * LUCENE-7859: Spatial-extras PackedQuadPrefixTree bug that only revealed itself with the new pointsOnly optimizations in LUCENE-7845. (David Smiley) +* LUCENE-7871: fix false positive match in BlockJoinSelector when children have no value, introducing + wrap methods accepting children as DISI. Extracting ToParentDocValues (Mikhail Khludnev) + Improvements * LUCENE-7489: Better storage of sparse doc-values fields with the default diff --git a/lucene/join/src/java/org/apache/lucene/search/join/BlockJoinSelector.java b/lucene/join/src/java/org/apache/lucene/search/join/BlockJoinSelector.java index a81230ded4e..79c35b89fb9 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/BlockJoinSelector.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/BlockJoinSelector.java @@ -126,7 +126,7 @@ public class BlockJoinSelector { return wrap(sortedNumerics, selection, parents, toIter(children)); } - /** creates an interator for the given bitset */ + /** creates an iterator for the given bitset */ protected static BitSetIterator toIter(BitSet children) { return new BitSetIterator(children, 0); } diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 8c061070afc..aadc6db6f8b 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -501,9 +501,6 @@ when using one of Exact*StatsCache (Mikhail Khludnev) * SOLR-10910: Clean up a few details left over from pluggable transient core and untangling CoreDescriptor/CoreContainer references (Erick Erickson) -* LUCENE-7871: fix false positive match in BlockJoinSelector when children have no value, introducing - wrap methods accepting children as DISI. Extracting ToParentDocValues (Mikhail Khludnev) - Optimizations ---------------------- * SOLR-10634: JSON Facet API: When a field/terms facet will retrieve all buckets (i.e. limit:-1)