Skip to content

Commit bf0a038

Browse files
authored
Merge branch 'main' into replace_tuple_with_record
2 parents f50ca01 + cc02ac8 commit bf0a038

File tree

50 files changed

+3290
-3222
lines changed

Some content is hidden

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

50 files changed

+3290
-3222
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/DependenciesInfoPlugin.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,13 @@
1515
import org.gradle.api.Project;
1616
import org.gradle.api.artifacts.Configuration;
1717
import org.gradle.api.attributes.Category;
18+
import org.gradle.api.attributes.Usage;
1819
import org.gradle.api.plugins.JavaPlugin;
1920

2021
public class DependenciesInfoPlugin implements Plugin<Project> {
22+
23+
public static String USAGE_ATTRIBUTE = "DependenciesInfo";
24+
2125
@Override
2226
public void apply(final Project project) {
2327
project.getPlugins().apply(CompileOnlyResolvePlugin.class);
@@ -43,6 +47,9 @@ public void apply(final Project project) {
4347
)
4448
);
4549

50+
dependenciesInfoFilesConfiguration.attributes(
51+
attributes -> attributes.attribute(Usage.USAGE_ATTRIBUTE, project.getObjects().named(Usage.class, USAGE_ATTRIBUTE))
52+
);
4653
project.getArtifacts().add("dependenciesInfoFiles", depsInfo);
4754

4855
}

distribution/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ configurations {
3131
attributes {
3232
attribute(Category.CATEGORY_ATTRIBUTE, project.getObjects().named(Category.class, Category.DOCUMENTATION))
3333
}
34+
attributes {
35+
attribute(Usage.USAGE_ATTRIBUTE, project.getObjects().named(Usage.class, DependenciesInfoPlugin.USAGE_ATTRIBUTE))
36+
}
3437
}
3538
featuresMetadata {
3639
attributes {

docs/changelog/129181.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 129181
2+
summary: Add Cluster Feature for L2 Norm
3+
area: "Search"
4+
type: bug
5+
issues: []

docs/reference/query-languages/esql/_snippets/functions/description/std_dev.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/_snippets/functions/examples/std_dev.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/std_dev.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/std_dev.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.

muted-tests.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ tests:
55
- class: org.elasticsearch.smoketest.WatcherYamlRestIT
66
method: test {p0=watcher/usage/10_basic/Test watcher usage stats output}
77
issue: https://github.com/elastic/elasticsearch/issues/112189
8-
- class: org.elasticsearch.ingest.geoip.IngestGeoIpClientYamlTestSuiteIT
9-
issue: https://github.com/elastic/elasticsearch/issues/111497
108
- class: org.elasticsearch.packaging.test.PackagesSecurityAutoConfigurationTests
119
method: test20SecurityNotAutoConfiguredOnReInstallation
1210
issue: https://github.com/elastic/elasticsearch/issues/112635
@@ -519,6 +517,12 @@ tests:
519517
- class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests
520518
method: testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution
521519
issue: https://github.com/elastic/elasticsearch/issues/129148
520+
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
521+
method: test {lookup-join.EnrichLookupStatsBug ASYNC}
522+
issue: https://github.com/elastic/elasticsearch/issues/129228
523+
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
524+
method: test {lookup-join.EnrichLookupStatsBug SYNC}
525+
issue: https://github.com/elastic/elasticsearch/issues/129229
522526

523527
# Examples:
524528
#

qa/vector/src/main/java/org/elasticsearch/test/knn/KnnSearcher.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,12 +276,11 @@ TopDocs doVectorQuery(byte[] vector, IndexSearcher searcher) throws IOException
276276
TopDocs doVectorQuery(float[] vector, IndexSearcher searcher) throws IOException {
277277
Query knnQuery;
278278
int topK = this.topK;
279-
int efSearch = this.efSearch;
280279
if (overSamplingFactor > 1f) {
281280
// oversample the topK results to get more candidates for the final result
282281
topK = (int) Math.ceil(topK * overSamplingFactor);
283-
efSearch = Math.max(topK, efSearch);
284282
}
283+
int efSearch = Math.max(topK, this.efSearch);
285284
if (indexType == KnnIndexTester.IndexType.IVF) {
286285
knnQuery = new IVFKnnFloatVectorQuery(VECTOR_FIELD, vector, topK, efSearch, null, nProbe);
287286
} else {
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/*
2+
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
3+
* or more contributor license agreements. Licensed under the "Elastic License
4+
* 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
5+
* Public License v 1"; you may not use this file except in compliance with, at
6+
* your election, the "Elastic License 2.0", the "GNU Affero General Public
7+
* License v3.0 only", or the "Server Side Public License, v 1".
8+
*/
9+
10+
package org.elasticsearch.index.codec.vectors;
11+
12+
import org.apache.lucene.internal.hppc.IntArrayList;
13+
14+
final class CentroidAssignments {
15+
16+
private final int numCentroids;
17+
private final float[][] cachedCentroids;
18+
private final IntArrayList[] assignmentsByCluster;
19+
20+
private CentroidAssignments(int numCentroids, float[][] cachedCentroids, IntArrayList[] assignmentsByCluster) {
21+
this.numCentroids = numCentroids;
22+
this.cachedCentroids = cachedCentroids;
23+
this.assignmentsByCluster = assignmentsByCluster;
24+
}
25+
26+
CentroidAssignments(float[][] centroids, IntArrayList[] assignmentsByCluster) {
27+
this(centroids.length, centroids, assignmentsByCluster);
28+
}
29+
30+
CentroidAssignments(int numCentroids, IntArrayList[] assignmentsByCluster) {
31+
this(numCentroids, null, assignmentsByCluster);
32+
}
33+
34+
// Getters and setters
35+
public int numCentroids() {
36+
return numCentroids;
37+
}
38+
39+
public float[][] cachedCentroids() {
40+
return cachedCentroids;
41+
}
42+
43+
public IntArrayList[] assignmentsByCluster() {
44+
return assignmentsByCluster;
45+
}
46+
}

0 commit comments

Comments
 (0)