diff --git a/java-client/src/main/java/com/couchbase/client/java/AsyncCluster.java b/java-client/src/main/java/com/couchbase/client/java/AsyncCluster.java index b35675132..23a4bcb77 100644 --- a/java-client/src/main/java/com/couchbase/client/java/AsyncCluster.java +++ b/java-client/src/main/java/com/couchbase/client/java/AsyncCluster.java @@ -418,7 +418,7 @@ AnalyticsRequest analyticsRequest(final String statement, final AnalyticsOptions * @throws TimeoutException if the operation times out before getting a result. * @throws CouchbaseException for all other error reasons (acts as a base type and catch-all). */ - @Stability.Volatile + @Stability.Uncommitted public CompletableFuture search(final String indexName, final SearchRequest searchRequest) { return search(indexName, searchRequest, DEFAULT_SEARCH_OPTIONS); } @@ -435,7 +435,7 @@ public CompletableFuture search(final String indexName, final Sear * @throws TimeoutException if the operation times out before getting a result. * @throws CouchbaseException for all other error reasons (acts as a base type and catch-all). */ - @Stability.Volatile + @Stability.Uncommitted public CompletableFuture search(final String indexName, final SearchRequest searchRequest, final SearchOptions options) { notNull(searchRequest, "SearchRequest", () -> new ReducedSearchErrorContext(indexName, null)); notNull(options, "SearchOptions", () -> new ReducedSearchErrorContext(indexName, null)); diff --git a/java-client/src/main/java/com/couchbase/client/java/AsyncScope.java b/java-client/src/main/java/com/couchbase/client/java/AsyncScope.java index 7c4ed7f6d..c0f15570a 100644 --- a/java-client/src/main/java/com/couchbase/client/java/AsyncScope.java +++ b/java-client/src/main/java/com/couchbase/client/java/AsyncScope.java @@ -304,7 +304,8 @@ AnalyticsRequest analyticsRequest(final String statement, final AnalyticsOptions * @throws TimeoutException if the operation times out before getting a result. * @throws CouchbaseException for all other error reasons (acts as a base type and catch-all). */ - @Stability.Volatile + @Stability.Uncommitted + @SinceCouchbase("7.6") public CompletableFuture search(final String indexName, final SearchRequest searchRequest) { return search(indexName, searchRequest, DEFAULT_SEARCH_OPTIONS); } @@ -321,7 +322,8 @@ public CompletableFuture search(final String indexName, final Sear * @throws TimeoutException if the operation times out before getting a result. * @throws CouchbaseException for all other error reasons (acts as a base type and catch-all). */ - @Stability.Volatile + @Stability.Uncommitted + @SinceCouchbase("7.6") public CompletableFuture search(final String indexName, final SearchRequest searchRequest, final SearchOptions options) { notNull(searchRequest, "SearchRequest", () -> new ReducedSearchErrorContext(indexName, null)); notNull(options, "SearchOptions", () -> new ReducedSearchErrorContext(indexName, null)); diff --git a/java-client/src/main/java/com/couchbase/client/java/Cluster.java b/java-client/src/main/java/com/couchbase/client/java/Cluster.java index a5245c390..ce41719a9 100644 --- a/java-client/src/main/java/com/couchbase/client/java/Cluster.java +++ b/java-client/src/main/java/com/couchbase/client/java/Cluster.java @@ -445,7 +445,7 @@ public AnalyticsResult analyticsQuery(final String statement, final AnalyticsOpt * @throws TimeoutException if the operation times out before getting a result. * @throws CouchbaseException for all other error reasons (acts as a base type and catch-all). */ - @Stability.Volatile + @Stability.Uncommitted public SearchResult search(final String indexName, final SearchRequest searchRequest) { return search(indexName, searchRequest, DEFAULT_SEARCH_OPTIONS); } @@ -462,7 +462,7 @@ public SearchResult search(final String indexName, final SearchRequest searchReq * @throws TimeoutException if the operation times out before getting a result. * @throws CouchbaseException for all other error reasons (acts as a base type and catch-all). */ - @Stability.Volatile + @Stability.Uncommitted public SearchResult search(final String indexName, final SearchRequest searchRequest, final SearchOptions options) { return block(asyncCluster.search(indexName, searchRequest, options)); } diff --git a/java-client/src/main/java/com/couchbase/client/java/ReactiveCluster.java b/java-client/src/main/java/com/couchbase/client/java/ReactiveCluster.java index b88896d5e..07901eafa 100644 --- a/java-client/src/main/java/com/couchbase/client/java/ReactiveCluster.java +++ b/java-client/src/main/java/com/couchbase/client/java/ReactiveCluster.java @@ -328,7 +328,7 @@ public Mono analyticsQuery(final String statement, fina * @throws TimeoutException if the operation times out before getting a result. * @throws CouchbaseException for all other error reasons (acts as a base type and catch-all). */ - @Stability.Volatile + @Stability.Uncommitted public Mono search(final String indexName, final SearchRequest searchRequest) { return search(indexName, searchRequest, DEFAULT_SEARCH_OPTIONS); } @@ -345,7 +345,7 @@ public Mono search(final String indexName, final SearchReq * @throws TimeoutException if the operation times out before getting a result. * @throws CouchbaseException for all other error reasons (acts as a base type and catch-all). */ - @Stability.Volatile + @Stability.Uncommitted public Mono search(final String indexName, final SearchRequest searchRequest, final SearchOptions options) { notNull(searchRequest, "SearchRequest", () -> new ReducedSearchErrorContext(indexName, null)); notNull(options, "SearchOptions", () -> new ReducedSearchErrorContext(indexName, null)); diff --git a/java-client/src/main/java/com/couchbase/client/java/ReactiveScope.java b/java-client/src/main/java/com/couchbase/client/java/ReactiveScope.java index 60e62dba2..2b3a93c2a 100644 --- a/java-client/src/main/java/com/couchbase/client/java/ReactiveScope.java +++ b/java-client/src/main/java/com/couchbase/client/java/ReactiveScope.java @@ -17,6 +17,7 @@ package com.couchbase.client.java; import com.couchbase.client.core.Core; +import com.couchbase.client.core.annotation.SinceCouchbase; import com.couchbase.client.core.annotation.Stability; import com.couchbase.client.core.api.search.CoreSearchQuery; import com.couchbase.client.core.api.search.queries.CoreSearchRequest; @@ -209,7 +210,8 @@ public Mono analyticsQuery(final String statement, fina * @throws TimeoutException if the operation times out before getting a result. * @throws CouchbaseException for all other error reasons (acts as a base type and catch-all). */ - @Stability.Volatile + @Stability.Uncommitted + @SinceCouchbase("7.6") public Mono search(final String indexName, final SearchRequest searchRequest) { return search(indexName, searchRequest, DEFAULT_SEARCH_OPTIONS); } @@ -226,7 +228,8 @@ public Mono search(final String indexName, final SearchReq * @throws TimeoutException if the operation times out before getting a result. * @throws CouchbaseException for all other error reasons (acts as a base type and catch-all). */ - @Stability.Volatile + @Stability.Uncommitted + @SinceCouchbase("7.6") public Mono search(final String indexName, final SearchRequest searchRequest, final SearchOptions options) { notNull(searchRequest, "SearchRequest", () -> new ReducedSearchErrorContext(indexName, null)); notNull(options, "SearchOptions", () -> new ReducedSearchErrorContext(indexName, null)); diff --git a/java-client/src/main/java/com/couchbase/client/java/Scope.java b/java-client/src/main/java/com/couchbase/client/java/Scope.java index 903254976..5a181f6fc 100644 --- a/java-client/src/main/java/com/couchbase/client/java/Scope.java +++ b/java-client/src/main/java/com/couchbase/client/java/Scope.java @@ -217,6 +217,8 @@ public AnalyticsResult analyticsQuery(final String statement, final AnalyticsOpt * @throws TimeoutException if the operation times out before getting a result. * @throws CouchbaseException for all other error reasons (acts as a base type and catch-all). */ + @Stability.Uncommitted + @SinceCouchbase("7.6") public SearchResult search(final String indexName, final SearchRequest searchRequest) { return search(indexName, searchRequest, DEFAULT_SEARCH_OPTIONS); } @@ -233,6 +235,8 @@ public SearchResult search(final String indexName, final SearchRequest searchReq * @throws TimeoutException if the operation times out before getting a result. * @throws CouchbaseException for all other error reasons (acts as a base type and catch-all). */ + @Stability.Uncommitted + @SinceCouchbase("7.6") public SearchResult search(final String indexName, final SearchRequest searchRequest, final SearchOptions options) { return block(async().search(indexName, searchRequest, options)); } diff --git a/java-client/src/main/java/com/couchbase/client/java/search/SearchRequest.java b/java-client/src/main/java/com/couchbase/client/java/search/SearchRequest.java index b55bec316..f4daeb5fd 100644 --- a/java-client/src/main/java/com/couchbase/client/java/search/SearchRequest.java +++ b/java-client/src/main/java/com/couchbase/client/java/search/SearchRequest.java @@ -15,10 +15,10 @@ */ package com.couchbase.client.java.search; +import com.couchbase.client.core.annotation.SinceCouchbase; import com.couchbase.client.core.annotation.Stability; import com.couchbase.client.core.api.search.queries.CoreSearchRequest; import com.couchbase.client.core.error.InvalidArgumentException; -import com.couchbase.client.java.search.queries.MatchNoneQuery; import com.couchbase.client.java.search.vector.VectorSearch; import reactor.util.annotation.Nullable; @@ -29,7 +29,7 @@ *

* If both are provided, the FTS service will merge the results. */ -@Stability.Volatile +@Stability.Uncommitted public class SearchRequest { private @Nullable SearchQuery searchQuery; @@ -77,6 +77,7 @@ public SearchRequest searchQuery(SearchQuery searchQuery) { * * @return this, for chaining purposes. */ + @SinceCouchbase("7.6") public SearchRequest vectorSearch(VectorSearch vectorSearch) { if (this.vectorSearch != null) { throw new InvalidArgumentException("A VectorSearch has already been specified. Note that a single VectorSearch can take multiple VectorQuery objects, allowing multiple vector queries to be run.", null, null); diff --git a/java-client/src/main/java/com/couchbase/client/java/search/vector/VectorQuery.java b/java-client/src/main/java/com/couchbase/client/java/search/vector/VectorQuery.java index bf00c1c3f..bc0a596ab 100644 --- a/java-client/src/main/java/com/couchbase/client/java/search/vector/VectorQuery.java +++ b/java-client/src/main/java/com/couchbase/client/java/search/vector/VectorQuery.java @@ -19,7 +19,7 @@ import com.couchbase.client.core.api.search.vector.CoreVectorQuery; import reactor.util.annotation.Nullable; -@Stability.Volatile +@Stability.Uncommitted public class VectorQuery { private final float[] vectorQuery; private final String vectorField; diff --git a/java-client/src/main/java/com/couchbase/client/java/search/vector/VectorQueryCombination.java b/java-client/src/main/java/com/couchbase/client/java/search/vector/VectorQueryCombination.java index d331342b0..bd5ee1dd3 100644 --- a/java-client/src/main/java/com/couchbase/client/java/search/vector/VectorQueryCombination.java +++ b/java-client/src/main/java/com/couchbase/client/java/search/vector/VectorQueryCombination.java @@ -21,7 +21,7 @@ /** * Controls how multiple vector queries are combined. */ -@Stability.Volatile +@Stability.Uncommitted public enum VectorQueryCombination { /** * All vector queries must match a document for it to be included. diff --git a/java-client/src/main/java/com/couchbase/client/java/search/vector/VectorSearch.java b/java-client/src/main/java/com/couchbase/client/java/search/vector/VectorSearch.java index 1bac43525..dfa423277 100644 --- a/java-client/src/main/java/com/couchbase/client/java/search/vector/VectorSearch.java +++ b/java-client/src/main/java/com/couchbase/client/java/search/vector/VectorSearch.java @@ -28,7 +28,7 @@ /** * A VectorSearch allows one or more individual {@link VectorQuery}s to be executed. */ -@Stability.Volatile +@Stability.Uncommitted public class VectorSearch { private final List vectorQueries; diff --git a/java-client/src/main/java/com/couchbase/client/java/search/vector/VectorSearchOptions.java b/java-client/src/main/java/com/couchbase/client/java/search/vector/VectorSearchOptions.java index 9da2a0c4c..b955dedfd 100644 --- a/java-client/src/main/java/com/couchbase/client/java/search/vector/VectorSearchOptions.java +++ b/java-client/src/main/java/com/couchbase/client/java/search/vector/VectorSearchOptions.java @@ -22,7 +22,7 @@ /** * Options related to executing a {@link VectorSearch}. */ -@Stability.Volatile +@Stability.Uncommitted public class VectorSearchOptions { private @Nullable VectorQueryCombination vectorQueryCombination; diff --git a/kotlin-client/src/main/kotlin/com/couchbase/client/kotlin/Cluster.kt b/kotlin-client/src/main/kotlin/com/couchbase/client/kotlin/Cluster.kt index 792305377..7ba836a22 100644 --- a/kotlin-client/src/main/kotlin/com/couchbase/client/kotlin/Cluster.kt +++ b/kotlin-client/src/main/kotlin/com/couchbase/client/kotlin/Cluster.kt @@ -39,7 +39,6 @@ import com.couchbase.client.kotlin.analytics.AnalyticsPriority import com.couchbase.client.kotlin.analytics.AnalyticsScanConsistency import com.couchbase.client.kotlin.analytics.internal.AnalyticsExecutor import com.couchbase.client.kotlin.annotations.UncommittedCouchbaseApi -import com.couchbase.client.kotlin.annotations.VolatileCouchbaseApi import com.couchbase.client.kotlin.codec.JsonSerializer import com.couchbase.client.kotlin.diagnostics.DiagnosticsResult import com.couchbase.client.kotlin.diagnostics.PingResult @@ -439,7 +438,7 @@ public class Cluster internal constructor( * @sample com.couchbase.client.kotlin.samples.searchSimpleVector * @sample com.couchbase.client.kotlin.samples.searchSpecMixedMode */ - @VolatileCouchbaseApi + @UncommittedCouchbaseApi public fun search( indexName: String, spec: SearchSpec, diff --git a/kotlin-client/src/main/kotlin/com/couchbase/client/kotlin/Scope.kt b/kotlin-client/src/main/kotlin/com/couchbase/client/kotlin/Scope.kt index 59707591f..88f7959fe 100644 --- a/kotlin-client/src/main/kotlin/com/couchbase/client/kotlin/Scope.kt +++ b/kotlin-client/src/main/kotlin/com/couchbase/client/kotlin/Scope.kt @@ -41,7 +41,7 @@ import com.couchbase.client.kotlin.analytics.AnalyticsParameters import com.couchbase.client.kotlin.analytics.AnalyticsPriority import com.couchbase.client.kotlin.analytics.AnalyticsScanConsistency import com.couchbase.client.kotlin.analytics.internal.AnalyticsExecutor -import com.couchbase.client.kotlin.annotations.VolatileCouchbaseApi +import com.couchbase.client.kotlin.annotations.UncommittedCouchbaseApi import com.couchbase.client.kotlin.codec.JsonSerializer import com.couchbase.client.kotlin.internal.requireUnique import com.couchbase.client.kotlin.internal.toOptional @@ -390,7 +390,7 @@ public class Scope( * @sample com.couchbase.client.kotlin.samples.searchSimpleVector * @sample com.couchbase.client.kotlin.samples.searchSpecMixedMode */ - @VolatileCouchbaseApi + @UncommittedCouchbaseApi @SinceCouchbase("7.6") public fun search( indexName: String, diff --git a/kotlin-client/src/main/kotlin/com/couchbase/client/kotlin/search/SearchSpec.kt b/kotlin-client/src/main/kotlin/com/couchbase/client/kotlin/search/SearchSpec.kt index 1d09e4d7e..d929f487c 100644 --- a/kotlin-client/src/main/kotlin/com/couchbase/client/kotlin/search/SearchSpec.kt +++ b/kotlin-client/src/main/kotlin/com/couchbase/client/kotlin/search/SearchSpec.kt @@ -19,7 +19,7 @@ package com.couchbase.client.kotlin.search import com.couchbase.client.core.annotation.SinceCouchbase import com.couchbase.client.core.api.search.queries.CoreSearchRequest import com.couchbase.client.core.api.search.vector.CoreVectorQueryCombination -import com.couchbase.client.kotlin.annotations.VolatileCouchbaseApi +import com.couchbase.client.kotlin.annotations.UncommittedCouchbaseApi import com.couchbase.client.kotlin.search.SearchQuery.Companion.MatchOperator import java.time.Instant @@ -43,7 +43,7 @@ import java.time.Instant * @sample com.couchbase.client.kotlin.samples.searchSpecVectorAllOf * @sample com.couchbase.client.kotlin.samples.searchSpecMixedMode */ -@VolatileCouchbaseApi +@UncommittedCouchbaseApi public sealed class SearchSpec { internal abstract val coreRequest: CoreSearchRequest @@ -54,7 +54,6 @@ public sealed class SearchSpec { * * @sample com.couchbase.client.kotlin.samples.searchSpecMixedMode */ - @VolatileCouchbaseApi @SinceCouchbase("7.6") public fun mixedMode( searchQuery: SearchQuery, @@ -413,7 +412,6 @@ public sealed class SearchSpec { * @sample com.couchbase.client.kotlin.samples.searchSpecVectorAnyOf * @sample com.couchbase.client.kotlin.samples.searchSpecMixedMode */ - @VolatileCouchbaseApi @SinceCouchbase("7.6") public fun vector( field: String, @@ -428,7 +426,7 @@ public sealed class SearchSpec { * * @sample com.couchbase.client.kotlin.samples.searchSpecVectorAnyOf */ - @VolatileCouchbaseApi + @SinceCouchbase("7.6") public fun anyOf( vectorQueries: List, ): VectorSearchSpec = CompoundVectorSearchSpec(vectorQueries, CoreVectorQueryCombination.OR) @@ -440,7 +438,7 @@ public sealed class SearchSpec { * * @sample com.couchbase.client.kotlin.samples.searchSpecVectorAnyOf */ - @VolatileCouchbaseApi + @SinceCouchbase("7.6") public fun anyOf( first: VectorQuery, vararg remaining: VectorQuery, @@ -453,7 +451,7 @@ public sealed class SearchSpec { * * @sample com.couchbase.client.kotlin.samples.searchSpecVectorAllOf */ - @VolatileCouchbaseApi + @SinceCouchbase("7.6") public fun allOf( vectorQueries: List, ): VectorSearchSpec = CompoundVectorSearchSpec(vectorQueries, CoreVectorQueryCombination.AND) @@ -465,7 +463,7 @@ public sealed class SearchSpec { * * @sample com.couchbase.client.kotlin.samples.searchSpecVectorAllOf */ - @VolatileCouchbaseApi + @SinceCouchbase("7.6") public fun allOf( first: VectorQuery, vararg remaining: VectorQuery, diff --git a/scala-client/src/main/scala/com/couchbase/client/scala/AsyncCluster.scala b/scala-client/src/main/scala/com/couchbase/client/scala/AsyncCluster.scala index 1b42453ae..b27a76d83 100644 --- a/scala-client/src/main/scala/com/couchbase/client/scala/AsyncCluster.scala +++ b/scala-client/src/main/scala/com/couchbase/client/scala/AsyncCluster.scala @@ -17,7 +17,7 @@ package com.couchbase.client.scala import com.couchbase.client.core.Core import com.couchbase.client.core.annotation.Stability -import com.couchbase.client.core.annotation.Stability.Volatile +import com.couchbase.client.core.annotation.Stability.Uncommitted import com.couchbase.client.core.api.CoreCouchbaseOps import com.couchbase.client.core.diagnostics._ import com.couchbase.client.core.env.Authenticator @@ -264,7 +264,7 @@ class AsyncCluster( * @return a `Future` containing a `Success(SearchResult)` (which includes any returned rows) if successful, * else a `Failure` */ - @Volatile + @Uncommitted def search( indexName: String, request: SearchRequest @@ -286,7 +286,7 @@ class AsyncCluster( * @return a `Future` containing a `Success(SearchResult)` (which includes any returned rows) if successful, * else a `Failure` */ - @Volatile + @Uncommitted def search( indexName: String, request: SearchRequest, diff --git a/scala-client/src/main/scala/com/couchbase/client/scala/AsyncScope.scala b/scala-client/src/main/scala/com/couchbase/client/scala/AsyncScope.scala index 5c51ffe1f..cb10a9e64 100644 --- a/scala-client/src/main/scala/com/couchbase/client/scala/AsyncScope.scala +++ b/scala-client/src/main/scala/com/couchbase/client/scala/AsyncScope.scala @@ -17,7 +17,7 @@ package com.couchbase.client.scala import com.couchbase.client.core.Core import com.couchbase.client.core.annotation.SinceCouchbase -import com.couchbase.client.core.annotation.Stability.Volatile +import com.couchbase.client.core.annotation.Stability.Uncommitted import com.couchbase.client.core.api.CoreCouchbaseOps import com.couchbase.client.core.api.manager.CoreBucketAndScope import com.couchbase.client.core.api.query.CoreQueryContext @@ -172,7 +172,8 @@ class AsyncScope private[scala] ( * @return a `Try` containing a `Success(SearchResult)` (which includes any returned rows) if successful, * else a `Failure` */ - @Volatile + @Uncommitted + @SinceCouchbase("7.6") def search( indexName: String, request: SearchRequest @@ -192,7 +193,8 @@ class AsyncScope private[scala] ( * @return a `Try` containing a `Success(SearchResult)` (which includes any returned rows) if successful, * else a `Failure` */ - @Volatile + @Uncommitted + @SinceCouchbase("7.6") def search( indexName: String, request: SearchRequest, diff --git a/scala-client/src/main/scala/com/couchbase/client/scala/Cluster.scala b/scala-client/src/main/scala/com/couchbase/client/scala/Cluster.scala index 32a5c1eda..4272591ca 100644 --- a/scala-client/src/main/scala/com/couchbase/client/scala/Cluster.scala +++ b/scala-client/src/main/scala/com/couchbase/client/scala/Cluster.scala @@ -17,7 +17,7 @@ package com.couchbase.client.scala import com.couchbase.client.core.annotation.Stability -import com.couchbase.client.core.annotation.Stability.Volatile +import com.couchbase.client.core.annotation.Stability.Uncommitted import com.couchbase.client.core.diagnostics._ import com.couchbase.client.core.env.{Authenticator, PasswordAuthenticator} import com.couchbase.client.core.transaction.CoreTransactionsReactive @@ -224,7 +224,7 @@ class Cluster private[scala] ( * @return a `Try` containing a `Success(SearchResult)` (which includes any returned rows) if successful, * else a `Failure` */ - @Volatile + @Uncommitted def search( indexName: String, request: SearchRequest @@ -247,7 +247,7 @@ class Cluster private[scala] ( * @return a `Try` containing a `Success(SearchResult)` (which includes any returned rows) if successful, * else a `Failure` */ - @Volatile + @Uncommitted def search( indexName: String, request: SearchRequest, diff --git a/scala-client/src/main/scala/com/couchbase/client/scala/ReactiveCluster.scala b/scala-client/src/main/scala/com/couchbase/client/scala/ReactiveCluster.scala index 3ed2ca1b7..0847389b2 100644 --- a/scala-client/src/main/scala/com/couchbase/client/scala/ReactiveCluster.scala +++ b/scala-client/src/main/scala/com/couchbase/client/scala/ReactiveCluster.scala @@ -18,7 +18,7 @@ package com.couchbase.client.scala import com.couchbase.client.core.Core import com.couchbase.client.core.annotation.Stability -import com.couchbase.client.core.annotation.Stability.Volatile +import com.couchbase.client.core.annotation.Stability.Uncommitted import com.couchbase.client.core.diagnostics.{DiagnosticsResult, PingResult} import com.couchbase.client.core.env.PasswordAuthenticator import com.couchbase.client.core.protostellar.CoreProtostellarUtil @@ -222,7 +222,7 @@ class ReactiveCluster(val async: AsyncCluster) { * @return an `SMono` containing a [[ReactiveSearchResult]] which includes a Flux giving streaming access to any * returned rows */ - @Volatile + @Uncommitted def search( indexName: String, request: SearchRequest @@ -243,7 +243,7 @@ class ReactiveCluster(val async: AsyncCluster) { * @return an `SMono` containing a [[ReactiveSearchResult]] which includes a Flux giving streaming access to any * returned rows */ - @Volatile + @Uncommitted def search( indexName: String, request: SearchRequest, diff --git a/scala-client/src/main/scala/com/couchbase/client/scala/ReactiveScope.scala b/scala-client/src/main/scala/com/couchbase/client/scala/ReactiveScope.scala index 674c7d679..b44726b72 100644 --- a/scala-client/src/main/scala/com/couchbase/client/scala/ReactiveScope.scala +++ b/scala-client/src/main/scala/com/couchbase/client/scala/ReactiveScope.scala @@ -17,7 +17,7 @@ package com.couchbase.client.scala import com.couchbase.client.core.Core import com.couchbase.client.core.annotation.SinceCouchbase -import com.couchbase.client.core.annotation.Stability.Volatile +import com.couchbase.client.core.annotation.Stability.Uncommitted import com.couchbase.client.core.api.query.CoreQueryContext import com.couchbase.client.core.protostellar.CoreProtostellarUtil import com.couchbase.client.scala.analytics.{AnalyticsOptions, ReactiveAnalyticsResult} @@ -137,7 +137,8 @@ class ReactiveScope(async: AsyncScope, val bucketName: String) { * @return a `Try` containing a `Success(SearchResult)` (which includes any returned rows) if successful, * else a `Failure` */ - @Volatile + @Uncommitted + @SinceCouchbase("7.6") def search( indexName: String, request: SearchRequest @@ -157,7 +158,8 @@ class ReactiveScope(async: AsyncScope, val bucketName: String) { * @return a `Try` containing a `Success(SearchResult)` (which includes any returned rows) if successful, * else a `Failure` */ - @Volatile + @Uncommitted + @SinceCouchbase("7.6") def search( indexName: String, request: SearchRequest, diff --git a/scala-client/src/main/scala/com/couchbase/client/scala/Scope.scala b/scala-client/src/main/scala/com/couchbase/client/scala/Scope.scala index e37ffaa28..86e86144d 100644 --- a/scala-client/src/main/scala/com/couchbase/client/scala/Scope.scala +++ b/scala-client/src/main/scala/com/couchbase/client/scala/Scope.scala @@ -17,7 +17,7 @@ package com.couchbase.client.scala import com.couchbase.client.core.annotation.SinceCouchbase -import com.couchbase.client.core.annotation.Stability.Volatile +import com.couchbase.client.core.annotation.Stability.Uncommitted import com.couchbase.client.core.api.query.CoreQueryContext import com.couchbase.client.scala.analytics.{AnalyticsOptions, AnalyticsResult} import com.couchbase.client.scala.manager.search.ScopeSearchIndexManager @@ -122,7 +122,8 @@ class Scope private[scala] (val async: AsyncScope, val bucketName: String) { * @return a `Try` containing a `Success(SearchResult)` (which includes any returned rows) if successful, * else a `Failure` */ - @Volatile + @Uncommitted + @SinceCouchbase("7.6") def search( indexName: String, request: SearchRequest @@ -145,7 +146,8 @@ class Scope private[scala] (val async: AsyncScope, val bucketName: String) { * @return a `Try` containing a `Success(SearchResult)` (which includes any returned rows) if successful, * else a `Failure` */ - @Volatile + @Uncommitted + @SinceCouchbase("7.6") def search( indexName: String, request: SearchRequest, diff --git a/scala-client/src/main/scala/com/couchbase/client/scala/search/vector/SearchRequest.scala b/scala-client/src/main/scala/com/couchbase/client/scala/search/vector/SearchRequest.scala index cdadea2f8..418e74981 100644 --- a/scala-client/src/main/scala/com/couchbase/client/scala/search/vector/SearchRequest.scala +++ b/scala-client/src/main/scala/com/couchbase/client/scala/search/vector/SearchRequest.scala @@ -16,7 +16,8 @@ package com.couchbase.client.scala.search.vector -import com.couchbase.client.core.annotation.Stability.Volatile +import com.couchbase.client.core.annotation.SinceCouchbase +import com.couchbase.client.core.annotation.Stability.Uncommitted import com.couchbase.client.core.api.search.queries.CoreSearchRequest import com.couchbase.client.core.error.InvalidArgumentException import com.couchbase.client.scala.search.queries.{MatchNoneQuery, SearchQuery} @@ -27,7 +28,7 @@ import scala.util.{Failure, Success, Try} * * If both are provided, the FS service will merge the results. */ -@Volatile +@Uncommitted case class SearchRequest private ( private val searchQuery: Option[SearchQuery] = None, private val vectorSearch: Option[VectorSearch] = None, @@ -40,6 +41,7 @@ case class SearchRequest private ( * * @return a copy of this, for chaining. */ + @SinceCouchbase("7.6") def vectorSearch(vectorSearch: VectorSearch): SearchRequest = { this.vectorSearch match { case Some(_) => @@ -91,7 +93,7 @@ case class SearchRequest private ( } } -@Volatile +@Uncommitted object SearchRequest { /** Execute an FTS [[SearchQuery]]. */ diff --git a/scala-client/src/main/scala/com/couchbase/client/scala/search/vector/VectorQuery.scala b/scala-client/src/main/scala/com/couchbase/client/scala/search/vector/VectorQuery.scala index a55aac99c..f9a71489a 100644 --- a/scala-client/src/main/scala/com/couchbase/client/scala/search/vector/VectorQuery.scala +++ b/scala-client/src/main/scala/com/couchbase/client/scala/search/vector/VectorQuery.scala @@ -16,11 +16,11 @@ package com.couchbase.client.scala.search.vector -import com.couchbase.client.core.annotation.Stability.Volatile +import com.couchbase.client.core.annotation.Stability.Uncommitted import com.couchbase.client.core.api.search.vector.CoreVectorQuery /** Represents a vector query. */ -@Volatile +@Uncommitted case class VectorQuery private ( private val vectorQuery: Array[Float], private val vectorField: String, @@ -53,7 +53,7 @@ case class VectorQuery private ( ) } -@Volatile +@Uncommitted object VectorQuery { def apply(vectorField: String, vectorQuery: Array[Float]): VectorQuery = new VectorQuery(vectorQuery, vectorField) diff --git a/scala-client/src/main/scala/com/couchbase/client/scala/search/vector/VectorSearch.scala b/scala-client/src/main/scala/com/couchbase/client/scala/search/vector/VectorSearch.scala index ceb352d77..380ba103d 100644 --- a/scala-client/src/main/scala/com/couchbase/client/scala/search/vector/VectorSearch.scala +++ b/scala-client/src/main/scala/com/couchbase/client/scala/search/vector/VectorSearch.scala @@ -16,12 +16,12 @@ package com.couchbase.client.scala.search.vector -import com.couchbase.client.core.annotation.Stability.Volatile +import com.couchbase.client.core.annotation.Stability.Uncommitted import com.couchbase.client.core.api.search.vector.CoreVectorSearch import scala.collection.JavaConverters._ /** Allows one or more [[VectorQuery]]s to be executed. */ -@Volatile +@Uncommitted case class VectorSearch private ( private val vectorQueries: Iterable[VectorQuery], private val vectorSearchOptions: Option[VectorSearchOptions] = None @@ -41,7 +41,7 @@ case class VectorSearch private ( ) } -@Volatile +@Uncommitted object VectorSearch { /** Create a [[VectorSearch]] containing a single [[VectorQuery]]. */ diff --git a/scala-client/src/main/scala/com/couchbase/client/scala/search/vector/VectorSearchOptions.scala b/scala-client/src/main/scala/com/couchbase/client/scala/search/vector/VectorSearchOptions.scala index 52c82288f..c15a73e46 100644 --- a/scala-client/src/main/scala/com/couchbase/client/scala/search/vector/VectorSearchOptions.scala +++ b/scala-client/src/main/scala/com/couchbase/client/scala/search/vector/VectorSearchOptions.scala @@ -16,14 +16,14 @@ package com.couchbase.client.scala.search.vector -import com.couchbase.client.core.annotation.Stability.Volatile +import com.couchbase.client.core.annotation.Stability.Uncommitted import com.couchbase.client.core.api.search.vector.{ CoreVectorQueryCombination, CoreVectorSearchOptions } /** Specifies how multiple [[VectorQuery]]s in a [[VectorSearch]] are combined. */ -@Volatile +@Uncommitted sealed trait VectorQueryCombination object VectorQueryCombination { @@ -35,7 +35,7 @@ object VectorQueryCombination { } /** Options related to executing a [[VectorSearch]]. */ -@Volatile +@Uncommitted case class VectorSearchOptions private ( private val vectorQueryCombination: Option[VectorQueryCombination] = None ) {