Skip to content

Commit

Permalink
Dependencies: Update elasticsearch, ... from 8.7.1 to 8.8.0 (#518)
Browse files Browse the repository at this point in the history
Co-authored-by: alexklibisz-scala-steward[bot] <125160947+alexklibisz-scala-steward[bot]@users.noreply.github.com>
Co-authored-by: Alex Klibisz <[email protected]>
  • Loading branch information
1 parent cba5b9c commit 054dd9b
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 10 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import ElasticsearchPluginPlugin.autoImport._
Global / scalaVersion := "2.13.10"

lazy val CirceVersion = "0.14.3"
lazy val ElasticsearchVersion = "8.7.1"
lazy val ElasticsearchVersion = "8.8.0"
lazy val Elastic4sVersion = "8.7.0"
lazy val ElastiknnVersion = IO.read(file("version")).strip()
lazy val LuceneVersion = "9.4.2"
lazy val LuceneVersion = "9.6.0"

lazy val ScalacOptions = List("-Xfatal-warnings", "-Ywarn-unused:imports")
lazy val TestSettings = Seq(
Expand Down
2 changes: 1 addition & 1 deletion client-python/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
elasticsearch==8.7.0
elasticsearch==8.8.0
dataclasses-json==0.3.7
tqdm==4.61.1
scipy==1.7.0
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM docker.elastic.co/elasticsearch/elasticsearch:8.7.1-amd64
FROM docker.elastic.co/elasticsearch/elasticsearch:8.8.0
COPY elastiknn-plugin/target/elastiknn*.zip .
RUN elasticsearch-plugin install -b file:$(ls elastiknn*zip | sort | tail -n1)
4 changes: 2 additions & 2 deletions docs/pages/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ Make a Dockerfile like below.
The image version (`elasticsearch:A.B.C`) must match the plugin's version (e.g. `A.B.C.x/elastiknn-A.B.C.x`).

```docker
FROM docker.elastic.co/elasticsearch/elasticsearch:8.7.1
RUN elasticsearch-plugin install --batch https://github.com/alexklibisz/elastiknn/releases/download/8.7.1.0/elastiknn-8.7.1.0.zip
FROM docker.elastic.co/elasticsearch/elasticsearch:8.8.0
RUN elasticsearch-plugin install --batch https://github.com/alexklibisz/elastiknn/releases/download/8.8.0.0/elastiknn-8.8.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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ class VectorMapperSuite extends AsyncFreeSpec with Matchers with Elastic4sMatche
}
}
exceptions <- Future.sequence(indexReqs)
} yield exceptions.map(_.getMessage shouldBe "mapper_parsing_exception failed to parse").last
} yield exceptions.map(_.getMessage should endWith("Expected dimension 100 but got 101")).last
}

// https://github.com/alexklibisz/elastiknn/issues/177
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import org.apache.lucene.search.{Query, TermQuery}
import org.apache.lucene.util.BytesRef
import org.elasticsearch.index.mapper.{Mapping => _, _}
import org.elasticsearch.index.query.SearchExecutionContext
import org.elasticsearch.search.fetch.StoredFieldsSpec
import org.elasticsearch.search.lookup.Source
import org.elasticsearch.xcontent.{ToXContent, XContentBuilder}

Expand Down Expand Up @@ -79,8 +80,10 @@ object VectorMapper {
}
}
override def valueFetcher(context: SearchExecutionContext, format: String): ValueFetcher = {
// TODO: figure out what this is supposed to return. Also see issue #250.
(source: Source, doc: Int, ignoredValues: util.List[AnyRef]) => util.List.of()
new ValueFetcher {
override def fetchValues(source: Source, doc: Int, ignoredValues: util.List[AnyRef]): util.List[AnyRef] = util.List.of()
override def storedFieldsSpec(): StoredFieldsSpec = StoredFieldsSpec.NO_REQUIREMENTS
}
}
}
}
Expand Down
1 change: 1 addition & 0 deletions project/ElasticsearchPluginPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ object ElasticsearchPluginPlugin extends AutoPlugin {
override lazy val projectSettings: Seq[Def.Setting[_]] = List(
libraryDependencies ++= Seq(
"org.elasticsearch" % "elasticsearch" % elasticsearchVersion.value
exclude("org.elasticsearch", "elasticsearch-preallocate") // https://github.com/elastic/elasticsearch/issues/96360
),
cleanFiles ++= Seq(
elasticsearchPluginDistributionDirectory.value,
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.7.1.0
8.8.0.0

0 comments on commit 054dd9b

Please sign in to comment.