honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Inline WildcardExpressionResolver#resolve 

Relates #16725
This commit is contained in:
Jason Tedor 2016-02-13 14:17:26 -05:00
parent 26c1bb36a2
commit 5bbb1312b1
1 changed files with 123 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
core/src/main/java/org/elasticsearch/cluster/metadata/IndexNameExpressionResolver.java
View File

@ -32,7 +32,6 @@ import org.elasticsearch.common.joda.DateMathParser;
import org.elasticsearch.common.joda.FormatDateTimeFormatter; import org.elasticsearch.common.joda.FormatDateTimeFormatter;
import org.elasticsearch.common.regex.Regex; import org.elasticsearch.common.regex.Regex;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.index.Index;
import org.elasticsearch.index.IndexNotFoundException; import org.elasticsearch.index.IndexNotFoundException;
import org.elasticsearch.indices.IndexClosedException; import org.elasticsearch.indices.IndexClosedException;
import org.joda.time.DateTimeZone; import org.joda.time.DateTimeZone;
@ -527,29 +526,35 @@ public class IndexNameExpressionResolver extends AbstractComponent {
return expressions; return expressions;
} }
if (expressions.isEmpty() || (expressions.size() == 1 && (MetaData.ALL.equals(expressions.get(0))) || Regex.isMatchAllPattern(expressions.get(0)))) { if (isEmptyOrTrivialWildcard(expressions)) {
if (options.expandWildcardsOpen() && options.expandWildcardsClosed()) { return resolveEmptyOrTrivialWildcard(options, metaData, true);
return Arrays.asList(metaData.concreteAllIndices());
} else if (options.expandWildcardsOpen()) {
return Arrays.asList(metaData.concreteAllOpenIndices());
} else if (options.expandWildcardsClosed()) {
return Arrays.asList(metaData.concreteAllClosedIndices());
} else {
return Collections.emptyList();
}
} }
Set<String> result = innerResolve(context, expressions, options, metaData);
if (result == null) {
return expressions;
}
if (result.isEmpty() && !options.allowNoIndices()) {
IndexNotFoundException infe = new IndexNotFoundException((String)null);
infe.setResources("index_or_alias", expressions.toArray(new String[0]));
throw infe;
}
return new ArrayList<>(result);
}
private Set<String> innerResolve(Context context, List<String> expressions, IndicesOptions options, MetaData metaData) {
Set<String> result = null; Set<String> result = null;
for (int i = 0; i < expressions.size(); i++) { for (int i = 0; i < expressions.size(); i++) {
String expression = expressions.get(i); String expression = expressions.get(i);
if (metaData.getAliasAndIndexLookup().containsKey(expression)) { if (aliasOrIndexExists(metaData, expression)) {
if (result != null) { if (result != null) {
result.add(expression); result.add(expression);
} }
continue; continue;
} }
if (Strings.isEmpty(expression)) { if (Strings.isEmpty(expression)) {
throw new IndexNotFoundException(expression); throw infe(expression);
} }
boolean add = true; boolean add = true;
if (expression.charAt(0) == '+') { if (expression.charAt(0) == '+') {
@ -557,32 +562,19 @@ public class IndexNameExpressionResolver extends AbstractComponent {
if (i == 0) { if (i == 0) {
result = new HashSet<>(); result = new HashSet<>();
} }
add = true;
expression = expression.substring(1); expression = expression.substring(1);
} else if (expression.charAt(0) == '-') { } else if (expression.charAt(0) == '-') {
// if its the first, fill it with all the indices... // if its the first, fill it with all the indices...
if (i == 0) { if (i == 0) {
String[] concreteIndices; List<String> concreteIndices = resolveEmptyOrTrivialWildcard(options, metaData, false);
if (options.expandWildcardsOpen() && options.expandWildcardsClosed()) { result = new HashSet<>(concreteIndices);
concreteIndices = metaData.concreteAllIndices();
} else if (options.expandWildcardsOpen()) {
concreteIndices = metaData.concreteAllOpenIndices();
} else if (options.expandWildcardsClosed()) {
concreteIndices = metaData.concreteAllClosedIndices();
} else {
assert false : "Shouldn't end up here";
concreteIndices = Strings.EMPTY_ARRAY;
}
result = new HashSet<>(Arrays.asList(concreteIndices));
} }
add = false; add = false;
expression = expression.substring(1); expression = expression.substring(1);
} }
if (!Regex.isSimpleMatchPattern(expression)) { if (!Regex.isSimpleMatchPattern(expression)) {
if (!options.ignoreUnavailable() && !metaData.getAliasAndIndexLookup().containsKey(expression)) { if (!unavailableIgnoredOrExists(options, metaData, expression)) {
IndexNotFoundException infe = new IndexNotFoundException(expression); throw infe(expression);
infe.setResources("index_or_alias", expression);
throw infe;
} }
if (result != null) { if (result != null) {
if (add) { if (add) {
@ -595,10 +587,44 @@ public class IndexNameExpressionResolver extends AbstractComponent {
} }
if (result == null) { if (result == null) {
// add all the previous ones... // add all the previous ones...
result = new HashSet<>(); result = new HashSet<>(expressions.subList(0, i));
result.addAll(expressions.subList(0, i));
} }
final IndexMetaData.State excludeState = excludeState(options);
final Map<String, AliasOrIndex> matches = matches(metaData, expression);
Set<String> expand = expand(context, excludeState, matches);
if (add) {
result.addAll(expand);
} else {
result.removeAll(expand);
}
if (!noIndicesAllowedOrMatches(options, matches)) {
throw infe(expression);
}
}
return result;
}
private boolean noIndicesAllowedOrMatches(IndicesOptions options, Map<String, AliasOrIndex> matches) {
return options.allowNoIndices() || !matches.isEmpty();
}
private boolean unavailableIgnoredOrExists(IndicesOptions options, MetaData metaData, String expression) {
return options.ignoreUnavailable() || aliasOrIndexExists(metaData, expression);
}
private boolean aliasOrIndexExists(MetaData metaData, String expression) {
return metaData.getAliasAndIndexLookup().containsKey(expression);
}
private static IndexNotFoundException infe(String expression) {
IndexNotFoundException infe = new IndexNotFoundException(expression);
infe.setResources("index_or_alias", expression);
return infe;
}
private static IndexMetaData.State excludeState(IndicesOptions options) {
final IndexMetaData.State excludeState; final IndexMetaData.State excludeState;
if (options.expandWildcardsOpen() && options.expandWildcardsClosed()) { if (options.expandWildcardsOpen() && options.expandWildcardsClosed()) {
excludeState = null; excludeState = null;
@ -610,28 +636,39 @@ public class IndexNameExpressionResolver extends AbstractComponent {
assert false : "this shouldn't get called if wildcards expand to none"; assert false : "this shouldn't get called if wildcards expand to none";
excludeState = null; excludeState = null;
} }
return excludeState;
}
final Map<String, AliasOrIndex> matches; private static Map<String, AliasOrIndex> matches(MetaData metaData, String expression) {
if (Regex.isMatchAllPattern(expression)) { if (Regex.isMatchAllPattern(expression)) {
// Can only happen if the expressions was initially: '-*' // Can only happen if the expressions was initially: '-*'
matches = metaData.getAliasAndIndexLookup(); return metaData.getAliasAndIndexLookup();
} else if (expression.indexOf("*") == expression.length() - 1) { } else if (expression.indexOf("*") == expression.length() - 1) {
// Suffix wildcard: return suffixWildcard(metaData, expression);
} else {
return otherWildcard(metaData, expression);
}
}
private static Map<String, AliasOrIndex> suffixWildcard(MetaData metaData, String expression) {
assert expression.length() >= 2 : "expression [" + expression + "] should have at least a length of 2"; assert expression.length() >= 2 : "expression [" + expression + "] should have at least a length of 2";
String fromPrefix = expression.substring(0, expression.length() - 1); String fromPrefix = expression.substring(0, expression.length() - 1);
char[] toPrefixCharArr = fromPrefix.toCharArray(); char[] toPrefixCharArr = fromPrefix.toCharArray();
toPrefixCharArr[toPrefixCharArr.length - 1]++; toPrefixCharArr[toPrefixCharArr.length - 1]++;
String toPrefix = new String(toPrefixCharArr); String toPrefix = new String(toPrefixCharArr);
matches = metaData.getAliasAndIndexLookup().subMap(fromPrefix, toPrefix); return metaData.getAliasAndIndexLookup().subMap(fromPrefix, toPrefix);
} else { }
// Other wildcard expressions:
private static Map<String, AliasOrIndex> otherWildcard(MetaData metaData, String expression) {
final String pattern = expression; final String pattern = expression;
matches = metaData.getAliasAndIndexLookup() return metaData.getAliasAndIndexLookup()
.entrySet() .entrySet()
.stream() .stream()
.filter(e -> Regex.simpleMatch(pattern, e.getKey())) .filter(e -> Regex.simpleMatch(pattern, e.getKey()))
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue)); .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
} }
private static Set<String> expand(Context context, IndexMetaData.State excludeState, Map<String, AliasOrIndex> matches) {
Set<String> expand = new HashSet<>(); Set<String> expand = new HashSet<>();
for (Map.Entry<String, AliasOrIndex> entry : matches.entrySet()) { for (Map.Entry<String, AliasOrIndex> entry : matches.entrySet()) {
AliasOrIndex aliasOrIndex = entry.getValue(); AliasOrIndex aliasOrIndex = entry.getValue();
@ -645,27 +682,24 @@ public class IndexNameExpressionResolver extends AbstractComponent {
} }
} }
} }
if (add) { return expand;
result.addAll(expand);
} else {
result.removeAll(expand);
} }
if (matches.isEmpty() && options.allowNoIndices() == false) { private boolean isEmptyOrTrivialWildcard(List<String> expressions) {
IndexNotFoundException infe = new IndexNotFoundException(expression); return expressions.isEmpty() || (expressions.size() == 1 && (MetaData.ALL.equals(expressions.get(0))) || Regex.isMatchAllPattern(expressions.get(0)));
infe.setResources("index_or_alias", expression);
throw infe;
} }
private List<String> resolveEmptyOrTrivialWildcard(IndicesOptions options, MetaData metaData, boolean assertEmpty) {
if (options.expandWildcardsOpen() && options.expandWildcardsClosed()) {
return Arrays.asList(metaData.concreteAllIndices());
} else if (options.expandWildcardsOpen()) {
return Arrays.asList(metaData.concreteAllOpenIndices());
} else if (options.expandWildcardsClosed()) {
return Arrays.asList(metaData.concreteAllClosedIndices());
} else {
assert assertEmpty : "Shouldn't end up here";
return Collections.emptyList();
} }
if (result == null) {
return expressions;
}
if (result.isEmpty() && !options.allowNoIndices()) {
IndexNotFoundException infe = new IndexNotFoundException((String)null);
infe.setResources("index_or_alias", expressions.toArray(new String[0]));
throw infe;
}
return new ArrayList<>(result);
} }
} }