Merge pull request #173 from jillesvangurp/int-to-long

int to long

Author: jillesvangurp

search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/SearchResponse.kt

@@ -70,9 +70,9 @@ data class SearchResponse(
         val innerHits: Map<String, HitsContainer>?,
         val highlight: JsonObject?,
         @SerialName("_seq_no")
-        override val seqNo: Int? = null,
+        override val seqNo: Long? = null,
         @SerialName("_primary_term")
-        override val primaryTerm: Int? = null,
+        override val primaryTerm: Long? = null,
         @SerialName("_version")
         override val version: Long?,
         @SerialName("_explanation")

search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/SniffingNodeSelector.kt

@@ -1,20 +1,18 @@
 package com.jillesvangurp.ktsearch
 
-import io.ktor.utils.io.core.*
+import kotlin.coroutines.AbstractCoroutineContextElement
+import kotlin.coroutines.CoroutineContext
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.minutes
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
 import kotlinx.datetime.Clock
 import kotlinx.datetime.Instant
-import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
-import kotlin.coroutines.AbstractCoroutineContextElement
-import kotlin.coroutines.CoroutineContext
-import kotlin.time.Duration
-import kotlin.time.Duration.Companion.minutes
 
 internal data class VerifiedNode(val lastChecked: Instant, val node: Node)
 
@@ -109,8 +107,7 @@ class SniffingNodeSelector(
                         affinity.remove(aid)
                     }
                 }
-            } else {
-            }
+            } 
         } finally {
             sniffing = false
         }

search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/bulk-api.kt

@@ -134,8 +134,8 @@ interface BulkSession {
         index: String? = null,
         id: String? = null,
         requireAlias: Boolean? = null,
-        ifSeqNo: Int? = null,
-        ifPrimaryTerm: Int? = null,
+        ifSeqNo: Long? = null,
+        ifPrimaryTerm: Long? = null,
         routing: String? = null
     )
 
@@ -147,8 +147,8 @@ interface BulkSession {
         index: String? = null,
         requireAlias: Boolean? = null,
         upsert: JsonObject? = null,
-        ifSeqNo: Int? = null,
-        ifPrimaryTerm: Int? = null,
+        ifSeqNo: Long? = null,
+        ifPrimaryTerm: Long? = null,
         routing: String? = null,
     )
 
@@ -158,8 +158,8 @@ interface BulkSession {
         index: String? = null,
         requireAlias: Boolean? = null,
         docAsUpsert: Boolean? = null,
-        ifSeqNo: Int? = null,
-        ifPrimaryTerm: Int? = null,
+        ifSeqNo: Long? = null,
+        ifPrimaryTerm: Long? = null,
         routing: String? = null,
         )
 
@@ -169,8 +169,8 @@ interface BulkSession {
         index: String? = null,
         requireAlias: Boolean? = null,
         docAsUpsert: Boolean? = null,
-        ifSeqNo: Int? = null,
-        ifPrimaryTerm: Int? = null,
+        ifSeqNo: Long? = null,
+        ifPrimaryTerm: Long? = null,
         routing: String? = null,
         )
 
@@ -236,8 +236,8 @@ internal class DefaultBulkSession internal constructor(
         index: String?,
         id: String?,
         requireAlias: Boolean?,
-        ifSeqNo: Int?,
-        ifPrimaryTerm: Int?,
+        ifSeqNo: Long?,
+        ifPrimaryTerm: Long?,
         routing: String?,
     ) {
         val opDsl = withJsonDsl {
@@ -290,8 +290,8 @@ internal class DefaultBulkSession internal constructor(
         index: String?,
         requireAlias: Boolean?,
         upsert: JsonObject?,
-        ifSeqNo: Int?,
-        ifPrimaryTerm: Int?,
+        ifSeqNo: Long?,
+        ifPrimaryTerm: Long?,
         routing: String?
     ) {
         val opDsl = withJsonDsl {
@@ -331,8 +331,8 @@ internal class DefaultBulkSession internal constructor(
         index: String?,
         requireAlias: Boolean?,
         docAsUpsert: Boolean?,
-        ifSeqNo: Int?,
-        ifPrimaryTerm: Int?,
+        ifSeqNo: Long?,
+        ifPrimaryTerm: Long?,
         routing: String?
     ) {
         update(
@@ -353,8 +353,8 @@ internal class DefaultBulkSession internal constructor(
         index: String?,
         requireAlias: Boolean?,
         docAsUpsert: Boolean?,
-        ifSeqNo: Int?,
-        ifPrimaryTerm: Int?,
+        ifSeqNo: Long?,
+        ifPrimaryTerm: Long?,
         routing: String?
     ) {
         val opDsl = withJsonDsl {

search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/documents-api.kt

@@ -12,8 +12,8 @@ import kotlin.time.Duration
 
 interface SourceInformation {
     val id: String
-    val seqNo: Int?
-    val primaryTerm: Int?
+    val seqNo: Long?
+    val primaryTerm: Long?
     val version: Long?
     val source: JsonObject?
 }
@@ -33,9 +33,9 @@ data class DocumentIndexResponse(
     @SerialName("_shards")
     val shards: Shards,
     @SerialName("_seq_no")
-    override val seqNo: Int,
+    override val seqNo: Long,
     @SerialName("_primary_term")
-    override val primaryTerm: Int,
+    override val primaryTerm: Long,
     @SerialName("_source")
     override val source: JsonObject? = null,
 ): SourceInformation
@@ -44,8 +44,8 @@ suspend inline fun <reified T> SearchClient.indexDocument(
     target: String,
     document: T,
     id: String? = null,
-    ifSeqNo: Int? = null,
-    ifPrimaryTerm: Int? = null,
+    ifSeqNo: Long? = null,
+    ifPrimaryTerm: Long? = null,
     opType: OperationType? = null,
     pipeline: String? = null,
     refresh: Refresh? = null,
@@ -82,8 +82,8 @@ suspend fun SearchClient.indexDocument(
     target: String,
     serializedJson: String,
     id: String? = null,
-    ifSeqNo: Int? = null,
-    ifPrimaryTerm: Int? = null,
+    ifSeqNo: Long? = null,
+    ifPrimaryTerm: Long? = null,
     opType: OperationType? = null,
     pipeline: String? = null,
     refresh: Refresh? = null,
@@ -132,9 +132,9 @@ data class GetDocumentResponse(
     @SerialName("_source")
     override val source: JsonObject?,
     @SerialName("_seq_no")
-    override val seqNo: Int?,
+    override val seqNo: Long?,
     @SerialName("_primary_term")
-    override val primaryTerm: Int?,
+    override val primaryTerm: Long?,
     val found: Boolean,
     @SerialName("_routing")
     val routing: String? = null,
@@ -144,8 +144,8 @@ data class GetDocumentResponse(
 suspend fun SearchClient.deleteDocument(
     target: String,
     id: String,
-    ifSeqNo: Int? = null,
-    ifPrimaryTerm: Int? = null,
+    ifSeqNo: Long? = null,
+    ifPrimaryTerm: Long? = null,
     refresh: Refresh? = null,
     routing: String? = null,
     timeout: Duration? = null,

search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/repository/IndexRepository.kt

@@ -88,8 +88,8 @@ interface TypedDocumentIBulkSession<T> : BulkSession {
     suspend fun update(
         id: String,
         original: T,
-        ifSeqNo: Int,
-        ifPrimaryTerm: Int,
+        ifSeqNo: Long,
+        ifPrimaryTerm: Long,
         updateBlock: (T) -> T,
     )
 }
@@ -116,8 +116,8 @@ internal class BulkUpdateSession<T : Any>(
     override suspend fun update(
         id: String,
         original: T,
-        ifSeqNo: Int,
-        ifPrimaryTerm: Int,
+        ifSeqNo: Long,
+        ifPrimaryTerm: Long,
         updateBlock: (T) -> T,
     ) {
         if (updateFunctions.containsKey(id)) {
@@ -266,8 +266,8 @@ class IndexRepository<T : Any>(
     suspend fun index(
         value: T,
         id: String? = null,
-        ifSeqNo: Int? = null,
-        ifPrimaryTerm: Int? = null,
+        ifSeqNo: Long? = null,
+        ifPrimaryTerm: Long? = null,
         opType: OperationType? = null,
         pipeline: String? = null,
         refresh: Refresh? = null,
@@ -382,8 +382,8 @@ class IndexRepository<T : Any>(
 
     suspend fun delete(
         id: String,
-        ifSeqNo: Int? = null,
-        ifPrimaryTerm: Int? = null,
+        ifSeqNo: Long? = null,
+        ifPrimaryTerm: Long? = null,
         refresh: Refresh? = null,
         routing: String? = null,
         timeout: Duration? = null,

search-client/src/commonMain/kotlin/com/jillesvangurp/ktsearch/update-api.kt

@@ -24,19 +24,19 @@ data class DocumentUpdateResponse(
     @SerialName("_shards")
     val shards: Shards,
     @SerialName("_seq_no")
-    val seqNo: Int,
+    val seqNo: Long,
     @SerialName("_primary_term")
-    val primaryTerm: Int,
+    val primaryTerm: Long,
     val get: DocumentUpdateResponse.UpdatedSourceInformation?=null
 ) {
     @Serializable
     data class UpdatedSourceInformation(
         @SerialName("_source")
         val source: JsonObject?,
         @SerialName("_seq_no")
-        val seqNo: Int?,
+        val seqNo: Long?,
         @SerialName("_primary_term")
-        val primaryTerm: Int?,
+        val primaryTerm: Long?,
         val version: Long?,
         val found: Boolean,
         @SerialName("_routing")
@@ -50,8 +50,8 @@ suspend inline fun <reified T> SearchClient.updateDocument(
     doc: T,
     json: Json = DEFAULT_JSON,
     detectNoop: Boolean? = null,
-    ifSeqNo: Int? = null,
-    ifPrimaryTerm: Int? = null,
+    ifSeqNo: Long? = null,
+    ifPrimaryTerm: Long? = null,
     requireAlias: Boolean? = null,
     retryOnConflict: Int? = null,
     refresh: Refresh? = null,
@@ -86,8 +86,8 @@ suspend fun SearchClient.updateDocument(
     id: String,
     docJson: String,
     detectNoop: Boolean? = null,
-    ifSeqNo: Int? = null,
-    ifPrimaryTerm: Int? = null,
+    ifSeqNo: Long? = null,
+    ifPrimaryTerm: Long? = null,
     requireAlias: Boolean? = null,
     retryOnConflict: Int? = null,
     refresh: Refresh? = null,
@@ -125,8 +125,8 @@ suspend inline fun <reified T> SearchClient.updateDocument(
     script: Script,
     upsertJson: T,
     json: Json = DEFAULT_JSON,
-    ifSeqNo: Int? = null,
-    ifPrimaryTerm: Int? = null,
+    ifSeqNo: Long? = null,
+    ifPrimaryTerm: Long? = null,
     requireAlias: Boolean? = null,
     retryOnConflict: Int? = null,
     refresh: Refresh? = null,
@@ -161,8 +161,8 @@ suspend fun SearchClient.updateDocument(
     id: String,
     script: Script,
     upsertJson: String? = null,
-    ifSeqNo: Int? = null,
-    ifPrimaryTerm: Int? = null,
+    ifSeqNo: Long? = null,
+    ifPrimaryTerm: Long? = null,
     requireAlias: Boolean? = null,
     retryOnConflict: Int? = null,
     refresh: Refresh? = null,

search-client/src/jvmMain/kotlin/com/jillesvangurp/ktsearch/defaultHttpClient.kt

@@ -53,6 +53,7 @@ fun ktorClientWithCIOEngine(
     elasticApiKey: String?,
     block: HttpClientConfig<*>.() -> Unit,
 ) = HttpClient(CIO) {
+    // there are some known issues with using CIO and weird EOF errors in combination with pipelining
     engine {
         maxConnectionsCount = 100
         endpoint {

versions.properties

@@ -21,7 +21,7 @@ version.com.jillesvangurp..json-dsl=3.0.7
 
 version.com.jillesvangurp..kotlinx-serialization-extensions=1.0.6
 
-version.io.github.oshai..kotlin-logging=7.0.5
+version.io.github.oshai..kotlin-logging=7.0.6
 
 version.junit.jupiter=5.12.1
 ##        # available=5.13.0-M1
@@ -30,16 +30,17 @@ version.junit.jupiter=5.12.1
 version.kotest=5.9.1
 ## # available=6.0.0.M1
 ## # available=6.0.0.M2
+## # available=6.0.0.M3
 
 version.kotlin=2.1.20
 
 version.kotlinx.coroutines=1.10.1
 
 version.kotlinx.datetime=0.6.2
 
-version.kotlinx.serialization=1.8.0
+version.kotlinx.serialization=1.8.1
 
- version.ktor=3.1.1
+ version.ktor=3.1.2
 
 version.org.apache.logging.log4j..log4j-to-slf4j=2.24.3
 ##                                   # available=3.0.0-alpha1