Skip to content

Commit 23781bb

Browse files
Remove xpack actions for vector field (#75017)
We have already decided not to have xpack usage for field mappers (see #53076). As mappings stats of all fields is already tracked in cluster stats. Moreover xpack usage for vector field is a quite expensive operation (see #74974). This removes xpack actions for vector field.
1 parent c061964 commit 23781bb

File tree

15 files changed

+5
-385
lines changed

15 files changed

+5
-385
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,9 @@ tasks.register("verifyVersions") {
144144
* after the backport of the backcompat code is complete.
145145
*/
146146

147-
boolean bwc_tests_enabled = true
147+
boolean bwc_tests_enabled = false
148148
// place a PR link here when committing bwc changes:
149-
String bwc_tests_disabled_issue = ""
149+
String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/75017"
150150
/*
151151
* FIPS 140-2 behavior was fixed in 7.11.0. Before that there is no way to run elasticsearch in a
152152
* JVM that is properly configured to be in fips mode with BCFIPS. For now we need to disable

docs/reference/rest-api/info.asciidoc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,6 @@ Example response:
142142
"available" : true,
143143
"enabled" : true
144144
},
145-
"vectors" : {
146-
"available" : true,
147-
"enabled" : true
148-
},
149145
"voting_only" : {
150146
"available" : true,
151147
"enabled" : true

docs/reference/rest-api/usage.asciidoc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -272,12 +272,6 @@ GET /_xpack/usage
272272
"available" : true,
273273
"enabled" : true
274274
},
275-
"vectors" : {
276-
"available" : true,
277-
"enabled" : true,
278-
"dense_vector_fields_count" : 0,
279-
"dense_vector_dims_avg_count" : 0
280-
},
281275
"voting_only" : {
282276
"available" : true,
283277
"enabled" : true

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackClientPlugin.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@
218218
import org.elasticsearch.xpack.core.transform.transforms.TimeSyncConfig;
219219
import org.elasticsearch.xpack.core.transform.transforms.TransformState;
220220
import org.elasticsearch.xpack.core.transform.transforms.TransformTaskParams;
221-
import org.elasticsearch.xpack.core.vectors.VectorsFeatureSetUsage;
222221
import org.elasticsearch.xpack.core.votingonly.VotingOnlyNodeFeatureSetUsage;
223222
import org.elasticsearch.xpack.core.watcher.WatcherFeatureSetUsage;
224223
import org.elasticsearch.xpack.core.watcher.WatcherMetadata;
@@ -516,8 +515,6 @@ public List<NamedWriteableRegistry.Entry> getNamedWriteables() {
516515
TransformField.TIME.getPreferredName(),
517516
TimeRetentionPolicyConfig::new
518517
),
519-
// Vectors
520-
new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.VECTORS, VectorsFeatureSetUsage::new),
521518
// Voting Only Node
522519
new NamedWriteableRegistry.Entry(XPackFeatureSet.Usage.class, XPackField.VOTING_ONLY, VotingOnlyNodeFeatureSetUsage::new),
523520
// Frozen indices

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/XPackField.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public final class XPackField {
4848
*/
4949
@Deprecated
5050
public static final String FLATTENED = "flattened";
51+
@Deprecated
5152
/** Name constant for the vectors feature. */
5253
public static final String VECTORS = "vectors";
5354
/** Name constant for the voting-only-node feature. */

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/XPackInfoFeatureAction.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public class XPackInfoFeatureAction extends ActionType<XPackInfoFeatureResponse>
3838
public static final XPackInfoFeatureAction SNAPSHOT_LIFECYCLE = new XPackInfoFeatureAction(XPackField.SNAPSHOT_LIFECYCLE);
3939
public static final XPackInfoFeatureAction CCR = new XPackInfoFeatureAction(XPackField.CCR);
4040
public static final XPackInfoFeatureAction TRANSFORM = new XPackInfoFeatureAction(XPackField.TRANSFORM);
41-
public static final XPackInfoFeatureAction VECTORS = new XPackInfoFeatureAction(XPackField.VECTORS);
4241
public static final XPackInfoFeatureAction VOTING_ONLY = new XPackInfoFeatureAction(XPackField.VOTING_ONLY);
4342
public static final XPackInfoFeatureAction FROZEN_INDICES = new XPackInfoFeatureAction(XPackField.FROZEN_INDICES);
4443
public static final XPackInfoFeatureAction SPATIAL = new XPackInfoFeatureAction(XPackField.SPATIAL);
@@ -54,7 +53,7 @@ public class XPackInfoFeatureAction extends ActionType<XPackInfoFeatureResponse>
5453
final List<XPackInfoFeatureAction> actions = new ArrayList<>();
5554
actions.addAll(Arrays.asList(
5655
SECURITY, MONITORING, WATCHER, GRAPH, MACHINE_LEARNING, LOGSTASH, EQL, SQL, ROLLUP, INDEX_LIFECYCLE, SNAPSHOT_LIFECYCLE, CCR,
57-
TRANSFORM, VECTORS, VOTING_ONLY, FROZEN_INDICES, SPATIAL, ANALYTICS, ENRICH, DATA_STREAMS, SEARCHABLE_SNAPSHOTS, DATA_TIERS,
56+
TRANSFORM, VOTING_ONLY, FROZEN_INDICES, SPATIAL, ANALYTICS, ENRICH, DATA_STREAMS, SEARCHABLE_SNAPSHOTS, DATA_TIERS,
5857
AGGREGATE_METRIC
5958
));
6059
ALL = Collections.unmodifiableList(actions);

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/action/XPackUsageFeatureAction.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ public class XPackUsageFeatureAction extends ActionType<XPackUsageFeatureRespons
3535
public static final XPackUsageFeatureAction SNAPSHOT_LIFECYCLE = new XPackUsageFeatureAction(XPackField.SNAPSHOT_LIFECYCLE);
3636
public static final XPackUsageFeatureAction CCR = new XPackUsageFeatureAction(XPackField.CCR);
3737
public static final XPackUsageFeatureAction TRANSFORM = new XPackUsageFeatureAction(XPackField.TRANSFORM);
38-
public static final XPackUsageFeatureAction VECTORS = new XPackUsageFeatureAction(XPackField.VECTORS);
3938
public static final XPackUsageFeatureAction VOTING_ONLY = new XPackUsageFeatureAction(XPackField.VOTING_ONLY);
4039
public static final XPackUsageFeatureAction FROZEN_INDICES = new XPackUsageFeatureAction(XPackField.FROZEN_INDICES);
4140
public static final XPackUsageFeatureAction SPATIAL = new XPackUsageFeatureAction(XPackField.SPATIAL);
@@ -66,7 +65,6 @@ public class XPackUsageFeatureAction extends ActionType<XPackUsageFeatureRespons
6665
SPATIAL,
6766
SQL,
6867
TRANSFORM,
69-
VECTORS,
7068
VOTING_ONLY,
7169
WATCHER
7270
);

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/vectors/VectorsFeatureSetUsage.java

Lines changed: 0 additions & 85 deletions
This file was deleted.

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/vectors/VectorsFeatureSetUsageTests.java

Lines changed: 0 additions & 48 deletions
This file was deleted.

x-pack/plugin/security/qa/operator-privileges-tests/src/javaRestTest/java/org/elasticsearch/xpack/security/operator/Constants.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@ public class Constants {
277277
"cluster:monitor/xpack/info/spatial",
278278
"cluster:monitor/xpack/info/sql",
279279
"cluster:monitor/xpack/info/transform",
280-
"cluster:monitor/xpack/info/vectors",
281280
"cluster:monitor/xpack/info/voting_only",
282281
"cluster:monitor/xpack/info/watcher",
283282
"cluster:monitor/xpack/license/get",
@@ -331,7 +330,6 @@ public class Constants {
331330
"cluster:monitor/xpack/usage/spatial",
332331
"cluster:monitor/xpack/usage/sql",
333332
"cluster:monitor/xpack/usage/transform",
334-
"cluster:monitor/xpack/usage/vectors",
335333
"cluster:monitor/xpack/usage/voting_only",
336334
"cluster:monitor/xpack/usage/watcher",
337335
"cluster:monitor/xpack/watcher/stats/dist",

0 commit comments

Comments
 (0)