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 13:56:25 UTC
svn commit: r1430828 - in /lucene/dev/branches/lucene4547/lucene/core/src:
java/org/apache/lucene/codecs/ java/org/apache/lucene/codecs/lucene40/
java/org/apache/lucene/util/packed/ test/org/apache/lucene/
test/org/apache/lucene/util/junitcompat/
Author: rmuir
Date: Wed Jan 9 12:56:24 2013
New Revision: 1430828
URL: http://svn.apache.org/viewvc?rev=1430828&view=rev
Log:
add/delete/move/remove some nocommits
Modified:
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/Codec.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/SimpleDocValuesFormat.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40Codec.java
lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/TestDemoDocValue.java
lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfDirectoryNotClosed.java
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/Codec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/Codec.java?rev=1430828&r1=1430827&r2=1430828&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/Codec.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/Codec.java Wed Jan 9 12:56:24 2013
@@ -69,10 +69,7 @@ public abstract class Codec implements N
public abstract DocValuesFormat docValuesFormat();
/** Encodes/decodes streaming docvalues */
- public SimpleDocValuesFormat simpleDocValuesFormat() {
- // nocommit make this abstract
- return null;
- }
+ public abstract SimpleDocValuesFormat simpleDocValuesFormat();
/** Encodes/decodes stored fields */
public abstract StoredFieldsFormat storedFieldsFormat();
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/SimpleDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/SimpleDocValuesFormat.java?rev=1430828&r1=1430827&r2=1430828&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/SimpleDocValuesFormat.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/SimpleDocValuesFormat.java Wed Jan 9 12:56:24 2013
@@ -43,7 +43,6 @@ public abstract class SimpleDocValuesFor
* SPI mechanism (registered in META-INF/ of your jar file, etc).
* @param name must be all ascii alphanumeric, and less than 128 characters in length.
*/
- // nocommit: @code -> @link
protected SimpleDocValuesFormat(String name) {
NamedSPILoader.checkServiceName(name);
this.name = name;
@@ -51,7 +50,6 @@ public abstract class SimpleDocValuesFor
public abstract SimpleDVConsumer fieldsConsumer(SegmentWriteState state) throws IOException;
- // nocommit do this:
public abstract SimpleDVProducer fieldsProducer(SegmentReadState state) throws IOException;
@Override
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40Codec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40Codec.java?rev=1430828&r1=1430827&r2=1430828&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40Codec.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40Codec.java Wed Jan 9 12:56:24 2013
@@ -25,6 +25,7 @@ import org.apache.lucene.codecs.LiveDocs
import org.apache.lucene.codecs.NormsFormat;
import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.codecs.SegmentInfoFormat;
+import org.apache.lucene.codecs.SimpleDocValuesFormat;
import org.apache.lucene.codecs.StoredFieldsFormat;
import org.apache.lucene.codecs.TermVectorsFormat;
import org.apache.lucene.codecs.perfield.PerFieldPostingsFormat;
@@ -99,6 +100,11 @@ public final class Lucene40Codec extends
}
@Override
+ public SimpleDocValuesFormat simpleDocValuesFormat() {
+ return null; // nocommit
+ }
+
+ @Override
public final LiveDocsFormat liveDocsFormat() {
return liveDocsFormat;
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java?rev=1430828&r1=1430827&r2=1430828&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java Wed Jan 9 12:56:24 2013
@@ -1152,6 +1152,7 @@ public class PackedInts {
this.version = version;
}
+ // nocommit
public int getValueCount() {
return valueCount;
}
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/TestDemoDocValue.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/TestDemoDocValue.java?rev=1430828&r1=1430827&r2=1430828&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/TestDemoDocValue.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/TestDemoDocValue.java Wed Jan 9 12:56:24 2013
@@ -494,11 +494,6 @@ public class TestDemoDocValue extends Lu
directory.close();
}
- // nocommit tests should fail if a codec makes the [easy]
- // mistake of NOT opening all files when SimpleDVProducer
- // is created ... frist cut of Lucene41 had this bug but
- // no tests failed!?
-
public void testDemoSortedBytes() throws IOException {
Analyzer analyzer = new MockAnalyzer(random());
Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfDirectoryNotClosed.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfDirectoryNotClosed.java?rev=1430828&r1=1430827&r2=1430828&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfDirectoryNotClosed.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/util/junitcompat/TestFailIfDirectoryNotClosed.java Wed Jan 9 12:56:24 2013
@@ -25,8 +25,7 @@ import org.junit.runner.Result;
public class TestFailIfDirectoryNotClosed extends WithNestedTests {
public TestFailIfDirectoryNotClosed() {
- // nocommit true
- super(false);
+ super(true);
}
public static class Nested1 extends WithNestedTests.AbstractNestedTest {