Skip to content

Commit 0de9fbb

Browse files
authored
Merge branch 'main' into downsample-histograms
2 parents 8584a1a + 40e5ea3 commit 0de9fbb

File tree

179 files changed

+2876
-566
lines changed

Some content is hidden

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

179 files changed

+2876
-566
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-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);

docs/changelog/137966.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 137966
2+
summary: Allows PIT to be cross project
3+
area: Search
4+
type: enhancement
5+
issues: []

docs/changelog/138457.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 138457
2+
summary: Intercept filters to knn queries
3+
area: Vector Search
4+
type: bug
5+
issues:
6+
- 138410

docs/changelog/138631.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 138631
2+
summary: Improved bulk loading for binary doc values
3+
area: Codec
4+
type: enhancement
5+
issues: []

docs/changelog/138663.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 138663
2+
summary: Support weaker consistency model for S3 MPUs
3+
area: Snapshot/Restore
4+
type: bug
5+
issues: []

docs/changelog/138681.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 138681
2+
summary: Field caps to support `project_routing` also in the body of the request
3+
area: Search
4+
type: enhancement
5+
issues: []

docs/changelog/138695.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 138695
2+
summary: Add `time_zone` request param support to KQL and QSTR functions
3+
area: ES|QL
4+
type: feature
5+
issues: []

docs/reference/query-languages/esql/_snippets/functions/description/all_first.md

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)