You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/09/26 21:16:38 UTC
svn commit: r1390683 - in /lucene/dev/trunk: lucene/
lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/
lucene/core/src/java/org/apache/lucene/codecs/lucene40/
lucene/core/src/java/org/apache/lucene/document/
lucene/core/src/java/org/apache/lu...
Author: rmuir
Date: Wed Sep 26 19:16:37 2012
New Revision: 1390683
URL: http://svn.apache.org/viewvc?rev=1390683&view=rev
Log:
LUCENE-4425: Unclear documentation of StoredFieldVisitor.binaryValue
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/StoredFieldVisitor.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1390683&r1=1390682&r2=1390683&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Wed Sep 26 19:16:37 2012
@@ -139,6 +139,10 @@ API Changes
Bits as liveDocs, then use the flex apis (fields(), terms(), etc) directly.
(Mike McCandless, Robert Muir)
+* LUCENE-4425: clarify documentation of StoredFieldVisitor.binaryValue
+ and simplify the api to binaryField(FieldInfo, byte[]).
+ (Adrien Grand, Robert Muir)
+
Bug Fixes
* LUCENE-4423: DocumentStoredFieldVisitor.binaryField ignored offset and
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java?rev=1390683&r1=1390682&r2=1390683&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java Wed Sep 26 19:16:37 2012
@@ -139,10 +139,9 @@ public class SimpleTextStoredFieldsReade
if (type == TYPE_STRING) {
visitor.stringField(fieldInfo, new String(scratch.bytes, scratch.offset+VALUE.length, scratch.length-VALUE.length, "UTF-8"));
} else if (type == TYPE_BINARY) {
- // TODO: who owns the bytes?
byte[] copy = new byte[scratch.length-VALUE.length];
System.arraycopy(scratch.bytes, scratch.offset+VALUE.length, copy, 0, copy.length);
- visitor.binaryField(fieldInfo, copy, 0, copy.length);
+ visitor.binaryField(fieldInfo, copy);
} else if (type == TYPE_INT) {
UnicodeUtil.UTF8toUTF16(scratch.bytes, scratch.offset+VALUE.length, scratch.length-VALUE.length, scratchUTF16);
visitor.intField(fieldInfo, Integer.parseInt(scratchUTF16.toString()));
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java?rev=1390683&r1=1390682&r2=1390683&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java Wed Sep 26 19:16:37 2012
@@ -188,7 +188,7 @@ public final class Lucene40StoredFieldsR
byte bytes[] = new byte[length];
fieldsStream.readBytes(bytes, 0, length);
if ((bits & FIELD_IS_BINARY) != 0) {
- visitor.binaryField(info, bytes, 0, bytes.length);
+ visitor.binaryField(info, bytes);
} else {
visitor.stringField(info, new String(bytes, 0, bytes.length, IOUtils.CHARSET_UTF_8));
}
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java?rev=1390683&r1=1390682&r2=1390683&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java Wed Sep 26 19:16:37 2012
@@ -58,8 +58,8 @@ public class DocumentStoredFieldVisitor
}
@Override
- public void binaryField(FieldInfo fieldInfo, byte[] value, int offset, int length) throws IOException {
- doc.add(new StoredField(fieldInfo.name, value, offset, length));
+ public void binaryField(FieldInfo fieldInfo, byte[] value) throws IOException {
+ doc.add(new StoredField(fieldInfo.name, value));
}
@Override
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/StoredFieldVisitor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/StoredFieldVisitor.java?rev=1390683&r1=1390682&r2=1390683&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/StoredFieldVisitor.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/StoredFieldVisitor.java Wed Sep 26 19:16:37 2012
@@ -41,8 +41,10 @@ public abstract class StoredFieldVisitor
protected StoredFieldVisitor() {
}
- /** Process a binary field. */
- public void binaryField(FieldInfo fieldInfo, byte[] value, int offset, int length) throws IOException {
+ /** Process a binary field.
+ * @param value newly allocated byte array with the binary contents.
+ */
+ public void binaryField(FieldInfo fieldInfo, byte[] value) throws IOException {
}
/** Process a string field */
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java?rev=1390683&r1=1390682&r2=1390683&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java Wed Sep 26 19:16:37 2012
@@ -72,8 +72,8 @@ public final class FieldFilterAtomicRead
public void document(final int docID, final StoredFieldVisitor visitor) throws IOException {
super.document(docID, new StoredFieldVisitor() {
@Override
- public void binaryField(FieldInfo fieldInfo, byte[] value, int offset, int length) throws IOException {
- visitor.binaryField(fieldInfo, value, offset, length);
+ public void binaryField(FieldInfo fieldInfo, byte[] value) throws IOException {
+ visitor.binaryField(fieldInfo, value);
}
@Override
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1390683&r1=1390682&r2=1390683&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java Wed Sep 26 19:16:37 2012
@@ -451,8 +451,8 @@ public class SolrIndexSearcher extends I
}
@Override
- public void binaryField(FieldInfo fieldInfo, byte[] value, int offset, int length) throws IOException {
- doc.add(new StoredField(fieldInfo.name, value, offset, length));
+ public void binaryField(FieldInfo fieldInfo, byte[] value) throws IOException {
+ doc.add(new StoredField(fieldInfo.name, value));
}
@Override