Merge branch 'main' into esql_geogrid_intersects

Author: craigtaverner

docs/reference/elasticsearch/mapping-reference/dense-vector.md

@@ -274,7 +274,7 @@ The following mapping parameters are accepted:
 $$$dense-vector-element-type$$$
 
 `element_type`
-:   (Optional, string) The data type used to encode vectors. The supported data types are `float` (default), `byte`, and bit.
+:   (Optional, string) The data type used to encode vectors. The supported data types are `float` (default), `byte`, and `bit`.
 
 ::::{dropdown} Valid values for element_type
 `float`

docs/reference/elasticsearch/mapping-reference/rank-vectors.md

@@ -90,7 +90,7 @@ The `rank_vectors` field type supports the following parameters:
 $$$rank-vectors-element-type$$$
 
 `element_type`
-:   (Optional, string) The data type used to encode vectors. The supported data types are `float` (default), `byte`, and bit.
+:   (Optional, string) The data type used to encode vectors. The supported data types are `float` (default), `byte`, and `bit`.
 
 ::::{dropdown} Valid values for element_type
 `float`

libs/exponential-histogram/src/main/java/org/elasticsearch/exponentialhistogram/AbstractExponentialHistogram.java

@@ -46,4 +46,54 @@ public boolean equals(Object obj) {
         }
         return false;
     }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder(getClassNameWithoutPackage()).append("{");
+        sb.append("scale=").append(scale());
+        sb.append(", sum=").append(sum());
+        sb.append(", valueCount=").append(valueCount());
+        sb.append(", min=").append(min());
+        sb.append(", max=").append(max());
+        ZeroBucket zb = zeroBucket();
+        if (zb.zeroThreshold() != 0) {
+            sb.append(", zeroThreshold=").append(zb.zeroThreshold());
+        }
+        if (zb.count() != 0) {
+            sb.append(", zeroCount=").append(zb.count());
+        }
+        BucketIterator neg = negativeBuckets().iterator();
+        if (neg.hasNext()) {
+            sb.append(", negative=[");
+            appendsBucketsAsString(sb, neg);
+            sb.append("]");
+        }
+        BucketIterator pos = positiveBuckets().iterator();
+        if (pos.hasNext()) {
+            sb.append(", positive=[");
+            appendsBucketsAsString(sb, pos);
+            sb.append("]");
+        }
+        sb.append("}");
+        return sb.toString();
+    }
+
+    private String getClassNameWithoutPackage() {
+        String fqn = getClass().getName();
+        int lastDot = fqn.lastIndexOf('.');
+        return fqn.substring(lastDot + 1);
+    }
+
+    private static void appendsBucketsAsString(StringBuilder out, BucketIterator it) {
+        boolean first = true;
+        while (it.hasNext()) {
+            if (first) {
+                first = false;
+            } else {
+                out.append(", ");
+            }
+            out.append(it.peekIndex()).append(": ").append(it.peekCount());
+            it.advance();
+        }
+    }
 }

libs/exponential-histogram/src/test/java/org/elasticsearch/exponentialhistogram/ExponentialHistogramToStringTests.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright Elasticsearch B.V., and/or licensed to Elasticsearch B.V.
+ * under one or more license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * This file is based on a modification of https://github.com/open-telemetry/opentelemetry-java which is licensed under the Apache 2.0 License.
+ */
+
+package org.elasticsearch.exponentialhistogram;
+
+import static org.hamcrest.Matchers.equalTo;
+
+public class ExponentialHistogramToStringTests extends ExponentialHistogramTestCase {
+
+    public void testFullHistogram() {
+        try (FixedCapacityExponentialHistogram histogram = FixedCapacityExponentialHistogram.create(10, breaker())) {
+            histogram.setZeroBucket(ZeroBucket.create(42.0, 7));
+            histogram.resetBuckets(10);
+            histogram.setMin(-100);
+            histogram.setMax(200);
+            histogram.setSum(1234.5);
+            histogram.tryAddBucket(2, 3, false); // negative bucket
+            histogram.tryAddBucket(3, 4, false); // negative bucket
+            histogram.tryAddBucket(4, 2, false); // negative bucket
+            histogram.tryAddBucket(1, 5, true); // positive bucket
+            histogram.tryAddBucket(5, 7, true); // positive bucket
+            histogram.tryAddBucket(6, 1, true); // positive bucket
+            String expected = "FixedCapacityExponentialHistogram{"
+                + "scale=10, sum=1234.5, valueCount=29, min=-100.0, max=200.0, zeroThreshold=42.0, zeroCount=7,"
+                + " negative=[2: 3, 3: 4, 4: 2], positive=[1: 5, 5: 7, 6: 1]}";
+            assertThat(histogram.toString(), equalTo(expected));
+        }
+    }
+
+    public void testEmptyHistogram() {
+        ExponentialHistogram emptyHistogram = ExponentialHistogram.empty();
+        String expected = "EmptyExponentialHistogram{scale=" + emptyHistogram.scale() + ", sum=0.0, valueCount=0, min=NaN, max=NaN}";
+        assertThat(emptyHistogram.toString(), equalTo(expected));
+    }
+}

modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/RerouteProcessor.java

@@ -9,6 +9,7 @@
 
 package org.elasticsearch.ingest.common;
 
+import org.elasticsearch.cluster.metadata.DataStream;
 import org.elasticsearch.cluster.metadata.ProjectId;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.ingest.AbstractProcessor;
@@ -17,11 +18,9 @@
 import org.elasticsearch.ingest.Processor;
 
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Function;
-import java.util.regex.Pattern;
 
 import static org.elasticsearch.core.Strings.format;
 import static org.elasticsearch.ingest.ConfigurationUtils.newConfigurationException;
@@ -221,11 +220,6 @@ public RerouteProcessor create(
      */
     static final class DataStreamValueSource {
 
-        private static final int MAX_LENGTH = 100;
-        private static final String REPLACEMENT = "_";
-        private static final Pattern DISALLOWED_IN_TYPE = Pattern.compile("[\\\\/*?\"<>| ,#:-]");
-        private static final Pattern DISALLOWED_IN_DATASET = Pattern.compile("[\\\\/*?\"<>| ,#:-]");
-        private static final Pattern DISALLOWED_IN_NAMESPACE = Pattern.compile("[\\\\/*?\"<>| ,#:]");
         static final DataStreamValueSource TYPE_VALUE_SOURCE = type("{{" + DATA_STREAM_TYPE + "}}");
         static final DataStreamValueSource DATASET_VALUE_SOURCE = dataset("{{" + DATA_STREAM_DATASET + "}}");
         static final DataStreamValueSource NAMESPACE_VALUE_SOURCE = namespace("{{" + DATA_STREAM_NAMESPACE + "}}");
@@ -235,24 +229,15 @@ static final class DataStreamValueSource {
         private final Function<String, String> sanitizer;
 
         public static DataStreamValueSource type(String type) {
-            return new DataStreamValueSource(type, ds -> sanitizeDataStreamField(ds, DISALLOWED_IN_TYPE));
+            return new DataStreamValueSource(type, DataStream::sanitizeType);
         }
 
         public static DataStreamValueSource dataset(String dataset) {
-            return new DataStreamValueSource(dataset, ds -> sanitizeDataStreamField(ds, DISALLOWED_IN_DATASET));
+            return new DataStreamValueSource(dataset, DataStream::sanitizeDataset);
         }
 
         public static DataStreamValueSource namespace(String namespace) {
-            return new DataStreamValueSource(namespace, nsp -> sanitizeDataStreamField(nsp, DISALLOWED_IN_NAMESPACE));
-        }
-
-        private static String sanitizeDataStreamField(String s, Pattern disallowedInDataset) {
-            if (s == null) {
-                return null;
-            }
-            s = s.toLowerCase(Locale.ROOT);
-            s = s.substring(0, Math.min(s.length(), MAX_LENGTH));
-            return disallowedInDataset.matcher(s).replaceAll(REPLACEMENT);
+            return new DataStreamValueSource(namespace, DataStream::sanitizeNamespace);
         }
 
         private DataStreamValueSource(String value, Function<String, String> sanitizer) {

rest-api-spec/src/main/resources/rest-api-spec/api/search_application.delete.json

@@ -4,7 +4,7 @@
       "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-application-delete",
       "description": "Delete a search application"
     },
-    "stability": "experimental",
+    "stability": "beta",
     "visibility": "public",
     "headers": {
       "accept": [

rest-api-spec/src/main/resources/rest-api-spec/api/search_application.get.json

@@ -4,7 +4,7 @@
       "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-application-get",
       "description": "Get search application details"
     },
-    "stability": "experimental",
+    "stability": "beta",
     "visibility": "public",
     "headers": {
       "accept": [

rest-api-spec/src/main/resources/rest-api-spec/api/search_application.list.json

@@ -4,7 +4,7 @@
       "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-application-get-behavioral-analytics",
       "description": "Get search applications"
     },
-    "stability": "experimental",
+    "stability": "beta",
     "visibility": "public",
     "headers": {
       "accept": [

rest-api-spec/src/main/resources/rest-api-spec/api/search_application.put.json

@@ -4,7 +4,7 @@
       "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-application-put",
       "description": "Create or update a search application"
     },
-    "stability": "experimental",
+    "stability": "beta",
     "visibility": "public",
     "headers": {
       "accept": [

rest-api-spec/src/main/resources/rest-api-spec/api/search_application.search.json

@@ -4,7 +4,7 @@
       "url": "https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-search-application-search",
       "description": "Run a search application search"
     },
-    "stability": "experimental",
+    "stability": "beta",
     "visibility": "public",
     "headers": {
       "accept": [