Browse Source

Remove AtomicFieldData.isValuesOrdered.

This method is not used anymore.

Close #5688
Adrien Grand 11 years ago
parent
commit
9df655adb2
17 changed files with 4 additions and 163 deletions
  1. 0 5
      src/main/java/org/elasticsearch/index/fielddata/AbstractAtomicNumericFieldData.java
  2. 0 5
      src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java
  3. 1 7
      src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java
  4. 0 5
      src/main/java/org/elasticsearch/index/fielddata/plain/AbstractGeoPointIndexFieldData.java
  5. 0 5
      src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java
  6. 3 6
      src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVAtomicFieldData.java
  7. 0 20
      src/main/java/org/elasticsearch/index/fielddata/plain/DoubleArrayAtomicFieldData.java
  8. 0 10
      src/main/java/org/elasticsearch/index/fielddata/plain/FSTBytesAtomicFieldData.java
  9. 0 20
      src/main/java/org/elasticsearch/index/fielddata/plain/FloatArrayAtomicFieldData.java
  10. 0 5
      src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVAtomicFieldData.java
  11. 0 15
      src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointCompressedAtomicFieldData.java
  12. 0 15
      src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointDoubleArrayAtomicFieldData.java
  13. 0 5
      src/main/java/org/elasticsearch/index/fielddata/plain/NumericDVAtomicFieldData.java
  14. 0 20
      src/main/java/org/elasticsearch/index/fielddata/plain/PackedArrayAtomicFieldData.java
  15. 0 10
      src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesAtomicFieldData.java
  16. 0 5
      src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildAtomicFieldData.java
  17. 0 5
      src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java

+ 0 - 5
src/main/java/org/elasticsearch/index/fielddata/AbstractAtomicNumericFieldData.java

@@ -31,11 +31,6 @@ public abstract class AbstractAtomicNumericFieldData implements AtomicNumericFie
         this.isFloat = isFloat;
     }
 
-    @Override
-    public boolean isValuesOrdered() {
-        return false;
-    }
-
     @Override
     public ScriptDocValues getScriptValues() {
         if (isFloat) {

+ 0 - 5
src/main/java/org/elasticsearch/index/fielddata/AtomicFieldData.java

@@ -33,11 +33,6 @@ public interface AtomicFieldData<Script extends ScriptDocValues> extends RamUsag
      */
     boolean isMultiValued();
 
-    /**
-     * Are the values ordered? (in ascending manner).
-     */
-    boolean isValuesOrdered();
-
     /**
      * The number of docs in this field data.
      */

+ 1 - 7
src/main/java/org/elasticsearch/index/fielddata/ordinals/GlobalOrdinalsIndexFieldData.java

@@ -29,11 +29,10 @@ import org.elasticsearch.index.AbstractIndexComponent;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.fielddata.*;
 import org.elasticsearch.index.fielddata.fieldcomparator.SortMode;
+import org.elasticsearch.index.fielddata.ordinals.InternalGlobalOrdinalsBuilder.OrdinalMappingSource;
 import org.elasticsearch.index.fielddata.plain.AtomicFieldDataWithOrdinalsTermsEnum;
 import org.elasticsearch.index.mapper.FieldMapper;
 
-import static org.elasticsearch.index.fielddata.ordinals.InternalGlobalOrdinalsBuilder.OrdinalMappingSource;
-
 /**
  * {@link IndexFieldData} impl based on global ordinals.
  */
@@ -162,11 +161,6 @@ public final class GlobalOrdinalsIndexFieldData extends AbstractIndexComponent i
             return afd.isMultiValued();
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return afd.isValuesOrdered();
-        }
-
         @Override
         public int getNumDocs() {
             return afd.getNumDocs();

+ 0 - 5
src/main/java/org/elasticsearch/index/fielddata/plain/AbstractGeoPointIndexFieldData.java

@@ -49,11 +49,6 @@ abstract class AbstractGeoPointIndexFieldData extends AbstractIndexFieldData<Ato
             return false;
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return false;
-        }
-
         @Override
         public long getNumberUniqueValues() {
             return 0;

+ 0 - 5
src/main/java/org/elasticsearch/index/fielddata/plain/BinaryDVAtomicFieldData.java

@@ -47,11 +47,6 @@ public class BinaryDVAtomicFieldData implements AtomicFieldData<ScriptDocValues.
         return false;
     }
 
-    @Override
-    public boolean isValuesOrdered() {
-        return true; // single-valued
-    }
-
     @Override
     public int getNumDocs() {
         return reader.maxDoc();

+ 3 - 6
src/main/java/org/elasticsearch/index/fielddata/plain/BytesBinaryDVAtomicFieldData.java

@@ -23,7 +23,9 @@ import org.apache.lucene.index.AtomicReader;
 import org.apache.lucene.index.BinaryDocValues;
 import org.apache.lucene.store.ByteArrayDataInput;
 import org.apache.lucene.util.BytesRef;
-import org.elasticsearch.index.fielddata.*;
+import org.elasticsearch.index.fielddata.AtomicFieldData;
+import org.elasticsearch.index.fielddata.BytesValues;
+import org.elasticsearch.index.fielddata.ScriptDocValues;
 
 final class BytesBinaryDVAtomicFieldData implements AtomicFieldData<ScriptDocValues> {
 
@@ -41,11 +43,6 @@ final class BytesBinaryDVAtomicFieldData implements AtomicFieldData<ScriptDocVal
         return true;
     }
 
-    @Override
-    public boolean isValuesOrdered() {
-        return false;
-    }
-
     @Override
     public int getNumDocs() {
         return reader.maxDoc();

+ 0 - 20
src/main/java/org/elasticsearch/index/fielddata/plain/DoubleArrayAtomicFieldData.java

@@ -72,11 +72,6 @@ public abstract class DoubleArrayAtomicFieldData extends AbstractAtomicNumericFi
             return false;
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return false;
-        }
-
         @Override
         public long getNumberUniqueValues() {
             return 0;
@@ -114,11 +109,6 @@ public abstract class DoubleArrayAtomicFieldData extends AbstractAtomicNumericFi
             return ordinals.isMultiValued();
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return true;
-        }
-
         @Override
         public long getNumberUniqueValues() {
             return ordinals.getNumOrds();
@@ -199,11 +189,6 @@ public abstract class DoubleArrayAtomicFieldData extends AbstractAtomicNumericFi
             return false;
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return false;
-        }
-
         @Override
         public long getNumberUniqueValues() {
             return numOrds;
@@ -297,11 +282,6 @@ public abstract class DoubleArrayAtomicFieldData extends AbstractAtomicNumericFi
             return false;
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return false;
-        }
-
         @Override
         public long getNumberUniqueValues() {
             return numOrds;

+ 0 - 10
src/main/java/org/elasticsearch/index/fielddata/plain/FSTBytesAtomicFieldData.java

@@ -74,11 +74,6 @@ public class FSTBytesAtomicFieldData implements AtomicFieldData.WithOrdinals<Scr
         return ordinals.getNumOrds();
     }
 
-    @Override
-    public boolean isValuesOrdered() {
-        return true;
-    }
-
     @Override
     public long getMemorySizeInBytes() {
         if (size == -1) {
@@ -199,11 +194,6 @@ public class FSTBytesAtomicFieldData implements AtomicFieldData.WithOrdinals<Scr
             return ordinals.getNumDocs();
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return true;
-        }
-
         @Override
         public BytesValues.WithOrdinals getBytesValues(boolean needsHashes) {
             return new EmptyByteValuesWithOrdinals(ordinals.ordinals());

+ 0 - 20
src/main/java/org/elasticsearch/index/fielddata/plain/FloatArrayAtomicFieldData.java

@@ -76,11 +76,6 @@ public abstract class FloatArrayAtomicFieldData extends AbstractAtomicNumericFie
             return 0;
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return false;
-        }
-
         @Override
         public long getMemorySizeInBytes() {
             return 0;
@@ -113,11 +108,6 @@ public abstract class FloatArrayAtomicFieldData extends AbstractAtomicNumericFie
             return ordinals.isMultiValued();
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return true;
-        }
-
         @Override
         public long getNumberUniqueValues() {
             return ordinals.getNumOrds();
@@ -195,11 +185,6 @@ public abstract class FloatArrayAtomicFieldData extends AbstractAtomicNumericFie
             return false;
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return false;
-        }
-
         @Override
         public long getNumberUniqueValues() {
             return numOrd;
@@ -295,11 +280,6 @@ public abstract class FloatArrayAtomicFieldData extends AbstractAtomicNumericFie
             return false;
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return false;
-        }
-
         @Override
         public long getNumberUniqueValues() {
             return numOrd;

+ 0 - 5
src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointBinaryDVAtomicFieldData.java

@@ -44,11 +44,6 @@ final class GeoPointBinaryDVAtomicFieldData extends AtomicGeoPointFieldData<Scri
         return false;
     }
 
-    @Override
-    public boolean isValuesOrdered() {
-        return false;
-    }
-
     @Override
     public int getNumDocs() {
         return reader.maxDoc();

+ 0 - 15
src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointCompressedAtomicFieldData.java

@@ -74,11 +74,6 @@ public abstract class GeoPointCompressedAtomicFieldData extends AtomicGeoPointFi
             return ordinals.isMultiValued();
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return true;
-        }
-
         @Override
         public long getNumberUniqueValues() {
             return ordinals.getNumOrds();
@@ -152,11 +147,6 @@ public abstract class GeoPointCompressedAtomicFieldData extends AtomicGeoPointFi
             return false;
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return false;
-        }
-
         @Override
         public long getNumberUniqueValues() {
             return numOrds;
@@ -227,11 +217,6 @@ public abstract class GeoPointCompressedAtomicFieldData extends AtomicGeoPointFi
             return false;
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return false;
-        }
-
         @Override
         public long getNumberUniqueValues() {
             return numOrds;

+ 0 - 15
src/main/java/org/elasticsearch/index/fielddata/plain/GeoPointDoubleArrayAtomicFieldData.java

@@ -70,11 +70,6 @@ public abstract class GeoPointDoubleArrayAtomicFieldData extends AtomicGeoPointF
             return ordinals.isMultiValued();
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return true;
-        }
-
         @Override
         public long getNumberUniqueValues() {
             return ordinals.getNumOrds();
@@ -144,11 +139,6 @@ public abstract class GeoPointDoubleArrayAtomicFieldData extends AtomicGeoPointF
             return false;
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return false;
-        }
-
         @Override
         public long getNumberUniqueValues() {
             return numOrds;
@@ -216,11 +206,6 @@ public abstract class GeoPointDoubleArrayAtomicFieldData extends AtomicGeoPointF
             return false;
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return false;
-        }
-
         @Override
         public long getNumberUniqueValues() {
             return numOrds;

+ 0 - 5
src/main/java/org/elasticsearch/index/fielddata/plain/NumericDVAtomicFieldData.java

@@ -52,11 +52,6 @@ public class NumericDVAtomicFieldData extends AbstractAtomicNumericFieldData {
         return false;
     }
 
-    @Override
-    public boolean isValuesOrdered() {
-        return true; // single-valued
-    }
-
     @Override
     public int getNumDocs() {
         return reader.maxDoc();

+ 0 - 20
src/main/java/org/elasticsearch/index/fielddata/plain/PackedArrayAtomicFieldData.java

@@ -73,11 +73,6 @@ public abstract class PackedArrayAtomicFieldData extends AbstractAtomicNumericFi
             return false;
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return false;
-        }
-
         @Override
         public long getMemorySizeInBytes() {
             return 0;
@@ -115,11 +110,6 @@ public abstract class PackedArrayAtomicFieldData extends AbstractAtomicNumericFi
             return ordinals.isMultiValued();
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return true;
-        }
-
         @Override
         public long getMemorySizeInBytes() {
             if (size == -1) {
@@ -202,11 +192,6 @@ public abstract class PackedArrayAtomicFieldData extends AbstractAtomicNumericFi
             return false;
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return false;
-        }
-
         @Override
         public long getNumberUniqueValues() {
             return numOrds;
@@ -306,11 +291,6 @@ public abstract class PackedArrayAtomicFieldData extends AbstractAtomicNumericFi
             return false;
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return false;
-        }
-
         @Override
         public long getNumberUniqueValues() {
             return numOrds;

+ 0 - 10
src/main/java/org/elasticsearch/index/fielddata/plain/PagedBytesAtomicFieldData.java

@@ -74,11 +74,6 @@ public class PagedBytesAtomicFieldData implements AtomicFieldData.WithOrdinals<S
         return ordinals.getNumOrds();
     }
 
-    @Override
-    public boolean isValuesOrdered() {
-        return true;
-    }
-
     @Override
     public long getMemorySizeInBytes() {
         if (size == -1) {
@@ -209,11 +204,6 @@ public class PagedBytesAtomicFieldData implements AtomicFieldData.WithOrdinals<S
             return 0;
         }
 
-        @Override
-        public boolean isValuesOrdered() {
-            return true;
-        }
-
         @Override
         public BytesValues.WithOrdinals getBytesValues(boolean needsHashes) {
             return new EmptyByteValuesWithOrdinals(ordinals.ordinals());

+ 0 - 5
src/main/java/org/elasticsearch/index/fielddata/plain/ParentChildAtomicFieldData.java

@@ -55,11 +55,6 @@ public class ParentChildAtomicFieldData implements AtomicFieldData {
         return true;
     }
 
-    @Override
-    public boolean isValuesOrdered() {
-        return true;
-    }
-
     @Override
     public int getNumDocs() {
         return numDocs;

+ 0 - 5
src/main/java/org/elasticsearch/index/fielddata/plain/SortedSetDVBytesAtomicFieldData.java

@@ -37,11 +37,6 @@ public final class SortedSetDVBytesAtomicFieldData extends SortedSetDVAtomicFiel
         super(reader, field);
     }
 
-    @Override
-    public boolean isValuesOrdered() {
-        return true;
-    }
-
     @Override
     public Strings getScriptValues() {
         return new ScriptDocValues.Strings(getBytesValues(false));