Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.sksamuel.elastic4s.requests.update

import com.sksamuel.elastic4s.handlers.update.UpdateHandlers
import com.sksamuel.elastic4s.requests.common.Preference.Shards
import com.sksamuel.elastic4s.requests.searches.queries.matches.MatchAllQuery
import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers

class UpdateByQueryHandlerTest extends AnyFlatSpec with Matchers with UpdateHandlers {

it should "build preference parameter with ShardsPreferenceRequest" in {
val request = UpdateByQueryAsyncRequest(
indexes = "test_index",
query = MatchAllQuery()
).preference(Shards(List("0", "1", "2", "3")))

val elasticRequest = AsyncUpdateByQueryHandler.build(request)

elasticRequest.params should contain("preference" -> "_shards:0,1,2,3")
}

it should "not include preference parameter when shards is None" in {
val request = UpdateByQueryAsyncRequest(
indexes = "test_index",
query = MatchAllQuery()
)

val elasticRequest = AsyncUpdateByQueryHandler.build(request)

elasticRequest.params should not contain key("preference")
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ package com.sksamuel.elastic4s.requests.update
import com.sksamuel.elastic4s.Indexes
import com.sksamuel.elastic4s.ext.OptionImplicits._
import com.sksamuel.elastic4s.requests.admin.IndicesOptionsRequest
import com.sksamuel.elastic4s.requests.common.{RefreshPolicy, Slice, Slicing}
import com.sksamuel.elastic4s.requests.common.{Preference, RefreshPolicy, Slice, Slicing}
import com.sksamuel.elastic4s.requests.script.Script
import com.sksamuel.elastic4s.requests.searches.queries.Query

import scala.concurrent.duration.FiniteDuration

case class UpdateByQueryAsyncRequest(
Expand All @@ -27,7 +28,8 @@ case class UpdateByQueryAsyncRequest(
shouldStoreResult: Option[Boolean] = None,
size: Option[Int] = None,
indicesOptions: Option[IndicesOptionsRequest] = None,
routing: Option[String] = None
routing: Option[String] = None,
preference: Option[String] = None
) extends BaseUpdateByQueryRequest {

def proceedOnConflicts(proceedOnConflicts: Boolean): UpdateByQueryAsyncRequest =
Expand Down Expand Up @@ -73,5 +75,8 @@ case class UpdateByQueryAsyncRequest(

def indicesOptions(options: IndicesOptionsRequest): UpdateByQueryAsyncRequest = copy(indicesOptions = options.some)

def preference(pref: Preference): UpdateByQueryAsyncRequest = preference(pref.value)
def preference(pref: String): UpdateByQueryAsyncRequest = copy(preference = pref.some)

override val waitForCompletion: Option[Boolean] = Some(false)
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.sksamuel.elastic4s.requests.update

import com.sksamuel.elastic4s.Indexes
import com.sksamuel.elastic4s.requests.common.{RefreshPolicy, Slice, Slicing}
import com.sksamuel.elastic4s.requests.common.{Preference, RefreshPolicy, Slice, Slicing}
import com.sksamuel.elastic4s.requests.script.Script
import com.sksamuel.elastic4s.requests.searches.queries.Query
import com.sksamuel.elastic4s.ext.OptionImplicits._
Expand Down Expand Up @@ -49,6 +49,8 @@ trait BaseUpdateByQueryRequest {
val indicesOptions: Option[IndicesOptionsRequest]

val routing: Option[String]

val preference: Option[String]
}
case class UpdateByQueryRequest(
indexes: Indexes,
Expand All @@ -71,7 +73,8 @@ case class UpdateByQueryRequest(
shouldStoreResult: Option[Boolean] = None,
size: Option[Int] = None,
indicesOptions: Option[IndicesOptionsRequest] = None,
routing: Option[String] = None
routing: Option[String] = None,
preference: Option[String] = None
) extends BaseUpdateByQueryRequest {

def proceedOnConflicts(proceedOnConflicts: Boolean): UpdateByQueryRequest =
Expand Down Expand Up @@ -119,4 +122,7 @@ case class UpdateByQueryRequest(
copy(shouldStoreResult = shouldStoreResult.some)

def indicesOptions(options: IndicesOptionsRequest): UpdateByQueryRequest = copy(indicesOptions = options.some)

def preference(pref: Preference): UpdateByQueryRequest = preference(pref.value)
def preference(pref: String): UpdateByQueryRequest = copy(preference = pref.some)
}
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ trait UpdateHandlers {
request.slices.foreach(s =>
if (s == Slicing.AutoSlices) params.put("slices", Slicing.AutoSlicesValue) else params.put("slices", s)
)
request.preference.foreach(params.put("preference", _))

request.indicesOptions.foreach { opts =>
IndicesOptionsParams(opts).foreach { case (key, value) => params.put(key, value) }
Expand Down