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 2013/01/24 17:21:48 UTC
svn commit: r1438060 -
/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/
Author: mikemccand
Date: Thu Jan 24 16:21:48 2013
New Revision: 1438060
URL: http://svn.apache.org/viewvc?rev=1438060&view=rev
Log:
remove/add nocommits
Added:
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/BinaryDocValuesWriter.java
- copied, changed from r1438007, lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/BytesDVWriter.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NumericDocValuesWriter.java
- copied, changed from r1438007, lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NumberDVWriter.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SortedDocValuesWriter.java
- copied, changed from r1438007, lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SortedBytesDVWriter.java
Removed:
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/BytesDVWriter.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NumberDVWriter.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SortedBytesDVWriter.java
Modified:
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/DocValuesProcessor.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NormsConsumerPerField.java
Copied: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/BinaryDocValuesWriter.java (from r1438007, lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/BytesDVWriter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/BinaryDocValuesWriter.java?p2=lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/BinaryDocValuesWriter.java&p1=lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/BytesDVWriter.java&r1=1438007&r2=1438060&rev=1438060&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/BytesDVWriter.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/BinaryDocValuesWriter.java Thu Jan 24 16:21:48 2013
@@ -30,16 +30,16 @@ import org.apache.lucene.util.Counter;
/** Buffers up pending byte[] per doc, then flushes when
* segment flushes. */
-// nocommit name?
-// nocommit make this a consumer in the chain?
-class BytesDVWriter extends DocValuesWriter {
+class BinaryDocValuesWriter extends DocValuesWriter {
private final BytesRefArray bytesRefArray;
private final FieldInfo fieldInfo;
private int addedValues = 0;
private final BytesRef emptyBytesRef = new BytesRef();
- public BytesDVWriter(FieldInfo fieldInfo, Counter counter) {
+ // nocommit this needs to update bytesUsed?
+
+ public BinaryDocValuesWriter(FieldInfo fieldInfo, Counter counter) {
this.fieldInfo = fieldInfo;
this.bytesRefArray = new BytesRefArray(counter);
}
@@ -49,8 +49,7 @@ class BytesDVWriter extends DocValuesWri
throw new IllegalArgumentException("DocValuesField \"" + fieldInfo.name + "\" appears more than once in this document (only one value is allowed per field)");
}
if (value == null) {
- // nocommit improve message
- throw new IllegalArgumentException("null binaryValue not allowed (field=" + fieldInfo.name + ")");
+ throw new IllegalArgumentException("field=\"" + fieldInfo.name + "\": null value not allowed");
}
if (value.length > (BYTE_BLOCK_SIZE - 2)) {
throw new IllegalArgumentException("DocValuesField \"" + fieldInfo.name + "\" is too large, must be <= " + (BYTE_BLOCK_SIZE - 2));
@@ -94,8 +93,6 @@ class BytesDVWriter extends DocValuesWri
@Override
public BytesRef next() {
- // nocommit make
- // mutable Number:
if (upto < bytesRefArray.size()) {
bytesRefArray.get(value, upto);
} else {
@@ -108,14 +105,18 @@ class BytesDVWriter extends DocValuesWri
}
});
- reset();
+ // nocommit
+ //reset();
}
+ @Override
public void abort() {
- reset();
+ // nocommit
+ //reset();
}
private void reset() {
- bytesRefArray.clear();
+ // nocommit
+ //bytesRefArray.clear();
}
}
\ No newline at end of file
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/DocValuesProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/DocValuesProcessor.java?rev=1438060&r1=1438059&r2=1438060&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/DocValuesProcessor.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/DocValuesProcessor.java Thu Jan 24 16:21:48 2013
@@ -100,53 +100,53 @@ final class DocValuesProcessor extends S
void addBinaryField(FieldInfo fieldInfo, int docID, BytesRef value) {
DocValuesWriter writer = writers.get(fieldInfo.name);
- BytesDVWriter binaryWriter;
+ BinaryDocValuesWriter binaryWriter;
if (writer == null) {
- binaryWriter = new BytesDVWriter(fieldInfo, bytesUsed);
+ binaryWriter = new BinaryDocValuesWriter(fieldInfo, bytesUsed);
writers.put(fieldInfo.name, binaryWriter);
- } else if (!(writer instanceof BytesDVWriter)) {
+ } else if (!(writer instanceof BinaryDocValuesWriter)) {
throw new IllegalArgumentException("Incompatible DocValues type: field \"" + fieldInfo.name + "\" changed from " + getTypeDesc(writer) + " to binary");
} else {
- binaryWriter = (BytesDVWriter) writer;
+ binaryWriter = (BinaryDocValuesWriter) writer;
}
binaryWriter.addValue(docID, value);
}
void addSortedField(FieldInfo fieldInfo, int docID, BytesRef value) {
DocValuesWriter writer = writers.get(fieldInfo.name);
- SortedBytesDVWriter sortedWriter;
+ SortedDocValuesWriter sortedWriter;
if (writer == null) {
- sortedWriter = new SortedBytesDVWriter(fieldInfo, bytesUsed);
+ sortedWriter = new SortedDocValuesWriter(fieldInfo, bytesUsed);
writers.put(fieldInfo.name, sortedWriter);
- } else if (!(writer instanceof SortedBytesDVWriter)) {
+ } else if (!(writer instanceof SortedDocValuesWriter)) {
throw new IllegalArgumentException("Incompatible DocValues type: field \"" + fieldInfo.name + "\" changed from " + getTypeDesc(writer) + " to sorted");
} else {
- sortedWriter = (SortedBytesDVWriter) writer;
+ sortedWriter = (SortedDocValuesWriter) writer;
}
sortedWriter.addValue(docID, value);
}
void addNumericField(FieldInfo fieldInfo, int docID, long value) {
DocValuesWriter writer = writers.get(fieldInfo.name);
- NumberDVWriter numericWriter;
+ NumericDocValuesWriter numericWriter;
if (writer == null) {
- numericWriter = new NumberDVWriter(fieldInfo, bytesUsed);
+ numericWriter = new NumericDocValuesWriter(fieldInfo, bytesUsed);
writers.put(fieldInfo.name, numericWriter);
- } else if (!(writer instanceof NumberDVWriter)) {
+ } else if (!(writer instanceof NumericDocValuesWriter)) {
throw new IllegalArgumentException("Incompatible DocValues type: field \"" + fieldInfo.name + "\" changed from " + getTypeDesc(writer) + " to numeric");
} else {
- numericWriter = (NumberDVWriter) writer;
+ numericWriter = (NumericDocValuesWriter) writer;
}
numericWriter.addValue(docID, value);
}
private String getTypeDesc(DocValuesWriter obj) {
- if (obj instanceof BytesDVWriter) {
+ if (obj instanceof BinaryDocValuesWriter) {
return "binary";
- } else if (obj instanceof NumberDVWriter) {
+ } else if (obj instanceof NumericDocValuesWriter) {
return "numeric";
} else {
- assert obj instanceof SortedBytesDVWriter;
+ assert obj instanceof SortedDocValuesWriter;
return "sorted";
}
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NormsConsumerPerField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NormsConsumerPerField.java?rev=1438060&r1=1438059&r2=1438060&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NormsConsumerPerField.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NormsConsumerPerField.java Thu Jan 24 16:21:48 2013
@@ -25,7 +25,7 @@ final class NormsConsumerPerField extend
private final DocumentsWriterPerThread.DocState docState;
private final Similarity similarity;
private final FieldInvertState fieldState;
- private NumberDVWriter consumer;
+ private NumericDocValuesWriter consumer;
public NormsConsumerPerField(final DocInverterPerField docInverterPerField, final FieldInfo fieldInfo, NormsConsumer parent) {
this.fieldInfo = fieldInfo;
@@ -46,7 +46,7 @@ final class NormsConsumerPerField extend
// nocommit wrongish? what about the
// only-doc-with-norms-enabled-hits-exc case?
fieldInfo.setNormValueType(FieldInfo.DocValuesType.NUMERIC);
- consumer = new NumberDVWriter(fieldInfo, docState.docWriter.bytesUsed);
+ consumer = new NumericDocValuesWriter(fieldInfo, docState.docWriter.bytesUsed);
}
consumer.addValue(docState.docID, similarity.computeNorm(fieldState));
}
Copied: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NumericDocValuesWriter.java (from r1438007, lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NumberDVWriter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NumericDocValuesWriter.java?p2=lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NumericDocValuesWriter.java&p1=lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NumberDVWriter.java&r1=1438007&r2=1438060&rev=1438060&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NumberDVWriter.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NumericDocValuesWriter.java Thu Jan 24 16:21:48 2013
@@ -28,9 +28,7 @@ import org.apache.lucene.util.packed.App
/** Buffers up pending long per doc, then flushes when
* segment flushes. */
-// nocommit rename to NumericDVWriter?
-// nocommit make this a consumer in the chain?
-class NumberDVWriter extends DocValuesWriter {
+class NumericDocValuesWriter extends DocValuesWriter {
private final static long MISSING = 0L;
@@ -39,7 +37,7 @@ class NumberDVWriter extends DocValuesWr
private long bytesUsed;
private final FieldInfo fieldInfo;
- public NumberDVWriter(FieldInfo fieldInfo, Counter iwBytesUsed) {
+ public NumericDocValuesWriter(FieldInfo fieldInfo, Counter iwBytesUsed) {
pending = new AppendingLongBuffer();
bytesUsed = pending.ramBytesUsed();
this.fieldInfo = fieldInfo;
@@ -97,8 +95,6 @@ class NumberDVWriter extends DocValuesWr
@Override
public Number next() {
- // nocommit make
- // mutable Number:
long value;
if (upto < pending.size()) {
value = iter.next();
@@ -106,23 +102,28 @@ class NumberDVWriter extends DocValuesWr
value = 0;
}
upto++;
+ // TODO: make reusable Number
return value;
}
};
}
});
- reset();
+ // nocommit
+ //reset();
}
+ @Override
public void abort() {
- reset();
+ // nocommit
+ //reset();
}
// nocommit do we really need this...? can't/doesn't parent alloc
// a new instance after flush?
void reset() {
- pending = new AppendingLongBuffer();
- updateBytesUsed();
+ // nocommit
+ //pending = new AppendingLongBuffer();
+ //updateBytesUsed();
}
}
\ No newline at end of file
Copied: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SortedDocValuesWriter.java (from r1438007, lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SortedBytesDVWriter.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SortedDocValuesWriter.java?p2=lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SortedDocValuesWriter.java&p1=lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SortedBytesDVWriter.java&r1=1438007&r2=1438060&rev=1438060&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SortedBytesDVWriter.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SortedDocValuesWriter.java Thu Jan 24 16:21:48 2013
@@ -34,9 +34,7 @@ import org.apache.lucene.util.RamUsageEs
/** Buffers up pending byte[] per doc, deref and sorting via
* int ord, then flushes when segment flushes. */
-// nocommit name?
-// nocommit make this a consumer in the chain?
-class SortedBytesDVWriter extends DocValuesWriter {
+class SortedDocValuesWriter extends DocValuesWriter {
final BytesRefHash hash;
private int[] pending = new int[DEFAULT_PENDING_SIZE];
private int pendingIndex = 0;
@@ -46,7 +44,7 @@ class SortedBytesDVWriter extends DocVal
private static final BytesRef EMPTY = new BytesRef(BytesRef.EMPTY_BYTES);
private static final int DEFAULT_PENDING_SIZE = 16;
- public SortedBytesDVWriter(FieldInfo fieldInfo, Counter iwBytesUsed) {
+ public SortedDocValuesWriter(FieldInfo fieldInfo, Counter iwBytesUsed) {
this.fieldInfo = fieldInfo;
this.iwBytesUsed = iwBytesUsed;
hash = new BytesRefHash(
@@ -62,8 +60,7 @@ class SortedBytesDVWriter extends DocVal
throw new IllegalArgumentException("DocValuesField \"" + fieldInfo.name + "\" appears more than once in this document (only one value is allowed per field)");
}
if (value == null) {
- // nocommit improve message
- throw new IllegalArgumentException("null sortedValue not allowed (field=" + fieldInfo.name + ")");
+ throw new IllegalArgumentException("field \"" + fieldInfo.name + "\": null value not allowed");
}
if (value.length > (BYTE_BLOCK_SIZE - 2)) {
throw new IllegalArgumentException("DocValuesField \"" + fieldInfo.name + "\" is too large, must be <= " + (BYTE_BLOCK_SIZE - 2));
@@ -184,8 +181,7 @@ class SortedBytesDVWriter extends DocVal
ord = emptyOrd;
}
docUpto++;
- // nocommit make
- // resuable Number?
+ // TODO: make reusable Number
return ordMap[ord];
}
};
@@ -193,17 +189,23 @@ class SortedBytesDVWriter extends DocVal
});
iwBytesUsed.addAndGet(-sortedValueRamUsage);
- reset();
+ // nocommit
+ //reset();
}
+ @Override
public void abort() {
- reset();
+ // nocommit
+ //reset();
}
private void reset() {
+ // nocommit
+ /*
iwBytesUsed.addAndGet((pending.length - DEFAULT_PENDING_SIZE) * RamUsageEstimator.NUM_BYTES_INT);
pending = ArrayUtil.shrink(pending, DEFAULT_PENDING_SIZE);
pendingIndex = 0;
hash.clear();
+ */
}
}