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.

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

Add support for Point In Time APIs #405

Merged
merged 16 commits into from
Nov 5, 2023
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Removed support for the `net461` target ([#256](https://github.com/opensearch-project/opensearch-net/pull/256))
- Fixed naming of `ClusterManagerTimeout` and `MasterTimeout` properties from `*TimeSpanout` in the low-level client ([#332](https://github.com/opensearch-project/opensearch-net/pull/332))

### Added
- Added support for point-in-time search and associated APIs ([#405](https://github.com/opensearch-project/opensearch-net/pull/405))

### Removed
- Removed the `Features` API which is not supported by OpenSearch from the low-level client ([#331](https://github.com/opensearch-project/opensearch-net/pull/331))

Expand Down Expand Up @@ -106,4 +109,4 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
[Unreleased]: https://github.com/opensearch-project/opensearch-net/compare/v1.5.0...main
[1.5.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.4.0...v1.5.0
[1.4.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.3.0...v1.4.0
[1.3.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.2.0...v1.3.0
[1.3.0]: https://github.com/opensearch-project/opensearch-net/compare/v1.2.0...v1.3.0
35 changes: 34 additions & 1 deletion guides/search.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,41 @@ var page3 = await client.ScrollAsync<Movie>("1m", page2.ScrollId);
Console.WriteLine(string.Join('\n', page3.Documents));
```

### Pagination with Point in Time
The scroll example above has one weakness: if the index is updated while you are scrolling through the results, they will be paginated inconsistently. To avoid this, you should use the "Point in Time" feature. The following example demonstrates how to use the `point_in_time` and `pit_id` parameters to paginate through the search results:

```csharp
var pitResp = await client.CreatePitAsync("movies", p => p.KeepAlive("1m"));

var page1 = await client.SearchAsync<Movie>(s => s
.Query(_ => query)
.Sort(_ => sort)
.Size(2)
.PointInTime(p => p.Id(pitResp.PitId).KeepAlive("1m")));
var page2 = await client.SearchAsync<Movie>(s => s
.Query(_ => query)
.Sort(_ => sort)
.Size(2)
.PointInTime(p => p.Id(pitResp.PitId).KeepAlive("1m"))
.SearchAfter(page1.Hits.Last().Sorts));
var page3 = await client.SearchAsync<Movie>(s => s
.Query(_ => query)
.Sort(_ => sort)
.Size(2)
.PointInTime(p => p.Id(pitResp.PitId).KeepAlive("1m"))
.SearchAfter(page2.Hits.Last().Sorts));

foreach (var doc in page1.Documents.Concat(page2.Documents).Concat(page3.Documents))
{
Console.WriteLine(doc.Title);
}

await client.DeletePitAsync(p => p.PitId(pitResp.PitId));
```

Note that a point-in-time is associated with an index or a set of index. So, when performing a search with a point-in-time, you DO NOT specify the index in the search.

## Cleanup
```csharp
await client.Indices.DeleteAsync("movies");
```
```
3 changes: 3 additions & 0 deletions src/ApiGenerator/Configuration/CodeConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ public static class CodeConfiguration
{
private static readonly Glob[] OperationsToInclude =
{
new("{create,delete}_pit"),
new("{delete,get}_all_pits"),

new("cluster.allocation_explain"),
new("cluster.delete_component_template"),
new("cluster.delete_voting_config_exclusions"),
Expand Down
115 changes: 90 additions & 25 deletions src/ApiGenerator/OpenSearch.openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -5119,16 +5119,6 @@
"type": "string",
"description": "The awareness attribute for which the health is required."
}
},
{
"name": "ensure_node_commissioned",
"in": "query",
"description": "Checks whether local node is commissioned or not. If set to true on a local call it will throw exception if node is decommissioned.",
"schema": {
"type": "boolean",
"default": false,
"description": "Checks whether local node is commissioned or not. If set to true on a local call it will throw exception if node is decommissioned."
}
}
],
"responses": {
Expand Down Expand Up @@ -5280,16 +5270,6 @@
"type": "string",
"description": "The awareness attribute for which the health is required."
}
},
{
"name": "ensure_node_commissioned",
"in": "query",
"description": "Checks whether local node is commissioned or not. If set to true on a local call it will throw exception if node is decommissioned.",
"schema": {
"type": "boolean",
"default": false,
"description": "Checks whether local node is commissioned or not. If set to true on a local call it will throw exception if node is decommissioned."
}
}
],
"responses": {
Expand Down Expand Up @@ -6831,6 +6811,18 @@
"deprecated": true
}
},
{
"name": "cluster_manager_timeout",
"in": "query",
"description": "Operation timeout for connection to cluster-manager node.",
"schema": {
"type": "string",
"pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$",
"description": "Operation timeout for connection to cluster-manager node.",
"x-version-added": "2.0.0",
"x-data-type": "time"
}
},
{
"name": "local",
"in": "query",
Expand Down Expand Up @@ -8536,6 +8528,18 @@
"deprecated": true
}
},
{
"name": "cluster_manager_timeout",
"in": "query",
"description": "Operation timeout for connection to cluster-manager node.",
"schema": {
"type": "string",
"pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$",
"description": "Operation timeout for connection to cluster-manager node.",
"x-version-added": "2.0.0",
"x-data-type": "time"
}
},
{
"name": "local",
"in": "query",
Expand Down Expand Up @@ -18594,6 +18598,18 @@
"deprecated": true
}
},
{
"name": "cluster_manager_timeout",
"in": "query",
"description": "Operation timeout for connection to cluster-manager node.",
"schema": {
"type": "string",
"pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$",
"description": "Operation timeout for connection to cluster-manager node.",
"x-version-added": "2.0.0",
"x-data-type": "time"
}
},
{
"name": "local",
"in": "query",
Expand Down Expand Up @@ -19451,6 +19467,18 @@
"description": "Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)."
}
},
{
"name": "cluster_manager_timeout",
"in": "query",
"description": "Operation timeout for connection to cluster-manager node.",
"schema": {
"type": "string",
"pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$",
"description": "Operation timeout for connection to cluster-manager node.",
"x-version-added": "2.0.0",
"x-data-type": "time"
}
},
{
"name": "expand_wildcards",
"in": "query",
Expand Down Expand Up @@ -25302,6 +25330,18 @@
"$ref": "#/components/schemas/ExpandWildcards"
}
},
{
"name": "cluster_manager_timeout",
"in": "query",
"description": "Operation timeout for connection to cluster-manager node.",
"schema": {
"type": "string",
"pattern": "^([0-9]+)(?:d|h|m|s|ms|micros|nanos)$",
"description": "Operation timeout for connection to cluster-manager node.",
"x-version-added": "2.0.0",
"x-data-type": "time"
}
},
{
"name": "wait_for_active_shards",
"in": "query",
Expand Down Expand Up @@ -26631,7 +26671,8 @@
"description": "Specify the keep alive for point in time.",
"schema": {
"type": "string",
"description": "Specify the keep alive for point in time."
"description": "Specify the keep alive for point in time.",
"x-data-type": "time"
}
},
{
Expand Down Expand Up @@ -30868,6 +30909,7 @@
},
"DeletePit_BodyParams": {
"type": "object",
"description": "The point-in-time ids to be deleted",
"properties": {
"pit_id": {
"type": "array",
Expand Down Expand Up @@ -31170,6 +31212,9 @@
"type": "string"
}
},
"dls": {
"type": "string"
},
"fls": {
"type": "array",
"items": {
Expand Down Expand Up @@ -31885,19 +31930,22 @@
"description": {
"type": "string"
},
"cluster_permission": {
"cluster_permissions": {
"type": "array",
"items": {
"type": "string"
}
},
"index_permission": {
"$ref": "#/components/schemas/IndexPermission"
"index_permissions": {
"type": "array",
"items": {
"$ref": "#/components/schemas/IndexPermission"
}
},
"tenant_permissions": {
"type": "array",
"items": {
"type": "string"
"$ref": "#/components/schemas/TenantPermission"
}
},
"static": {
Expand Down Expand Up @@ -32220,6 +32268,23 @@
}
}
},
"TenantPermission": {
"type": "object",
"properties": {
"tenant_patterns": {
"type": "array",
"items": {
"type": "string"
}
},
"allowed_actions": {
"type": "array",
"items": {
"type": "string"
}
}
}
},
"TenantsMap": {
"type": "object",
"additionalProperties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ using System.Linq.Expressions;

using OpenSearch.Net;
using OpenSearch.Net.Utf8Json;
@if (ns != CsharpNames.RootNamespace)
@if (ns != null)
{
<text>using OpenSearch.Net@(ns);
</text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ using System.Linq.Expressions;
using System.Runtime.Serialization;
using OpenSearch.Net;
using OpenSearch.Net.Utf8Json;
@if (ns != CsharpNames.RootNamespace)
@if (ns != null)
{
<text>using OpenSearch.Net@(ns);
</text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
using System.Collections.Generic;
using System.Linq.Expressions;
using System.Runtime.Serialization;
using OpenSearch.Net.Extensions;
using OpenSearch.Net.Utf8Json;
using OpenSearch.Net.Utf8Json.Internal;
using OpenSearch.Net.Utf8Json.Resolvers;
Expand Down
1 change: 1 addition & 0 deletions src/OpenSearch.Client/Cat/CatHelpResponseBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
using System.Threading;
using System.Threading.Tasks;
using OpenSearch.Net;
using OpenSearch.Net.Extensions;

namespace OpenSearch.Client.Specification.CatApi
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,6 @@ internal static string ToEnumValue<T>(this T enumValue) where T : struct
return null;
}

internal static string Utf8String(this ref ArraySegment<byte> segment) =>
StringEncoding.UTF8.GetString(segment.Array, segment.Offset, segment.Count);

internal static string Utf8String(this byte[] bytes) => bytes == null ? null : Encoding.UTF8.GetString(bytes, 0, bytes.Length);

internal static byte[] Utf8Bytes(this string s) => s.IsNullOrEmpty() ? null : Encoding.UTF8.GetBytes(s);

internal static bool IsNullOrEmpty(this IndexName value) => value == null || value.GetHashCode() == 0;

internal static bool IsNullable(this Type type) =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
*/

using System.Collections.Generic;
using OpenSearch.Net.Extensions;
using OpenSearch.Net.Utf8Json;
using OpenSearch.Net.Utf8Json.Internal;
using OpenSearch.Net.Utf8Json.Resolvers;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
*/

using System.Collections.Generic;
using OpenSearch.Net.Extensions;
using OpenSearch.Net.Utf8Json;
using OpenSearch.Net.Utf8Json.Internal;
using OpenSearch.Net.Utf8Json.Resolvers;
Expand Down
1 change: 1 addition & 0 deletions src/OpenSearch.Client/OpenSearch.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<ProjectReference Include="..\OpenSearch.Net\OpenSearch.Net.csproj" />
</ItemGroup>
<ItemGroup>
<InternalsVisibleTo Include="Tests" Key="$(ExposedPublicKey)" />
<InternalsVisibleTo Include="OpenSearch.Net.CustomDynamicObjectResolver" Key="$(ExposedPublicKey)" />
<InternalsVisibleTo Include="OpenSearch.Net.DynamicCompositeResolver" Key="$(ExposedPublicKey)" />
<InternalsVisibleTo Include="OpenSearch.Net.DynamicObjectResolverAllowPrivateFalseExcludeNullFalseNameMutateOriginal" Key="$(ExposedPublicKey)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

using System;
using OpenSearch.Net;
using OpenSearch.Net.Extensions;
using OpenSearch.Net.Utf8Json;
using OpenSearch.Net.Utf8Json.Internal;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
*/

using System;
using OpenSearch.Net.Extensions;
using OpenSearch.Net.Utf8Json;
using OpenSearch.Net.Utf8Json.Internal;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
* under the License.
*/

using OpenSearch.Net.Extensions;
using OpenSearch.Net.Utf8Json;
using OpenSearch.Net.Utf8Json.Internal;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
*/

using System.Collections.Generic;
using OpenSearch.Net.Extensions;
using OpenSearch.Net.Utf8Json;
using OpenSearch.Net.Utf8Json.Internal;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
*/

using System;
using OpenSearch.Net.Extensions;
using OpenSearch.Net.Utf8Json;
using OpenSearch.Net.Utf8Json.Internal;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
using OpenSearch.Net.Utf8Json;
using OpenSearch.Net.Utf8Json.Internal;
using OpenSearch.Client;
using OpenSearch.Net.Extensions;

namespace OpenSearch.Client
{
Expand Down
Loading
Loading