Skip to content

Commit 0fb2f93

Browse files
committed
Remove todos
1 parent a5d6fce commit 0fb2f93

File tree

1 file changed

+0
-20
lines changed

1 file changed

+0
-20
lines changed

server/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1687,10 +1687,8 @@ private static Set<ResolvedExpression> expandToOpenClosed(
16871687
Set<ResolvedExpression> resources = new HashSet<>();
16881688
if (context.isPreserveAliases() && indexAbstraction.getType() == Type.ALIAS) {
16891689
resources.add(new ResolvedExpression(indexAbstraction.getName(), selector));
1690-
// TODO-MARY expandToApplicableSelectors(indexAbstraction, selector, resources);
16911690
} else if (context.isPreserveDataStreams() && indexAbstraction.getType() == Type.DATA_STREAM) {
16921691
resources.add(new ResolvedExpression(indexAbstraction.getName(), selector));
1693-
// TODO-MARY expandToApplicableSelectors(indexAbstraction, selector, resources);
16941692
} else {
16951693
if (shouldIncludeRegularIndices(context.getOptions(), selector)) {
16961694
for (int i = 0, n = indexAbstraction.getIndices().size(); i < n; i++) {
@@ -1717,24 +1715,6 @@ private static Set<ResolvedExpression> expandToOpenClosed(
17171715
return resources;
17181716
}
17191717

1720-
/**
1721-
* Adds the abstraction and selector to the results when preserving data streams and aliases at wildcard resolution. If a selector
1722-
* is provided, the result is only added if the selector is applicable to the abstraction provided.
1723-
* @param indexAbstraction abstraction to add
1724-
* @param selector The selector to add
1725-
* @param resources Result collector which is updated with all applicable resolved expressions for a given abstraction and selector
1726-
* pair.
1727-
*/
1728-
private static void expandToApplicableSelectors(
1729-
IndexAbstraction indexAbstraction,
1730-
IndexComponentSelector selector,
1731-
Set<ResolvedExpression> resources
1732-
) {
1733-
if (selector == null || indexAbstraction.isDataStreamRelated() || selector.shouldIncludeFailures() == false) {
1734-
resources.add(new ResolvedExpression(indexAbstraction.getName(), selector));
1735-
}
1736-
}
1737-
17381718
private static List<ResolvedExpression> resolveEmptyOrTrivialWildcard(Context context, IndexComponentSelector selector) {
17391719
final String[] allIndices = resolveEmptyOrTrivialWildcardToAllIndices(
17401720
context.getOptions(),

0 commit comments

Comments
 (0)