Skip to content

Commit 400b69d

Browse files
authored
Merge branch 'main' into enhancement/1532-unused-stats-remover
2 parents 3d8a61b + 84865a1 commit 400b69d

File tree

83 files changed

+1489
-381
lines changed

Some content is hidden

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

83 files changed

+1489
-381
lines changed

benchmarks/src/main/java/org/elasticsearch/benchmark/script/ScriptScoreBenchmark.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@
3030
import org.elasticsearch.index.fielddata.IndexFieldDataCache;
3131
import org.elasticsearch.index.fielddata.IndexNumericFieldData;
3232
import org.elasticsearch.index.mapper.MappedFieldType;
33+
import org.elasticsearch.index.mapper.MappingLookup;
3334
import org.elasticsearch.index.mapper.NumberFieldMapper.NumberFieldType;
3435
import org.elasticsearch.index.mapper.NumberFieldMapper.NumberType;
36+
import org.elasticsearch.index.mapper.SourceFieldMetrics;
3537
import org.elasticsearch.indices.breaker.CircuitBreakerService;
3638
import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
3739
import org.elasticsearch.plugins.PluginsLoader;
@@ -90,7 +92,7 @@ public class ScriptScoreBenchmark {
9092
private final SearchLookup lookup = new SearchLookup(
9193
fieldTypes::get,
9294
(mft, lookup, fdo) -> mft.fielddataBuilder(FieldDataContext.noRuntimeFields("benchmark")).build(fieldDataCache, breakerService),
93-
SourceProvider.fromStoredFields()
95+
SourceProvider.fromLookup(MappingLookup.EMPTY, null, SourceFieldMetrics.NOOP)
9496
);
9597

9698
@Param({ "expression", "metal", "painless_cast", "painless_def" })

docs/changelog/127549.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 127549
2+
summary: Add local optimizations for `constant_keyword`
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

docs/changelog/127564.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 127564
2+
summary: Consider inlinestats when having `field_caps` check for field names
3+
area: ES|QL
4+
type: bug
5+
issues:
6+
- 127236

docs/changelog/127731.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 127731
2+
summary: ESQL - Enable telemetry for COMPLETION command
3+
area: Search
4+
type: feature
5+
issues: []

docs/changelog/128213.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 128213
2+
summary: Refactor `SourceProvider` creation to consistently use `MappingLookup`
3+
area: Mapping
4+
type: enhancement
5+
issues: []

docs/reference/query-languages/esql/_snippets/functions/appendix/values.md

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

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/kibana/definition/functions/values.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/reference/query-languages/esql/kibana/docs/functions/values.md

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpChannel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import io.netty.channel.Channel;
1313

1414
import org.elasticsearch.action.ActionListener;
15-
import org.elasticsearch.common.util.concurrent.ListenableFuture;
15+
import org.elasticsearch.action.support.SubscribableListener;
1616
import org.elasticsearch.http.HttpChannel;
1717
import org.elasticsearch.http.HttpResponse;
1818

@@ -25,7 +25,7 @@
2525
public class Netty4HttpChannel implements HttpChannel {
2626

2727
private final Channel channel;
28-
private final ListenableFuture<Void> closeContext = new ListenableFuture<>();
28+
private final SubscribableListener<Void> closeContext = new SubscribableListener<>();
2929

3030
Netty4HttpChannel(Channel channel) {
3131
this.channel = channel;

0 commit comments

Comments
 (0)