base

Author: l-trotta

java-client/src/main/java/co/elastic/clients/elasticsearch/core/rank_eval/RankEvalQuery.java

@@ -187,6 +187,8 @@ protected static void setupRankEvalQueryDeserializer(ObjectDeserializer<RankEval
 		op.add(Builder::query, Query._DESERIALIZER, "query");
 		op.add(Builder::size, JsonpDeserializer.integerDeserializer(), "size");
 
+		op.shortcutProperty("query");
+
 	}
 
 }

java-client/src/main/java/co/elastic/clients/elasticsearch/doc-files/api-spec.html

@@ -115,23 +115,23 @@
 '_global.ping.Request': '_global/ping/PingRequest.ts#L22-L27',
 '_global.put_script.Request': '_global/put_script/PutScriptRequest.ts#L25-L64',
 '_global.put_script.Response': '_global/put_script/PutScriptResponse.ts#L22-L24',
-'_global.rank_eval.DocumentRating': '_global/rank_eval/types.ts#L116-L123',
-'_global.rank_eval.RankEvalHit': '_global/rank_eval/types.ts#L141-L145',
-'_global.rank_eval.RankEvalHitItem': '_global/rank_eval/types.ts#L136-L139',
+'_global.rank_eval.DocumentRating': '_global/rank_eval/types.ts#L119-L126',
+'_global.rank_eval.RankEvalHit': '_global/rank_eval/types.ts#L144-L148',
+'_global.rank_eval.RankEvalHitItem': '_global/rank_eval/types.ts#L139-L142',
 '_global.rank_eval.RankEvalMetric': '_global/rank_eval/types.ts#L90-L96',
 '_global.rank_eval.RankEvalMetricBase': '_global/rank_eval/types.ts#L26-L32',
-'_global.rank_eval.RankEvalMetricDetail': '_global/rank_eval/types.ts#L125-L134',
+'_global.rank_eval.RankEvalMetricDetail': '_global/rank_eval/types.ts#L128-L137',
 '_global.rank_eval.RankEvalMetricDiscountedCumulativeGain': '_global/rank_eval/types.ts#L66-L77',
 '_global.rank_eval.RankEvalMetricExpectedReciprocalRank': '_global/rank_eval/types.ts#L79-L88',
 '_global.rank_eval.RankEvalMetricMeanReciprocalRank': '_global/rank_eval/types.ts#L60-L64',
 '_global.rank_eval.RankEvalMetricPrecision': '_global/rank_eval/types.ts#L42-L52',
 '_global.rank_eval.RankEvalMetricRatingTreshold': '_global/rank_eval/types.ts#L34-L40',
 '_global.rank_eval.RankEvalMetricRecall': '_global/rank_eval/types.ts#L54-L58',
-'_global.rank_eval.RankEvalQuery': '_global/rank_eval/types.ts#L111-L114',
+'_global.rank_eval.RankEvalQuery': '_global/rank_eval/types.ts#L111-L117',
 '_global.rank_eval.RankEvalRequestItem': '_global/rank_eval/types.ts#L98-L109',
 '_global.rank_eval.Request': '_global/rank_eval/RankEvalRequest.ts#L24-L61',
 '_global.rank_eval.Response': '_global/rank_eval/RankEvalResponse.ts#L26-L34',
-'_global.rank_eval.UnratedDocument': '_global/rank_eval/types.ts#L147-L150',
+'_global.rank_eval.UnratedDocument': '_global/rank_eval/types.ts#L150-L153',
 '_global.reindex.Destination': '_global/reindex/types.ts#L39-L64',
 '_global.reindex.RemoteSource': '_global/reindex/types.ts#L99-L125',
 '_global.reindex.Request': '_global/reindex/ReindexRequest.ts#L27-L101',
@@ -814,27 +814,27 @@
 '_types.query_dsl.CombinedFieldsZeroTerms': '_types/query_dsl/abstractions.ts#L514-L523',
 '_types.query_dsl.CommonTermsQuery': '_types/query_dsl/fulltext.ts#L34-L44',
 '_types.query_dsl.ConstantScoreQuery': '_types/query_dsl/compound.ts#L70-L77',
-'_types.query_dsl.DateDecayFunction': '_types/query_dsl/compound.ts#L193-L193',
+'_types.query_dsl.DateDecayFunction': '_types/query_dsl/compound.ts#L196-L196',
 '_types.query_dsl.DateDistanceFeatureQuery': '_types/query_dsl/specialized.ts#L72-L75',
 '_types.query_dsl.DateRangeQuery': '_types/query_dsl/term.ts#L146-L155',
-'_types.query_dsl.DecayFunction': '_types/query_dsl/compound.ts#L199-L208',
-'_types.query_dsl.DecayFunctionBase': '_types/query_dsl/compound.ts#L175-L186',
-'_types.query_dsl.DecayPlacement': '_types/query_dsl/compound.ts#L154-L173',
+'_types.query_dsl.DecayFunction': '_types/query_dsl/compound.ts#L202-L211',
+'_types.query_dsl.DecayFunctionBase': '_types/query_dsl/compound.ts#L178-L189',
+'_types.query_dsl.DecayPlacement': '_types/query_dsl/compound.ts#L157-L176',
 '_types.query_dsl.DisMaxQuery': '_types/query_dsl/compound.ts#L79-L91',
 '_types.query_dsl.DistanceFeatureQuery': '_types/query_dsl/specialized.ts#L77-L85',
 '_types.query_dsl.DistanceFeatureQueryBase': '_types/query_dsl/specialized.ts#L40-L60',
 '_types.query_dsl.ExistsQuery': '_types/query_dsl/term.ts#L37-L42',
 '_types.query_dsl.FieldAndFormat': '_types/query_dsl/abstractions.ts#L525-L539',
 '_types.query_dsl.FieldLookup': '_types/query_dsl/abstractions.ts#L429-L446',
-'_types.query_dsl.FieldValueFactorModifier': '_types/query_dsl/compound.ts#L307-L350',
-'_types.query_dsl.FieldValueFactorScoreFunction': '_types/query_dsl/compound.ts#L133-L152',
-'_types.query_dsl.FunctionBoostMode': '_types/query_dsl/compound.ts#L279-L305',
-'_types.query_dsl.FunctionScoreContainer': '_types/query_dsl/compound.ts#L210-L250',
-'_types.query_dsl.FunctionScoreMode': '_types/query_dsl/compound.ts#L252-L277',
-'_types.query_dsl.FunctionScoreQuery': '_types/query_dsl/compound.ts#L93-L119',
+'_types.query_dsl.FieldValueFactorModifier': '_types/query_dsl/compound.ts#L310-L353',
+'_types.query_dsl.FieldValueFactorScoreFunction': '_types/query_dsl/compound.ts#L136-L155',
+'_types.query_dsl.FunctionBoostMode': '_types/query_dsl/compound.ts#L282-L308',
+'_types.query_dsl.FunctionScoreContainer': '_types/query_dsl/compound.ts#L213-L253',
+'_types.query_dsl.FunctionScoreMode': '_types/query_dsl/compound.ts#L255-L280',
+'_types.query_dsl.FunctionScoreQuery': '_types/query_dsl/compound.ts#L93-L122',
 '_types.query_dsl.FuzzyQuery': '_types/query_dsl/term.ts#L44-L79',
 '_types.query_dsl.GeoBoundingBoxQuery': '_types/query_dsl/geo.ts#L32-L53',
-'_types.query_dsl.GeoDecayFunction': '_types/query_dsl/compound.ts#L194-L197',
+'_types.query_dsl.GeoDecayFunction': '_types/query_dsl/compound.ts#L197-L200',
 '_types.query_dsl.GeoDistanceFeatureQuery': '_types/query_dsl/specialized.ts#L67-L70',
 '_types.query_dsl.GeoDistanceQuery': '_types/query_dsl/geo.ts#L60-L91',
 '_types.query_dsl.GeoExecution': '_types/query_dsl/geo.ts#L55-L58',
@@ -865,10 +865,10 @@
 '_types.query_dsl.MatchQuery': '_types/query_dsl/fulltext.ts#L282-L347',
 '_types.query_dsl.MoreLikeThisQuery': '_types/query_dsl/specialized.ts#L87-L169',
 '_types.query_dsl.MultiMatchQuery': '_types/query_dsl/fulltext.ts#L456-L539',
-'_types.query_dsl.MultiValueMode': '_types/query_dsl/compound.ts#L352-L369',
+'_types.query_dsl.MultiValueMode': '_types/query_dsl/compound.ts#L355-L372',
 '_types.query_dsl.NestedQuery': '_types/query_dsl/joining.ts#L106-L130',
 '_types.query_dsl.NumberRangeQuery': '_types/query_dsl/term.ts#L157-L157',
-'_types.query_dsl.NumericDecayFunction': '_types/query_dsl/compound.ts#L192-L192',
+'_types.query_dsl.NumericDecayFunction': '_types/query_dsl/compound.ts#L195-L195',
 '_types.query_dsl.Operator': '_types/query_dsl/Operator.ts#L22-L27',
 '_types.query_dsl.ParentIdQuery': '_types/query_dsl/joining.ts#L132-L146',
 '_types.query_dsl.PercolateQuery': '_types/query_dsl/specialized.ts#L202-L239',
@@ -878,7 +878,7 @@
 '_types.query_dsl.QueryBase': '_types/query_dsl/abstractions.ts#L452-L463',
 '_types.query_dsl.QueryContainer': '_types/query_dsl/abstractions.ts#L102-L427',
 '_types.query_dsl.QueryStringQuery': '_types/query_dsl/fulltext.ts#L580-L700',
-'_types.query_dsl.RandomScoreFunction': '_types/query_dsl/compound.ts#L128-L131',
+'_types.query_dsl.RandomScoreFunction': '_types/query_dsl/compound.ts#L131-L134',
 '_types.query_dsl.RangeQuery': '_types/query_dsl/term.ts#L161-L170',
 '_types.query_dsl.RangeQueryBase': '_types/query_dsl/term.ts#L109-L133',
 '_types.query_dsl.RangeRelation': '_types/query_dsl/term.ts#L172-L185',
@@ -891,7 +891,7 @@
 '_types.query_dsl.RegexpQuery': '_types/query_dsl/term.ts#L187-L217',
 '_types.query_dsl.RuleQuery': '_types/query_dsl/specialized.ts#L381-L385',
 '_types.query_dsl.ScriptQuery': '_types/query_dsl/specialized.ts#L327-L333',
-'_types.query_dsl.ScriptScoreFunction': '_types/query_dsl/compound.ts#L121-L126',
+'_types.query_dsl.ScriptScoreFunction': '_types/query_dsl/compound.ts#L124-L129',
 '_types.query_dsl.ScriptScoreQuery': '_types/query_dsl/specialized.ts#L335-L349',
 '_types.query_dsl.SemanticQuery': '_types/query_dsl/SemanticQuery.ts#L22-L27',
 '_types.query_dsl.ShapeFieldQuery': '_types/query_dsl/specialized.ts#L366-L379',
@@ -919,7 +919,7 @@
 '_types.query_dsl.TextQueryType': '_types/query_dsl/fulltext.ts#L541-L567',
 '_types.query_dsl.TokenPruningConfig': '_types/query_dsl/TokenPruningConfig.ts#L22-L35',
 '_types.query_dsl.TypeQuery': '_types/query_dsl/term.ts#L269-L271',
-'_types.query_dsl.UntypedDecayFunction': '_types/query_dsl/compound.ts#L188-L191',
+'_types.query_dsl.UntypedDecayFunction': '_types/query_dsl/compound.ts#L191-L194',
 '_types.query_dsl.UntypedDistanceFeatureQuery': '_types/query_dsl/specialized.ts#L62-L65',
 '_types.query_dsl.UntypedRangeQuery': '_types/query_dsl/term.ts#L135-L144',
 '_types.query_dsl.WeightedTokensQuery': '_types/query_dsl/WeightedTokensQuery.ts#L27-L32',
@@ -1201,7 +1201,8 @@
 'eql.search.Request': 'eql/search/EqlSearchRequest.ts#L28-L118',
 'eql.search.Response': 'eql/search/EqlSearchResponse.ts#L22-L24',
 'eql.search.ResultPosition': 'eql/search/types.ts#L20-L32',
-'esql.query.Request': 'esql/query/QueryRequest.ts#L24-L76',
+'esql._types.TableValuesContainer': 'esql/_types/TableValuesContainer.ts#L22-L28',
+'esql.query.Request': 'esql/query/QueryRequest.ts#L26-L89',
 'esql.query.Response': 'esql/query/QueryResponse.ts#L22-L25',
 'features._types.Feature': 'features/_types/Feature.ts#L20-L23',
 'features.get_features.Request': 'features/get_features/GetFeaturesRequest.ts#L22-L26',
@@ -2752,10 +2753,10 @@
         if (hash.length > 1) {
             hash = hash.substring(1);
         }
-        window.location = "https://github.com/elastic/elasticsearch-specification/tree/5615a46a870f15fa51edf6a3c4e8c2ed8cc3ebf7/specification/" + (paths[hash] || "");
+        window.location = "https://github.com/elastic/elasticsearch-specification/tree/8711e52d563766c06424b69b01e60f25a140ce13/specification/" + (paths[hash] || "");
     </script>
 </head>
 <body>
-    Please see the <a href="https://github.com/elastic/elasticsearch-specification/tree/5615a46a870f15fa51edf6a3c4e8c2ed8cc3ebf7/specification/">Elasticsearch API specification</a>.
+    Please see the <a href="https://github.com/elastic/elasticsearch-specification/tree/8711e52d563766c06424b69b01e60f25a140ce13/specification/">Elasticsearch API specification</a>.
 </body>
 </html>

java-client/src/main/java/co/elastic/clients/elasticsearch/esql/QueryRequest.java

@@ -97,6 +97,8 @@ public class QueryRequest extends RequestBase implements JsonpSerializable {
 
 	private final String query;
 
+	private final Map<String, Map<String, TableValues>> tables;
+
 	// ---------------------------------------------------------------------------------------------
 
 	private QueryRequest(Builder builder) {
@@ -110,6 +112,7 @@ private QueryRequest(Builder builder) {
 		this.params = ApiTypeHelper.unmodifiable(builder.params);
 		this.profile = builder.profile;
 		this.query = ApiTypeHelper.requireNonNull(builder.query, this, "query");
+		this.tables = ApiTypeHelper.unmodifiable(builder.tables);
 
 	}
 
@@ -196,6 +199,11 @@ public final List<FieldValue> params() {
 	}
 
 	/**
+	 * If provided and <code>true</code> the response will include an extra
+	 * <code>profile</code> object with information on how the query was executed.
+	 * This information is for human debugging and its format can change at any time
+	 * but it can give some insight into the performance of each part of the query.
+	 * <p>
 	 * API name: {@code profile}
 	 */
 	@Nullable
@@ -213,6 +221,16 @@ public final String query() {
 		return this.query;
 	}
 
+	/**
+	 * Tables to use with the LOOKUP operation. The top level key is the table name
+	 * and the next level key is the column name.
+	 * <p>
+	 * API name: {@code tables}
+	 */
+	public final Map<String, Map<String, TableValues>> tables() {
+		return this.tables;
+	}
+
 	/**
 	 * Serialize this object to JSON.
 	 */
@@ -257,6 +275,26 @@ protected void serializeInternal(JsonGenerator generator, JsonpMapper mapper) {
 		generator.writeKey("query");
 		generator.write(this.query);
 
+		if (ApiTypeHelper.isDefined(this.tables)) {
+			generator.writeKey("tables");
+			generator.writeStartObject();
+			for (Map.Entry<String, Map<String, TableValues>> item0 : this.tables.entrySet()) {
+				generator.writeKey(item0.getKey());
+				generator.writeStartObject();
+				if (item0.getValue() != null) {
+					for (Map.Entry<String, TableValues> item1 : item0.getValue().entrySet()) {
+						generator.writeKey(item1.getKey());
+						item1.getValue().serialize(generator, mapper);
+
+					}
+				}
+				generator.writeEnd();
+
+			}
+			generator.writeEnd();
+
+		}
+
 	}
 
 	// ---------------------------------------------------------------------------------------------
@@ -292,6 +330,9 @@ public static class Builder extends RequestBase.AbstractBuilder<Builder> impleme
 
 		private String query;
 
+		@Nullable
+		private Map<String, Map<String, TableValues>> tables;
+
 		/**
 		 * By default, ES|QL returns results as rows. For example, FROM returns each
 		 * individual document as one row. For the JSON, YAML, CBOR and smile formats,
@@ -487,6 +528,11 @@ public final Builder params(Function<FieldValue.Builder, ObjectBuilder<FieldValu
 		}
 
 		/**
+		 * If provided and <code>true</code> the response will include an extra
+		 * <code>profile</code> object with information on how the query was executed.
+		 * This information is for human debugging and its format can change at any time
+		 * but it can give some insight into the performance of each part of the query.
+		 * <p>
 		 * API name: {@code profile}
 		 */
 		public final Builder profile(@Nullable Boolean value) {
@@ -505,6 +551,32 @@ public final Builder query(String value) {
 			return this;
 		}
 
+		/**
+		 * Tables to use with the LOOKUP operation. The top level key is the table name
+		 * and the next level key is the column name.
+		 * <p>
+		 * API name: {@code tables}
+		 * <p>
+		 * Adds all entries of <code>map</code> to <code>tables</code>.
+		 */
+		public final Builder tables(Map<String, Map<String, TableValues>> map) {
+			this.tables = _mapPutAll(this.tables, map);
+			return this;
+		}
+
+		/**
+		 * Tables to use with the LOOKUP operation. The top level key is the table name
+		 * and the next level key is the column name.
+		 * <p>
+		 * API name: {@code tables}
+		 * <p>
+		 * Adds an entry to <code>tables</code>.
+		 */
+		public final Builder tables(String key, Map<String, TableValues> value) {
+			this.tables = _mapPut(this.tables, key, value);
+			return this;
+		}
+
 		@Override
 		protected Builder self() {
 			return this;
@@ -539,6 +611,8 @@ protected static void setupQueryRequestDeserializer(ObjectDeserializer<QueryRequ
 		op.add(Builder::params, JsonpDeserializer.arrayDeserializer(FieldValue._DESERIALIZER), "params");
 		op.add(Builder::profile, JsonpDeserializer.booleanDeserializer(), "profile");
 		op.add(Builder::query, JsonpDeserializer.stringDeserializer(), "query");
+		op.add(Builder::tables, JsonpDeserializer
+				.stringMapDeserializer(JsonpDeserializer.stringMapDeserializer(TableValues._DESERIALIZER)), "tables");
 
 	}