Skip to content

Commit 2c864e9

Browse files
committed
Merge remote-tracking branch 'carlosdelest/non-issue/knn-k-param' into non-issue/knn-k-param
# Conflicts: # docs/reference/query-languages/esql/kibana/definition/functions/knn.json # muted-tests.yml # server/src/main/java/org/elasticsearch/TransportVersions.java
2 parents 94f1524 + 123f2e4 commit 2c864e9

File tree

3 files changed

+37
-29
lines changed

3 files changed

+37
-29
lines changed

docs/reference/query-languages/esql/kibana/definition/functions/knn.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.

muted-tests.yml

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,9 @@ tests:
236236
- class: org.elasticsearch.packaging.test.DockerTests
237237
method: test012SecurityCanBeDisabled
238238
issue: https://github.com/elastic/elasticsearch/issues/116636
239+
- class: org.elasticsearch.index.shard.StoreRecoveryTests
240+
method: testAddIndices
241+
issue: https://github.com/elastic/elasticsearch/issues/124104
239242
- class: org.elasticsearch.smoketest.MlWithSecurityIT
240243
method: test {yaml=ml/data_frame_analytics_crud/Test get stats on newly created config}
241244
issue: https://github.com/elastic/elasticsearch/issues/121726
@@ -455,6 +458,12 @@ tests:
455458
- class: org.elasticsearch.packaging.test.DockerTests
456459
method: test073RunEsAsDifferentUserAndGroupWithoutBindMounting
457460
issue: https://github.com/elastic/elasticsearch/issues/128996
461+
- class: org.elasticsearch.upgrades.UpgradeClusterClientYamlTestSuiteIT
462+
method: test {p0=upgraded_cluster/70_ilm/Test Lifecycle Still There And Indices Are Still Managed}
463+
issue: https://github.com/elastic/elasticsearch/issues/129097
464+
- class: org.elasticsearch.upgrades.UpgradeClusterClientYamlTestSuiteIT
465+
method: test {p0=upgraded_cluster/90_ml_data_frame_analytics_crud/Get mixed cluster outlier_detection job}
466+
issue: https://github.com/elastic/elasticsearch/issues/129098
458467
- class: org.elasticsearch.packaging.test.DockerTests
459468
method: test081SymlinksAreFollowedWithEnvironmentVariableFiles
460469
issue: https://github.com/elastic/elasticsearch/issues/128867
@@ -479,9 +488,21 @@ tests:
479488
- class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests
480489
method: testMergeTasksAreUnblockedWhenMoreDiskSpaceBecomesAvailable
481490
issue: https://github.com/elastic/elasticsearch/issues/129296
491+
- class: org.elasticsearch.xpack.security.PermissionsIT
492+
method: testCanManageIndexWithNoPermissions
493+
issue: https://github.com/elastic/elasticsearch/issues/129471
494+
- class: org.elasticsearch.xpack.security.PermissionsIT
495+
method: testCanManageIndexAndPolicyDifferentUsers
496+
issue: https://github.com/elastic/elasticsearch/issues/129479
497+
- class: org.elasticsearch.xpack.security.PermissionsIT
498+
method: testCanViewExplainOnUnmanagedIndex
499+
issue: https://github.com/elastic/elasticsearch/issues/129480
482500
- class: org.elasticsearch.xpack.profiling.action.GetStatusActionIT
483501
method: testWaitsUntilResourcesAreCreated
484502
issue: https://github.com/elastic/elasticsearch/issues/129486
503+
- class: org.elasticsearch.xpack.security.PermissionsIT
504+
method: testWhenUserLimitedByOnlyAliasOfIndexCanWriteToIndexWhichWasRolledoverByILMPolicy
505+
issue: https://github.com/elastic/elasticsearch/issues/129481
485506
- class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceTests
486507
method: testIORateIsAdjustedForAllRunningMergeTasks
487508
issue: https://github.com/elastic/elasticsearch/issues/129531
@@ -497,15 +518,24 @@ tests:
497518
- class: org.elasticsearch.search.query.VectorIT
498519
method: testFilteredQueryStrategy
499520
issue: https://github.com/elastic/elasticsearch/issues/129517
521+
- class: org.elasticsearch.snapshots.SnapshotShutdownIT
522+
method: testSnapshotShutdownProgressTracker
523+
issue: https://github.com/elastic/elasticsearch/issues/129752
500524
- class: org.elasticsearch.xpack.security.SecurityRolesMultiProjectIT
501525
method: testUpdatingFileBasedRoleAffectsAllProjects
502526
issue: https://github.com/elastic/elasticsearch/issues/129775
503527
- class: org.elasticsearch.qa.verify_version_constants.VerifyVersionConstantsIT
504528
method: testLuceneVersionConstant
505529
issue: https://github.com/elastic/elasticsearch/issues/125638
530+
- class: org.elasticsearch.index.store.FsDirectoryFactoryTests
531+
method: testPreload
532+
issue: https://github.com/elastic/elasticsearch/issues/129852
506533
- class: org.elasticsearch.xpack.rank.rrf.RRFRankClientYamlTestSuiteIT
507534
method: test {yaml=rrf/950_pinned_interaction/rrf with pinned retriever as a sub-retriever}
508535
issue: https://github.com/elastic/elasticsearch/issues/129845
536+
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
537+
method: test {p0=esql/60_usage/Basic ESQL usage output (telemetry) non-snapshot version}
538+
issue: https://github.com/elastic/elasticsearch/issues/129888
509539
- class: org.elasticsearch.gradle.internal.InternalDistributionBwcSetupPluginFuncTest
510540
method: "builds distribution from branches via archives extractedAssemble [bwcDistVersion: 8.2.1, bwcProject: bugfix, expectedAssembleTaskName:
511541
extractedAssemble, #2]"
@@ -519,42 +549,20 @@ tests:
519549
- class: org.elasticsearch.xpack.esql.qa.multi_node.GenerativeIT
520550
method: test
521551
issue: https://github.com/elastic/elasticsearch/issues/130067
552+
- class: geoip.GeoIpMultiProjectIT
553+
issue: https://github.com/elastic/elasticsearch/issues/130073
522554
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeIT
523555
method: test
524556
issue: https://github.com/elastic/elasticsearch/issues/130067
557+
- class: org.elasticsearch.xpack.esql.action.EnrichIT
558+
method: testTopN
559+
issue: https://github.com/elastic/elasticsearch/issues/130122
525560
- class: org.elasticsearch.action.support.ThreadedActionListenerTests
526561
method: testRejectionHandling
527562
issue: https://github.com/elastic/elasticsearch/issues/130129
528563
- class: org.elasticsearch.compute.aggregation.TopIntAggregatorFunctionTests
529564
method: testManyInitialManyPartialFinalRunnerThrowing
530565
issue: https://github.com/elastic/elasticsearch/issues/130145
531-
- class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests
532-
method: testUnavailableBudgetBlocksNewMergeTasksFromStartingExecution
533-
issue: https://github.com/elastic/elasticsearch/issues/130205
534-
- class: org.elasticsearch.index.codec.vectors.cluster.KMeansLocalTests
535-
method: testKMeansNeighbors
536-
issue: https://github.com/elastic/elasticsearch/issues/130258
537-
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
538-
method: test {p0=esql/10_basic/basic with documents_found}
539-
issue: https://github.com/elastic/elasticsearch/issues/130256
540-
- class: org.elasticsearch.xpack.searchablesnapshots.cache.shared.NodesCachesStatsIntegTests
541-
method: testNodesCachesStats
542-
issue: https://github.com/elastic/elasticsearch/issues/129863
543-
- class: org.elasticsearch.index.IndexingPressureIT
544-
method: testWriteCanRejectOnPrimaryBasedOnMaxOperationSize
545-
issue: https://github.com/elastic/elasticsearch/issues/130281
546-
- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
547-
method: test {lookup-join.MvJoinKeyOnFrom SYNC}
548-
issue: https://github.com/elastic/elasticsearch/issues/130296
549-
- class: org.elasticsearch.xpack.esql.inference.bulk.BulkInferenceExecutorTests
550-
method: testSuccessfulExecution
551-
issue: https://github.com/elastic/elasticsearch/issues/130306
552-
- class: org.elasticsearch.multiproject.test.CoreWithMultipleProjectsClientYamlTestSuiteIT
553-
method: test {yaml=cluster.stats/10_basic/Dense vector stats}
554-
issue: https://github.com/elastic/elasticsearch/issues/130307
555-
- class: org.elasticsearch.multiproject.test.CoreWithMultipleProjectsClientYamlTestSuiteIT
556-
method: test {yaml=nodes.stats/11_indices_metrics/Lucene segment level fields stats}
557-
issue: https://github.com/elastic/elasticsearch/issues/130360
558566

559567
# Examples:
560568
#

server/src/main/java/org/elasticsearch/TransportVersions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ static TransportVersion def(int id) {
209209
public static final TransportVersion ML_INFERENCE_ELASTIC_DENSE_TEXT_EMBEDDINGS_ADDED_8_19 = def(8_841_0_59);
210210
public static final TransportVersion ML_INFERENCE_COHERE_API_VERSION_8_19 = def(8_841_0_60);
211211
public static final TransportVersion ESQL_DOCUMENTS_FOUND_AND_VALUES_LOADED_8_19 = def(8_841_0_61);
212-
public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN_8_19 = def(8_841_0_62);
213212
public static final TransportVersion V_9_0_0 = def(9_000_0_09);
214213
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_1 = def(9_000_0_10);
215214
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_2 = def(9_000_0_11);
@@ -326,6 +325,7 @@ static TransportVersion def(int id) {
326325
public static final TransportVersion ML_INFERENCE_COHERE_API_VERSION = def(9_110_0_00);
327326
public static final TransportVersion ESQL_PROFILE_INCLUDE_PLAN = def(9_111_0_00);
328327
public static final TransportVersion MAPPINGS_IN_DATA_STREAMS = def(9_112_0_00);
328+
public static final TransportVersion ESQL_KNN_K_PARAM_MANDATORY = def(9_113_0_00);
329329

330330
/*
331331
* STOP! READ THIS FIRST! No, really,

0 commit comments

Comments
 (0)