Skip to content

Commit c932add

Browse files
piergmpiergm
authored
Merge branch 'elastic:main' into bugfix/highlighting-for-constant_keyword-field-type
2 parents 81e9794 + f65029d commit c932add

File tree

405 files changed

+3927
-2092
lines changed

Some content is hidden

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

405 files changed

+3927
-2092
lines changed

‎benchmarks/src/main/java/org/elasticsearch/benchmark/routing/allocation/Allocators.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.elasticsearch.cluster.EmptyClusterInfoService;
1212
import org.elasticsearch.cluster.node.DiscoveryNode;
1313
import org.elasticsearch.cluster.node.DiscoveryNodeRole;
14+
import org.elasticsearch.cluster.node.VersionInformation;
1415
import org.elasticsearch.cluster.routing.ShardRouting;
1516
import org.elasticsearch.cluster.routing.allocation.AllocateUnassignedDecision;
1617
import org.elasticsearch.cluster.routing.allocation.AllocationService;
@@ -22,14 +23,14 @@
2223
import org.elasticsearch.common.settings.ClusterSettings;
2324
import org.elasticsearch.common.settings.Settings;
2425
import org.elasticsearch.common.transport.TransportAddress;
25-
import org.elasticsearch.common.util.set.Sets;
2626
import org.elasticsearch.gateway.GatewayAllocator;
2727
import org.elasticsearch.snapshots.EmptySnapshotsInfoService;
2828

2929
import java.util.Collection;
3030
import java.util.Collections;
3131
import java.util.List;
3232
import java.util.Map;
33+
import java.util.Set;
3334
import java.util.concurrent.atomic.AtomicInteger;
3435

3536
import static org.elasticsearch.cluster.routing.allocation.AllocateUnassignedDecision.NOT_TAKEN;
@@ -98,8 +99,8 @@ public static DiscoveryNode newNode(String nodeId, Map<String, String> attribute
9899
nodeId,
99100
new TransportAddress(TransportAddress.META_ADDRESS, portGenerator.incrementAndGet()),
100101
attributes,
101-
Sets.newHashSet(DiscoveryNodeRole.MASTER_ROLE, DiscoveryNodeRole.DATA_ROLE),
102-
null
102+
Set.of(DiscoveryNodeRole.MASTER_ROLE, DiscoveryNodeRole.DATA_ROLE),
103+
(VersionInformation) null
103104
);
104105
}
105106
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public TopDocs benchmark() throws IOException {
148148

149149
private Query scriptScoreQuery(ScoreScript.Factory factory) {
150150
ScoreScript.LeafFactory leafFactory = factory.newFactory(Map.of(), lookup);
151-
return new ScriptScoreQuery(new MatchAllDocsQuery(), null, leafFactory, lookup, null, "test", 0, IndexVersion.CURRENT);
151+
return new ScriptScoreQuery(new MatchAllDocsQuery(), null, leafFactory, lookup, null, "test", 0, IndexVersion.current());
152152
}
153153

154154
private ScoreScript.Factory bareMetalScript() {

‎benchmarks/src/main/java/org/elasticsearch/benchmark/vector/DistanceFunctionBenchmark.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ private DotBinaryFloatBenchmarkFunction(int dims) {
242242

243243
@Override
244244
public void execute(Consumer<Object> consumer) {
245-
new BinaryDenseVector(docFloatVector, docVector, dims, IndexVersion.CURRENT).dotProduct(queryVector);
245+
new BinaryDenseVector(docFloatVector, docVector, dims, IndexVersion.current()).dotProduct(queryVector);
246246
}
247247
}
248248

@@ -290,7 +290,7 @@ private CosineBinaryFloatBenchmarkFunction(int dims) {
290290

291291
@Override
292292
public void execute(Consumer<Object> consumer) {
293-
new BinaryDenseVector(docFloatVector, docVector, dims, IndexVersion.CURRENT).cosineSimilarity(queryVector, false);
293+
new BinaryDenseVector(docFloatVector, docVector, dims, IndexVersion.current()).cosineSimilarity(queryVector, false);
294294
}
295295
}
296296

@@ -338,7 +338,7 @@ private L1BinaryFloatBenchmarkFunction(int dims) {
338338

339339
@Override
340340
public void execute(Consumer<Object> consumer) {
341-
new BinaryDenseVector(docFloatVector, docVector, dims, IndexVersion.CURRENT).l1Norm(queryVector);
341+
new BinaryDenseVector(docFloatVector, docVector, dims, IndexVersion.current()).l1Norm(queryVector);
342342
}
343343
}
344344

@@ -386,7 +386,7 @@ private L2BinaryFloatBenchmarkFunction(int dims) {
386386

387387
@Override
388388
public void execute(Consumer<Object> consumer) {
389-
new BinaryDenseVector(docFloatVector, docVector, dims, IndexVersion.CURRENT).l1Norm(queryVector);
389+
new BinaryDenseVector(docFloatVector, docVector, dims, IndexVersion.current()).l1Norm(queryVector);
390390
}
391391
}
392392

‎build-tools-internal/version.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
elasticsearch = 8.10.0
2-
lucene = 9.7.0-snapshot-41cd1f7a88c
2+
lucene = 9.7.0
33

44
bundled_jdk_vendor = openjdk
55
bundled_jdk = 20.0.1+9@b4887098932d415489976708ad6d1a4b

‎docs/changelog/95987.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
pr: 95987
2+
summary: Fix reused/recovered bytes for files that are only partially recovered from
3+
cache
4+
area: Snapshot/Restore
5+
type: bug
6+
issues:
7+
- 95970
8+
- 95994

‎docs/changelog/96717.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 96717
2+
summary: Support type for simple query string
3+
area: Search
4+
type: enhancement
5+
issues: []

‎docs/changelog/96994.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 96994
2+
summary: Add `node.roles` to cat allocation API
3+
area: Allocation
4+
type: enhancement
5+
issues: []

‎docs/changelog/97038.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 97038
2+
summary: Limit the details field length we store for each SLM invocation
3+
area: ILM+SLM
4+
type: bug
5+
issues:
6+
- 96918

‎docs/changelog/97099.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 97099
2+
summary: Skip `SortingDigest` when merging a large digest in `HybridDigest`
3+
area: Aggregations
4+
type: enhancement
5+
issues: []

‎docs/changelog/97111.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 97111
2+
summary: Fix cluster settings update task acknowledgment
3+
area: Cluster Coordination
4+
type: bug
5+
issues: []

0 commit comments

Comments
 (0)