Skip to content

Commit 575d24d

Browse files
Merge branch 'main' into take-date-nanos-implicit-casting-out-of-snapshot
2 parents 699f22f + 593212b commit 575d24d

File tree

510 files changed

+6298
-682
lines changed

Some content is hidden

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

510 files changed

+6298
-682
lines changed

.github/workflows/docs-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
with:
1414
path-pattern: docs/**
1515
path-pattern-ignore: docs/changelog/**/*.yaml
16+
enable-cumulative-comment: true
1617
permissions:
1718
deployments: write
1819
id-token: write

benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/AggregatorBenchmark.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,11 @@ public Block eval(Page page) {
666666
return mask;
667667
}
668668

669+
@Override
670+
public long baseRamBytesUsed() {
671+
return 0;
672+
}
673+
669674
@Override
670675
public void close() {
671676
mask.close();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ static void selfTest() {
144144
public String operation;
145145

146146
private static Operator operator(String operation) {
147-
return new EvalOperator(driverContext.blockFactory(), evaluator(operation));
147+
return new EvalOperator(driverContext, evaluator(operation));
148148
}
149149

150150
private static EvalOperator.ExpressionEvaluator evaluator(String operation) {

distribution/build.gradle

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -629,22 +629,6 @@ subprojects {
629629
}
630630
}
631631

632-
['archives:windows-zip',
633-
'archives:darwin-tar',
634-
'archives:darwin-aarch64-tar',
635-
'archives:linux-aarch64-tar',
636-
'archives:linux-tar',
637-
'archives:integ-test-zip',
638-
'packages:rpm', 'packages:deb',
639-
'packages:aarch64-rpm', 'packages:aarch64-deb',
640-
].forEach { subName ->
641-
Project subproject = project("${project.path}:${subName}")
642-
Configuration configuration = configurations.create(subproject.name)
643-
dependencies {
644-
"${configuration.name}" project(path: subproject.path, configuration:'default')
645-
}
646-
}
647-
648632
// This artifact makes it possible for other projects to pull
649633
// in the final log4j2.properties configuration, as it appears in the
650634
// archive distribution.

docs/changelog/133080.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 133080
2+
summary: "Disallow creating `semantic_text` fields in indices created prior to 8.11.0"
3+
area: Relevance
4+
type: bug
5+
issues: []

docs/changelog/133392.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 133392
2+
summary: Track memory in evaluators
3+
area: ES|QL
4+
type: bug
5+
issues: []

docs/changelog/133403.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 133403
2+
summary: Fix service destination template file name
3+
area: Data streams
4+
type: bug
5+
issues: []

muted-tests.yml

Lines changed: 33 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -489,21 +489,12 @@ tests:
489489
- class: org.elasticsearch.search.CCSDuelIT
490490
method: testTermsAggsWithProfile
491491
issue: https://github.com/elastic/elasticsearch/issues/132880
492-
- class: org.elasticsearch.index.mapper.LongFieldMapperTests
493-
method: testFetchMany
494-
issue: https://github.com/elastic/elasticsearch/issues/132948
495-
- class: org.elasticsearch.index.mapper.LongFieldMapperTests
496-
method: testFetch
497-
issue: https://github.com/elastic/elasticsearch/issues/132956
498492
- class: org.elasticsearch.cluster.ClusterInfoServiceIT
499493
method: testMaxQueueLatenciesInClusterInfo
500494
issue: https://github.com/elastic/elasticsearch/issues/132957
501495
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
502496
method: test {p0=search/400_synthetic_source/_doc_count}
503497
issue: https://github.com/elastic/elasticsearch/issues/132965
504-
- class: org.elasticsearch.index.mapper.LongFieldMapperTests
505-
method: testSyntheticSourceWithTranslogSnapshot
506-
issue: https://github.com/elastic/elasticsearch/issues/132964
507498
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
508499
method: test {p0=search/160_exists_query/Test exists query on unmapped float field}
509500
issue: https://github.com/elastic/elasticsearch/issues/132984
@@ -594,15 +585,9 @@ tests:
594585
- class: org.elasticsearch.xpack.search.CrossClusterAsyncSearchIT
595586
method: testCCSClusterDetailsWhereAllShardsSkippedInCanMatch
596587
issue: https://github.com/elastic/elasticsearch/issues/133370
597-
- class: org.elasticsearch.index.mapper.LongFieldMapperTests
598-
method: testSyntheticSourceMany
599-
issue: https://github.com/elastic/elasticsearch/issues/133394
600588
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
601589
method: test {p0=search.vectors/42_knn_search_int4_flat/kNN search with filter}
602590
issue: https://github.com/elastic/elasticsearch/issues/133420
603-
- class: org.elasticsearch.index.mapper.LongFieldMapperTests
604-
method: testSyntheticSourceInNestedObject
605-
issue: https://github.com/elastic/elasticsearch/issues/133426
606591
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
607592
method: test {p0=search/160_exists_query/Test exists query on date field in empty index}
608593
issue: https://github.com/elastic/elasticsearch/issues/133439
@@ -627,9 +612,6 @@ tests:
627612
- class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryStopIT
628613
method: testStopQueryLocal
629614
issue: https://github.com/elastic/elasticsearch/issues/133481
630-
- class: org.elasticsearch.index.mapper.LongFieldMapperTests
631-
method: testSyntheticSource
632-
issue: https://github.com/elastic/elasticsearch/issues/133496
633615
- class: org.elasticsearch.xpack.logsdb.qa.StandardVersusStandardReindexedIntoLogsDbChallengeRestIT
634616
method: testEsqlSource
635617
issue: https://github.com/elastic/elasticsearch/issues/132601
@@ -675,6 +657,39 @@ tests:
675657
- class: org.elasticsearch.xpack.logsdb.qa.LogsDbVersusReindexedLogsDbChallengeRestIT
676658
method: testEsqlSource
677659
issue: https://github.com/elastic/elasticsearch/issues/133520
660+
- class: org.elasticsearch.xpack.esql.action.EsqlActionBreakerIT
661+
method: testTopNPushedToLucene
662+
issue: https://github.com/elastic/elasticsearch/issues/133556
663+
- class: org.elasticsearch.xpack.esql.action.EsqlActionBreakerIT
664+
method: testFilterNestedFields
665+
issue: https://github.com/elastic/elasticsearch/issues/133557
666+
- class: org.elasticsearch.xpack.logsdb.qa.LogsDbVersusReindexedLogsDbChallengeRestIT
667+
method: testMatchAllQuery
668+
issue: https://github.com/elastic/elasticsearch/issues/133560
669+
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
670+
method: test {p0=search/10_source_filtering/no filtering}
671+
issue: https://github.com/elastic/elasticsearch/issues/133561
672+
- class: org.elasticsearch.compute.lucene.LuceneTopNSourceOperatorTests
673+
method: testShardDataPartitioning
674+
issue: https://github.com/elastic/elasticsearch/issues/133574
675+
- class: org.elasticsearch.compute.data.BasicBlockTests
676+
method: testIntBlock
677+
issue: https://github.com/elastic/elasticsearch/issues/133596
678+
- class: org.elasticsearch.xpack.logsdb.patternedtext.PatternedTextFieldMapperTests
679+
method: testSyntheticSourceMany
680+
issue: https://github.com/elastic/elasticsearch/issues/133598
681+
- class: org.elasticsearch.compute.lucene.LuceneTopNSourceOperatorTests
682+
method: testWithCranky
683+
issue: https://github.com/elastic/elasticsearch/issues/133600
684+
- class: org.elasticsearch.compute.data.BasicBlockTests
685+
method: testDoubleBlock
686+
issue: https://github.com/elastic/elasticsearch/issues/133606
687+
- class: org.elasticsearch.compute.lucene.LuceneTopNSourceOperatorTests
688+
method: testShardDataPartitioningWithCranky
689+
issue: https://github.com/elastic/elasticsearch/issues/133607
690+
- class: org.elasticsearch.compute.data.BasicBlockTests
691+
method: testBooleanBlock
692+
issue: https://github.com/elastic/elasticsearch/issues/133608
678693

679694
# Examples:
680695
#

server/src/main/java/org/elasticsearch/action/admin/cluster/state/TransportClusterStateAction.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.elasticsearch.cluster.metadata.ProjectId;
3030
import org.elasticsearch.cluster.metadata.ProjectMetadata;
3131
import org.elasticsearch.cluster.project.ProjectResolver;
32+
import org.elasticsearch.cluster.project.ProjectStateRegistry;
3233
import org.elasticsearch.cluster.routing.GlobalRoutingTable;
3334
import org.elasticsearch.cluster.routing.RoutingTable;
3435
import org.elasticsearch.cluster.service.ClusterService;
@@ -162,13 +163,19 @@ private ClusterState filterClusterState(final ClusterState inputState) {
162163
}
163164
final Metadata.Builder mdBuilder = Metadata.builder(inputState.metadata());
164165
final GlobalRoutingTable.Builder rtBuilder = GlobalRoutingTable.builder(inputState.globalRoutingTable());
166+
final ProjectStateRegistry.Builder psBuilder = ProjectStateRegistry.builder(inputState);
165167
for (var projectId : metadata.projects().keySet()) {
166168
if (projectIds.contains(projectId) == false) {
167169
mdBuilder.removeProject(projectId);
168170
rtBuilder.removeProject(projectId);
171+
psBuilder.removeProject(projectId);
169172
}
170173
}
171-
return ClusterState.builder(inputState).metadata(mdBuilder.build()).routingTable(rtBuilder.build()).build();
174+
return ClusterState.builder(inputState)
175+
.metadata(mdBuilder.build())
176+
.routingTable(rtBuilder.build())
177+
.putCustom(ProjectStateRegistry.TYPE, psBuilder.build())
178+
.build();
172179
}
173180

174181
@SuppressForbidden(reason = "exposing ClusterState#compatibilityVersions requires reading them")

server/src/main/java/org/elasticsearch/index/codec/tsdb/es819/ES819TSDBDocValuesProducer.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1719,6 +1719,7 @@ private static class TermsDictEntry {
17191719

17201720
static final class SingletonLongToSingletonOrdinalDelegate implements BlockLoader.SingletonLongBuilder {
17211721
private final BlockLoader.SingletonOrdinalsBuilder builder;
1722+
private final int[] buffer = new int[ES819TSDBDocValuesFormat.NUMERIC_BLOCK_SIZE];
17221723

17231724
SingletonLongToSingletonOrdinalDelegate(BlockLoader.SingletonOrdinalsBuilder builder) {
17241725
this.builder = builder;
@@ -1731,20 +1732,21 @@ public BlockLoader.SingletonLongBuilder appendLong(long value) {
17311732

17321733
@Override
17331734
public BlockLoader.SingletonLongBuilder appendLongs(long[] values, int from, int length) {
1735+
assert length <= buffer.length;
17341736
// Unfortunately, no array copy here...
17351737
// Since we need to loop here, let's also keep track of min/max.
17361738
int minOrd = Integer.MAX_VALUE;
17371739
int maxOrd = Integer.MIN_VALUE;
17381740
int counter = 0;
1739-
int[] convertedOrds = new int[length];
17401741
int end = from + length;
17411742
for (int j = from; j < end; j++) {
17421743
int ord = Math.toIntExact(values[j]);
1743-
convertedOrds[counter++] = ord;
1744+
buffer[counter++] = ord;
17441745
minOrd = Math.min(minOrd, ord);
17451746
maxOrd = Math.max(maxOrd, ord);
17461747
}
1747-
builder.appendOrds(convertedOrds, 0, length, minOrd, maxOrd);
1748+
assert counter == length;
1749+
builder.appendOrds(buffer, 0, length, minOrd, maxOrd);
17481750
return this;
17491751
}
17501752

0 commit comments

Comments
 (0)