You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2012/12/20 17:29:27 UTC

svn commit: r1424573 - in /lucene/dev/branches/lucene4547/lucene: codecs/src/java/org/apache/lucene/codecs/memory/ codecs/src/java/org/apache/lucene/codecs/simpletext/ core/src/java/org/apache/lucene/codecs/ core/src/java/org/apache/lucene/codecs/perfi...

Author: mikemccand
Date: Thu Dec 20 16:29:26 2012
New Revision: 1424573

URL: http://svn.apache.org/viewvc?rev=1424573&view=rev
Log:
move clone down

Modified:
    lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesFormat.java
    lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSimpleDocValuesFormat.java
    lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/SimpleDVProducer.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/perfield/PerFieldDocValuesFormat.java
    lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java
    lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java
    lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java

Modified: lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesFormat.java?rev=1424573&r1=1424572&r2=1424573&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesFormat.java (original)
+++ lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryDocValuesFormat.java Thu Dec 20 16:29:26 2012
@@ -56,8 +56,7 @@ public class MemoryDocValuesFormat exten
 
       @Override
       public NumericDocValues getNumeric(FieldInfo field) throws IOException {
-        // nocommit is that clone() ok...?  it IS necessary
-        NumericDocValues valuesIn = producer.clone().getNumeric(field);
+        NumericDocValues valuesIn = producer.getNumeric(field);
 
         final int maxDoc = valuesIn.size();
         final long minValue = valuesIn.minValue();
@@ -96,8 +95,7 @@ public class MemoryDocValuesFormat exten
       
       @Override
       public BinaryDocValues getBinary(FieldInfo field) throws IOException {
-        // nocommit is that clone() ok...?  it IS necessary
-        BinaryDocValues valuesIn = producer.clone().getBinary(field);
+        BinaryDocValues valuesIn = producer.getBinary(field);
         final int maxDoc = valuesIn.size();
         final int maxLength = valuesIn.maxLength();
         final boolean fixedLength = valuesIn.isFixedLength();
@@ -138,8 +136,7 @@ public class MemoryDocValuesFormat exten
 
       @Override
       public SortedDocValues getSorted(FieldInfo field) throws IOException {
-        // nocommit is that clone() ok...?  it IS necessary
-        SortedDocValues valuesIn = producer.clone().getSorted(field);
+        SortedDocValues valuesIn = producer.getSorted(field);
         final int maxDoc = valuesIn.size();
         final int maxLength = valuesIn.maxLength();
         final boolean fixedLength = valuesIn.isFixedLength();

Modified: lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSimpleDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSimpleDocValuesFormat.java?rev=1424573&r1=1424572&r2=1424573&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSimpleDocValuesFormat.java (original)
+++ lucene/dev/branches/lucene4547/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSimpleDocValuesFormat.java Thu Dec 20 16:29:26 2012
@@ -491,17 +491,6 @@ public class SimpleTextSimpleDocValuesFo
       assert !fields.isEmpty();
     }
 
-    private SimpleTextDocValuesReader(SimpleTextDocValuesReader other) {
-      this.data = other.data.clone();
-      this.fields.putAll(other.fields);
-      this.maxDoc = other.maxDoc;
-    }
-
-    @Override
-    public SimpleDVProducer clone() {
-      return new SimpleTextDocValuesReader(this);
-    }
-
     @Override
     public NumericDocValues getNumeric(FieldInfo fieldInfo) throws IOException {
       final OneField field = fields.get(fieldInfo.name);
@@ -511,7 +500,7 @@ public class SimpleTextSimpleDocValuesFo
       // valid:
       assert field != null: "field=" + fieldInfo.name + " fields=" + fields;
 
-      final IndexInput in = data;
+      final IndexInput in = data.clone();
       final BytesRef scratch = new BytesRef();
       final DecimalFormat decoder = new DecimalFormat(field.pattern, new DecimalFormatSymbols(Locale.ROOT));
 
@@ -567,7 +556,7 @@ public class SimpleTextSimpleDocValuesFo
       // valid:
       assert field != null;
 
-      final IndexInput in = data;
+      final IndexInput in = data.clone();
       final BytesRef scratch = new BytesRef();
       final DecimalFormat decoder = new DecimalFormat(field.pattern, new DecimalFormatSymbols(Locale.ROOT));
 
@@ -623,7 +612,7 @@ public class SimpleTextSimpleDocValuesFo
       // valid:
       assert field != null;
 
-      final IndexInput in = data;
+      final IndexInput in = data.clone();
       final BytesRef scratch = new BytesRef();
       final DecimalFormat decoder = new DecimalFormat(field.pattern, new DecimalFormatSymbols(Locale.ROOT));
       final DecimalFormat ordDecoder = new DecimalFormat(field.ordPattern, new DecimalFormatSymbols(Locale.ROOT));

Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/SimpleDVProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/SimpleDVProducer.java?rev=1424573&r1=1424572&r2=1424573&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/SimpleDVProducer.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/SimpleDVProducer.java Thu Dec 20 16:29:26 2012
@@ -37,6 +37,4 @@ public abstract class SimpleDVProducer i
   public abstract BinaryDocValues getBinary(FieldInfo field) throws IOException;
 
   public abstract SortedDocValues getSorted(FieldInfo field) throws IOException;
-
-  public abstract SimpleDVProducer clone();
 }

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=1424573&r1=1424572&r2=1424573&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 Thu Dec 20 16:29:26 2012
@@ -50,6 +50,7 @@ public abstract class SimpleDocValuesFor
   }
 
   public abstract SimpleDVConsumer fieldsConsumer(SegmentWriteState state) throws IOException;
+
   // nocommit do this:
   public abstract SimpleDVProducer fieldsProducer(SegmentReadState state) throws IOException;
 

Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java?rev=1424573&r1=1424572&r2=1424573&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldDocValuesFormat.java Thu Dec 20 16:29:26 2012
@@ -228,7 +228,7 @@ public abstract class PerFieldDocValuesF
       Map<SimpleDVProducer,SimpleDVProducer> oldToNew = new IdentityHashMap<SimpleDVProducer,SimpleDVProducer>();
       // First clone all formats
       for(Map.Entry<String,SimpleDVProducer> ent : other.formats.entrySet()) {
-        SimpleDVProducer values = ent.getValue().clone();
+        SimpleDVProducer values = ent.getValue();
         formats.put(ent.getKey(), values);
         oldToNew.put(ent.getValue(), values);
       }

Modified: lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java?rev=1424573&r1=1424572&r2=1424573&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java Thu Dec 20 16:29:26 2012
@@ -19,7 +19,9 @@ package org.apache.lucene.index;
 
 import java.io.IOException;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedHashSet;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -83,19 +85,17 @@ final class SegmentCoreReaders {
     }
   };
 
-  final CloseableThreadLocal<SimpleDVProducer> simpleDocValuesLocal = new CloseableThreadLocal<SimpleDVProducer>() {
+  final CloseableThreadLocal<Map<String,Object>> simpleDocValuesLocal = new CloseableThreadLocal<Map<String,Object>>() {
     @Override
-    protected SimpleDVProducer initialValue() {
-      // nocommit remove null check
-      return (simpleDVProducer == null) ? null : simpleDVProducer.clone();
+    protected Map<String,Object> initialValue() {
+      return new HashMap<String,Object>();
     }
   };
 
-  final CloseableThreadLocal<SimpleDVProducer> simpleNormsLocal = new CloseableThreadLocal<SimpleDVProducer>() {
+  final CloseableThreadLocal<Map<String,Object>> simpleNormsLocal = new CloseableThreadLocal<Map<String,Object>>() {
     @Override
-    protected SimpleDVProducer initialValue() {
-      // nocommit remove null check
-      return (simpleNormsProducer == null) ? null : simpleNormsProducer.clone();
+    protected Map<String,Object> initialValue() {
+      return new HashMap<String,Object>();
     }
   };
 
@@ -202,7 +202,15 @@ final class SegmentCoreReaders {
       return null;
     }
 
-    return simpleDocValuesLocal.get().getNumeric(fi);
+    Map<String,Object> dvFields = simpleDocValuesLocal.get();
+
+    NumericDocValues dvs = (NumericDocValues) dvFields.get(field);
+    if (dvs == null) {
+      dvs = simpleDVProducer.getNumeric(fi);
+      dvFields.put(field, dvs);
+    }
+
+    return dvs;
   }
 
   BinaryDocValues getBinaryDocValues(String field) throws IOException {
@@ -225,7 +233,15 @@ final class SegmentCoreReaders {
       return null;
     }
 
-    return simpleDocValuesLocal.get().getBinary(fi);
+    Map<String,Object> dvFields = simpleDocValuesLocal.get();
+
+    BinaryDocValues dvs = (BinaryDocValues) dvFields.get(field);
+    if (dvs == null) {
+      dvs = simpleDVProducer.getBinary(fi);
+      dvFields.put(field, dvs);
+    }
+
+    return dvs;
   }
 
   SortedDocValues getSortedDocValues(String field) throws IOException {
@@ -248,7 +264,15 @@ final class SegmentCoreReaders {
       return null;
     }
 
-    return simpleDocValuesLocal.get().getSorted(fi);
+    Map<String,Object> dvFields = simpleDocValuesLocal.get();
+
+    SortedDocValues dvs = (SortedDocValues) dvFields.get(field);
+    if (dvs == null) {
+      dvs = simpleDVProducer.getSorted(fi);
+      dvFields.put(field, dvs);
+    }
+
+    return dvs;
   }
 
   NumericDocValues getSimpleNormValues(String field) throws IOException {
@@ -264,7 +288,16 @@ final class SegmentCoreReaders {
     if (simpleNormsProducer == null) {
       return null;
     }
-    return simpleNormsLocal.get().getNumeric(fi);
+
+    Map<String,Object> normFields = simpleNormsLocal.get();
+
+    NumericDocValues norms = (NumericDocValues) normFields.get(field);
+    if (norms == null) {
+      norms = simpleNormsProducer.getNumeric(fi);
+      normFields.put(field, norms);
+    }
+
+    return norms;
   }
 
   void decRef() throws IOException {

Modified: lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java?rev=1424573&r1=1424572&r2=1424573&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java (original)
+++ lucene/dev/branches/lucene4547/lucene/core/src/test/org/apache/lucene/search/TestDocValuesScoring.java Thu Dec 20 16:29:26 2012
@@ -32,6 +32,7 @@ import org.apache.lucene.search.similari
 import org.apache.lucene.search.similarities.Similarity;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
 import org.apache.lucene.util.LuceneTestCase;
 
 /**
@@ -40,6 +41,8 @@ import org.apache.lucene.util.LuceneTest
  * In the example, a docvalues field is used as a per-document boost (separate from the norm)
  * @lucene.experimental
  */
+// nocommit Lucene40 doesn't yet impl SimpleDV:
+@SuppressCodecs("Lucene40")
 public class TestDocValuesScoring extends LuceneTestCase {
   private static final float SCORE_EPSILON = 0.001f; /* for comparing floats */
 

Modified: lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java?rev=1424573&r1=1424572&r2=1424573&view=diff
==============================================================================
--- lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java (original)
+++ lucene/dev/branches/lucene4547/lucene/test-framework/src/java/org/apache/lucene/util/_TestUtil.java Thu Dec 20 16:29:26 2012
@@ -251,6 +251,8 @@ public class _TestUtil {
       ((TieredMergePolicy) mp).setUseCompoundFile(v);
     } else if (mp instanceof LogMergePolicy) {
       ((LogMergePolicy) mp).setUseCompoundFile(v);
+    } else {
+      throw new IllegalArgumentException("cannot set compound file for MergePolicy " + mp);
     }
   }