Merge branch 'master' into async_search

Author: jimczi

buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/CopyRestApiTask.java

@@ -51,7 +51,7 @@
  * @see RestResourcesPlugin
  */
 public class CopyRestApiTask extends DefaultTask {
-    private static final String COPY_TO = "rest-api-spec/api";
+    private static final String REST_API_PREFIX = "rest-api-spec/api";
     final ListProperty<String> includeCore = getProject().getObjects().listProperty(String.class);
     final ListProperty<String> includeXpack = getProject().getObjects().listProperty(String.class);
 
@@ -109,7 +109,7 @@ public FileTree getInputDir() {
 
     @OutputDirectory
     public File getOutputDir() {
-        return new File(getTestSourceSet().getOutput().getResourcesDir(), COPY_TO);
+        return new File(getTestSourceSet().getOutput().getResourcesDir(), REST_API_PREFIX);
     }
 
     @TaskAction
@@ -132,7 +132,13 @@ void copy() {
             project.copy(c -> {
                 c.from(project.zipTree(coreConfig.getSingleFile()));
                 c.into(getTestSourceSet().getOutput().getResourcesDir()); // this ends up as the same dir as outputDir
-                c.include(includeCore.get().stream().map(prefix -> COPY_TO + "/" + prefix + "*/**").collect(Collectors.toList()));
+                if (includeCore.get().isEmpty()) {
+                    c.include(REST_API_PREFIX + "/**");
+                } else {
+                    c.include(
+                        includeCore.get().stream().map(prefix -> REST_API_PREFIX + "/" + prefix + "*/**").collect(Collectors.toList())
+                    );
+                }
             });
         }
         // only copy x-pack specs if explicitly instructed

buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/CopyRestTestsTask.java

@@ -48,7 +48,7 @@
  * @see RestResourcesPlugin
  */
 public class CopyRestTestsTask extends DefaultTask {
-    private static final String COPY_TO = "rest-api-spec/test";
+    private static final String REST_TEST_PREFIX = "rest-api-spec/test";
     final ListProperty<String> includeCore = getProject().getObjects().listProperty(String.class);
     final ListProperty<String> includeXpack = getProject().getObjects().listProperty(String.class);
 
@@ -103,7 +103,7 @@ public FileTree getInputDir() {
 
     @OutputDirectory
     public File getOutputDir() {
-        return new File(getTestSourceSet().getOutput().getResourcesDir(), COPY_TO);
+        return new File(getTestSourceSet().getOutput().getResourcesDir(), REST_TEST_PREFIX);
     }
 
     @TaskAction
@@ -128,7 +128,9 @@ void copy() {
                 project.copy(c -> {
                     c.from(project.zipTree(coreConfig.getSingleFile()));
                     c.into(getTestSourceSet().getOutput().getResourcesDir()); // this ends up as the same dir as outputDir
-                    c.include(includeCore.get().stream().map(prefix -> COPY_TO + "/" + prefix + "*/**").collect(Collectors.toList()));
+                    c.include(
+                        includeCore.get().stream().map(prefix -> REST_TEST_PREFIX + "/" + prefix + "*/**").collect(Collectors.toList())
+                    );
                 });
             }
         }

buildSrc/src/main/resources/minimumGradleVersion

@@ -1 +1 @@
-6.2.1
+6.2.2

buildSrc/version.properties

@@ -1,5 +1,5 @@
 elasticsearch     = 8.0.0
-lucene            = 8.5.0-snapshot-fa75139efea
+lucene            = 8.5.0-snapshot-c4475920b08
 
 bundled_jdk_vendor = adoptopenjdk
 bundled_jdk = 13.0.2+8

client/rest-high-level/src/main/java/org/elasticsearch/client/RequestConverters.java

@@ -913,6 +913,10 @@ Params withRouting(String routing) {
         }
 
         Params withSlices(int slices) {
+            if (slices == 0) {
+                // translate to "auto" value in rest request so the receiving end doesn't throw error
+                return putParam("slices", AbstractBulkByScrollRequest.AUTO_SLICES_VALUE);
+            }
             return putParam("slices", String.valueOf(slices));
         }
 

client/rest-high-level/src/main/java/org/elasticsearch/client/analytics/TopMetricsAggregationBuilder.java

@@ -32,6 +32,8 @@
 import org.elasticsearch.search.sort.SortBuilder;
 
 import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -49,20 +51,20 @@ public class TopMetricsAggregationBuilder extends AbstractAggregationBuilder<Top
 
     private final SortBuilder<?> sort;
     private final int size;
-    private final String metric;
+    private final List<String> metrics;
 
     /**
      * Build the request.
      * @param name the name of the metric
      * @param sort the sort key used to select the top metrics
      * @param size number of results to return per bucket
-     * @param metric the name of the field to select
+     * @param metrics the names of the fields to select
      */
-    public TopMetricsAggregationBuilder(String name, SortBuilder<?> sort, int size, String metric) {
+    public TopMetricsAggregationBuilder(String name, SortBuilder<?> sort, int size, String... metrics) {
         super(name);
         this.sort = sort;
         this.size = size;
-        this.metric = metric;
+        this.metrics = Arrays.asList(metrics);
     }
 
     @Override
@@ -78,7 +80,11 @@ protected XContentBuilder internalXContent(XContentBuilder builder, Params param
             sort.toXContent(builder, params);
             builder.endArray();
             builder.field("size", size);
-            builder.startObject("metric").field("field", metric).endObject();
+            builder.startArray("metrics");
+            for (String metric: metrics) {
+                builder.startObject().field("field", metric).endObject();
+            }
+            builder.endArray();
         }
         return builder.endObject();
     }

client/rest-high-level/src/main/java/org/elasticsearch/client/transform/transforms/pivot/DateHistogramGroupSource.java

@@ -20,12 +20,14 @@
 package org.elasticsearch.client.transform.transforms.pivot;
 
 import org.elasticsearch.common.ParseField;
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.xcontent.ConstructingObjectParser;
 import org.elasticsearch.common.xcontent.ObjectParser;
 import org.elasticsearch.common.xcontent.ToXContentFragment;
 import org.elasticsearch.common.xcontent.ToXContentObject;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.script.Script;
 import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
 
 import java.io.IOException;
@@ -48,23 +50,28 @@ public class DateHistogramGroupSource extends SingleGroupSource implements ToXCo
 
     // From DateHistogramAggregationBuilder in core, transplanted and modified to a set
     // so we don't need to import a dependency on the class
-    private static final Set<String> DATE_FIELD_UNITS = Collections.unmodifiableSet(new HashSet<>(Arrays.asList(
-            "year",
-            "1y",
-            "quarter",
-            "1q",
-            "month",
-            "1M",
-            "week",
-            "1w",
-            "day",
-            "1d",
-            "hour",
-            "1h",
-            "minute",
-            "1m",
-            "second",
-            "1s")));
+    private static final Set<String> DATE_FIELD_UNITS = Collections.unmodifiableSet(
+        new HashSet<>(
+            Arrays.asList(
+                "year",
+                "1y",
+                "quarter",
+                "1q",
+                "month",
+                "1M",
+                "week",
+                "1w",
+                "day",
+                "1d",
+                "hour",
+                "1h",
+                "minute",
+                "1m",
+                "second",
+                "1s"
+            )
+        )
+    );
 
     /**
      * Interval can be specified in 2 ways:
@@ -76,6 +83,7 @@ public class DateHistogramGroupSource extends SingleGroupSource implements ToXCo
      */
     public interface Interval extends ToXContentFragment {
         String getName();
+
         DateHistogramInterval getInterval();
     }
 
@@ -131,8 +139,9 @@ public static class CalendarInterval implements Interval {
         public CalendarInterval(DateHistogramInterval interval) {
             this.interval = interval;
             if (DATE_FIELD_UNITS.contains(interval.toString()) == false) {
-                throw new IllegalArgumentException("The supplied interval [" + interval + "] could not be parsed " +
-                    "as a calendar interval.");
+                throw new IllegalArgumentException(
+                    "The supplied interval [" + interval + "] could not be parsed " + "as a calendar interval."
+                );
             }
         }
 
@@ -173,33 +182,35 @@ public int hashCode() {
         }
     }
 
-    private static final ConstructingObjectParser<DateHistogramGroupSource, Void> PARSER =
-            new ConstructingObjectParser<>("date_histogram_group_source",
-                true,
-                (args) -> {
-                   String field = (String)args[0];
-                   String fixedInterval = (String) args[1];
-                   String calendarInterval = (String) args[2];
-
-                   Interval interval = null;
-
-                   if (fixedInterval != null && calendarInterval != null) {
-                       throw new IllegalArgumentException("You must specify either fixed_interval or calendar_interval, found both");
-                   } else if (fixedInterval != null) {
-                       interval = new FixedInterval(new DateHistogramInterval(fixedInterval));
-                   } else if (calendarInterval != null) {
-                       interval = new CalendarInterval(new DateHistogramInterval(calendarInterval));
-                   } else {
-                       throw new IllegalArgumentException("You must specify either fixed_interval or calendar_interval, found none");
-                   }
-
-                   ZoneId zoneId = (ZoneId) args[3];
-                   return new DateHistogramGroupSource(field, interval, zoneId);
-                });
+    private static final ConstructingObjectParser<DateHistogramGroupSource, Void> PARSER = new ConstructingObjectParser<>(
+        "date_histogram_group_source",
+        true,
+        (args) -> {
+            String field = (String) args[0];
+            Script script = (Script) args[1];
+            String fixedInterval = (String) args[2];
+            String calendarInterval = (String) args[3];
+            ZoneId zoneId = (ZoneId) args[4];
+
+            Interval interval = null;
+
+            if (fixedInterval != null && calendarInterval != null) {
+                throw new IllegalArgumentException("You must specify either fixed_interval or calendar_interval, found both");
+            } else if (fixedInterval != null) {
+                interval = new FixedInterval(new DateHistogramInterval(fixedInterval));
+            } else if (calendarInterval != null) {
+                interval = new CalendarInterval(new DateHistogramInterval(calendarInterval));
+            } else {
+                throw new IllegalArgumentException("You must specify either fixed_interval or calendar_interval, found none");
+            }
+
+            return new DateHistogramGroupSource(field, script, interval, zoneId);
+        }
+    );
 
     static {
         PARSER.declareString(optionalConstructorArg(), FIELD);
-
+        Script.declareScript(PARSER, optionalConstructorArg(), SCRIPT);
         PARSER.declareString(optionalConstructorArg(), new ParseField(FixedInterval.NAME));
         PARSER.declareString(optionalConstructorArg(), new ParseField(CalendarInterval.NAME));
 
@@ -219,8 +230,8 @@ public static DateHistogramGroupSource fromXContent(final XContentParser parser)
     private final Interval interval;
     private final ZoneId timeZone;
 
-    DateHistogramGroupSource(String field, Interval interval, ZoneId timeZone) {
-        super(field);
+    DateHistogramGroupSource(String field, Script script, Interval interval, ZoneId timeZone) {
+        super(field, script);
         this.interval = interval;
         this.timeZone = timeZone;
     }
@@ -241,9 +252,7 @@ public ZoneId getTimeZone() {
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
         builder.startObject();
-        if (field != null) {
-            builder.field(FIELD.getPreferredName(), field);
-        }
+        super.innerXContent(builder, params);
         interval.toXContent(builder, params);
         if (timeZone != null) {
             builder.field(TIME_ZONE.getPreferredName(), timeZone.toString());
@@ -264,23 +273,29 @@ public boolean equals(Object other) {
 
         final DateHistogramGroupSource that = (DateHistogramGroupSource) other;
 
-        return Objects.equals(this.field, that.field) &&
-                Objects.equals(this.interval, that.interval) &&
-                Objects.equals(this.timeZone, that.timeZone);
+        return Objects.equals(this.field, that.field)
+            && Objects.equals(this.interval, that.interval)
+            && Objects.equals(this.timeZone, that.timeZone);
     }
 
     @Override
     public int hashCode() {
         return Objects.hash(field, interval, timeZone);
     }
 
+    @Override
+    public String toString() {
+        return Strings.toString(this, true, true);
+    }
+
     public static Builder builder() {
         return new Builder();
     }
 
     public static class Builder {
 
         private String field;
+        private Script script;
         private Interval interval;
         private ZoneId timeZone;
 
@@ -294,6 +309,16 @@ public Builder setField(String field) {
             return this;
         }
 
+        /**
+         * The script with which to construct the date histogram grouping
+         * @param script The script
+         * @return The {@link Builder} with the script set.
+         */
+        public Builder setScript(Script script) {
+            this.script = script;
+            return this;
+        }
+
         /**
          * Set the interval for the DateHistogram grouping
          * @param interval a fixed or calendar interval
@@ -315,7 +340,7 @@ public Builder setTimeZone(ZoneId timeZone) {
         }
 
         public DateHistogramGroupSource build() {
-            return new DateHistogramGroupSource(field, interval, timeZone);
+            return new DateHistogramGroupSource(field, script, interval, timeZone);
         }
     }
 }