Skip to content

Commit 2d5ce24

Browse files
Merge pull request #485 from couchbase/DOC-14065_JAVA_FTS_to_Search_Namechange
DOC-14065_JAVA_FTS to Search_Namechange
2 parents 66b6e57 + 1db1863 commit 2d5ce24

3 files changed

Lines changed: 25 additions & 24 deletions

File tree

modules/howtos/pages/full-text-searching-with-sdk.adoc

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
= Search
2-
:description: You can use the Search Service to create queryable full-text indexes in Couchbase Server.
2+
:description: You can use the Search Service to create queryable Search indexes in Couchbase Server.
33
:page-toclevels: 2
44
:page-aliases: ROOT:search-query.adoc, ROOT:full-text-searching-with-sdk.adoc
55

66
[abstract]
77
{description}
88

9-
The Search Service allows you to create, manage and query full-text indexes on JSON documents stored in Couchbase buckets.
9+
The Search Service allows you to create, manage and query Search indexes on JSON documents stored in Couchbase buckets.
1010
It uses natural language processing for indexing and querying documents, provides relevance scoring on the results of your queries and has fast indexes for querying a wide range of possible text searches.
1111

1212
Some of the supported query-types include simple queries like Match and Term queries, range queries like Date Range and Numeric Range and compound queries for conjunctions, disjunctions and/or boolean queries.
@@ -20,10 +20,10 @@ After familiarizing yourself with how to create and query a Search index in the
2020
There are two APIs for querying search: `cluster.searchQuery()`, and `cluster.search()`.
2121
Both are also available at the Scope level.
2222

23-
The former API supports FTS queries (`SearchQuery`), while the latter additionally supports the `VectorSearch` added in 7.6.
23+
The former API supports Search queries (`SearchQuery`), while the latter additionally supports the `VectorSearch` added in 7.6.
2424
Most of this documentation will focus on the former API, as the latter is in @Stability.Volatile status.
2525

26-
We will perform an FTS query here - see the xref:vector-searching-with-sdk.adoc[Vector Search] docs for examples of Vector and xref:vector-searching-with-sdk.adoc#combining-fts-and-vector-queries[combining Vector and FTS].
26+
We will perform a Search query here -- see the xref:vector-searching-with-sdk.adoc[Vector Search] docs for examples of Vector and xref:vector-searching-with-sdk.adoc#combining-fts-and-vector-queries[combining Vector and Search queries].
2727

2828
[source,java]
2929
----
@@ -99,7 +99,7 @@ The `SearchRow` contains the following methods:
9999
.SearchRow
100100
[options="header"]
101101
|====
102-
| `index()` | The name of the FTS index that gave this result.
102+
| `index()` | The name of the Search index that gave this result.
103103
| `id()` | The id of the matching document.
104104
| `score()` | The score of this hit.
105105
| `explanation()` | If enabled provides an explanation in JSON form.
@@ -115,20 +115,20 @@ so if you absolutely need to check if all partitions are present in the result d
115115
(and not only catch an exception on the query itself).
116116

117117
== Scoped vs Global Indexes
118-
The FTS APIs exist at both the `Cluster` and `Scope` levels.
118+
The Search APIs exist at both the `Cluster` and `Scope` levels.
119119

120-
This is because FTS supports, as of Couchbase Server 7.6, a new form of "scoped index" in addition to the traditional "global index".
120+
This is because the Search Service supports, as of Couchbase Server 7.6, a new form of "scoped index" in addition to the traditional "global index".
121121

122122
It's important to use the `Cluster.searchQuery()` or `Cluster.search()` for global indexes, and `Scope.search()` for scoped indexes.
123123

124124

125125
////
126126
== Vector Search
127-
As of Couchbase Server 7.6, the FTS service supports vector search in additional to traditional full text search queries.
127+
As of Couchbase Server 7.6, the Search Service supports vector search in additional to traditional search queries.
128128
// todo link to the server docs when available
129129
130130
=== Examples
131-
==== Single vector query
131+
==== Single Vector Query
132132
In this first example we are performing a single vector query:
133133
134134
[source,java]
@@ -137,7 +137,7 @@ include::devguide:example$java/Search.java[tag=vector1,indent=0]
137137
----
138138
139139
Let's break this down.
140-
We create a `SearchRequest`, which can contain a traditional FTS query `SearchQuery` and/or the new `VectorSearch`.
140+
We create a `SearchRequest`, which can contain a traditional Search query `SearchQuery` and/or the new `VectorSearch`.
141141
Here we are just using the latter.
142142
143143
The `VectorSearch` allows us to perform one or more `VectorQuery` s.
@@ -146,14 +146,14 @@ The `VectorQuery` itself takes the name of the document field that contains embe
146146
147147
(Note that Couchbase itself is not involved in generating the vectors, and these will come from an external source such as an embeddings API.)
148148
149-
Finally we execute the `SearchRequest` against the FTS index "travel-sample-index", which has previously been setup to vector index the "vector_field" field.
149+
Finally we execute the `SearchRequest` against the Search index "travel-sample-index", which has previously been setup to vector index the "vector_field" field.
150150
151151
This happens to be a scoped index so we are using `scope.search()`.
152152
If it was a global index we would use `cluster.search()` instead - see <<Scoped vs Global Indexes>>.
153153
154154
It returns the same `SearchResult` detailed earlier.
155155
156-
==== Multiple vector queries
156+
==== Multiple Vector Queries
157157
You can run multiple vector queries together:
158158
159159
[source,java]
@@ -163,8 +163,9 @@ include::devguide:example$java/Search.java[tag=vector3,indent=0]
163163
164164
How the results are combined (ANDed or ORed) can be controlled with `vectorSearchOptions().vectorQueryCombination()`.
165165
166-
==== Combining FTS and vector queries
167-
You can combine a traditional FTS query with vector queries:
166+
==== Combining Search and Vector Queries
167+
168+
You can combine a traditional Search query with vector queries:
168169
169170
[source,java]
170171
----
@@ -174,8 +175,8 @@ include::devguide:example$java/Search.java[tag=vector2,indent=0]
174175
How the results are combined (ANDed or ORed) can be controlled with `vectorSearchOptions().vectorQueryCombination()`.
175176
////
176177

177-
// ==== FTS queries
178-
// And note that traditional FTS queries, without vector search, are also supported with the new `cluster.search()` / `scope.search()` APIs:
178+
// ==== Search queries
179+
// And note that traditional Search queries, without Vector Search, are also supported with the new `cluster.search()` / `scope.search()` APIs:
179180

180181
[source,java]
181182
----

modules/howtos/pages/transcoders-nonjson.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ include::devguide:example$java/Transcoding.java[tag=gson-decode,indent=0]
138138
It is most common to store JSON with Couchbase.
139139
However, it is possible to store non-JSON documents, such as raw binary data, perhaps using an concise binary encoding like https://msgpack.org[MessagePack] or https://cbor.io/[CBOR], in the Key-Value store.
140140

141-
NOTE: It's important to note that the Couchbase Data Platform includes multiple components other than the Key-Value store -- including {sqlpp_url}[{sqlpp} (formerly N1QL)] and its indexes, FTS, analytics, and eventing -- and these are optimized for JSON and will either ignore or provide limited functionality with non-JSON documents.
141+
NOTE: It's important to note that the Couchbase Data Platform includes multiple components other than the Key-Value store -- including {sqlpp_url}[{sqlpp} (formerly N1QL)] and its Indexes, Search Service, Analytics, and Eventing -- and these are optimized for JSON and will either ignore or provide limited functionality with non-JSON documents.
142142

143143
Also note that some simple data types can be stored directly as JSON, without recourse to non-JSON transcoding.
144144
A valid JSON document can be a simple integer (`42`), string (`"hello"`), array (`[1,2,3]`), boolean (`true`, `false`) and the JSON `null` value.

modules/howtos/pages/vector-searching-with-sdk.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ include::devguide:example$java/ParameterizedVectorQuery.java[tag=parameterized,i
8888

8989
== Vector Search With the Search Service
9090

91-
Vector search is also implemented using xref:full-text-searching-with-sdk.adoc[Search Indexes], and can be combined with traditional full text search queries.
91+
Vector search is also implemented using xref:full-text-searching-with-sdk.adoc[Search Indexes], and can be combined with traditional search queries.
9292
Vector embeddings can be an array of floats or a xref:server:vector-search:run-vector-search-ui.adoc#base64[base64 encoded string].
9393

9494
=== Prerequisites
@@ -108,7 +108,7 @@ include::devguide:example$java/Search.java[tag=vector1,indent=0]
108108
----
109109

110110
Let's break this down.
111-
We create a `SearchRequest`, which can contain a traditional FTS query `SearchQuery` and/or the new `VectorSearch`.
111+
We create a `SearchRequest`, which can contain a traditional s Search query `SearchQuery` and/or the new `VectorSearch`.
112112
Here we are just using the latter.
113113

114114
The `VectorSearch` allows us to perform one or more `VectorQuery` s.
@@ -117,7 +117,7 @@ The `VectorQuery` itself takes the name of the document field that contains embe
117117

118118
(Note that Couchbase itself is not involved in generating the vectors, and these will come from an external source such as an embeddings API.)
119119

120-
Finally we execute the `SearchRequest` against the FTS index "travel-sample-index", which has previously been setup to vector index the "vector_field" field.
120+
Finally we execute the `SearchRequest` against the Search index "travel-sample-index", which has previously been setup to vector index the "vector_field" field.
121121

122122
This happens to be a scoped index so we are using `scope.search()`.
123123
If it was a global index we would use `cluster.search()` instead - see <<Scoped vs Global Indexes>>.
@@ -175,9 +175,9 @@ include::devguide:example$java/Search.java[tag=vector3,indent=0]
175175

176176
How the results are combined (ANDed or ORed) can be controlled with `vectorSearchOptions().vectorQueryCombination()`.
177177

178-
==== Combining FTS and vector queries
178+
==== Combining Search and Vector Queries
179179

180-
You can combine a traditional FTS query with vector queries:
180+
You can combine a traditional Search query with vector queries:
181181

182182
[source,java]
183183
----
@@ -202,8 +202,8 @@ See a fuller list, with Vector properties, in the xref:cloud:search:search-reque
202202

203203

204204
////
205-
==== FTS queries
206-
And note that traditional FTS queries, without vector search, are also supported with the new `cluster.search()` / `scope.search()` APIs:
205+
==== Search Queries
206+
And note that traditional Search queries, without Vector Search, are also supported with the new `cluster.search()` / `scope.search()` APIs:
207207
[source,java]
208208
----
209209
include::devguide:example$java/Search.java[tag=vector4,indent=0]

0 commit comments

Comments
 (0)