You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2011/12/15 06:11:30 UTC
svn commit: r1214623 [6/17] - in /lucene/dev/branches/solrcloud: ./
dev-tools/idea/lucene/contrib/ lucene/ lucene/contrib/
lucene/contrib/demo/src/java/org/apache/lucene/demo/
lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight...
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/PerDocConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/PerDocConsumer.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/PerDocConsumer.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/PerDocConsumer.java Thu Dec 15 05:11:14 2011
@@ -19,11 +19,8 @@ import java.io.Closeable;
import java.io.IOException;
import org.apache.lucene.index.FieldInfo;
-import org.apache.lucene.index.FieldInfos;
+import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.MergeState;
-import org.apache.lucene.index.values.IndexDocValues;
-import org.apache.lucene.index.values.TypePromoter;
-import org.apache.lucene.index.values.ValueType;
/**
* Abstract API that consumes per document values. Concrete implementations of
@@ -37,82 +34,26 @@ import org.apache.lucene.index.values.Va
*/
public abstract class PerDocConsumer implements Closeable{
/** Adds a new DocValuesField */
- public abstract DocValuesConsumer addValuesField(FieldInfo field)
+ public abstract DocValuesConsumer addValuesField(DocValues.Type type, FieldInfo field)
throws IOException;
/**
- * Consumes and merges the given {@link PerDocValues} producer
+ * Consumes and merges the given {@link PerDocProducer} producer
* into this consumers format.
*/
- public void merge(MergeState mergeState)
- throws IOException {
- final FieldInfos fieldInfos = mergeState.fieldInfos;
- final IndexDocValues[] docValues = new IndexDocValues[mergeState.readers.size()];
- final PerDocValues[] perDocValues = new PerDocValues[mergeState.readers.size()];
- // pull all PerDocValues
- for (int i = 0; i < perDocValues.length; i++) {
- perDocValues[i] = mergeState.readers.get(i).reader.perDocValues();
- }
- for (FieldInfo fieldInfo : fieldInfos) {
- mergeState.fieldInfo = fieldInfo;
- TypePromoter currentPromoter = TypePromoter.getIdentityPromoter();
+ public void merge(MergeState mergeState) throws IOException {
+ final DocValues[] docValues = new DocValues[mergeState.readers.size()];
+
+ for (FieldInfo fieldInfo : mergeState.fieldInfos) {
+ mergeState.fieldInfo = fieldInfo; // set the field we are merging
if (fieldInfo.hasDocValues()) {
- for (int i = 0; i < perDocValues.length; i++) {
- if (perDocValues[i] != null) { // get all IDV to merge
- docValues[i] = perDocValues[i].docValues(fieldInfo.name);
- if (docValues[i] != null) {
- currentPromoter = promoteValueType(fieldInfo, docValues[i], currentPromoter);
- if (currentPromoter == null) {
- break;
- }
- }
- }
- }
-
- if (currentPromoter == null) {
- fieldInfo.resetDocValues(null);
- continue;
- }
- assert currentPromoter != TypePromoter.getIdentityPromoter();
- if (fieldInfo.getDocValues() != currentPromoter.type()) {
- // reset the type if we got promoted
- fieldInfo.resetDocValues(currentPromoter.type());
+ for (int i = 0; i < docValues.length; i++) {
+ docValues[i] = mergeState.readers.get(i).reader.docValues(fieldInfo.name);
}
-
- final DocValuesConsumer docValuesConsumer = addValuesField(mergeState.fieldInfo);
+ final DocValuesConsumer docValuesConsumer = addValuesField(fieldInfo.getDocValuesType(), fieldInfo);
assert docValuesConsumer != null;
docValuesConsumer.merge(mergeState, docValues);
}
}
- /* NOTE: don't close the perDocProducers here since they are private segment producers
- * and will be closed once the SegmentReader goes out of scope */
- }
-
- protected TypePromoter promoteValueType(final FieldInfo fieldInfo, final IndexDocValues docValues,
- TypePromoter currentPromoter) {
- assert currentPromoter != null;
- final TypePromoter incomingPromoter = TypePromoter.create(docValues.type(), docValues.getValueSize());
- assert incomingPromoter != null;
- final TypePromoter newPromoter = currentPromoter.promote(incomingPromoter);
- return newPromoter == null ? handleIncompatibleValueType(fieldInfo, incomingPromoter, currentPromoter) : newPromoter;
- }
-
- /**
- * Resolves a conflicts of incompatible {@link TypePromoter}s. The default
- * implementation promotes incompatible types to
- * {@link ValueType#BYTES_VAR_STRAIGHT} and preserves all values. If this
- * method returns <code>null</code> all docvalues for the given
- * {@link FieldInfo} are dropped and all values are lost.
- *
- * @param incomingPromoter
- * the incompatible incoming promoter
- * @param currentPromoter
- * the current promoter
- * @return a promoted {@link TypePromoter} or <code>null</code> iff this index
- * docvalues should be dropped for this field.
- */
- protected TypePromoter handleIncompatibleValueType(FieldInfo fieldInfo, TypePromoter incomingPromoter, TypePromoter currentPromoter) {
- return TypePromoter.create(ValueType.BYTES_VAR_STRAIGHT, TypePromoter.VAR_TYPE_VALUE_SIZE);
- }
-
+ }
}
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/appending/AppendingCodec.java Thu Dec 15 05:11:14 2011
@@ -20,6 +20,7 @@ package org.apache.lucene.index.codecs.a
import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.codecs.DocValuesFormat;
import org.apache.lucene.index.codecs.FieldInfosFormat;
+import org.apache.lucene.index.codecs.NormsFormat;
import org.apache.lucene.index.codecs.StoredFieldsFormat;
import org.apache.lucene.index.codecs.PostingsFormat;
import org.apache.lucene.index.codecs.SegmentInfosFormat;
@@ -27,6 +28,7 @@ import org.apache.lucene.index.codecs.Te
import org.apache.lucene.index.codecs.lucene40.Lucene40Codec;
import org.apache.lucene.index.codecs.lucene40.Lucene40FieldInfosFormat;
import org.apache.lucene.index.codecs.lucene40.Lucene40DocValuesFormat;
+import org.apache.lucene.index.codecs.lucene40.Lucene40NormsFormat;
import org.apache.lucene.index.codecs.lucene40.Lucene40StoredFieldsFormat;
import org.apache.lucene.index.codecs.lucene40.Lucene40TermVectorsFormat;
@@ -47,6 +49,7 @@ public class AppendingCodec extends Code
private final FieldInfosFormat fieldInfos = new Lucene40FieldInfosFormat();
private final TermVectorsFormat vectors = new Lucene40TermVectorsFormat();
private final DocValuesFormat docValues = new Lucene40DocValuesFormat();
+ private final NormsFormat norms = new Lucene40NormsFormat();
@Override
public PostingsFormat postingsFormat() {
@@ -77,4 +80,9 @@ public class AppendingCodec extends Code
public FieldInfosFormat fieldInfosFormat() {
return fieldInfos;
}
+
+ @Override
+ public NormsFormat normsFormat() {
+ return norms;
+ }
}
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xCodec.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xCodec.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xCodec.java Thu Dec 15 05:11:14 2011
@@ -26,13 +26,15 @@ import org.apache.lucene.index.SegmentRe
import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.codecs.DocValuesFormat;
import org.apache.lucene.index.codecs.FieldInfosFormat;
+import org.apache.lucene.index.codecs.NormsFormat;
+import org.apache.lucene.index.codecs.PerDocProducer;
import org.apache.lucene.index.codecs.StoredFieldsFormat;
import org.apache.lucene.index.codecs.PerDocConsumer;
-import org.apache.lucene.index.codecs.PerDocValues;
import org.apache.lucene.index.codecs.PostingsFormat;
import org.apache.lucene.index.codecs.SegmentInfosFormat;
import org.apache.lucene.index.codecs.TermVectorsFormat;
import org.apache.lucene.index.codecs.lucene40.Lucene40FieldInfosFormat;
+import org.apache.lucene.index.codecs.lucene40.Lucene40NormsFormat;
import org.apache.lucene.index.codecs.lucene40.Lucene40SegmentInfosFormat;
import org.apache.lucene.index.codecs.lucene40.Lucene40StoredFieldsFormat;
import org.apache.lucene.index.codecs.lucene40.Lucene40TermVectorsFormat;
@@ -62,6 +64,9 @@ public class Lucene3xCodec extends Codec
// this way IR.commit fails on delete/undelete/setNorm/etc ?
private final SegmentInfosFormat infosFormat = new Lucene40SegmentInfosFormat();
+ // TODO: this should really be a different impl
+ private final NormsFormat normsFormat = new Lucene40NormsFormat();
+
// 3.x doesn't support docvalues
private final DocValuesFormat docValuesFormat = new DocValuesFormat() {
@Override
@@ -70,7 +75,7 @@ public class Lucene3xCodec extends Codec
}
@Override
- public PerDocValues docsProducer(SegmentReadState state) throws IOException {
+ public PerDocProducer docsProducer(SegmentReadState state) throws IOException {
return null;
}
@@ -107,4 +112,9 @@ public class Lucene3xCodec extends Codec
public SegmentInfosFormat segmentInfosFormat() {
return infosFormat;
}
+
+ @Override
+ public NormsFormat normsFormat() {
+ return normsFormat;
+ }
}
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40Codec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40Codec.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40Codec.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40Codec.java Thu Dec 15 05:11:14 2011
@@ -20,6 +20,7 @@ package org.apache.lucene.index.codecs.l
import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.codecs.DocValuesFormat;
import org.apache.lucene.index.codecs.FieldInfosFormat;
+import org.apache.lucene.index.codecs.NormsFormat;
import org.apache.lucene.index.codecs.StoredFieldsFormat;
import org.apache.lucene.index.codecs.PostingsFormat;
import org.apache.lucene.index.codecs.SegmentInfosFormat;
@@ -40,6 +41,7 @@ public class Lucene40Codec extends Codec
private final FieldInfosFormat fieldInfosFormat = new Lucene40FieldInfosFormat();
private final DocValuesFormat docValuesFormat = new Lucene40DocValuesFormat();
private final SegmentInfosFormat infosFormat = new Lucene40SegmentInfosFormat();
+ private final NormsFormat normsFormat = new Lucene40NormsFormat();
private final PostingsFormat postingsFormat = new PerFieldPostingsFormat() {
@Override
public PostingsFormat getPostingsFormatForField(String field) {
@@ -81,6 +83,11 @@ public class Lucene40Codec extends Codec
return infosFormat;
}
+ @Override
+ public NormsFormat normsFormat() {
+ return normsFormat;
+ }
+
/** Returns the postings format that should be used for writing
* new segments of <code>field</code>.
*
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40DocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40DocValuesFormat.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40DocValuesFormat.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40DocValuesFormat.java Thu Dec 15 05:11:14 2011
@@ -25,7 +25,7 @@ import org.apache.lucene.index.SegmentIn
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.codecs.DocValuesFormat;
import org.apache.lucene.index.codecs.PerDocConsumer;
-import org.apache.lucene.index.codecs.PerDocValues;
+import org.apache.lucene.index.codecs.PerDocProducer;
import org.apache.lucene.store.Directory;
public class Lucene40DocValuesFormat extends DocValuesFormat {
@@ -36,7 +36,7 @@ public class Lucene40DocValuesFormat ext
}
@Override
- public PerDocValues docsProducer(SegmentReadState state) throws IOException {
+ public PerDocProducer docsProducer(SegmentReadState state) throws IOException {
return new Lucene40DocValuesProducer(state);
}
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40DocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40DocValuesProducer.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40DocValuesProducer.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40DocValuesProducer.java Thu Dec 15 05:11:14 2011
@@ -24,25 +24,25 @@ import java.util.Collection;
import java.util.Map;
import java.util.TreeMap;
+import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.codecs.DocValuesReaderBase;
-import org.apache.lucene.index.values.IndexDocValues;
import org.apache.lucene.store.CompoundFileDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.IOUtils;
/**
- * Default PerDocValues implementation that uses compound file.
+ * Default PerDocProducer implementation that uses compound file.
* @lucene.experimental
*/
public class Lucene40DocValuesProducer extends DocValuesReaderBase {
- protected final TreeMap<String,IndexDocValues> docValues;
+ protected final TreeMap<String,DocValues> docValues;
private final Directory cfs;
/**
* Creates a new {@link Lucene40DocValuesProducer} instance and loads all
- * {@link IndexDocValues} instances for this segment and codec.
+ * {@link DocValues} instances for this segment and codec.
*/
public Lucene40DocValuesProducer(SegmentReadState state) throws IOException {
if (state.fieldInfos.anyDocValuesFields()) {
@@ -53,12 +53,12 @@ public class Lucene40DocValuesProducer e
docValues = load(state.fieldInfos, state.segmentInfo.name, state.segmentInfo.docCount, cfs, state.context);
} else {
cfs = null;
- docValues = new TreeMap<String,IndexDocValues>();
+ docValues = new TreeMap<String,DocValues>();
}
}
@Override
- protected Map<String,IndexDocValues> docValues() {
+ protected Map<String,DocValues> docValues() {
return docValues;
}
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40FieldInfosReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40FieldInfosReader.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40FieldInfosReader.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40FieldInfosReader.java Thu Dec 15 05:11:14 2011
@@ -12,7 +12,7 @@ import org.apache.lucene.index.IndexForm
import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.index.FieldInfo.IndexOptions;
import org.apache.lucene.index.codecs.FieldInfosReader;
-import org.apache.lucene.index.values.ValueType;
+import org.apache.lucene.index.DocValues;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexInput;
@@ -95,7 +95,7 @@ public class Lucene40FieldInfosReader ex
hasVectors |= storeTermVector;
hasProx |= isIndexed && indexOptions == IndexOptions.DOCS_AND_FREQS_AND_POSITIONS;
hasFreq |= isIndexed && indexOptions != IndexOptions.DOCS_ONLY;
- ValueType docValuesType = null;
+ DocValues.Type docValuesType = null;
if (format <= Lucene40FieldInfosWriter.FORMAT_FLEX) {
final byte b = input.readByte();
switch(b) {
@@ -103,43 +103,43 @@ public class Lucene40FieldInfosReader ex
docValuesType = null;
break;
case 1:
- docValuesType = ValueType.VAR_INTS;
+ docValuesType = DocValues.Type.VAR_INTS;
break;
case 2:
- docValuesType = ValueType.FLOAT_32;
+ docValuesType = DocValues.Type.FLOAT_32;
break;
case 3:
- docValuesType = ValueType.FLOAT_64;
+ docValuesType = DocValues.Type.FLOAT_64;
break;
case 4:
- docValuesType = ValueType.BYTES_FIXED_STRAIGHT;
+ docValuesType = DocValues.Type.BYTES_FIXED_STRAIGHT;
break;
case 5:
- docValuesType = ValueType.BYTES_FIXED_DEREF;
+ docValuesType = DocValues.Type.BYTES_FIXED_DEREF;
break;
case 6:
- docValuesType = ValueType.BYTES_VAR_STRAIGHT;
+ docValuesType = DocValues.Type.BYTES_VAR_STRAIGHT;
break;
case 7:
- docValuesType = ValueType.BYTES_VAR_DEREF;
+ docValuesType = DocValues.Type.BYTES_VAR_DEREF;
break;
case 8:
- docValuesType = ValueType.FIXED_INTS_16;
+ docValuesType = DocValues.Type.FIXED_INTS_16;
break;
case 9:
- docValuesType = ValueType.FIXED_INTS_32;
+ docValuesType = DocValues.Type.FIXED_INTS_32;
break;
case 10:
- docValuesType = ValueType.FIXED_INTS_64;
+ docValuesType = DocValues.Type.FIXED_INTS_64;
break;
case 11:
- docValuesType = ValueType.FIXED_INTS_8;
+ docValuesType = DocValues.Type.FIXED_INTS_8;
break;
case 12:
- docValuesType = ValueType.BYTES_FIXED_SORTED;
+ docValuesType = DocValues.Type.BYTES_FIXED_SORTED;
break;
case 13:
- docValuesType = ValueType.BYTES_VAR_SORTED;
+ docValuesType = DocValues.Type.BYTES_VAR_SORTED;
break;
default:
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40FieldInfosWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40FieldInfosWriter.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40FieldInfosWriter.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40FieldInfosWriter.java Thu Dec 15 05:11:14 2011
@@ -83,7 +83,7 @@ public class Lucene40FieldInfosWriter ex
if (!fi.hasDocValues()) {
b = 0;
} else {
- switch(fi.getDocValues()) {
+ switch(fi.getDocValuesType()) {
case VAR_INTS:
b = 1;
break;
@@ -124,7 +124,7 @@ public class Lucene40FieldInfosWriter ex
b = 13;
break;
default:
- throw new IllegalStateException("unhandled indexValues type " + fi.getDocValues());
+ throw new IllegalStateException("unhandled indexValues type " + fi.getDocValuesType());
}
}
output.writeByte(b);
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40StoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40StoredFieldsReader.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40StoredFieldsReader.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40StoredFieldsReader.java Thu Dec 15 05:11:14 2011
@@ -22,7 +22,6 @@ import java.io.IOException;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfos;
-import org.apache.lucene.index.FieldReaderException;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.IndexFormatTooNewException;
import org.apache.lucene.index.IndexFormatTooOldException;
@@ -225,7 +224,7 @@ public final class Lucene40StoredFieldsR
visitor.doubleField(info, Double.longBitsToDouble(fieldsStream.readLong()));
return;
default:
- throw new FieldReaderException("Invalid numeric type: " + Integer.toHexString(numeric));
+ throw new CorruptIndexException("Invalid numeric type: " + Integer.toHexString(numeric));
}
} else {
final int length = fieldsStream.readVInt();
@@ -252,7 +251,7 @@ public final class Lucene40StoredFieldsR
fieldsStream.readLong();
return;
default:
- throw new FieldReaderException("Invalid numeric type: " + Integer.toHexString(numeric));
+ throw new CorruptIndexException("Invalid numeric type: " + Integer.toHexString(numeric));
}
} else {
final int length = fieldsStream.readVInt();
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesConsumer.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesConsumer.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesConsumer.java Thu Dec 15 05:11:14 2011
@@ -26,7 +26,7 @@ import org.apache.lucene.index.IndexFile
import org.apache.lucene.index.PerDocWriteState;
import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.index.codecs.DocValuesWriterBase;
-import org.apache.lucene.index.values.Writer;
+import org.apache.lucene.index.codecs.lucene40.values.Writer;
import org.apache.lucene.store.Directory;
/**
@@ -53,7 +53,7 @@ public class SepDocValuesConsumer extend
for (FieldInfo fieldInfo : fieldInfos) {
if (fieldInfo.hasDocValues()) {
String filename = docValuesId(segmentInfo.name, fieldInfo.number);
- switch (fieldInfo.getDocValues()) {
+ switch (fieldInfo.getDocValuesType()) {
case BYTES_FIXED_DEREF:
case BYTES_VAR_DEREF:
case BYTES_VAR_STRAIGHT:
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesProducer.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesProducer.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/sep/SepDocValuesProducer.java Thu Dec 15 05:11:14 2011
@@ -22,28 +22,28 @@ import java.util.Collection;
import java.util.Map;
import java.util.TreeMap;
+import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.codecs.DocValuesReaderBase;
-import org.apache.lucene.index.values.IndexDocValues;
import org.apache.lucene.util.IOUtils;
/**
- * Implementation of PerDocValues that uses separate files.
+ * Implementation of PerDocProducer that uses separate files.
* @lucene.experimental
*/
public class SepDocValuesProducer extends DocValuesReaderBase {
- private final TreeMap<String, IndexDocValues> docValues;
+ private final TreeMap<String, DocValues> docValues;
/**
* Creates a new {@link SepDocValuesProducer} instance and loads all
- * {@link IndexDocValues} instances for this segment and codec.
+ * {@link DocValues} instances for this segment and codec.
*/
public SepDocValuesProducer(SegmentReadState state) throws IOException {
docValues = load(state.fieldInfos, state.segmentInfo.name, state.segmentInfo.docCount, state.dir, state.context);
}
@Override
- protected Map<String,IndexDocValues> docValues() {
+ protected Map<String,DocValues> docValues() {
return docValues;
}
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextCodec.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextCodec.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextCodec.java Thu Dec 15 05:11:14 2011
@@ -20,6 +20,7 @@ package org.apache.lucene.index.codecs.s
import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.codecs.DocValuesFormat;
import org.apache.lucene.index.codecs.FieldInfosFormat;
+import org.apache.lucene.index.codecs.NormsFormat;
import org.apache.lucene.index.codecs.PostingsFormat;
import org.apache.lucene.index.codecs.SegmentInfosFormat;
import org.apache.lucene.index.codecs.StoredFieldsFormat;
@@ -40,6 +41,8 @@ public final class SimpleTextCodec exten
private final TermVectorsFormat vectorsFormat = new SimpleTextTermVectorsFormat();
// TODO: need a plain-text impl
private final DocValuesFormat docValues = new Lucene40DocValuesFormat();
+ // TODO: need a plain-text impl (using the above)
+ private final NormsFormat normsFormat = new SimpleTextNormsFormat();
public SimpleTextCodec() {
super("SimpleText");
@@ -74,4 +77,9 @@ public final class SimpleTextCodec exten
public SegmentInfosFormat segmentInfosFormat() {
return segmentInfos;
}
+
+ @Override
+ public NormsFormat normsFormat() {
+ return normsFormat;
+ }
}
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldInfosReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldInfosReader.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldInfosReader.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldInfosReader.java Thu Dec 15 05:11:14 2011
@@ -26,8 +26,8 @@ import org.apache.lucene.index.FieldInfo
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.index.FieldInfo.IndexOptions;
+import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.codecs.FieldInfosReader;
-import org.apache.lucene.index.values.ValueType;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexInput;
@@ -98,12 +98,12 @@ public class SimpleTextFieldInfosReader
SimpleTextUtil.readLine(input, scratch);
assert StringHelper.startsWith(scratch, DOCVALUES);
String dvType = readString(DOCVALUES.length, scratch);
- final ValueType docValuesType;
+ final DocValues.Type docValuesType;
if ("false".equals(dvType)) {
docValuesType = null;
} else {
- docValuesType = ValueType.valueOf(dvType);
+ docValuesType = DocValues.Type.valueOf(dvType);
}
SimpleTextUtil.readLine(input, scratch);
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldInfosWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldInfosWriter.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldInfosWriter.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldInfosWriter.java Thu Dec 15 05:11:14 2011
@@ -100,7 +100,7 @@ public class SimpleTextFieldInfosWriter
if (!fi.hasDocValues()) {
SimpleTextUtil.write(out, "false", scratch);
} else {
- SimpleTextUtil.write(out, fi.getDocValues().toString(), scratch);
+ SimpleTextUtil.write(out, fi.getDocValuesType().toString(), scratch);
}
SimpleTextUtil.writeNewline(out);
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/CachingWrapperFilter.java Thu Dec 15 05:11:14 2011
@@ -18,6 +18,7 @@ package org.apache.lucene.search;
*/
import java.io.IOException;
+import java.util.Collections;
import java.util.Map;
import java.util.WeakHashMap;
@@ -27,7 +28,7 @@ import org.apache.lucene.util.FixedBitSe
import org.apache.lucene.util.Bits;
/**
- * Wraps another filter's result and caches it. The purpose is to allow
+ * Wraps another {@link Filter}'s result and caches it. The purpose is to allow
* filters to simply filter, and then wrap with this class
* to add caching.
*/
@@ -35,47 +36,45 @@ public class CachingWrapperFilter extend
// TODO: make this filter aware of ReaderContext. a cached filter could
// specify the actual readers key or something similar to indicate on which
// level of the readers hierarchy it should be cached.
- Filter filter;
-
- protected final FilterCache<DocIdSet> cache;
-
- static class FilterCache<T> {
-
- /**
- * A transient Filter cache (package private because of test)
- */
- // NOTE: not final so that we can dynamically re-init
- // after de-serialize
- transient Map<Object,T> cache;
-
- public synchronized T get(IndexReader reader, Object coreKey) throws IOException {
- T value;
-
- if (cache == null) {
- cache = new WeakHashMap<Object,T>();
- }
-
- return cache.get(coreKey);
- }
-
- public synchronized void put(Object coreKey, T value) {
- cache.put(coreKey, value);
- }
- }
+ private final Filter filter;
+ private final Map<Object,DocIdSet> cache = Collections.synchronizedMap(new WeakHashMap<Object,DocIdSet>());
+ private final boolean recacheDeletes;
/** Wraps another filter's result and caches it.
+ * Deletions are not cached and AND'd in on the fly, see
+ * {@link #CachingWrapperFilter(Filter,boolean)} for an explanation.
+ * This constructor is recommended for often changing indexes.
* @param filter Filter to cache results of
+ * @see #CachingWrapperFilter(Filter,boolean)
*/
public CachingWrapperFilter(Filter filter) {
+ this(filter, false);
+ }
+
+ /** Wraps another filter's result and caches it. If
+ * {@code recacheDeletes} is {@code true}, then new deletes (for example
+ * after {@link IndexReader#openIfChanged}) will cause the filter
+ * {@link DocIdSet} to be recached.
+ *
+ * <p>If your index changes seldom, it is recommended to use {@code recacheDeletes=true},
+ * as recaching will only occur when the index is reopened.
+ * For near-real-time indexes or indexes that are often
+ * reopened with (e.g., {@link IndexReader#openIfChanged} is used), you should
+ * pass {@code recacheDeletes=false}. This will cache the filter results omitting
+ * deletions and will AND them in while scoring.
+ * @param filter Filter to cache results of
+ * @param recacheDeletes if deletions on the underlying index should recache
+ */
+ public CachingWrapperFilter(Filter filter, boolean recacheDeletes) {
this.filter = filter;
- cache = new FilterCache<DocIdSet>();
+ this.recacheDeletes = recacheDeletes;
}
/** Provide the DocIdSet to be cached, using the DocIdSet provided
* by the wrapped Filter.
* <p>This implementation returns the given {@link DocIdSet}, if {@link DocIdSet#isCacheable}
* returns <code>true</code>, else it copies the {@link DocIdSetIterator} into
- * an {@link FixedBitSet}.
+ * a {@link FixedBitSet}.
*/
protected DocIdSet docIdSetToCache(DocIdSet docIdSet, IndexReader reader) throws IOException {
if (docIdSet == null) {
@@ -104,35 +103,54 @@ public class CachingWrapperFilter extend
@Override
public DocIdSet getDocIdSet(AtomicReaderContext context, final Bits acceptDocs) throws IOException {
final IndexReader reader = context.reader;
- final Object coreKey = reader.getCoreCacheKey();
- DocIdSet docIdSet = cache.get(reader, coreKey);
+ // Only cache if incoming acceptDocs is == live docs;
+ // if Lucene passes in more interesting acceptDocs in
+ // the future (@UweSays: it already does when you chain FilteredQuery) we don't want to over-cache:
+ final Bits liveDocs = reader.getLiveDocs();
+ final boolean doCacheAcceptDocs = (recacheDeletes && acceptDocs == liveDocs);
+
+ final Object key;
+ final Bits cacheAcceptDocs;
+ if (doCacheAcceptDocs) {
+ assert acceptDocs == liveDocs;
+ key = reader.getCombinedCoreAndDeletesKey();
+ cacheAcceptDocs = acceptDocs;
+ } else {
+ key = reader.getCoreCacheKey();
+ cacheAcceptDocs = null;
+ }
+
+ DocIdSet docIdSet = cache.get(key);
if (docIdSet != null) {
hitCount++;
} else {
missCount++;
- // cache miss: we use no acceptDocs here
- // (this saves time on building DocIdSet, the acceptDocs will be applied on the cached set)
- docIdSet = docIdSetToCache(filter.getDocIdSet(context, null/**!!!*/), reader);
- cache.put(coreKey, docIdSet);
+ docIdSet = docIdSetToCache(filter.getDocIdSet(context, cacheAcceptDocs), reader);
+ cache.put(key, docIdSet);
+ }
+
+ if (doCacheAcceptDocs) {
+ return docIdSet;
+ } else {
+ return BitsFilteredDocIdSet.wrap(docIdSet, acceptDocs);
}
-
- return BitsFilteredDocIdSet.wrap(docIdSet, acceptDocs);
}
@Override
public String toString() {
- return "CachingWrapperFilter("+filter+")";
+ return "CachingWrapperFilter("+filter+",recacheDeletes=" + recacheDeletes + ")";
}
@Override
public boolean equals(Object o) {
if (!(o instanceof CachingWrapperFilter)) return false;
- return this.filter.equals(((CachingWrapperFilter)o).filter);
+ final CachingWrapperFilter other = (CachingWrapperFilter) o;
+ return this.filter.equals(other.filter) && this.recacheDeletes == other.recacheDeletes;
}
@Override
public int hashCode() {
- return filter.hashCode() ^ 0x1117BF25;
+ return (filter.hashCode() ^ 0x1117BF25) + (recacheDeletes ? 0 : 1);
}
}
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FieldCacheImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FieldCacheImpl.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FieldCacheImpl.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FieldCacheImpl.java Thu Dec 15 05:11:14 2011
@@ -32,6 +32,7 @@ import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.OrdTermState;
+import org.apache.lucene.index.SegmentReader;
import org.apache.lucene.index.TermState;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
@@ -145,11 +146,20 @@ class FieldCacheImpl implements FieldCac
*/
static final class StopFillCacheException extends RuntimeException {
}
+
+ // per-segment fieldcaches don't purge until the shared core closes.
+ final SegmentReader.CoreClosedListener purgeCore = new SegmentReader.CoreClosedListener() {
+ @Override
+ public void onClose(SegmentReader owner) {
+ FieldCacheImpl.this.purge(owner);
+ }
+ };
- final static IndexReader.ReaderFinishedListener purgeReader = new IndexReader.ReaderFinishedListener() {
- // @Override -- not until Java 1.6
- public void finished(IndexReader reader) {
- FieldCache.DEFAULT.purge(reader);
+ // composite/SlowMultiReaderWrapper fieldcaches don't purge until composite reader is closed.
+ final IndexReader.ReaderClosedListener purgeReader = new IndexReader.ReaderClosedListener() {
+ @Override
+ public void onClose(IndexReader owner) {
+ FieldCacheImpl.this.purge(owner);
}
};
@@ -188,7 +198,11 @@ class FieldCacheImpl implements FieldCac
// First time this reader is using FieldCache
innerCache = new HashMap<Entry,Object>();
readerCache.put(readerKey, innerCache);
- reader.addReaderFinishedListener(purgeReader);
+ if (reader instanceof SegmentReader) {
+ ((SegmentReader) reader).addCoreClosedListener(wrapper.purgeCore);
+ } else {
+ reader.addReaderClosedListener(wrapper.purgeReader);
+ }
}
if (innerCache.get(key) == null) {
innerCache.put(key, value);
@@ -209,7 +223,11 @@ class FieldCacheImpl implements FieldCac
// First time this reader is using FieldCache
innerCache = new HashMap<Entry,Object>();
readerCache.put(readerKey, innerCache);
- reader.addReaderFinishedListener(purgeReader);
+ if (reader instanceof SegmentReader) {
+ ((SegmentReader) reader).addCoreClosedListener(wrapper.purgeCore);
+ } else {
+ reader.addReaderClosedListener(wrapper.purgeReader);
+ }
value = null;
} else {
value = innerCache.get(key);
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FieldComparator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FieldComparator.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FieldComparator.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FieldComparator.java Thu Dec 15 05:11:14 2011
@@ -21,11 +21,8 @@ import java.io.IOException;
import java.util.Comparator;
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
+import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.values.IndexDocValues.SortedSource;
-import org.apache.lucene.index.values.IndexDocValues.Source;
-import org.apache.lucene.index.values.IndexDocValues;
-import org.apache.lucene.index.values.ValueType;
import org.apache.lucene.search.FieldCache.ByteParser;
import org.apache.lucene.search.FieldCache.DocTerms;
import org.apache.lucene.search.FieldCache.DocTermsIndex;
@@ -360,7 +357,7 @@ public abstract class FieldComparator<T>
public static final class FloatDocValuesComparator extends FieldComparator<Double> {
private final double[] values;
private final String field;
- private Source currentReaderValues;
+ private DocValues.Source currentReaderValues;
private double bottom;
FloatDocValuesComparator(int numHits, String field) {
@@ -400,11 +397,11 @@ public abstract class FieldComparator<T>
@Override
public FieldComparator setNextReader(AtomicReaderContext context) throws IOException {
- final IndexDocValues docValues = context.reader.docValues(field);
+ final DocValues docValues = context.reader.docValues(field);
if (docValues != null) {
currentReaderValues = docValues.getSource();
} else {
- currentReaderValues = IndexDocValues.getDefaultSource(ValueType.FLOAT_64);
+ currentReaderValues = DocValues.getDefaultSource(DocValues.Type.FLOAT_64);
}
return this;
}
@@ -648,7 +645,7 @@ public abstract class FieldComparator<T>
/** Loads int index values and sorts by ascending value. */
public static final class IntDocValuesComparator extends FieldComparator<Long> {
private final long[] values;
- private Source currentReaderValues;
+ private DocValues.Source currentReaderValues;
private final String field;
private long bottom;
@@ -693,11 +690,11 @@ public abstract class FieldComparator<T>
@Override
public FieldComparator setNextReader(AtomicReaderContext context) throws IOException {
- IndexDocValues docValues = context.reader.docValues(field);
+ DocValues docValues = context.reader.docValues(field);
if (docValues != null) {
currentReaderValues = docValues.getSource();
} else {
- currentReaderValues = IndexDocValues.getDefaultSource(ValueType.FIXED_INTS_64);
+ currentReaderValues = DocValues.getDefaultSource(DocValues.Type.FIXED_INTS_64);
}
return this;
}
@@ -1382,7 +1379,7 @@ public abstract class FieldComparator<T>
/* Current reader's doc ord/values.
@lucene.internal */
- SortedSource termsIndex;
+ DocValues.SortedSource termsIndex;
/* Comparator for comparing by value.
@lucene.internal */
@@ -1490,10 +1487,10 @@ public abstract class FieldComparator<T>
// Used per-segment when bit width of doc->ord is 8:
private final class ByteOrdComparator extends PerSegmentComparator {
private final byte[] readerOrds;
- private final SortedSource termsIndex;
+ private final DocValues.SortedSource termsIndex;
private final int docBase;
- public ByteOrdComparator(byte[] readerOrds, SortedSource termsIndex, int docBase) {
+ public ByteOrdComparator(byte[] readerOrds, DocValues.SortedSource termsIndex, int docBase) {
this.readerOrds = readerOrds;
this.termsIndex = termsIndex;
this.docBase = docBase;
@@ -1535,10 +1532,10 @@ public abstract class FieldComparator<T>
// Used per-segment when bit width of doc->ord is 16:
private final class ShortOrdComparator extends PerSegmentComparator {
private final short[] readerOrds;
- private final SortedSource termsIndex;
+ private final DocValues.SortedSource termsIndex;
private final int docBase;
- public ShortOrdComparator(short[] readerOrds, SortedSource termsIndex, int docBase) {
+ public ShortOrdComparator(short[] readerOrds, DocValues.SortedSource termsIndex, int docBase) {
this.readerOrds = readerOrds;
this.termsIndex = termsIndex;
this.docBase = docBase;
@@ -1580,10 +1577,10 @@ public abstract class FieldComparator<T>
// Used per-segment when bit width of doc->ord is 32:
private final class IntOrdComparator extends PerSegmentComparator {
private final int[] readerOrds;
- private final SortedSource termsIndex;
+ private final DocValues.SortedSource termsIndex;
private final int docBase;
- public IntOrdComparator(int[] readerOrds, SortedSource termsIndex, int docBase) {
+ public IntOrdComparator(int[] readerOrds, DocValues.SortedSource termsIndex, int docBase) {
this.readerOrds = readerOrds;
this.termsIndex = termsIndex;
this.docBase = docBase;
@@ -1623,11 +1620,11 @@ public abstract class FieldComparator<T>
// Used per-segment when bit width is not a native array
// size (8, 16, 32):
- private final class AnyOrdComparator extends PerSegmentComparator {
+ private final class AnyPackedDocToOrdComparator extends PerSegmentComparator {
private final PackedInts.Reader readerOrds;
private final int docBase;
- public AnyOrdComparator(PackedInts.Reader readerOrds, int docBase) {
+ public AnyPackedDocToOrdComparator(PackedInts.Reader readerOrds, int docBase) {
this.readerOrds = readerOrds;
this.docBase = docBase;
}
@@ -1664,16 +1661,57 @@ public abstract class FieldComparator<T>
}
}
+ // Used per-segment when DV doesn't use packed ints for
+ // docToOrds:
+ private final class AnyOrdComparator extends PerSegmentComparator {
+ private final int docBase;
+
+ public AnyOrdComparator(int docBase) {
+ this.docBase = docBase;
+ }
+
+ @Override
+ public int compareBottom(int doc) {
+ assert bottomSlot != -1;
+ if (bottomSameReader) {
+ // ord is precisely comparable, even in the equal case
+ return bottomOrd - termsIndex.ord(doc);
+ } else {
+ // ord is only approx comparable: if they are not
+ // equal, we can use that; if they are equal, we
+ // must fallback to compare by value
+ final int order = termsIndex.ord(doc);
+ final int cmp = bottomOrd - order;
+ if (cmp != 0) {
+ return cmp;
+ }
+ termsIndex.getByOrd(order, tempBR);
+ return comp.compare(bottomValue, tempBR);
+ }
+ }
+
+ @Override
+ public void copy(int slot, int doc) {
+ final int ord = termsIndex.ord(doc);
+ ords[slot] = ord;
+ if (values[slot] == null) {
+ values[slot] = new BytesRef();
+ }
+ termsIndex.getByOrd(ord, values[slot]);
+ readerGen[slot] = currentReaderGen;
+ }
+ }
+
@Override
public FieldComparator setNextReader(AtomicReaderContext context) throws IOException {
final int docBase = context.docBase;
- final IndexDocValues dv = context.reader.docValues(field);
+ final DocValues dv = context.reader.docValues(field);
if (dv == null) {
// This may mean entire segment had no docs with
// this DV field; use default field value (empty
// byte[]) in this case:
- termsIndex = IndexDocValues.getDefaultSortedSource(ValueType.BYTES_VAR_SORTED, context.reader.maxDoc());
+ termsIndex = DocValues.getDefaultSortedSource(DocValues.Type.BYTES_VAR_SORTED, context.reader.maxDoc());
} else {
termsIndex = dv.getSource().asSortedSource();
if (termsIndex == null) {
@@ -1687,24 +1725,30 @@ public abstract class FieldComparator<T>
comp = termsIndex.getComparator();
FieldComparator perSegComp = null;
- final PackedInts.Reader docToOrd = termsIndex.getDocToOrd();
- if (docToOrd.hasArray()) {
- final Object arr = docToOrd.getArray();
- assert arr != null;
- if (arr instanceof byte[]) {
- // 8 bit packed
- perSegComp = new ByteOrdComparator((byte[]) arr, termsIndex, docBase);
- } else if (arr instanceof short[]) {
- // 16 bit packed
- perSegComp = new ShortOrdComparator((short[]) arr, termsIndex, docBase);
- } else if (arr instanceof int[]) {
- // 32 bit packed
- perSegComp = new IntOrdComparator((int[]) arr, termsIndex, docBase);
+ if (termsIndex.hasPackedDocToOrd()) {
+ final PackedInts.Reader docToOrd = termsIndex.getDocToOrd();
+ if (docToOrd.hasArray()) {
+ final Object arr = docToOrd.getArray();
+ assert arr != null;
+ if (arr instanceof byte[]) {
+ // 8 bit packed
+ perSegComp = new ByteOrdComparator((byte[]) arr, termsIndex, docBase);
+ } else if (arr instanceof short[]) {
+ // 16 bit packed
+ perSegComp = new ShortOrdComparator((short[]) arr, termsIndex, docBase);
+ } else if (arr instanceof int[]) {
+ // 32 bit packed
+ perSegComp = new IntOrdComparator((int[]) arr, termsIndex, docBase);
+ }
}
- }
- if (perSegComp == null) {
- perSegComp = new AnyOrdComparator(docToOrd, docBase);
+ if (perSegComp == null) {
+ perSegComp = new AnyPackedDocToOrdComparator(docToOrd, docBase);
+ }
+ } else {
+ if (perSegComp == null) {
+ perSegComp = new AnyOrdComparator(docBase);
+ }
}
currentReaderGen++;
@@ -1845,7 +1889,7 @@ public abstract class FieldComparator<T>
public static final class TermValDocValuesComparator extends FieldComparator<BytesRef> {
private BytesRef[] values;
- private Source docTerms;
+ private DocValues.Source docTerms;
private final String field;
private BytesRef bottom;
private final BytesRef tempBR = new BytesRef();
@@ -1878,11 +1922,11 @@ public abstract class FieldComparator<T>
@Override
public FieldComparator setNextReader(AtomicReaderContext context) throws IOException {
- final IndexDocValues dv = context.reader.docValues(field);
+ final DocValues dv = context.reader.docValues(field);
if (dv != null) {
docTerms = dv.getSource();
} else {
- docTerms = IndexDocValues.getDefaultSource(ValueType.BYTES_VAR_DEREF);
+ docTerms = DocValues.getDefaultSource(DocValues.Type.BYTES_VAR_DEREF);
}
return this;
}
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FilteredQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FilteredQuery.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FilteredQuery.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FilteredQuery.java Thu Dec 15 05:11:14 2011
@@ -33,25 +33,23 @@ import java.util.Set;
* <p>Note: the bits are retrieved from the filter each time this
* query is used in a search - use a CachingWrapperFilter to avoid
* regenerating the bits every time.
- *
- * <p>Created: Apr 20, 2004 8:58:29 AM
- *
* @since 1.4
* @see CachingWrapperFilter
*/
-public class FilteredQuery
-extends Query {
+public class FilteredQuery extends Query {
- Query query;
- Filter filter;
+ private final Query query;
+ private final Filter filter;
/**
* Constructs a new query which applies a filter to the results of the original query.
- * Filter.getDocIdSet() will be called every time this query is used in a search.
+ * {@link Filter#getDocIdSet} will be called every time this query is used in a search.
* @param query Query to be filtered, cannot be <code>null</code>.
* @param filter Filter to apply to query results, cannot be <code>null</code>.
*/
public FilteredQuery (Query query, Filter filter) {
+ if (query == null || filter == null)
+ throw new IllegalArgumentException("Query and filter cannot be null.");
this.query = query;
this.filter = filter;
}
@@ -229,31 +227,45 @@ extends Query {
};
}
- /** Rewrites the wrapped query. */
+ /** Rewrites the query. If the wrapped is an instance of
+ * {@link MatchAllDocsQuery} it returns a {@link ConstantScoreQuery}. Otherwise
+ * it returns a new {@code FilteredQuery} wrapping the rewritten query. */
@Override
public Query rewrite(IndexReader reader) throws IOException {
- Query rewritten = query.rewrite(reader);
- if (rewritten != query) {
- FilteredQuery clone = (FilteredQuery)this.clone();
- clone.query = rewritten;
- return clone;
+ final Query queryRewritten = query.rewrite(reader);
+
+ if (queryRewritten instanceof MatchAllDocsQuery) {
+ // Special case: If the query is a MatchAllDocsQuery, we only
+ // return a CSQ(filter).
+ final Query rewritten = new ConstantScoreQuery(filter);
+ // Combine boost of MatchAllDocsQuery and the wrapped rewritten query:
+ rewritten.setBoost(this.getBoost() * queryRewritten.getBoost());
+ return rewritten;
+ }
+
+ if (queryRewritten != query) {
+ // rewrite to a new FilteredQuery wrapping the rewritten query
+ final Query rewritten = new FilteredQuery(queryRewritten, filter);
+ rewritten.setBoost(this.getBoost());
+ return rewritten;
} else {
+ // nothing to rewrite, we are done!
return this;
}
}
- public Query getQuery() {
+ public final Query getQuery() {
return query;
}
- public Filter getFilter() {
+ public final Filter getFilter() {
return filter;
}
// inherit javadoc
@Override
public void extractTerms(Set<Term> terms) {
- getQuery().extractTerms(terms);
+ getQuery().extractTerms(terms);
}
/** Prints a user-readable version of this query. */
@@ -271,16 +283,21 @@ extends Query {
/** Returns true iff <code>o</code> is equal to this. */
@Override
public boolean equals(Object o) {
- if (o instanceof FilteredQuery) {
- FilteredQuery fq = (FilteredQuery) o;
- return (query.equals(fq.query) && filter.equals(fq.filter) && getBoost()==fq.getBoost());
- }
- return false;
+ if (o == this)
+ return true;
+ if (!super.equals(o))
+ return false;
+ assert o instanceof FilteredQuery;
+ final FilteredQuery fq = (FilteredQuery) o;
+ return fq.query.equals(this.query) && fq.filter.equals(this.filter);
}
/** Returns a hash code value for this object. */
@Override
public int hashCode() {
- return query.hashCode() ^ filter.hashCode() + Float.floatToRawIntBits(getBoost());
+ int hash = super.hashCode();
+ hash = hash * 31 + query.hashCode();
+ hash = hash * 31 + filter.hashCode();
+ return hash;
}
}
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/IndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/IndexSearcher.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/IndexSearcher.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/IndexSearcher.java Thu Dec 15 05:11:14 2011
@@ -17,10 +17,10 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import java.io.Closeable;
import java.io.IOException;
import java.util.Iterator;
import java.util.NoSuchElementException;
+import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.CompletionService;
import java.util.concurrent.ExecutionException;
@@ -42,8 +42,6 @@ import org.apache.lucene.index.Terms;
import org.apache.lucene.search.similarities.DefaultSimilarityProvider;
import org.apache.lucene.search.similarities.SimilarityProvider;
import org.apache.lucene.store.NIOFSDirectory; // javadoc
-import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.ReaderUtil;
import org.apache.lucene.util.TermContext;
import org.apache.lucene.util.ThreadInterruptedException;
@@ -73,7 +71,7 @@ import org.apache.lucene.util.ThreadInte
* synchronize on the <code>IndexSearcher</code> instance;
* use your own (non-Lucene) objects instead.</p>
*/
-public class IndexSearcher implements Closeable {
+public class IndexSearcher {
final IndexReader reader; // package private for testing!
// NOTE: these members might change in incompatible ways
@@ -178,16 +176,21 @@ public class IndexSearcher implements Cl
return reader;
}
- /* Sugar for <code>.getIndexReader().document(docID)</code> */
+ /** Sugar for <code>.getIndexReader().document(docID)</code> */
public Document doc(int docID) throws CorruptIndexException, IOException {
return reader.document(docID);
}
- /* Sugar for <code>.getIndexReader().document(docID, fieldVisitor)</code> */
+ /** Sugar for <code>.getIndexReader().document(docID, fieldVisitor)</code> */
public void doc(int docID, StoredFieldVisitor fieldVisitor) throws CorruptIndexException, IOException {
reader.document(docID, fieldVisitor);
}
+ /** Sugar for <code>.getIndexReader().document(docID, fieldsToLoad)</code> */
+ public final Document document(int docID, Set<String> fieldsToLoad) throws CorruptIndexException, IOException {
+ return reader.document(docID, fieldsToLoad);
+ }
+
/** Expert: Set the SimilarityProvider implementation used by this Searcher.
*
*/
@@ -198,10 +201,6 @@ public class IndexSearcher implements Cl
public SimilarityProvider getSimilarityProvider() {
return similarityProvider;
}
-
- @Override
- public void close() throws IOException {
- }
/** @lucene.internal */
protected Query wrapFilter(Query query, Filter filter) {
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/NRTManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/NRTManager.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/NRTManager.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/NRTManager.java Thu Dec 15 05:11:14 2011
@@ -21,7 +21,6 @@ import java.io.Closeable;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.Condition;
@@ -34,6 +33,7 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.IndexSearcher; // javadocs
+import org.apache.lucene.search.SearcherFactory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.ThreadInterruptedException;
@@ -49,6 +49,8 @@ import org.apache.lucene.util.ThreadInte
* #addWaitingListener} so your reopener is notified when a
* caller is waiting for a specific generation searcher. </p>
*
+ * @see SearcherFactory
+ *
* @lucene.experimental
*/
@@ -65,60 +67,30 @@ public class NRTManager implements Close
/**
* Create new NRTManager.
*
- * @param writer IndexWriter to open near-real-time
- * readers
- * @param warmer optional {@link SearcherWarmer}. Pass
- * null if you don't require the searcher to warmed
- * before going live. If this is non-null then a
- * merged segment warmer is installed on the
- * provided IndexWriter's config.
- *
- * <p><b>NOTE</b>: the provided {@link SearcherWarmer} is
- * not invoked for the initial searcher; you should
- * warm it yourself if necessary.
+ * @param writer IndexWriter to open near-real-time
+ * readers
+ * @param searcherFactory An optional {@link SearcherFactory}. Pass
+ * <code>null</code> if you don't require the searcher to be warmed
+ * before going live or other custom behavior.
*/
- public NRTManager(IndexWriter writer, SearcherWarmer warmer) throws IOException {
- this(writer, null, warmer, true);
- }
-
- /**
- * Create new NRTManager.
- *
- * @param writer IndexWriter to open near-real-time
- * readers
- * @param es optional ExecutorService so different segments can
- * be searched concurrently (see {@link IndexSearcher#IndexSearcher(IndexReader, ExecutorService)}.
- * Pass <code>null</code> to search segments sequentially.
- * @param warmer optional {@link SearcherWarmer}. Pass
- * null if you don't require the searcher to warmed
- * before going live. If this is non-null then a
- * merged segment warmer is installed on the
- * provided IndexWriter's config.
- *
- * <p><b>NOTE</b>: the provided {@link SearcherWarmer} is
- * not invoked for the initial searcher; you should
- * warm it yourself if necessary.
- */
- public NRTManager(IndexWriter writer, ExecutorService es,
- SearcherWarmer warmer) throws IOException {
- this(writer, es, warmer, true);
+ public NRTManager(IndexWriter writer, SearcherFactory searcherFactory) throws IOException {
+ this(writer, searcherFactory, true);
}
/**
* Expert: just like {@link
- * #NRTManager(IndexWriter,ExecutorService,SearcherWarmer)},
+ * #NRTManager(IndexWriter,SearcherFactory)},
* but you can also specify whether every searcher must
* apply deletes. This is useful for cases where certain
* uses can tolerate seeing some deleted docs, since
* reopen time is faster if deletes need not be applied. */
- public NRTManager(IndexWriter writer, ExecutorService es,
- SearcherWarmer warmer, boolean alwaysApplyDeletes) throws IOException {
+ public NRTManager(IndexWriter writer, SearcherFactory searcherFactory, boolean alwaysApplyDeletes) throws IOException {
this.writer = writer;
if (alwaysApplyDeletes) {
- withoutDeletes = withDeletes = new SearcherManagerRef(true, 0, new SearcherManager(writer, true, warmer, es));
+ withoutDeletes = withDeletes = new SearcherManagerRef(true, 0, new SearcherManager(writer, true, searcherFactory));
} else {
- withDeletes = new SearcherManagerRef(true, 0, new SearcherManager(writer, true, warmer, es));
- withoutDeletes = new SearcherManagerRef(false, 0, new SearcherManager(writer, false, warmer, es));
+ withDeletes = new SearcherManagerRef(true, 0, new SearcherManager(writer, true, searcherFactory));
+ withoutDeletes = new SearcherManagerRef(false, 0, new SearcherManager(writer, false, searcherFactory));
}
indexingGen = new AtomicLong(1);
}
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/SearcherManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/SearcherManager.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/SearcherManager.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/SearcherManager.java Thu Dec 15 05:11:14 2011
@@ -17,8 +17,8 @@ package org.apache.lucene.search;
* limitations under the License.
*/
+import java.io.Closeable;
import java.io.IOException;
-import java.util.concurrent.ExecutorService;
import java.util.concurrent.Semaphore;
import org.apache.lucene.index.CorruptIndexException;
@@ -61,14 +61,15 @@ import org.apache.lucene.store.Directory
* {@link NRTManager} since that class pulls near-real-time readers from the
* IndexWriter.
*
+ * @see SearcherFactory
+ *
* @lucene.experimental
*/
-public final class SearcherManager {
+public final class SearcherManager implements Closeable {
private volatile IndexSearcher currentSearcher;
- private final ExecutorService es;
- private final SearcherWarmer warmer;
+ private final SearcherFactory searcherFactory;
private final Semaphore reopenLock = new Semaphore(1);
/**
@@ -81,60 +82,41 @@ public final class SearcherManager {
* Applying deletes can be costly, so if your app can tolerate deleted documents
* being returned you might gain some performance by passing <code>false</code>.
* See {@link IndexReader#openIfChanged(IndexReader, IndexWriter, boolean)}.
- * @param warmer An optional {@link SearcherWarmer}. Pass
- * <code>null</code> if you don't require the searcher to warmed
- * before going live. If this is <code>non-null</code> then a
- * merged segment warmer is installed on the
- * provided IndexWriter's config.
- * @param es An optional {@link ExecutorService} so different segments can
- * be searched concurrently (see {@link
- * IndexSearcher#IndexSearcher(IndexReader,ExecutorService)}. Pass <code>null</code>
- * to search segments sequentially.
+ * @param searcherFactory An optional {@link SearcherFactory}. Pass
+ * <code>null</code> if you don't require the searcher to be warmed
+ * before going live or other custom behavior.
*
* @throws IOException
*/
- public SearcherManager(IndexWriter writer, boolean applyAllDeletes,
- final SearcherWarmer warmer, final ExecutorService es) throws IOException {
- this.es = es;
- this.warmer = warmer;
- currentSearcher = new IndexSearcher(IndexReader.open(writer, applyAllDeletes));
- if (warmer != null) {
- writer.getConfig().setMergedSegmentWarmer(
- new IndexWriter.IndexReaderWarmer() {
- @Override
- public void warm(IndexReader reader) throws IOException {
- warmer.warm(new IndexSearcher(reader, es));
- }
- });
+ public SearcherManager(IndexWriter writer, boolean applyAllDeletes, SearcherFactory searcherFactory) throws IOException {
+ if (searcherFactory == null) {
+ searcherFactory = new SearcherFactory();
}
+ this.searcherFactory = searcherFactory;
+ currentSearcher = searcherFactory.newSearcher(IndexReader.open(writer, applyAllDeletes));
}
/**
* Creates and returns a new SearcherManager from the given {@link Directory}.
* @param dir the directory to open the IndexReader on.
- * @param warmer An optional {@link SearcherWarmer}. Pass
- * <code>null</code> if you don't require the searcher to warmed
- * before going live. If this is <code>non-null</code> then a
- * merged segment warmer is installed on the
- * provided IndexWriter's config.
- * @param es And optional {@link ExecutorService} so different segments can
- * be searched concurrently (see {@link
- * IndexSearcher#IndexSearcher(IndexReader,ExecutorService)}. Pass <code>null</code>
- * to search segments sequentially.
+ * @param searcherFactory An optional {@link SearcherFactory}. Pass
+ * <code>null</code> if you don't require the searcher to be warmed
+ * before going live or other custom behavior.
*
* @throws IOException
*/
- public SearcherManager(Directory dir, SearcherWarmer warmer,
- ExecutorService es) throws IOException {
- this.es = es;
- this.warmer = warmer;
- currentSearcher = new IndexSearcher(IndexReader.open(dir, true), es);
+ public SearcherManager(Directory dir, SearcherFactory searcherFactory) throws IOException {
+ if (searcherFactory == null) {
+ searcherFactory = new SearcherFactory();
+ }
+ this.searcherFactory = searcherFactory;
+ currentSearcher = searcherFactory.newSearcher(IndexReader.open(dir));
}
/**
* You must call this, periodically, to perform a reopen. This calls
* {@link IndexReader#openIfChanged(IndexReader)} with the underlying reader, and if that returns a
- * new reader, it's warmed (if you provided a {@link SearcherWarmer} and then
+ * new reader, it's warmed (if you provided a {@link SearcherFactory} and then
* swapped into production.
*
* <p>
@@ -167,12 +149,9 @@ public final class SearcherManager {
release(searcherToReopen);
}
if (newReader != null) {
- final IndexSearcher newSearcher = new IndexSearcher(newReader, es);
+ final IndexSearcher newSearcher = searcherFactory.newSearcher(newReader);
boolean success = false;
try {
- if (warmer != null) {
- warmer.warm(newSearcher);
- }
swapSearcher(newSearcher);
success = true;
} finally {
@@ -260,5 +239,4 @@ public final class SearcherManager {
currentSearcher = newSearcher;
release(oldSearcher);
}
-
}
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/similarities/Similarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/similarities/Similarity.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/similarities/Similarity.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/similarities/Similarity.java Thu Dec 15 05:11:14 2011
@@ -20,7 +20,7 @@ package org.apache.lucene.search.similar
import java.io.IOException;
-import org.apache.lucene.document.IndexDocValuesField; // javadoc
+import org.apache.lucene.document.DocValuesField; // javadoc
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.IndexReader; // javadoc
import org.apache.lucene.index.IndexReader.AtomicReaderContext;
@@ -71,11 +71,11 @@ import org.apache.lucene.util.TermContex
* <p>
* Because index-time boost is handled entirely at the application level anyway,
* an application can alternatively store the index-time boost separately using an
- * {@link IndexDocValuesField}, and access this at query-time with
+ * {@link DocValuesField}, and access this at query-time with
* {@link IndexReader#docValues(String)}.
* <p>
* Finally, using index-time boosts (either via folding into the normalization byte or
- * via IndexDocValues), is an inefficient way to boost the scores of different fields if the
+ * via DocValues), is an inefficient way to boost the scores of different fields if the
* boost will be the same for every document, instead the Similarity can simply take a constant
* boost parameter <i>C</i>, and the SimilarityProvider can return different instances with
* different boosts depending upon field name.
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/IOUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/IOUtils.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/IOUtils.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/IOUtils.java Thu Dec 15 05:11:14 2011
@@ -96,7 +96,7 @@ public final class IOUtils {
}
/** @see #closeWhileHandlingException(Exception, Closeable...) */
- public static <E extends Exception> void closeWhileHandlingException(E priorException, Iterable<Closeable> objects) throws E, IOException {
+ public static <E extends Exception> void closeWhileHandlingException(E priorException, Iterable<? extends Closeable> objects) throws E, IOException {
Throwable th = null;
for (Closeable object : objects) {
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/InfoStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/InfoStream.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/InfoStream.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/InfoStream.java Thu Dec 15 05:11:14 2011
@@ -26,10 +26,14 @@ public abstract class InfoStream impleme
public static final InfoStream NO_OUTPUT = new NoOutput();
private static final class NoOutput extends InfoStream {
@Override
- public void message(String component, String message) {}
+ public void message(String component, String message) {
+ assert false: "message() should not be called when isEnabled returns false";
+ }
@Override
- public boolean isEnabled(String component) { return false; }
+ public boolean isEnabled(String component) {
+ return false;
+ }
@Override
public void close() {}
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/ReaderUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/ReaderUtil.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/ReaderUtil.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/ReaderUtil.java Thu Dec 15 05:11:14 2011
@@ -189,7 +189,7 @@ public final class ReaderUtil {
int newDocBase = 0;
for (int i = 0; i < sequentialSubReaders.length; i++) {
- build(newParent, sequentialSubReaders[i], i, newDocBase);
+ children[i] = build(newParent, sequentialSubReaders[i], i, newDocBase);
newDocBase += sequentialSubReaders[i].maxDoc();
}
return newParent;
Modified: lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/analysis/BaseTokenStreamTestCase.java Thu Dec 15 05:11:14 2011
@@ -135,6 +135,10 @@ public abstract class BaseTokenStreamTes
assertTrue("startOffset must be >= 0", offsetAtt.startOffset() >= 0);
assertTrue("endOffset must be >= 0", offsetAtt.endOffset() >= 0);
assertTrue("endOffset must be >= startOffset", offsetAtt.endOffset() >= offsetAtt.startOffset());
+ if (finalOffset != null) {
+ assertTrue("startOffset must be <= finalOffset", offsetAtt.startOffset() <= finalOffset.intValue());
+ assertTrue("endOffset must be <= finalOffset", offsetAtt.endOffset() <= finalOffset.intValue());
+ }
}
if (posIncrAtt != null) {
assertTrue("posIncrement must be >= 0", posIncrAtt.getPositionIncrement() >= 0);
Modified: lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/analysis/CollationTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/analysis/CollationTestBase.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/analysis/CollationTestBase.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/analysis/CollationTestBase.java Thu Dec 15 05:11:14 2011
@@ -102,7 +102,6 @@ public abstract class CollationTestBase
(query, new TermRangeFilter("content", secondBeg, secondEnd, true, true), 1).scoreDocs;
assertEquals("The index Term should be included.", 1, result.length);
- searcher.close();
reader.close();
}
@@ -131,7 +130,6 @@ public abstract class CollationTestBase
query = new TermRangeQuery("content", secondBeg, secondEnd, true, true);
hits = searcher.search(query, null, 1000).scoreDocs;
assertEquals("The index Term should be included.", 1, hits.length);
- searcher.close();
reader.close();
}
@@ -147,7 +145,7 @@ public abstract class CollationTestBase
writer.addDocument(doc);
writer.close();
- IndexReader reader = IndexReader.open(farsiIndex, true);
+ IndexReader reader = IndexReader.open(farsiIndex);
IndexSearcher search = newSearcher(reader);
// Unicode order would include U+0633 in [ U+062F - U+0698 ], but Farsi
@@ -164,7 +162,6 @@ public abstract class CollationTestBase
("content", secondBeg, secondEnd, true, true);
result = search.search(csrq, null, 1000).scoreDocs;
assertEquals("The index Term should be included.", 1, result.length);
- search.close();
}
// Test using various international locales with accented characters (which
@@ -240,7 +237,6 @@ public abstract class CollationTestBase
sort.setSort(new SortField("Denmark", SortField.Type.STRING));
assertMatches(searcher, queryY, sort, dkResult);
- searcher.close();
reader.close();
}
Modified: lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/RandomIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/RandomIndexWriter.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/RandomIndexWriter.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/RandomIndexWriter.java Thu Dec 15 05:11:14 2011
@@ -24,11 +24,11 @@ import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.IndexDocValuesField;
+import org.apache.lucene.document.DocValuesField;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexWriter; // javadoc
import org.apache.lucene.index.codecs.Codec;
-import org.apache.lucene.index.values.ValueType;
+import org.apache.lucene.index.DocValues;
import org.apache.lucene.search.Query;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
@@ -167,12 +167,12 @@ public class RandomIndexWriter implement
private void randomPerDocFieldValues(Random random, Document doc) {
- ValueType[] values = ValueType.values();
- ValueType type = values[random.nextInt(values.length)];
+ DocValues.Type[] values = DocValues.Type.values();
+ DocValues.Type type = values[random.nextInt(values.length)];
String name = "random_" + type.name() + "" + docValuesFieldPrefix;
if ("Lucene3x".equals(codec.getName()) || doc.getField(name) != null)
return;
- IndexDocValuesField docValuesField = new IndexDocValuesField(name);
+ DocValuesField docValuesField = new DocValuesField(name);
switch (type) {
case BYTES_FIXED_DEREF:
case BYTES_FIXED_STRAIGHT:
@@ -385,7 +385,7 @@ public class RandomIndexWriter implement
w.commit();
switchDoDocValues();
if (r.nextBoolean()) {
- return IndexReader.open(w.getDirectory(), new KeepOnlyLastCommitDeletionPolicy(), r.nextBoolean(), _TestUtil.nextInt(r, 1, 10));
+ return IndexReader.open(w.getDirectory(), _TestUtil.nextInt(r, 1, 10));
} else {
return w.getReader(applyDeletions);
}
Modified: lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java Thu Dec 15 05:11:14 2011
@@ -472,7 +472,6 @@ public abstract class ThreadedIndexingAn
IndexSearcher searcher = newSearcher(reader);
sum += searcher.search(new TermQuery(new Term("body", "united")), 10).totalHits;
- searcher.close();
if (VERBOSE) {
System.out.println("TEST: warm visited " + sum + " fields");
Modified: lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mocksep/MockSepDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mocksep/MockSepDocValuesFormat.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mocksep/MockSepDocValuesFormat.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/mocksep/MockSepDocValuesFormat.java Thu Dec 15 05:11:14 2011
@@ -25,7 +25,7 @@ import org.apache.lucene.index.SegmentIn
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.codecs.DocValuesFormat;
import org.apache.lucene.index.codecs.PerDocConsumer;
-import org.apache.lucene.index.codecs.PerDocValues;
+import org.apache.lucene.index.codecs.PerDocProducer;
import org.apache.lucene.index.codecs.sep.SepDocValuesConsumer;
import org.apache.lucene.index.codecs.sep.SepDocValuesProducer;
import org.apache.lucene.store.Directory;
@@ -43,7 +43,7 @@ public class MockSepDocValuesFormat exte
}
@Override
- public PerDocValues docsProducer(SegmentReadState state) throws IOException {
+ public PerDocProducer docsProducer(SegmentReadState state) throws IOException {
return new SepDocValuesProducer(state);
}
Modified: lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/search/CheckHits.java Thu Dec 15 05:11:14 2011
@@ -116,7 +116,6 @@ public class CheckHits {
query.toString(defaultFieldName),
correct, actual);
FieldCache.DEFAULT.purge(s.getIndexReader()); // our wrapping can create insanity otherwise
- s.close();
}
}
Modified: lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java?rev=1214623&r1=1214622&r2=1214623&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/search/QueryUtils.java Thu Dec 15 05:11:14 2011
@@ -79,8 +79,8 @@ public class QueryUtils {
}
public static void checkUnequal(Query q1, Query q2) {
- Assert.assertTrue(!q1.equals(q2));
- Assert.assertTrue(!q2.equals(q1));
+ Assert.assertFalse(q1 + " equal to " + q2, q1.equals(q2));
+ Assert.assertFalse(q2 + " equal to " + q1, q2.equals(q1));
// possible this test can fail on a hash collision... if that
// happens, please change test to use a different example.
@@ -115,13 +115,10 @@ public class QueryUtils {
IndexSearcher wrapped;
check(random, q1, wrapped = wrapUnderlyingReader(random, s, -1), false);
FieldCache.DEFAULT.purge(wrapped.getIndexReader()); // // our wrapping can create insanity otherwise
- wrapped.close();
check(random, q1, wrapped = wrapUnderlyingReader(random, s, 0), false);
FieldCache.DEFAULT.purge(wrapped.getIndexReader()); // // our wrapping can create insanity otherwise
- wrapped.close();
check(random, q1, wrapped = wrapUnderlyingReader(random, s, +1), false);
FieldCache.DEFAULT.purge(wrapped.getIndexReader()); // // our wrapping can create insanity otherwise
- wrapped.close();
}
checkExplanations(q1,s);
@@ -200,7 +197,7 @@ public class QueryUtils {
Assert.assertEquals("writer has non-deleted docs",
0, w.numDocs());
w.close();
- IndexReader r = IndexReader.open(d, true);
+ IndexReader r = IndexReader.open(d);
Assert.assertEquals("reader has wrong number of deleted docs",
numDeletedDocs, r.numDeletedDocs());
return r;
@@ -309,7 +306,6 @@ public class QueryUtils {
Assert.assertFalse("query's last doc was "+ lastDoc[0] +" but skipTo("+(lastDoc[0]+1)+") got to "+scorer.docID(),more);
}
leafPtr++;
- indexSearcher.close();
}
lastReader[0] = context.reader;
assert readerContextArray[leafPtr].reader == context.reader;
@@ -335,7 +331,6 @@ public class QueryUtils {
boolean more = scorer.advance(lastDoc[0] + 1) != DocIdSetIterator.NO_MORE_DOCS;
Assert.assertFalse("query's last doc was "+ lastDoc[0] +" but skipTo("+(lastDoc[0]+1)+") got to "+scorer.docID(),more);
}
- indexSearcher.close();
}
}
}
@@ -394,7 +389,6 @@ public class QueryUtils {
boolean more = scorer.advance(lastDoc[0] + 1) != DocIdSetIterator.NO_MORE_DOCS;
Assert.assertFalse("query's last doc was "+ lastDoc[0] +" but skipTo("+(lastDoc[0]+1)+") got to "+scorer.docID(),more);
}
- indexSearcher.close();
leafPtr++;
}
@@ -419,7 +413,6 @@ public class QueryUtils {
boolean more = scorer.advance(lastDoc[0] + 1) != DocIdSetIterator.NO_MORE_DOCS;
Assert.assertFalse("query's last doc was "+ lastDoc[0] +" but skipTo("+(lastDoc[0]+1)+") got to "+scorer.docID(),more);
}
- indexSearcher.close();
}
}
}