You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/08/01 09:52:15 UTC
svn commit: r1693683 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/sandbox/ lucene/sandbox/src/java/org/apache/lucene/rangetree/
lucene/sandbox/src/resources/META-INF/services/
lucene/sandbox/src/test/org/apache/lucene/rangetree/
Author: mikemccand
Date: Sat Aug 1 07:52:14 2015
New Revision: 1693683
URL: http://svn.apache.org/r1693683
Log:
LUCENE-6697: add range tree for fast numeric and binary range filtering
Added:
lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/rangetree/
- copied from r1693682, lucene/dev/trunk/lucene/sandbox/src/java/org/apache/lucene/rangetree/
lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/rangetree/
- copied from r1693682, lucene/dev/trunk/lucene/sandbox/src/test/org/apache/lucene/rangetree/
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/lucene/sandbox/ (props changed)
lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/rangetree/RangeTreeReader.java
lucene/dev/branches/branch_5x/lucene/sandbox/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/rangetree/TestRangeTree.java
Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1693683&r1=1693682&r2=1693683&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Sat Aug 1 07:52:14 2015
@@ -105,6 +105,12 @@ New Features
* LUCENE-6695: Added a new BlendedTermQuery to blend statistics across several
terms. (Simon Willnauer, Adrien Grand)
+* LUCENE-6697: Add experimental range tree doc values format and
+ queries, based on a 1D version of the spatial BKD tree, for a faster
+ and smaller alternative to postings-based numeric and binary term
+ filtering. Range trees can also handle values larger than 64 bits.
+ (Adrien Grand, Mike McCandless)
+
API Changes
* LUCENE-6508: Simplify Lock api, there is now just
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/rangetree/RangeTreeReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/rangetree/RangeTreeReader.java?rev=1693683&r1=1693682&r2=1693683&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/rangetree/RangeTreeReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/java/org/apache/lucene/rangetree/RangeTreeReader.java Sat Aug 1 07:52:14 2015
@@ -26,6 +26,8 @@ import org.apache.lucene.util.RamUsageEs
import java.io.IOException;
import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
/** Handles intersection of a range with a numeric tree previously written with {@link RangeTreeWriter}.
*
@@ -199,4 +201,9 @@ final class RangeTreeReader implements A
return blockMinValues.length * RamUsageEstimator.NUM_BYTES_LONG +
blockFPs.length * RamUsageEstimator.NUM_BYTES_LONG;
}
+
+ @Override
+ public Collection<Accountable> getChildResources() {
+ return Collections.emptyList();
+ }
}
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat?rev=1693683&r1=1693682&r2=1693683&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/resources/META-INF/services/org.apache.lucene.codecs.DocValuesFormat Sat Aug 1 07:52:14 2015
@@ -14,4 +14,5 @@
# limitations under the License.
org.apache.lucene.bkdtree.BKDTreeDocValuesFormat
+org.apache.lucene.rangetree.RangeTreeDocValuesFormat
Modified: lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/rangetree/TestRangeTree.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/rangetree/TestRangeTree.java?rev=1693683&r1=1693682&r2=1693683&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/rangetree/TestRangeTree.java (original)
+++ lucene/dev/branches/branch_5x/lucene/sandbox/src/test/org/apache/lucene/rangetree/TestRangeTree.java Sat Aug 1 07:52:14 2015
@@ -352,7 +352,7 @@ public class TestRangeTree extends Lucen
verify(missing, values);
}
- private static void verify(Bits missing, long[] values) throws Exception {
+ private static void verify(final Bits missing, final long[] values) throws Exception {
int maxPointsInLeaf = TestUtil.nextInt(random(), 16, 2048);
int maxPointsSortInHeap = TestUtil.nextInt(random(), maxPointsInLeaf, 1024*1024);
IndexWriterConfig iwc = newIndexWriterConfig();
@@ -380,7 +380,7 @@ public class TestRangeTree extends Lucen
} else {
dir = newDirectory();
}
- Set<Integer> deleted = new HashSet<>();
+ final Set<Integer> deleted = new HashSet<>();
// RandomIndexWriter is too slow here:
IndexWriter w = new IndexWriter(dir, iwc);
for(int id=0;id<values.length;id++) {
@@ -408,7 +408,7 @@ public class TestRangeTree extends Lucen
w.close();
// We can't wrap with "exotic" readers because the NumericRangeTreeQuery must see the NumericTreeDVFormat:
- IndexSearcher s = newSearcher(r, false);
+ final IndexSearcher s = newSearcher(r, false);
int numThreads = TestUtil.nextInt(random(), 2, 5);