Dependencies: Upgrade Elasticsearch to 7.14.0, Lucene to 8.9.0 (#304)

alexklibisz · Aug 26, 2021 · ffd617a · ffd617a
1 parent 1d3eac7
commit ffd617a
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 55 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 buildscript {
     ext {
-        esVersion = '7.13.3'
-        luceneVersion = '8.8.2'
+        esVersion = '7.14.0'
+        luceneVersion = '8.9.0'
         circeVersion= '0.14.0-M4'
         circeGenericExtrasVersion= '0.13.1-M4'
         scalaShortVersion = '2.12'

diff --git a/client-python/requirements.txt b/client-python/requirements.txt
@@ -1,4 +1,4 @@
-elasticsearch==7.13.3
+elasticsearch==7.14.0
 dataclasses-json==0.3.7
 tqdm==4.61.1
 scipy==1.7.0
diff --git a/docs/pages/installation.md b/docs/pages/installation.md
@@ -31,7 +31,7 @@ Make a Dockerfile like below. The image version (`elasticsearch:A.B.C`) must mat
 
 ```docker
 FROM docker.elastic.co/elasticsearch/elasticsearch:7.13.3
-RUN elasticsearch-plugin install --batch https://github.com/alexklibisz/elastiknn/releases/download/7.13.3.2/elastiknn-7.13.3.2.zip
+RUN elasticsearch-plugin install --batch https://github.com/alexklibisz/elastiknn/releases/download/7.14.0.0/elastiknn-7.14.0.0.zip
 ```
 
 Build and run the Dockerfile. If you have any issues please refer to the [official docs.](https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html)

diff --git a/elastiknn-plugin/Dockerfile b/elastiknn-plugin/Dockerfile
@@ -1,3 +1,3 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:7.13.3-amd64
+FROM docker.elastic.co/elasticsearch/elasticsearch:7.14.0-amd64
 COPY build/distributions/*.zip .
 RUN elasticsearch-plugin install -b file:$(ls elastiknn*zip | sort | tail -n1)
diff --git a/elastiknn-plugin/src/main/scala/com/klibisz/elastiknn/ElastiknnPlugin.scala b/elastiknn-plugin/src/main/scala/com/klibisz/elastiknn/ElastiknnPlugin.scala
@@ -63,7 +63,6 @@ class ElastiknnPlugin(settings: Settings) extends Plugin with SearchPlugin with
               config.getGlobalCheckpointSupplier,
               config.retentionLeasesSupplier,
               config.getPrimaryTermSupplier,
-              config.getTombstoneDocSupplier,
               config.getSnapshotCommitSupplier
             )
           )

diff --git a/elastiknn-plugin/src/main/scala/com/klibisz/elastiknn/mapper/VectorMapper.scala b/elastiknn-plugin/src/main/scala/com/klibisz/elastiknn/mapper/VectorMapper.scala
@@ -14,7 +14,6 @@ import org.apache.lucene.search.{Query, TermQuery}
 import org.apache.lucene.util.BytesRef
 import org.elasticsearch.common.xcontent.XContentParser.Token
 import org.elasticsearch.common.xcontent.{ToXContent, XContentBuilder}
-import org.elasticsearch.index.mapper.Mapper.TypeParser
 import org.elasticsearch.index.mapper._
 import org.elasticsearch.index.query.SearchExecutionContext
 import org.elasticsearch.search.lookup.SourceLookup
@@ -103,7 +102,7 @@ abstract class VectorMapper[V <: Vec: ElasticsearchCodec] { self =>
   import com.klibisz.elastiknn.utils.CirceUtils._
 
   class TypeParser extends Mapper.TypeParser {
-    override def parse(name: String, node: JavaJsonMap, parserContext: TypeParser.ParserContext): Mapper.Builder = {
+    override def parse(name: String, node: JavaJsonMap, parserContext: MappingParserContext): Mapper.Builder = {
       val mapping: Mapping = ElasticsearchCodec.decodeJsonGet[Mapping](node.asJson)
       val builder: Builder = new Builder(name, mapping)
       // TypeParsers.parseField(builder, name, node, parserContext)

diff --git a/elastiknn-plugin/src/test/java/com/klibisz/elastiknn/ElastiKnnJavaClusterIT.java b/elastiknn-plugin/src/test/java/com/klibisz/elastiknn/ElastiKnnJavaClusterIT.java
diff --git a/elastiknn-plugin/src/test/java/com/klibisz/elastiknn/ElastiKnnRestIT.java b/elastiknn-plugin/src/test/java/com/klibisz/elastiknn/ElastiKnnRestIT.java
diff --git a/version b/version
@@ -1 +1 @@
-7.13.3.2
+7.14.0.0