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 2010/12/17 11:08:00 UTC
svn commit: r1050334 - in /lucene/dev/branches/bulkpostings/lucene/src:
java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldsReader.java
test/org/apache/lucene/index/TestCodecs.java
Author: mikemccand
Date: Fri Dec 17 10:08:00 2010
New Revision: 1050334
URL: http://svn.apache.org/viewvc?rev=1050334&view=rev
Log:
LUCENE-2817: fix SimpleText reuse
Modified:
lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldsReader.java
lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestCodecs.java
Modified: lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldsReader.java?rev=1050334&r1=1050333&r2=1050334&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldsReader.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/java/org/apache/lucene/index/codecs/simpletext/SimpleTextFieldsReader.java Fri Dec 17 10:08:00 2010
@@ -194,7 +194,7 @@ class SimpleTextFieldsReader extends Fie
@Override
public DocsEnum docs(Bits skipDocs, DocsEnum reuse) throws IOException {
SimpleTextDocsEnum docsEnum;
- if (reuse != null && reuse instanceof SimpleTextDocsEnum && ((SimpleTextDocsEnum) reuse).canReuse(in)) {
+ if (reuse != null && reuse instanceof SimpleTextDocsEnum && ((SimpleTextDocsEnum) reuse).canReuse(SimpleTextFieldsReader.this.in)) {
docsEnum = (SimpleTextDocsEnum) reuse;
} else {
docsEnum = new SimpleTextDocsEnum();
@@ -209,7 +209,7 @@ class SimpleTextFieldsReader extends Fie
}
SimpleTextDocsAndPositionsEnum docsAndPositionsEnum;
- if (reuse != null && reuse instanceof SimpleTextDocsAndPositionsEnum && ((SimpleTextDocsAndPositionsEnum) reuse).canReuse(in)) {
+ if (reuse != null && reuse instanceof SimpleTextDocsAndPositionsEnum && ((SimpleTextDocsAndPositionsEnum) reuse).canReuse(SimpleTextFieldsReader.this.in)) {
docsAndPositionsEnum = (SimpleTextDocsAndPositionsEnum) reuse;
} else {
docsAndPositionsEnum = new SimpleTextDocsAndPositionsEnum();
@@ -220,7 +220,7 @@ class SimpleTextFieldsReader extends Fie
@Override
public BulkPostingsEnum bulkPostings(BulkPostingsEnum reuse, boolean doFreq, boolean doPositions) throws IOException {
SimpleTextBulkPostingsEnum bulkPostingsEnum;
- if (reuse != null && reuse instanceof SimpleTextBulkPostingsEnum && ((SimpleTextBulkPostingsEnum) reuse).canReuse(in, doFreq, doPositions)) {
+ if (reuse != null && reuse instanceof SimpleTextBulkPostingsEnum && ((SimpleTextBulkPostingsEnum) reuse).canReuse(SimpleTextFieldsReader.this.in, doFreq, doPositions)) {
bulkPostingsEnum = (SimpleTextBulkPostingsEnum) reuse;
} else {
bulkPostingsEnum = new SimpleTextBulkPostingsEnum(doFreq, doPositions);
@@ -257,6 +257,7 @@ class SimpleTextFieldsReader extends Fie
this.skipDocs = skipDocs;
in.seek(fp);
this.omitTF = omitTF;
+ docID = 0;
if (omitTF) {
tf = 1;
}
Modified: lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestCodecs.java?rev=1050334&r1=1050333&r2=1050334&view=diff
==============================================================================
--- lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestCodecs.java (original)
+++ lucene/dev/branches/bulkpostings/lucene/src/test/org/apache/lucene/index/TestCodecs.java Fri Dec 17 10:08:00 2010
@@ -40,6 +40,7 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.Version;
+import static org.junit.Assume.*;
// TODO: test multiple codecs here?
@@ -619,6 +620,8 @@ public class TestCodecs extends LuceneTe
public void testBulkPostingsBufferReuse() throws Exception {
+
+ //assumeFalse("SimpleText never reuses", CodecProvider.getDefault().getDefaultFieldCodec().equals("SimpleText"));
Directory dir = newDirectory();
final RandomIndexWriter w = new RandomIndexWriter(random, dir);
Document doc = new Document();