Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change refreshInterval to Duration type #100

Merged
merged 1 commit into from
Jan 9, 2024
Merged

change refreshInterval to Duration type #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ client.createIndex(indexName) {
settings {
replicas = 0
shards = 3
refreshInterval = "10s"
refreshInterval = 10.seconds
}
mappings(dynamicEnabled = false) {
text(TestDocument::name)
Expand Down
3 changes: 2 additions & 1 deletion docs/src/test/kotlin/documentation/manual/bulk/indexmanagement/index-management.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import documentation.manual.ManualPages
import documentation.mdLink
import documentation.sourceGitRepository
import kotlinx.coroutines.runBlocking
import kotlin.time.Duration.Companion.seconds

val indexManagementMd = sourceGitRepository.md {
val client = SearchClient(KtorRestClient(Node("localhost", 9999)))
Expand Down Expand Up @@ -54,7 +55,7 @@ val indexManagementMd = sourceGitRepository.md {
settings {
replicas = 1
shards = 3
refreshInterval = "10s"
refreshInterval = 10.seconds

analysis {
filter("2_5_edgengrams") {
Expand Down
5 changes: 2 additions & 3 deletions docs/src/test/kotlin/documentation/projectreadme/readme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

package documentation.projectreadme

import com.jillesvangurp.kotlin4example.ExampleOutput
import com.jillesvangurp.kotlin4example.Kotlin4Example
import com.jillesvangurp.ktsearch.*
import com.jillesvangurp.searchdsls.querydsl.*
import documentation.githubLink
Expand All @@ -13,6 +11,7 @@ import documentation.printStdOut
import documentation.sourceGitRepository
import kotlinx.coroutines.runBlocking
import kotlinx.serialization.Serializable
import kotlin.time.Duration.Companion.seconds

val projectReadme = sourceGitRepository.md {
+"""
Expand Down Expand Up @@ -103,7 +102,7 @@ val projectReadme = sourceGitRepository.md {
settings {
replicas = 0
shards = 3
refreshInterval = "10s"
refreshInterval = 10.seconds
}
mappings(dynamicEnabled = false) {
text(TestDocument::name)
Expand Down
4 changes: 2 additions & 2 deletions search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/reindex-api.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ suspend fun SearchClient.reindex(
return restClient.post {
path("_reindex")
parameter("refresh", refresh)
parameter("timeout", timeout.toElasticsearchTimeUnit())
parameter("timeout", timeout)
parameter("wait_for_active_shards", waitForActiveShards)
parameter("wait_for_completion", waitForCompletion)
parameter("requests_per_second", requestsPerSecond)
parameter("require_alias", requireAlias)
parameter("scroll", scroll.toElasticsearchTimeUnit())
parameter("scroll", scroll)
parameter("slices", slices)
parameter("max_docs", maxDocs)
body = reindexDSL.toString()
Expand Down
4 changes: 2 additions & 2 deletions search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/request-dsl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ data class SearchAPIRequest(
}

fun parameter(key: String, value: Duration?) {
value?.let {
parameters[key] = "${value.inWholeSeconds}s"
value.toElasticsearchTimeUnit()?.let {
parameters[key] = it
}
}

Expand Down
3 changes: 2 additions & 1 deletion search-client/src/commonTest/kotlin/com/jillesvangurp/ktsearch/IndexCreateTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import io.kotest.matchers.shouldBe
import kotlinx.coroutines.test.runTest
import kotlinx.serialization.json.*
import kotlin.test.Test
import kotlin.time.Duration.Companion.seconds

class IndexCreateTest: SearchTestBase() {
@Test
Expand Down Expand Up @@ -33,7 +34,7 @@ class IndexCreateTest: SearchTestBase() {
settings {
replicas = 0
shards = 5
refreshInterval = "31s"
refreshInterval = 31.seconds
}
}
response.acknowledged shouldBe true
Expand Down
3 changes: 2 additions & 1 deletion search-dsls/src/commonMain/kotlin/com/jillesvangurp/searchdsls/mappingdsl/IndexSettings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package com.jillesvangurp.searchdsls.mappingdsl

import com.jillesvangurp.jsondsl.*
import kotlin.reflect.KProperty
import kotlin.time.Duration

@Suppress("LeakingThis")
class Analysis : JsonDsl() {
Expand Down Expand Up @@ -67,7 +68,7 @@ class Analysis : JsonDsl() {
class IndexSettings : JsonDsl() {
var replicas: Int by property("index.number_of_replicas")
var shards: Int by property("index.number_of_shards")
var refreshInterval: String by property("index.refresh_interval")
var refreshInterval: Duration by property("index.refresh_interval")
var indexLifeCycleName: String by property("index.lifecycle.name")

fun analysis(block: Analysis.() -> Unit) {
Expand Down