Remove ScriptDocValues.EMPTY.

Instead the default implementation is used, but on top of empty (Bytes|Long|Double|GeoPoint)Values. This makes sure there is no inconsistency between documents depending on whether other documents in the segment have values or not. Close elastic#5646
jpountz · Apr 1, 2014 · 47cef2e · 47cef2e
1 parent 268f2c3
commit 47cef2e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 23 deletions.
diff --git a/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java b/src/main/java/org/elasticsearch/index/fielddata/ScriptDocValues.java
@@ -29,7 +29,6 @@
 import org.joda.time.DateTimeZone;
 import org.joda.time.MutableDateTime;
 
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -38,7 +37,9 @@
  */
 public abstract class ScriptDocValues {
 
-    public static final ScriptDocValues EMPTY = new Empty();
+    public static final Longs EMPTY_LONGS = new Longs(LongValues.EMPTY);
+    public static final Doubles EMPTY_DOUBLES = new Doubles(DoubleValues.EMPTY);
+    public static final GeoPoints EMPTY_GEOPOINTS = new GeoPoints(GeoPointValues.EMPTY);
     public static final Strings EMPTY_STRINGS = new Strings(BytesValues.EMPTY);
     protected int docId;
     protected boolean listLoaded = false;
@@ -52,23 +53,6 @@ public void setNextDocId(int docId) {
 
     public abstract List<?> getValues();
 
-    public static class Empty extends ScriptDocValues {
-        @Override
-        public void setNextDocId(int docId) {
-        }
-
-        @Override
-        public boolean isEmpty() {
-            return true;
-        }
-
-        @Override
-        public List<?> getValues() {
-            return Collections.emptyList();
-        }
-
-    }
-
     public final static class Strings extends ScriptDocValues {
 
         private final BytesValues values;

diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractGeoPointIndexFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/AbstractGeoPointIndexFieldData.java
@@ -76,7 +76,7 @@ public GeoPointValues getGeoPointValues() {
 
         @Override
         public ScriptDocValues getScriptValues() {
-            return ScriptDocValues.EMPTY;
+            return ScriptDocValues.EMPTY_GEOPOINTS;
         }
 
         @Override

diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/DoubleArrayAtomicFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/DoubleArrayAtomicFieldData.java
@@ -94,7 +94,7 @@ public BytesValues getBytesValues(boolean needsHashes) {
 
         @Override
         public ScriptDocValues getScriptValues() {
-            return ScriptDocValues.EMPTY;
+            return ScriptDocValues.EMPTY_DOUBLES;
         }
     }
 

diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/FloatArrayAtomicFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/FloatArrayAtomicFieldData.java
@@ -93,7 +93,7 @@ public BytesValues getBytesValues(boolean needsHashes) {
 
         @Override
         public ScriptDocValues getScriptValues() {
-            return ScriptDocValues.EMPTY;
+            return ScriptDocValues.EMPTY_DOUBLES;
         }
     }
 

diff --git a/src/main/java/org/elasticsearch/index/fielddata/plain/PackedArrayAtomicFieldData.java b/src/main/java/org/elasticsearch/index/fielddata/plain/PackedArrayAtomicFieldData.java
@@ -95,7 +95,7 @@ public BytesValues getBytesValues(boolean needsHashes) {
 
         @Override
         public ScriptDocValues getScriptValues() {
-            return ScriptDocValues.EMPTY;
+            return ScriptDocValues.EMPTY_LONGS;
         }
     }