Skip to content

Commit 41cfb9f

Browse files
author
elasticsearchmachine
committed
Merge remote-tracking branch 'origin/main' into lucene_snapshot
2 parents 1d38a6a + 64e4c38 commit 41cfb9f

File tree

2 files changed

+0
-20
lines changed

2 files changed

+0
-20
lines changed

rest-api-spec/src/main/resources/rest-api-spec/api/indices.segments.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,6 @@
5151
],
5252
"default":"open",
5353
"description":"Whether to expand wildcard expression to concrete indices that are open, closed or both."
54-
},
55-
"verbose":{
56-
"type":"boolean",
57-
"description":"Includes detailed memory usage by Lucene.",
58-
"default":false,
59-
"deprecated" : {
60-
"version" : "8.0.0",
61-
"description" : "lucene no longer keeps track of segment memory overhead as it is largely off-heap"
62-
}
6354
}
6455
}
6556
}

server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestIndicesSegmentsAction.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
import org.elasticsearch.action.support.IndicesOptions;
1414
import org.elasticsearch.client.internal.node.NodeClient;
1515
import org.elasticsearch.common.Strings;
16-
import org.elasticsearch.common.logging.DeprecationCategory;
17-
import org.elasticsearch.common.logging.DeprecationLogger;
1816
import org.elasticsearch.rest.BaseRestHandler;
1917
import org.elasticsearch.rest.RestRequest;
2018
import org.elasticsearch.rest.Scope;
@@ -30,8 +28,6 @@
3028
@ServerlessScope(Scope.INTERNAL)
3129
public class RestIndicesSegmentsAction extends BaseRestHandler {
3230

33-
private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(RestIndicesSegmentsAction.class);
34-
3531
public RestIndicesSegmentsAction() {}
3632

3733
@Override
@@ -49,13 +45,6 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
4945
IndicesSegmentsRequest indicesSegmentsRequest = new IndicesSegmentsRequest(
5046
Strings.splitStringByCommaToArray(request.param("index"))
5147
).withVectorFormatsInfo(request.paramAsBoolean("vector_formats", false));
52-
if (request.hasParam("verbose")) {
53-
DEPRECATION_LOGGER.warn(
54-
DeprecationCategory.INDICES,
55-
"indices_segments_action_verbose",
56-
"The [verbose] query parameter for [indices_segments_action] has no effect and is deprecated"
57-
);
58-
}
5948
indicesSegmentsRequest.indicesOptions(IndicesOptions.fromRequest(request, indicesSegmentsRequest.indicesOptions()));
6049
return channel -> new RestCancellableNodeClient(client, request.getHttpChannel()).admin()
6150
.indices()

0 commit comments

Comments
 (0)