You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2013/01/14 21:15:03 UTC
svn commit: r1433091 - in
/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41:
Lucene41SimpleNormsConsumer.java Lucene41SimpleNormsProducer.java
Author: rmuir
Date: Mon Jan 14 20:14:46 2013
New Revision: 1433091
URL: http://svn.apache.org/viewvc?rev=1433091&view=rev
Log:
simplify packedints usage for in-ram norms impl
Modified:
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleNormsConsumer.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleNormsProducer.java
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleNormsConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleNormsConsumer.java?rev=1433091&r1=1433090&r2=1433091&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleNormsConsumer.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleNormsConsumer.java Mon Jan 14 20:14:46 2013
@@ -133,16 +133,8 @@ class Lucene41SimpleNormsConsumer extend
data.writeLong(minValue);
- FormatAndBits formatAndBits = PackedInts.fastestFormatAndBits(count, bitsPerValue, PackedInts.COMPACT);
-
- // nocommit: refactor this crap in PackedInts.java
- // e.g. Header.load()/save() or something rather than how it works now.
- CodecUtil.writeHeader(data, PackedInts.CODEC_NAME, PackedInts.VERSION_CURRENT);
- data.writeVInt(bitsPerValue);
- data.writeVInt(count);
- data.writeVInt(formatAndBits.format.getId());
-
- final PackedInts.Writer writer = PackedInts.getWriterNoHeader(data, formatAndBits.format, count, formatAndBits.bitsPerValue, 0);
+ FormatAndBits formatAndBits = PackedInts.fastestFormatAndBits(count, bitsPerValue, PackedInts.COMPACT);
+ final PackedInts.Writer writer = PackedInts.getWriter(data, count, formatAndBits.bitsPerValue, 0);
for(Number nv : values) {
writer.add(nv.longValue() - minValue);
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleNormsProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleNormsProducer.java?rev=1433091&r1=1433090&r2=1433091&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleNormsProducer.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleNormsProducer.java Mon Jan 14 20:14:46 2013
@@ -102,8 +102,7 @@ class Lucene41SimpleNormsProducer extend
}
final long minValue = data.readLong();
assert minValue == 0;
- PackedInts.Header header = PackedInts.readHeader(data);
- final PackedInts.Reader reader = PackedInts.getReaderNoHeader(data, header);
+ final PackedInts.Reader reader = PackedInts.getReader(data);
return new NumericDocValues() {
@Override
public long get(int docID) {
@@ -112,8 +111,7 @@ class Lucene41SimpleNormsProducer extend
};
} else {
final long minValue = data.readLong();
- PackedInts.Header header = PackedInts.readHeader(data);
- final PackedInts.Reader reader = PackedInts.getReaderNoHeader(data, header);
+ final PackedInts.Reader reader = PackedInts.getReader(data);
return new NumericDocValues() {
@Override
public long get(int docID) {