Support PIT, Fields and RuntimeFields on AsyncSearch (#5989)

Author: stevejgordon

src/Nest/Search/Search/SearchRequest.cs

@@ -39,8 +39,7 @@ public partial interface ISearchRequest : ITypedSearchRequest
 		bool? Explain { get; set; }
 
 		/// <summary>
-		/// BETA: Allows for retrieving a list of document fields in the search response.
-		/// <para>This functionality is in beta and is subject to change. </para>
+		/// Allows for retrieving a list of document fields in the search response.
 		/// </summary>
 		[DataMember(Name = "fields")]
 		Fields Fields { get; set; }

src/Nest/XPack/AsyncSearch/Submit/AsyncSearchSubmitRequest.cs

@@ -26,6 +26,10 @@ public partial interface IAsyncSearchSubmitRequest : ITypedSearchRequest
 		[DataMember(Name = "explain")]
 		bool? Explain { get; set; }
 
+		/// <inheritdoc cref="ISearchRequest.Fields"/>
+		[DataMember(Name = "fields")]
+		Fields Fields { get; set; }
+
 		/// <inheritdoc cref="ISearchRequest.From"/>
 		[DataMember(Name = "from")]
 		int? From { get; set; }
@@ -98,6 +102,14 @@ public partial interface IAsyncSearchSubmitRequest : ITypedSearchRequest
 		/// <inheritdoc cref="ISearchRequest.Version"/>
 		[DataMember(Name = "version")]
 		bool? Version { get; set; }
+
+		/// <inheritdoc cref="ISearchRequest.PointInTime"/>
+		[DataMember(Name = "pit")]
+		IPointInTime PointInTime { get; set; }
+
+		/// <inheritdoc cref="ISearchRequest.RuntimeFields"/>
+		[DataMember(Name = "runtime_mappings")]
+		IRuntimeFields RuntimeFields { get; set; }
 	}
 
 	[ReadAs(typeof(AsyncSearchSubmitRequest<>))]
@@ -118,6 +130,8 @@ public partial class AsyncSearchSubmitRequest
 		/// <inheritdoc />
 		public bool? Explain { get; set; }
 		/// <inheritdoc />
+		public Fields Fields { get; set; }
+		/// <inheritdoc />
 		public int? From { get; set; }
 		/// <inheritdoc />
 		public IHighlight Highlight { get; set; }
@@ -158,6 +172,10 @@ public partial class AsyncSearchSubmitRequest
 		public bool? TrackTotalHits { get; set; }
 		/// <inheritdoc />
 		public bool? Version { get; set; }
+		/// <inheritdoc />
+		public IPointInTime PointInTime { get; set; }
+		/// <inheritdoc />
+		public IRuntimeFields RuntimeFields { get; set; }
 
 		Type ITypedSearchRequest.ClrType => null;
 
@@ -179,6 +197,7 @@ public partial class AsyncSearchSubmitDescriptor<TInferDocument> where TInferDoc
 		IFieldCollapse IAsyncSearchSubmitRequest.Collapse { get; set; }
 		Fields IAsyncSearchSubmitRequest.DocValueFields { get; set; }
 		bool? IAsyncSearchSubmitRequest.Explain { get; set; }
+		Fields IAsyncSearchSubmitRequest.Fields { get; set; }
 		int? IAsyncSearchSubmitRequest.From { get; set; }
 		IHighlight IAsyncSearchSubmitRequest.Highlight { get; set; }
 		IDictionary<IndexName, double> IAsyncSearchSubmitRequest.IndicesBoost { get; set; }
@@ -199,6 +218,8 @@ public partial class AsyncSearchSubmitDescriptor<TInferDocument> where TInferDoc
 		bool? IAsyncSearchSubmitRequest.TrackScores { get; set; }
 		bool? IAsyncSearchSubmitRequest.TrackTotalHits { get; set; }
 		bool? IAsyncSearchSubmitRequest.Version { get; set; }
+		IPointInTime IAsyncSearchSubmitRequest.PointInTime { get; set; }
+		IRuntimeFields IAsyncSearchSubmitRequest.RuntimeFields { get; set; }
 
 		protected sealed override void RequestDefaults(AsyncSearchSubmitRequestParameters parameters) => TypedKeys();
 
@@ -225,6 +246,17 @@ public AsyncSearchSubmitDescriptor<TInferDocument> Source(Func<SourceFilterDescr
 		/// <inheritdoc cref="IAsyncSearchSubmitRequest.Size" />
 		public AsyncSearchSubmitDescriptor<TInferDocument> Take(int? take) => Size(take);
 
+		/// <inheritdoc cref="IAsyncSearchSubmitRequest.Fields" />
+		public AsyncSearchSubmitDescriptor<TInferDocument> Fields(Func<FieldsDescriptor<TInferDocument>, IPromise<Fields>> fields) =>
+			Assign(fields, (a, v) => a.Fields = v?.Invoke(new FieldsDescriptor<TInferDocument>())?.Value);
+
+		/// <inheritdoc cref="IAsyncSearchSubmitRequest.Fields" />
+		public AsyncSearchSubmitDescriptor<TInferDocument> Fields<TSource>(Func<FieldsDescriptor<TSource>, IPromise<Fields>> fields) where TSource : class =>
+			Assign(fields, (a, v) => a.Fields = v?.Invoke(new FieldsDescriptor<TSource>())?.Value);
+
+		/// <inheritdoc cref="IAsyncSearchSubmitRequest.Fields" />
+		public AsyncSearchSubmitDescriptor<TInferDocument> Fields(Fields fields) => Assign(fields, (a, v) => a.DocValueFields = v);
+
 		/// <inheritdoc cref="IAsyncSearchSubmitRequest.From" />
 		public AsyncSearchSubmitDescriptor<TInferDocument> From(int? from) => Assign(from, (a, v) => a.From = v);
 
@@ -324,5 +356,34 @@ public AsyncSearchSubmitDescriptor<TInferDocument> Rescore(Func<RescoringDescrip
 
 		/// <inheritdoc cref="IAsyncSearchSubmitRequest.TrackTotalHits" />
 		public AsyncSearchSubmitDescriptor<TInferDocument> TrackTotalHits(bool? trackTotalHits = true) => Assign(trackTotalHits, (a, v) => a.TrackTotalHits = v);
+
+		/// <inheritdoc cref="IAsyncSearchSubmitRequest.PointInTime" />
+		public AsyncSearchSubmitDescriptor<TInferDocument> PointInTime(string pitId)
+		{
+			Self.PointInTime = new PointInTime(pitId);
+			return this;
+		}
+
+		/// <inheritdoc cref="IAsyncSearchSubmitRequest.PointInTime" />
+		public AsyncSearchSubmitDescriptor<TInferDocument> PointInTime(string pitId, Func<PointInTimeDescriptor, IPointInTime> pit) =>
+			Assign(pit, (a, v) => a.PointInTime = v?.Invoke(new PointInTimeDescriptor(pitId)));
+
+		/// <inheritdoc cref="IAsyncSearchSubmitRequest.RuntimeFields" />
+		public AsyncSearchSubmitDescriptor<TInferDocument> RuntimeFields(Func<RuntimeFieldsDescriptor<TInferDocument>, IPromise<IRuntimeFields>> runtimeFieldsSelector) =>
+			Assign(runtimeFieldsSelector, (a, v) => a.RuntimeFields = v?.Invoke(new RuntimeFieldsDescriptor<TInferDocument>())?.Value);
+
+		/// <inheritdoc cref="IAsyncSearchSubmitRequest.RuntimeFields" />
+		public AsyncSearchSubmitDescriptor<TInferDocument> RuntimeFields<TSource>(Func<RuntimeFieldsDescriptor<TSource>, IPromise<IRuntimeFields>> runtimeFieldsSelector) where TSource : class =>
+			Assign(runtimeFieldsSelector, (a, v) => a.RuntimeFields = v?.Invoke(new RuntimeFieldsDescriptor<TSource>())?.Value);
+
+		protected override string ResolveUrl(RouteValues routeValues, IConnectionSettingsValues settings)
+		{
+			if (Self.PointInTime is object && !string.IsNullOrEmpty(Self.PointInTime.Id) && routeValues.ContainsKey("index"))
+			{
+				routeValues.Remove("index");
+			}
+
+			return base.ResolveUrl(routeValues, settings);
+		}
 	}
 }