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/27 16:55:32 UTC

svn commit: r1439105 - in /lucene/dev/branches/lucene4547/lucene: codecs/src/java/org/apache/lucene/codecs/diskdv/ core/src/java/org/apache/lucene/codecs/lucene42/

Author: rmuir
Date: Sun Jan 27 15:55:31 2013
New Revision: 1439105

URL: http://svn.apache.org/viewvc?rev=1439105&view=rev
Log:
clear up some nocommits

Modified:
    lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/diskdv/DiskDocValuesConsumer.java
    lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/diskdv/DiskDocValuesFormat.java
    lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesConsumer.java

Modified: lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/diskdv/DiskDocValuesConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/diskdv/DiskDocValuesConsumer.java?rev=1439105&r1=1439104&r2=1439105&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/diskdv/DiskDocValuesConsumer.java (original)
+++ lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/diskdv/DiskDocValuesConsumer.java Sun Jan 27 15:55:31 2013
@@ -122,12 +122,10 @@ class DiskDocValuesConsumer extends DocV
   
   @Override
   public void close() throws IOException {
-    // nocommit: just write this to a RAMfile or something and flush it here, with #fields first.
-    // this meta is a tiny file so this hurts nobody
     boolean success = false;
     try {
       if (meta != null) {
-        meta.writeVInt(-1);
+        meta.writeVInt(-1); // write EOF marker
       }
       success = true;
     } finally {

Modified: lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/diskdv/DiskDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/diskdv/DiskDocValuesFormat.java?rev=1439105&r1=1439104&r2=1439105&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/diskdv/DiskDocValuesFormat.java (original)
+++ lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/diskdv/DiskDocValuesFormat.java Sun Jan 27 15:55:31 2013
@@ -25,19 +25,22 @@ import org.apache.lucene.codecs.DocValue
 import org.apache.lucene.index.SegmentReadState;
 import org.apache.lucene.index.SegmentWriteState;
 
-// nocommit fix this
 /**
+ * DocValues format that keeps everything on disk.
+ * <p>
  * Internally there are only 2 field types:
- * BINARY: a big byte[]
- * NUMERIC: packed ints
- *
- * NumericField = NUMERIC
- * fixedLength BinaryField = BINARY
- * variableLength BinaryField = BINARY + NUMERIC (addresses)
- * fixedLength SortedField = BINARY + NUMERIC (ords)
- * variableLength SortedField = BINARY + NUMERIC (addresses) + NUMERIC (ords) 
+ * <ul>
+ *   <li>BINARY: a big byte[].
+ *   <li>NUMERIC: packed ints
+ * </ul>
+ * SORTED is encoded as BINARY + NUMERIC
+ * <p>
+ * NOTE: Don't use this format in production (its not very efficient).
+ * Most likely you would want some parts in RAM, other parts on disk. 
+ * <p>
+ * @lucene.experimental
  */
-public class DiskDocValuesFormat extends DocValuesFormat {
+public final class DiskDocValuesFormat extends DocValuesFormat {
 
   public DiskDocValuesFormat() {
     super("Disk");

Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesConsumer.java?rev=1439105&r1=1439104&r2=1439105&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesConsumer.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/lucene42/Lucene42DocValuesConsumer.java Sun Jan 27 15:55:31 2013
@@ -132,12 +132,10 @@ class Lucene42DocValuesConsumer extends 
   
   @Override
   public void close() throws IOException {
-    // nocommit: just write this to a RAMfile or something and flush it here, with #fields first.
-    // this meta is a tiny file so this hurts nobody
     boolean success = false;
     try {
       if (meta != null) {
-        meta.writeVInt(-1);
+        meta.writeVInt(-1); // write EOF marker
       }
       success = true;
     } finally {