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/15 23:46:34 UTC
svn commit: r1433720 - in /lucene/dev/branches/lucene4547/lucene/core/src:
java/org/apache/lucene/index/FieldInfo.java
java/org/apache/lucene/index/NormsConsumerPerField.java
test/org/apache/lucene/index/TestUniqueTermCount.java
Author: mikemccand
Date: Tue Jan 15 22:46:33 2013
New Revision: 1433720
URL: http://svn.apache.org/viewvc?rev=1433720&view=rev
Log:
fix TestUniqueTermCount
Modified:
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/NormsConsumerPerField.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java?rev=1433720&r1=1433719&r2=1433720&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/FieldInfo.java Tue Jan 15 22:46:33 2013
@@ -210,6 +210,7 @@ public final class FieldInfo {
assert checkConsistency();
}
+ // nocommit type is always number? should we remove this?
void setNormValueType(DocValuesType type) {
normType = type;
assert checkConsistency();
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=1433720&r1=1433719&r2=1433720&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 22:46:33 2013
@@ -43,6 +43,7 @@ final class NormsConsumerPerField extend
void finish() throws IOException {
if (fieldInfo.isIndexed() && !fieldInfo.omitsNorms()) {
if (consumer == null) {
+ fieldInfo.setNormValueType(FieldInfo.DocValuesType.NUMERIC);
consumer = new NumberDVWriter(fieldInfo, docState.docWriter.bytesUsed);
}
consumer.addValue(docState.docID, similarity.computeNorm(fieldState));
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java?rev=1433720&r1=1433719&r2=1433720&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestUniqueTermCount.java Tue Jan 15 22:46:33 2013
@@ -70,6 +70,7 @@ public class TestUniqueTermCount extends
public void test() throws Exception {
NumericDocValues fooNorms = MultiSimpleDocValues.simpleNormValues(reader, "foo");
+ assertNotNull(fooNorms);
for (int i = 0; i < reader.maxDoc(); i++) {
assertEquals(expected.get(i).longValue(), fooNorms.get(i));
}