Implement hidden aliases #52547
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,8 +28,12 @@ | |
| import java.util.Collections; | ||
| import java.util.Iterator; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import static org.elasticsearch.cluster.metadata.IndexMetaData.INDEX_HIDDEN_SETTING; | ||
|
|
||
| /** | ||
| * Encapsulates the {@link IndexMetaData} instances of a concrete index or indices an alias is pointing to. | ||
| */ | ||
|
|
@@ -46,6 +50,11 @@ public interface AliasOrIndex { | |
| */ | ||
| List<IndexMetaData> getIndices(); | ||
|
|
||
| /** | ||
| * @return whether this alias/index is hidden or not | ||
| */ | ||
| boolean isHidden(); | ||
|
|
||
| /** | ||
| * Represents an concrete index and encapsulates its {@link IndexMetaData} | ||
| */ | ||
|
|
@@ -66,6 +75,11 @@ public boolean isAlias() { | |
| public List<IndexMetaData> getIndices() { | ||
| return Collections.singletonList(concreteIndex); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isHidden() { | ||
| return INDEX_HIDDEN_SETTING.get(concreteIndex.getSettings()); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -76,11 +90,13 @@ class Alias implements AliasOrIndex { | |
| private final String aliasName; | ||
| private final List<IndexMetaData> referenceIndexMetaDatas; | ||
| private final SetOnce<IndexMetaData> writeIndex = new SetOnce<>(); | ||
| private final boolean isHidden; | ||
|
|
||
| public Alias(AliasMetaData aliasMetaData, IndexMetaData indexMetaData) { | ||
| this.aliasName = aliasMetaData.getAlias(); | ||
| this.referenceIndexMetaDatas = new ArrayList<>(); | ||
| this.referenceIndexMetaDatas.add(indexMetaData); | ||
| this.isHidden = aliasMetaData.isHidden() == null ? false : aliasMetaData.isHidden(); | ||
| } | ||
|
|
||
| @Override | ||
|
|
@@ -103,6 +119,11 @@ public IndexMetaData getWriteIndex() { | |
| return writeIndex.get(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isHidden() { | ||
| return isHidden; | ||
| } | ||
|
|
||
| /** | ||
| * Returns the unique alias metadata per concrete index. | ||
| * | ||
|
|
@@ -135,7 +156,8 @@ void addIndex(IndexMetaData indexMetaData) { | |
| this.referenceIndexMetaDatas.add(indexMetaData); | ||
| } | ||
|
|
||
| public void computeAndValidateAliasProperties() { | ||
| // Validate write indices | ||
| List<IndexMetaData> writeIndices = referenceIndexMetaDatas.stream() | ||
| .filter(idxMeta -> Boolean.TRUE.equals(idxMeta.getAliases().get(aliasName).writeIndex())) | ||
| .collect(Collectors.toList()); | ||
|
|
@@ -153,6 +175,24 @@ public void computeAndValidateWriteIndex() { | |
| throw new IllegalStateException("alias [" + aliasName + "] has more than one write index [" + | ||
| Strings.collectionToCommaDelimitedString(writeIndicesStrings) + "]"); | ||
| } | ||
|
|
||
| // Validate hidden status | ||
| final Map<Boolean, List<IndexMetaData>> groupedByHiddenStatus = referenceIndexMetaDatas.stream() | ||
gwbrown marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| .collect(Collectors.groupingBy(idxMeta -> Boolean.TRUE.equals(idxMeta.getAliases().get(aliasName).isHidden()))); | ||
| if (isNonEmpty(groupedByHiddenStatus.get(true)) && isNonEmpty(groupedByHiddenStatus.get(false))) { | ||
| List<String> hiddenOn = groupedByHiddenStatus.get(true).stream() | ||
| .map(idx -> idx.getIndex().getName()).collect(Collectors.toList()); | ||
| List<String> nonHiddenOn = groupedByHiddenStatus.get(false).stream() | ||
| .map(idx -> idx.getIndex().getName()).collect(Collectors.toList()); | ||
| throw new IllegalStateException("alias [" + aliasName + "] has is_hidden set to true on indices [" + | ||
| Strings.collectionToCommaDelimitedString(hiddenOn) + "] but does not have is_hidden set to true on indices [" + | ||
| Strings.collectionToCommaDelimitedString(nonHiddenOn) + "]; alias must have the same is_hidden setting " + | ||
| "on all indices"); | ||
| } | ||
| } | ||
|
|
||
| private boolean isNonEmpty(List<IndexMetaData> idxMetas) { | ||
| return (Objects.isNull(idxMetas) || idxMetas.isEmpty()) == false; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -721,7 +721,7 @@ private Set<String> innerResolve(Context context, List<String> expressions, Indi | |
| // add all the previous ones... | ||
| result = new HashSet<>(expressions.subList(0, i)); | ||
| } | ||
| if (Regex.isSimpleMatchPattern(expression) == false) { | ||
| //TODO why does wildcard resolver throw exceptions regarding non wildcarded expressions? This should not be done here. | ||
| if (options.ignoreUnavailable() == false) { | ||
| AliasOrIndex aliasOrIndex = metaData.getAliasAndIndexLookup().get(expression); | ||
|
|
@@ -840,27 +840,29 @@ private static Set<String> expand(Context context, IndexMetaData.State excludeSt | |
| String expression, boolean includeHidden) { | ||
| Set<String> expand = new HashSet<>(); | ||
| for (Map.Entry<String, AliasOrIndex> entry : matches.entrySet()) { | ||
| String aliasOrIndexName = entry.getKey(); | ||
| AliasOrIndex aliasOrIndex = entry.getValue(); | ||
|
|
||
| if (aliasOrIndex.isHidden() == false || includeHidden || implicitHiddenMatch(aliasOrIndexName, expression)) { | ||
| if (context.isPreserveAliases() && aliasOrIndex.isAlias()) { | ||
| expand.add(aliasOrIndexName); | ||
| } else { | ||
| for (IndexMetaData meta : aliasOrIndex.getIndices()) { | ||
| if (excludeState == null || meta.getState() != excludeState) { | ||
| expand.add(meta.getIndex().getName()); | ||
| } | ||
| } | ||
|
|
||
| } | ||
| } | ||
| } | ||
| return expand; | ||
| } | ||
|
|
||
| private static boolean implicitHiddenMatch(String itemName, String expression) { | ||
| return itemName.startsWith(".") && expression.startsWith(".") && Regex.isSimpleMatchPattern(expression); | ||
| } | ||
|
|
||
| private boolean isEmptyOrTrivialWildcard(List<String> expressions) { | ||
| return expressions.isEmpty() || (expressions.size() == 1 && (MetaData.ALL.equals(expressions.get(0)) || | ||
| Regex.isMatchAllPattern(expressions.get(0)))); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1266,7 +1266,7 @@ private SortedMap<String, AliasOrIndex> buildAliasAndIndexLookup() { | |
| } | ||
| } | ||
| aliasAndIndexLookup.values().stream().filter(AliasOrIndex::isAlias) | ||
| .forEach(alias -> ((AliasOrIndex.Alias) alias).computeAndValidateAliasProperties()); | ||
| return aliasAndIndexLookup; | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.