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/16 00:01:33 UTC
svn commit: r1433725 - in /lucene/dev/branches/lucene4547/lucene/core/src:
java/org/apache/lucene/index/NormsConsumerPerField.java
java/org/apache/lucene/index/TermVectorsConsumerPerField.java
test/org/apache/lucene/index/TestNorms.java
Author: mikemccand
Date: Tue Jan 15 23:01:32 2013
New Revision: 1433725
URL: http://svn.apache.org/viewvc?rev=1433725&view=rev
Log:
fix TestNorms
Modified:
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NormsConsumerPerField.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
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=1433725&r1=1433724&r2=1433725&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 Tue Jan 15 23:01:32 2013
@@ -43,6 +43,8 @@ final class NormsConsumerPerField extend
void finish() throws IOException {
if (fieldInfo.isIndexed() && !fieldInfo.omitsNorms()) {
if (consumer == null) {
+ // 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);
}
@@ -53,7 +55,9 @@ final class NormsConsumerPerField extend
void flush(SegmentWriteState state, SimpleDVConsumer normsWriter) throws IOException {
int docCount = state.segmentInfo.getDocCount();
if (consumer == null) {
- return; // null type - not omitted but not written
+ return; // null type - not omitted but not written -
+ // nocommit meaning the only docs that had
+ // norms hit exceptions?
}
consumer.finish(docCount);
consumer.flush(state, normsWriter);
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java?rev=1433725&r1=1433724&r2=1433725&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/TermVectorsConsumerPerField.java Tue Jan 15 23:01:32 2013
@@ -188,7 +188,6 @@ final class TermVectorsConsumerPerField
termsHashPerField.reset();
- // commit the termVectors once successful - FI will otherwise reset them
fieldInfo.setStoreTermVectors();
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestNorms.java?rev=1433725&r1=1433724&r2=1433725&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestNorms.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestNorms.java Tue Jan 15 23:01:32 2013
@@ -106,7 +106,7 @@ public class TestNorms extends LuceneTes
for (int i = 0; i < open.maxDoc(); i++) {
StoredDocument document = open.document(i);
int expected = Integer.parseInt(document.get(byteTestField));
- assertEquals((byte)expected, normValues.get(i));
+ assertEquals((byte)expected, (byte)normValues.get(i));
}
open.close();
dir.close();