Skip to content

Commit 162cc17

Browse files
mromaiosmromaios
authored
Merge branch 'main' into handle-empty-chunked-infer-input
2 parents 5219b40 + e46f211 commit 162cc17

File tree

330 files changed

+5842
-1349
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

330 files changed

+5842
-1349
lines changed

‎benchmarks/src/main/java/org/elasticsearch/benchmark/_nightly/esql/QueryPlanningBenchmark.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ public void setup() {
9292
System.nanoTime(),
9393
false,
9494
AnalyzerSettings.QUERY_TIMESERIES_RESULT_TRUNCATION_DEFAULT_SIZE.getDefault(Settings.EMPTY),
95-
AnalyzerSettings.QUERY_TIMESERIES_RESULT_TRUNCATION_DEFAULT_SIZE.get(Settings.EMPTY)
95+
AnalyzerSettings.QUERY_TIMESERIES_RESULT_TRUNCATION_DEFAULT_SIZE.get(Settings.EMPTY),
96+
null
9697
);
9798

9899
var fields = 10_000;

‎benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/EvalBenchmark.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,8 @@ private static Configuration configuration() {
373373
0,
374374
false,
375375
AnalyzerSettings.QUERY_TIMESERIES_RESULT_TRUNCATION_MAX_SIZE.getDefault(Settings.EMPTY),
376-
AnalyzerSettings.QUERY_TIMESERIES_RESULT_TRUNCATION_DEFAULT_SIZE.getDefault(Settings.EMPTY)
376+
AnalyzerSettings.QUERY_TIMESERIES_RESULT_TRUNCATION_DEFAULT_SIZE.getDefault(Settings.EMPTY),
377+
null
377378
);
378379
}
379380

‎build-conventions/settings.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99

1010
plugins {
11-
id "com.gradle.develocity" version "4.1.1"
11+
id "com.gradle.develocity" version "4.2.2"
1212
}
1313

1414
rootProject.name = 'build-conventions'

‎build-tools-internal/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionSha256Sum=16f2b95838c1ddcf7242b1c39e7bbbb43c842f1f1a1a0dc4959b6d4d68abcac3
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-all.zip
3+
distributionSha256Sum=f86344275d1b194688dd330abf9f6f2344cd02872ffee035f2d1ea2fd60cf7f3
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-all.zip
55
networkTimeout=10000
66
validateDistributionUrl=true
77
zipStoreBase=GRADLE_USER_HOME

‎build-tools-internal/settings.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pluginManagement {
99
}
1010

1111
plugins {
12-
id "com.gradle.develocity" version "4.1.1"
12+
id "com.gradle.develocity" version "4.2.2"
1313
}
1414

1515
dependencyResolutionManagement {

‎build-tools-internal/src/main/resources/minimumGradleVersion‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.2.0
1+
9.2.1

‎build-tools/settings.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pluginManagement {
1010
includeBuild "../build-conventions"
1111
}
1212
plugins {
13-
id "com.gradle.develocity" version "4.1.1"
13+
id "com.gradle.develocity" version "4.2.2"
1414
}
1515
include 'reaper'
1616

‎build-tools/src/main/java/org/elasticsearch/gradle/testclusters/MockApmServer.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,26 @@ public void stop() {
114114
}
115115

116116
class RootHandler implements HttpHandler {
117+
// checked by APM agent to identify the APM server version to adjust its behavior accordingly
118+
private static final String FAKE_VERSION = """
119+
{
120+
"build_date": "2021-12-18T19:59:06Z",
121+
"build_sha": "24fe620eeff5a19e2133c940c7e5ce1ceddb1445",
122+
"publish_ready": true,
123+
"version": "9.0.0"
124+
}
125+
""";
126+
117127
public void handle(HttpExchange t) {
118128
try {
129+
if ("GET".equals(t.getRequestMethod()) && "/".equals(t.getRequestURI().getPath())) {
130+
t.sendResponseHeaders(200, FAKE_VERSION.length());
131+
try (OutputStream os = t.getResponseBody()) {
132+
os.write(FAKE_VERSION.getBytes());
133+
}
134+
return;
135+
}
136+
119137
InputStream body = t.getRequestBody();
120138
if (metricFilter == null && transactionFilter == null) {
121139
logRequestBody(body);

‎distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/SystemJvmOptions.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ static List<String> systemJvmOptions(Settings nodeSettings, final Map<String, St
6262
"-Dio.netty.recycler.maxCapacityPerThread=0",
6363
// Needed to get access to raw vectors from Lucene scorers
6464
"--add-opens=org.apache.lucene.core/org.apache.lucene.codecs.lucene99=org.elasticsearch.server",
65+
"--add-opens=org.apache.lucene.core/org.apache.lucene.codecs.hnsw=org.elasticsearch.server",
6566
"--add-opens=org.apache.lucene.core/org.apache.lucene.internal.vectorization=org.elasticsearch.server",
6667
// log4j 2
6768
"-Dlog4j.shutdownHookEnabled=false",

‎docs/changelog/134709.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 134709
2+
summary: "OTLP: store units in mappings"
3+
area: Mapping
4+
type: enhancement
5+
issues: []

0 commit comments

Comments
 (0)