svn commit: r1392826 - in /lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index: CheckIndex.java SegmentInfo.java SegmentInfoPerCommit.java

[rm...@apache.org]

Author: rmuir
Date: Tue Oct  2 10:36:39 2012
New Revision: 1392826

URL: http://svn.apache.org/viewvc?rev=1392826&view=rev
Log:
prevent any complaints about this by not printing anything at all

Modified:
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfoPerCommit.java

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java?rev=1392826&r1=1392825&r2=1392826&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java Tue Oct  2 10:36:39 2012
@@ -31,6 +31,7 @@ import java.util.Map;
 import org.apache.lucene.codecs.BlockTreeTermsReader;
 import org.apache.lucene.codecs.Codec;
 import org.apache.lucene.codecs.PostingsFormat; // javadocs
+import org.apache.lucene.codecs.lucene3x.Lucene3xSegmentInfoFormat;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.document.FieldType; // for javadocs
 import org.apache.lucene.index.DocValues.SortedSource;
@@ -511,7 +512,10 @@ public class CheckIndex {
         msg("    numFiles=" + info.files().size());
         segInfoStat.numFiles = info.files().size();
         segInfoStat.sizeMB = info.sizeInBytes()/(1024.*1024.);
-        msg("    size (MB)=" + nf.format(segInfoStat.sizeMB));
+        if (info.info.getAttribute(Lucene3xSegmentInfoFormat.DS_OFFSET_KEY) == null) {
+          // don't print size in bytes if its a 3.0 segment with shared docstores
+          msg("    size (MB)=" + nf.format(segInfoStat.sizeMB));
+        }
         Map<String,String> diagnostics = info.info.getDiagnostics();
         segInfoStat.diagnostics = diagnostics;
         if (diagnostics.size() > 0) {

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java?rev=1392826&r1=1392825&r2=1392826&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfo.java Tue Oct  2 10:36:39 2012
@@ -106,6 +106,8 @@ public final class SegmentInfo {
    * this segment.  Note that this will not include any live
    * docs for the segment; to include that use {@link
    * SegmentInfoPerCommit#sizeInBytes()} instead.
+   * <p><b>NOTE:</b> This value is not correct for 3.0 segments
+   * that have shared docstores. To get the correct value, upgrade!
    */
   public long sizeInBytes() throws IOException {
     if (sizeInBytes == -1) {

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfoPerCommit.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfoPerCommit.java?rev=1392826&r1=1392825&r2=1392826&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfoPerCommit.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/SegmentInfoPerCommit.java Tue Oct  2 10:36:39 2012
@@ -64,7 +64,9 @@ public class SegmentInfoPerCommit {
   }
 
   /** Returns total size in bytes of all files for this
-   *  segment. */
+   *  segment. 
+   * <p><b>NOTE:</b> This value is not correct for 3.0 segments
+   * that have shared docstores. To get the correct value, upgrade! */
   public long sizeInBytes() throws IOException {
     if (sizeInBytes == -1) {
       long sum = 0;