You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/03/21 16:45:25 UTC
svn commit: r1303449 -
/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesConsumer.java
Author: uschindler
Date: Wed Mar 21 15:45:25 2012
New Revision: 1303449
URL: http://svn.apache.org/viewvc?rev=1303449&view=rev
Log:
Fix fall-through warning and ensure all variables are initialized (by finalness) and default switch throwing runtimeex
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesConsumer.java
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesConsumer.java?rev=1303449&r1=1303448&r2=1303449&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesConsumer.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesConsumer.java Wed Mar 21 15:45:25 2012
@@ -70,8 +70,7 @@ public class SimpleTextDocValuesConsumer
@Override
public void add(int docID, IndexableField value) throws IOException {
assert docID >= 0;
- int ord = -1;
- int vSize = -1;
+ final int ord, vSize;
switch (type) {
case BYTES_FIXED_DEREF:
case BYTES_FIXED_SORTED:
@@ -106,7 +105,12 @@ public class SimpleTextDocValuesConsumer
break;
case FIXED_INTS_64:
vSize = 8;
+ scratch.grow(8);
+ DocValuesArraySource.copyLong(scratch, value.numericValue().longValue());
+ ord = hash.add(scratch);
+ break;
case VAR_INTS:
+ vSize = -1;
scratch.grow(8);
DocValuesArraySource.copyLong(scratch, value.numericValue().longValue());
ord = hash.add(scratch);
@@ -125,7 +129,8 @@ public class SimpleTextDocValuesConsumer
Double.doubleToRawLongBits(value.numericValue().doubleValue()));
ord = hash.add(scratch);
break;
-
+ default:
+ throw new RuntimeException("should not reach this line");
}
if (fixedSize == Integer.MIN_VALUE) {