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/11/10 17:26:21 UTC
svn commit: r1713684 - in /lucene/dev/trunk/lucene/core/src:
java/org/apache/lucene/util/ java/org/apache/lucene/util/bkd/
test/org/apache/lucene/search/
Author: mikemccand
Date: Tue Nov 10 16:26:20 2015
New Revision: 1713684
URL: http://svn.apache.org/viewvc?rev=1713684&view=rev
Log:
LUCENE-6890: update TODOs; remove dead code from test case; improve javadocs
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/StringHelper.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/bkd/BKDReader.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/bkd/BKDWriter.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDimensionalRangeQuery.java
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/StringHelper.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/StringHelper.java?rev=1713684&r1=1713683&r2=1713684&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/StringHelper.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/StringHelper.java Tue Nov 10 16:26:20 2015
@@ -382,8 +382,8 @@ public abstract class StringHelper {
}
/** Compares a fixed length slice of two byte arrays interpreted as
- * unsigned values. Returns positive int if a > b, negative
- * int if a < b and 0 if a == b */
+ * big-endian unsigned values. Returns positive int if a > b,
+ * negative int if a < b and 0 if a == b */
public static int compare(int count, byte[] a, int aOffset, byte[] b, int bOffset) {
for(int i=0;i<count;i++) {
int cmp = (a[aOffset+i]&0xff) - (b[bOffset+i]&0xff);
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/bkd/BKDReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/bkd/BKDReader.java?rev=1713684&r1=1713683&r2=1713684&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/bkd/BKDReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/bkd/BKDReader.java Tue Nov 10 16:26:20 2015
@@ -129,8 +129,6 @@ public class BKDReader implements Accoun
int count = in.readVInt();
visitor.grow(count);
- // TODO: especially for the 1D case, this was a decent speedup, because caller could know it should budget for around XXX docs:
- //state.docs.grow(count);
for(int i=0;i<count;i++) {
visitor.visit(in.readInt());
}
@@ -142,9 +140,6 @@ public class BKDReader implements Accoun
// How many points are stored in this leaf cell:
int count = in.readVInt();
- // TODO: we could maybe pollute the IntersectVisitor API with a "grow" method if this maybe helps perf
- // enough (it did before, esp. for the 1D case):
- //state.docs.grow(count);
for(int i=0;i<count;i++) {
docIDs[i] = in.readInt();
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/bkd/BKDWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/bkd/BKDWriter.java?rev=1713684&r1=1713683&r2=1713684&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/bkd/BKDWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/bkd/BKDWriter.java Tue Nov 10 16:26:20 2015
@@ -474,6 +474,8 @@ public class BKDWriter implements Closea
out.writeVInt(leafBlockFPs.length);
+ // TODO: for 1D case, don't waste the first byte of each split value (it's always 0)
+
// NOTE: splitPackedValues[0] is unused, because nodeID is 1-based:
out.writeBytes(splitPackedValues, 0, splitPackedValues.length);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDimensionalRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDimensionalRangeQuery.java?rev=1713684&r1=1713683&r2=1713684&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDimensionalRangeQuery.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDimensionalRangeQuery.java Tue Nov 10 16:26:20 2015
@@ -50,7 +50,6 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
@@ -90,24 +89,11 @@ public class TestDimensionalRangeQuery e
int numValues = atLeast(10000);
long value = randomValue(false);
long[] values = new long[numValues];
- FixedBitSet missing = new FixedBitSet(numValues);
if (VERBOSE) {
System.out.println("TEST: use same value=" + value);
}
-
- for(int docID=0;docID<numValues;docID++) {
- int x = random().nextInt(20);
- if (x == 17) {
- // Some docs don't have a point:
- missing.set(docID);
- if (VERBOSE) {
- System.out.println(" doc=" + docID + " is missing");
- }
- continue;
- }
- values[docID] = value;
- }
+ Arrays.fill(values, value);
verifyLongs(values, null);
}