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/09 18:25:47 UTC
svn commit: r1430967 - in /lucene/dev/branches/lucene4547/lucene/core/src:
java/org/apache/lucene/codecs/lucene41/ test/org/apache/lucene/index/
Author: rmuir
Date: Wed Jan 9 17:25:47 2013
New Revision: 1430967
URL: http://svn.apache.org/viewvc?rev=1430967&view=rev
Log:
enable @Ignored (no nocommit??????) test
Modified:
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleDocValuesConsumer.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleDocValuesFormat.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleDocValuesProducer.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleDocValuesConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleDocValuesConsumer.java?rev=1430967&r1=1430966&r2=1430967&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleDocValuesConsumer.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleDocValuesConsumer.java Wed Jan 9 17:25:47 2013
@@ -38,8 +38,12 @@ class Lucene41SimpleDocValuesConsumer ex
Lucene41SimpleDocValuesConsumer(SegmentWriteState state) throws IOException {
String dataName = IndexFileNames.segmentFileName(state.segmentInfo.name, state.segmentSuffix, "dvd");
data = state.directory.createOutput(dataName, state.context);
+ CodecUtil.writeHeader(data, Lucene41SimpleDocValuesFormat.DATA_CODEC,
+ Lucene41SimpleDocValuesFormat.VERSION_CURRENT);
String metaName = IndexFileNames.segmentFileName(state.segmentInfo.name, state.segmentSuffix, "dvm");
meta = state.directory.createOutput(metaName, state.context);
+ CodecUtil.writeHeader(meta, Lucene41SimpleDocValuesFormat.METADATA_CODEC,
+ Lucene41SimpleDocValuesFormat.VERSION_CURRENT);
maxDoc = state.segmentInfo.getDocCount();
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleDocValuesFormat.java?rev=1430967&r1=1430966&r2=1430967&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleDocValuesFormat.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleDocValuesFormat.java Wed Jan 9 17:25:47 2013
@@ -52,4 +52,9 @@ public class Lucene41SimpleDocValuesForm
public SimpleDVProducer fieldsProducer(SegmentReadState state) throws IOException {
return new Lucene41SimpleDocValuesProducer(state);
}
+
+ static final String DATA_CODEC = "Lucene41DocValuesData";
+ static final String METADATA_CODEC = "Lucene41DocValuesMetadata";
+ static final int VERSION_START = 0;
+ static final int VERSION_CURRENT = VERSION_START;
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleDocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleDocValuesProducer.java?rev=1430967&r1=1430966&r2=1430967&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleDocValuesProducer.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene41/Lucene41SimpleDocValuesProducer.java Wed Jan 9 17:25:47 2013
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+import org.apache.lucene.codecs.CodecUtil;
import org.apache.lucene.codecs.SimpleDVProducer;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.index.CorruptIndexException;
@@ -48,6 +49,9 @@ class Lucene41SimpleDocValuesProducer ex
IndexInput in = state.directory.openInput(metaName, state.context);
boolean success = false;
try {
+ CodecUtil.checkHeader(in, Lucene41SimpleDocValuesFormat.METADATA_CODEC,
+ Lucene41SimpleDocValuesFormat.VERSION_START,
+ Lucene41SimpleDocValuesFormat.VERSION_START);
numerics = new HashMap<Integer,NumericEntry>();
ords = new HashMap<Integer,NumericEntry>();
binaries = new HashMap<Integer,BinaryEntry>();
@@ -63,6 +67,9 @@ class Lucene41SimpleDocValuesProducer ex
String dataName = IndexFileNames.segmentFileName(state.segmentInfo.name, state.segmentSuffix, "dvd");
data = state.directory.openInput(dataName, state.context);
+ CodecUtil.checkHeader(data, Lucene41SimpleDocValuesFormat.DATA_CODEC,
+ Lucene41SimpleDocValuesFormat.VERSION_START,
+ Lucene41SimpleDocValuesFormat.VERSION_START);
}
private void readFields(IndexInput meta, FieldInfos infos) throws IOException {
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java?rev=1430967&r1=1430966&r2=1430967&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/index/TestAllFilesHaveCodecHeader.java Wed Jan 9 17:25:47 2013
@@ -38,7 +38,6 @@ import org.junit.Ignore;
/**
* Test that a plain default puts codec headers in all files.
*/
-@Ignore("re-enable once Lucene41 doesn't secretly wrap SimpleText anymore")
public class TestAllFilesHaveCodecHeader extends LuceneTestCase {
public void test() throws Exception {
Directory dir = newDirectory();