Upgrade to elasticsearch 1.4.0

imotov · imotov · commit 1254c4837de6 · 2014-11-09T20:56:01.000-10:00
Fixes elastic#8
diff --git a/pom.xml b/pom.xml
@@ -38,8 +38,8 @@
     <!-- The Elasticsearch version that the project will be built with -->
     <!-- ============================================================= -->
     <properties>
-        <elasticsearch.version>1.3.4</elasticsearch.version>
-        <lucene.version>4.9.1</lucene.version>
+        <elasticsearch.version>1.4.0</elasticsearch.version>
+        <lucene.version>4.10.2</lucene.version>
     </properties>
 
     <!-- ============================================================= -->
@@ -91,7 +91,13 @@
             <version>1.3</version>
             <scope>test</scope>
         </dependency>
-        
+
+        <dependency>
+            <groupId>com.carrotsearch.randomizedtesting</groupId>
+            <artifactId>randomizedtesting-runner</artifactId>
+            <version>2.1.10</version>
+            <scope>test</scope>
+        </dependency>
            
     </dependencies>
 
diff --git a/src/main/java/org/elasticsearch/examples/nativescript/script/CosineSimilarityScoreScript.java b/src/main/java/org/elasticsearch/examples/nativescript/script/CosineSimilarityScoreScript.java
@@ -4,6 +4,7 @@
 import java.util.ArrayList;
 import java.util.Map;
 
+import org.apache.lucene.search.Scorer;
 import org.elasticsearch.script.ScriptException;
 
 import org.elasticsearch.common.Nullable;
@@ -32,6 +33,11 @@ public class CosineSimilarityScoreScript extends AbstractSearchScript {
 
     final static public String SCRIPT_NAME = "cosine_sim_script_score";
 
+    @Override
+    public void setScorer(Scorer scorer) {
+        // ignore
+    }
+
     /**
      * Factory that is registered in
      * {@link org.elasticsearch.examples.nativescript.plugin.NativeScriptExamplesPlugin#onModule(org.elasticsearch.script.ScriptModule)}
diff --git a/src/main/java/org/elasticsearch/examples/nativescript/script/LanguageModelScoreScript.java b/src/main/java/org/elasticsearch/examples/nativescript/script/LanguageModelScoreScript.java
@@ -4,6 +4,7 @@
 import java.util.ArrayList;
 import java.util.Map;
 
+import org.apache.lucene.search.Scorer;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.index.fielddata.ScriptDocValues;
 import org.elasticsearch.script.AbstractSearchScript;
@@ -34,6 +35,11 @@ public class LanguageModelScoreScript extends AbstractSearchScript {
 
     final static public String SCRIPT_NAME = "language_model_script_score";
 
+    @Override
+    public void setScorer(Scorer scorer) {
+        // ignore
+    }
+
     /**
      * Factory that is registered in
      * {@link org.elasticsearch.examples.nativescript.plugin.NativeScriptExamplesPlugin#onModule(org.elasticsearch.script.ScriptModule)}
diff --git a/src/main/java/org/elasticsearch/examples/nativescript/script/PhraseScoreScript.java b/src/main/java/org/elasticsearch/examples/nativescript/script/PhraseScoreScript.java
@@ -4,6 +4,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import org.apache.lucene.search.Scorer;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.script.AbstractSearchScript;
 import org.elasticsearch.script.ExecutableScript;
@@ -29,6 +30,11 @@ public class PhraseScoreScript extends AbstractSearchScript {
 
     final static public String SCRIPT_NAME = "phrase_script_score";
 
+    @Override
+    public void setScorer(Scorer scorer) {
+        // ignore
+    }
+
     /**
      * Factory that is registered in
      * {@link org.elasticsearch.examples.nativescript.plugin.NativeScriptExamplesPlugin#onModule(org.elasticsearch.script.ScriptModule)}
diff --git a/src/main/java/org/elasticsearch/examples/nativescript/script/PopularityScoreScriptFactory.java b/src/main/java/org/elasticsearch/examples/nativescript/script/PopularityScoreScriptFactory.java
@@ -1,5 +1,6 @@
 package org.elasticsearch.examples.nativescript.script;
 
+import org.apache.lucene.search.Scorer;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.xcontent.support.XContentMapValues;
 import org.elasticsearch.index.fielddata.ScriptDocValues;
@@ -8,6 +9,7 @@
 import org.elasticsearch.script.NativeScriptFactory;
 import org.elasticsearch.script.ScriptException;
 
+import java.io.IOException;
 import java.util.Map;
 
 /**
@@ -36,21 +38,33 @@ private static class PopularityScoreScript extends AbstractFloatSearchScript {
 
         private final String field;
 
+        private Scorer scorer;
+
         public PopularityScoreScript(String field) {
             this.field = field;
         }
 
+        @Override
+        public void setScorer(Scorer scorer) {
+            this.scorer = scorer;
+        }
+
         @Override
         public float runAsFloat() {
-            ScriptDocValues docValue = (ScriptDocValues) doc().get(field);
-            if (docValue != null && !docValue.isEmpty()) {
-                ScriptDocValues.Longs fieldData = (ScriptDocValues.Longs) docValue;
-                double boost = 1 + Math.log10(fieldData.getValue() + 1);
-                // Because this script is used in custom_score script the value of score() is populated.
-                // In all other cases doc().getScore() should be used instead.
-                return (float) boost * score();
+            try {
+                ScriptDocValues docValue = (ScriptDocValues) doc().get(field);
+                if (docValue != null && !docValue.isEmpty()) {
+                    ScriptDocValues.Longs fieldData = (ScriptDocValues.Longs) docValue;
+                    double boost = 1 + Math.log10(fieldData.getValue() + 1);
+                    // Because this script is used in custom_score script the value of score() is populated.
+                    // In all other cases doc().getScore() should be used instead.
+                    return (float) boost * scorer.score();
+
+                }
+                return scorer.score();
+            } catch (IOException ex) {
+                return 0.0f;
             }
-            return score();
         }
     }
 }
diff --git a/src/main/java/org/elasticsearch/examples/nativescript/script/RandomSortScriptFactory.java b/src/main/java/org/elasticsearch/examples/nativescript/script/RandomSortScriptFactory.java
@@ -1,5 +1,6 @@
 package org.elasticsearch.examples.nativescript.script;
 
+import org.apache.lucene.search.Scorer;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.common.xcontent.support.XContentMapValues;
 import org.elasticsearch.index.fielddata.ScriptDocValues;
@@ -50,6 +51,11 @@ private RandomSortScript() {
         public long runAsLong() {
             return random.nextLong();
         }
+
+        @Override
+        public void setScorer(Scorer scorer) {
+            // we are not using it - ignore
+        }
     }
 
     private static class PseudoRandomSortScript extends AbstractLongSearchScript {
@@ -79,5 +85,10 @@ public long runAsLong() {
                 return -1;
             }
         }
+
+        @Override
+        public void setScorer(Scorer scorer) {
+            // we are not using it - ignore
+        }
     }
 }
diff --git a/src/main/java/org/elasticsearch/examples/nativescript/script/TFIDFScoreScript.java b/src/main/java/org/elasticsearch/examples/nativescript/script/TFIDFScoreScript.java
@@ -4,6 +4,7 @@
 import java.util.ArrayList;
 import java.util.Map;
 
+import org.apache.lucene.search.Scorer;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.script.AbstractSearchScript;
 import org.elasticsearch.script.ExecutableScript;
@@ -28,6 +29,11 @@ public class TFIDFScoreScript extends AbstractSearchScript {
 
     final static public String SCRIPT_NAME = "tfidf_script_score";
 
+    @Override
+    public void setScorer(Scorer scorer) {
+        // ignore
+    }
+
     /**
      * Factory that is registered in
      * {@link org.elasticsearch.examples.nativescript.plugin.NativeScriptExamplesPlugin#onModule(org.elasticsearch.script.ScriptModule)}
diff --git a/src/test/java/org/elasticsearch/examples/nativescript/script/AbstractSearchScriptTests.java b/src/test/java/org/elasticsearch/examples/nativescript/script/AbstractSearchScriptTests.java
@@ -13,7 +13,7 @@
 /**
  */
 @ClusterScope(scope = Scope.SUITE, numDataNodes = 1)
-public class AbstractSearchScriptTests extends ElasticsearchIntegrationTest {
+public abstract class AbstractSearchScriptTests extends ElasticsearchIntegrationTest {
 
     @Override
     public Settings indexSettings() {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package org.elasticsearch.examples.nativescript.script;`
`2`	`2`
	`3`	`+import org.apache.lucene.search.Scorer;`
`3`	`4`	`import org.elasticsearch.common.Nullable;`
`4`	`5`	`import org.elasticsearch.common.xcontent.support.XContentMapValues;`
`5`	`6`	`import org.elasticsearch.index.fielddata.ScriptDocValues;`
`@@ -50,6 +51,11 @@ private RandomSortScript() {`
`50`	`51`	`public long runAsLong() {`
`51`	`52`	`return random.nextLong();`
`52`	`53`	`}`
	`54`	`+`
	`55`	`+ @Override`
	`56`	`+ public void setScorer(Scorer scorer) {`
	`57`	`+ // we are not using it - ignore`
	`58`	`+ }`
`53`	`59`	`}`
`54`	`60`
`55`	`61`	`private static class PseudoRandomSortScript extends AbstractLongSearchScript {`
`@@ -79,5 +85,10 @@ public long runAsLong() {`
`79`	`85`	`return -1;`
`80`	`86`	`}`
`81`	`87`	`}`
	`88`	`+`
	`89`	`+ @Override`
	`90`	`+ public void setScorer(Scorer scorer) {`
	`91`	`+ // we are not using it - ignore`
	`92`	`+ }`
`82`	`93`	`}`
`83`	`94`	`}`