Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LUCENE-799: Added support for Lazy compressed string fields. Thanks to Mike Klaas. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@507009 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Grant Ingersoll 2007-02-13 14:06:52 +00:00
parent 95bab8401f
commit 09930c9349
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -113,6 +113,8 @@ New features
which allow one to retrieve the size of a field without retrieving the actual field. which allow one to retrieve the size of a field without retrieving the actual field.
(Chuck Williams via Grant Ingersoll) (Chuck Williams via Grant Ingersoll)
15. LUCENE-799: Properly handle lazy, compressed fields. (Mike Klaas via Grant Ingersoll)
API Changes API Changes
1. LUCENE-438: Remove "final" from Token, implement Cloneable, allow 1. LUCENE-438: Remove "final" from Token, implement Cloneable, allow

14
src/java/org/apache/lucene/index/FieldsReader.java
View File

@ -362,10 +362,16 @@ final class FieldsReader {
IndexInput localFieldsStream = getFieldStream(); IndexInput localFieldsStream = getFieldStream();
try { try {
localFieldsStream.seek(pointer); localFieldsStream.seek(pointer);
//read in chars b/c we already know the length we need to read if (isCompressed) {
char[] chars = new char[toRead]; final byte[] b = new byte[toRead];
localFieldsStream.readChars(chars, 0, toRead); localFieldsStream.readBytes(b, 0, b.length);
fieldsData = new String(chars); fieldsData = new String(uncompress(b), "UTF-8");
} else {
//read in chars b/c we already know the length we need to read
char[] chars = new char[toRead];
localFieldsStream.readChars(chars, 0, toRead);
fieldsData = new String(chars);
}
} catch (IOException e) { } catch (IOException e) {
throw new FieldReaderException(e); throw new FieldReaderException(e);
} }

7
src/test/org/apache/lucene/index/TestFieldsReader.java
View File

@ -93,6 +93,7 @@ public class TestFieldsReader extends TestCase {
lazyFieldNames.add(DocHelper.LAZY_FIELD_KEY); lazyFieldNames.add(DocHelper.LAZY_FIELD_KEY);
lazyFieldNames.add(DocHelper.LAZY_FIELD_BINARY_KEY); lazyFieldNames.add(DocHelper.LAZY_FIELD_BINARY_KEY);
lazyFieldNames.add(DocHelper.TEXT_FIELD_UTF2_KEY); lazyFieldNames.add(DocHelper.TEXT_FIELD_UTF2_KEY);
lazyFieldNames.add(DocHelper.COMPRESSED_TEXT_FIELD_2_KEY);
SetBasedFieldSelector fieldSelector = new SetBasedFieldSelector(loadFieldNames, lazyFieldNames); SetBasedFieldSelector fieldSelector = new SetBasedFieldSelector(loadFieldNames, lazyFieldNames);
Document doc = reader.doc(0, fieldSelector); Document doc = reader.doc(0, fieldSelector);
assertTrue("doc is null and it shouldn't be", doc != null); assertTrue("doc is null and it shouldn't be", doc != null);
@ -102,6 +103,12 @@ public class TestFieldsReader extends TestCase {
String value = field.stringValue(); String value = field.stringValue();
assertTrue("value is null and it shouldn't be", value != null); assertTrue("value is null and it shouldn't be", value != null);
assertTrue(value + " is not equal to " + DocHelper.LAZY_FIELD_TEXT, value.equals(DocHelper.LAZY_FIELD_TEXT) == true); assertTrue(value + " is not equal to " + DocHelper.LAZY_FIELD_TEXT, value.equals(DocHelper.LAZY_FIELD_TEXT) == true);
field = doc.getFieldable(DocHelper.COMPRESSED_TEXT_FIELD_2_KEY);
assertTrue("field is null and it shouldn't be", field != null);
assertTrue("field is not lazy and it should be", field.isLazy());
value = field.stringValue();
assertTrue("value is null and it shouldn't be", value != null);
assertTrue(value + " is not equal to " + DocHelper.FIELD_2_COMPRESSED_TEXT, value.equals(DocHelper.FIELD_2_COMPRESSED_TEXT) == true);
field = doc.getFieldable(DocHelper.TEXT_FIELD_1_KEY); field = doc.getFieldable(DocHelper.TEXT_FIELD_1_KEY);
assertTrue("field is null and it shouldn't be", field != null); assertTrue("field is null and it shouldn't be", field != null);
assertTrue("Field is lazy and it should not be", field.isLazy() == false); assertTrue("Field is lazy and it should not be", field.isLazy() == false);