Supporting Elasticsearch version 5.6.0

Author: Lior Knaany

README.md

@@ -10,8 +10,10 @@ give it a try.
 
 
 ## Elasticsearch version
-* Currently designed for elasticsearch 5.2.2. stay tuned for ES 5.5
-  
+* Currently designed for Elasticsearch 5.6.0.
+* for Elasticsearch 5.2.2 use branch `es-5.2.2`
+* for Elasticsearch 2.4.4 use branch `es-2.4.4`
+
 
 ## Maven configuration
 * Clone the project

pom.xml

@@ -7,7 +7,7 @@
     <name>elasticsearch-binary-vector-scoring</name>
     <groupId>com.liorkn.elasticsearch</groupId>
     <artifactId>elasticsearch-binary-vector-scoring</artifactId>
-    <version>5.2.2</version>
+    <version>5.6.0</version>
     <description>ElasticSearch Plugin for Binary Vector Scoring</description>
 
     <licenses>
@@ -27,7 +27,7 @@
         <elasticsearch.license.headerDefinition>${project.basedir}/src/main/resources/license-check/license_header_definition.xml</elasticsearch.license.headerDefinition>
 
         <tests.ifNoTests>warn</tests.ifNoTests>
-		<elasticsearch.version>5.2.2</elasticsearch.version>
+		<elasticsearch.version>5.6.0</elasticsearch.version>
     </properties>
 
 

src/main/java/com/liorkn/elasticsearch/plugin/VectorScoringPlugin.java

@@ -13,16 +13,11 @@
  */
 package com.liorkn.elasticsearch.plugin;
 
-import com.liorkn.elasticsearch.script.VectorScoreScript;
 import com.liorkn.elasticsearch.service.VectorScoringScriptEngineService;
 
-import java.util.Collections;
-import java.util.List;
-
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.plugins.ScriptPlugin;
-import org.elasticsearch.script.NativeScriptFactory;
 import org.elasticsearch.script.ScriptEngineService;
 
 /**
@@ -31,14 +26,8 @@
  * src/main/resources/es-plugin.properties file that points to this class.
  */
 public final class VectorScoringPlugin extends Plugin implements ScriptPlugin {
-	
-	@Override
-    public List<NativeScriptFactory> getNativeScripts() {
-        return Collections.singletonList(new VectorScoreScript.Factory());
-    }
-	
-	@Override
-	public ScriptEngineService getScriptEngineService(Settings settings) {
+
+    public final ScriptEngineService getScriptEngineService(Settings settings) {
         return new VectorScoringScriptEngineService(settings);
     }
 }

src/main/java/com/liorkn/elasticsearch/script/VectorScoreScript.java

@@ -14,14 +14,12 @@
 
 package com.liorkn.elasticsearch.script;
 
-import com.liorkn.elasticsearch.plugin.VectorScoringPlugin;
 import org.apache.lucene.index.BinaryDocValues;
 import org.apache.lucene.search.Scorer;
 import org.apache.lucene.store.ByteArrayDataInput;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.script.ExecutableScript;
 import org.elasticsearch.script.LeafSearchScript;
-import org.elasticsearch.script.NativeScriptFactory;
 import org.elasticsearch.script.ScriptException;
 
 import java.nio.ByteBuffer;
@@ -87,7 +85,7 @@ public void setBinaryEmbeddingReader(BinaryDocValues binaryEmbeddingReader) {
      * {@link VectorScoringPlugin#onModule(org.elasticsearch.script.ScriptModule)}
      * method when the plugin is loaded.
      */
-    public static class Factory implements NativeScriptFactory {
+    public static class Factory {
 
         /**
          * This method is called for every search on every shard.
@@ -96,7 +94,6 @@ public static class Factory implements NativeScriptFactory {
          *            list of script parameters passed with the query
          * @return new native script
          */
-        @Override
         public ExecutableScript newScript(@Nullable Map<String, Object> params) throws ScriptException {
             return new VectorScoreScript(params);
         }
@@ -106,24 +103,19 @@ public ExecutableScript newScript(@Nullable Map<String, Object> params) throws S
          *
          * @return {@code true} if scores are needed.
          */
-        @Override
         public boolean needsScores() {
             return false;
         }
-        
-        @Override
-        public String getName() {
-            return SCRIPT_NAME;
-        }
+
     }
-    
+
 
     /**
      * Init
      * @param params index that a scored are placed in this parameter. Initialize them here.
      */
     @SuppressWarnings("unchecked")
-    public VectorScoreScript(Map<String, Object> params) throws ScriptException {
+    public VectorScoreScript(Map<String, Object> params) {
         final Object cosineBool = params.get("cosine");
         cosine = cosineBool != null ?
                 (boolean)cosineBool :

src/main/java/com/liorkn/elasticsearch/service/VectorScoringScriptEngineService.java

@@ -9,7 +9,6 @@
 import org.elasticsearch.script.CompiledScript;
 import org.elasticsearch.script.ExecutableScript;
 import org.elasticsearch.script.LeafSearchScript;
-import org.elasticsearch.script.NativeScriptFactory;
 import org.elasticsearch.script.ScriptEngineService;
 import org.elasticsearch.script.SearchScript;
 import org.elasticsearch.search.lookup.SearchLookup;
@@ -30,29 +29,35 @@ public VectorScoringScriptEngineService(Settings settings) {
     }
 
     @Override
-    public String getType() {
-        return NAME;
+    public Object compile(String scriptName, String scriptSource, Map<String, String> params) {
+        return new VectorScoreScript.Factory();
     }
 
+
     @Override
-    public String getExtension() {
+    public boolean isInlineScriptEnabled() {
+        return true;
+    }
+
+    @Override
+    public String getType() {
         return NAME;
     }
 
     @Override
-    public Object compile(String script, String source, Map<String, String> params) {
-    		return new VectorScoreScript.Factory();
+    public String getExtension() {
+        return NAME;
     }
 
     @Override
     public ExecutableScript executable(CompiledScript compiledScript, @Nullable Map<String, Object> vars) {
-        NativeScriptFactory scriptFactory = (NativeScriptFactory) compiledScript.compiled();
+        VectorScoreScript.Factory scriptFactory = (VectorScoreScript.Factory) compiledScript.compiled();
         return scriptFactory.newScript(vars);
     }
 
     @Override
     public SearchScript search(CompiledScript compiledScript, final SearchLookup lookup, @Nullable final Map<String, Object> vars) {
-        final NativeScriptFactory scriptFactory = (NativeScriptFactory) compiledScript.compiled();
+        final VectorScoreScript.Factory scriptFactory = (VectorScoreScript.Factory) compiledScript.compiled();
         final VectorScoreScript script = (VectorScoreScript) scriptFactory.newScript(vars);
         return new SearchScript() {
             @Override