Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CORE: Make Pattern Exclusion Work with Aliases #33518

Merged
merged 5 commits into from
Sep 9, 2018
Merged

CORE: Make Pattern Exclusion Work with Aliases #33518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
576dd2d
CORE: Make Pattern Exclusion Work with Aliases
original-brownbear Sep 7, 2018
71a0d88
faster
original-brownbear Sep 7, 2018
8b9e769
CR: Support overrides to exclusions
original-brownbear Sep 9, 2018
7e64005
Merge remote-tracking branch 'elastic/master' into 33395
original-brownbear Sep 9, 2018
cc713f6
Fix issue with '_all'
original-brownbear Sep 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 26 additions & 11 deletions server/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,14 +296,38 @@ private ImmutableOpenMap<String, List<AliasMetaData>> findAliases(String[] origi
return ImmutableOpenMap.of();
}

boolean matchAllAliases = matchAllAliases(aliases);
String[] patterns = new String[aliases.length];
boolean[] include = new boolean[aliases.length];
for (int i = 0; i < aliases.length; i++) {
String alias = aliases[i];
if (alias.charAt(0) == '-') {
patterns[i] = alias.substring(1);
include[i] = false;
} else {
patterns[i] = alias;
include[i] = true;
}
}
boolean matchAllAliases = patterns.length == 0;
ImmutableOpenMap.Builder<String, List<AliasMetaData>> mapBuilder = ImmutableOpenMap.builder();
for (String index : concreteIndices) {
IndexMetaData indexMetaData = indices.get(index);
List<AliasMetaData> filteredValues = new ArrayList<>();
for (ObjectCursor<AliasMetaData> cursor : indexMetaData.getAliases().values()) {
AliasMetaData value = cursor.value;
if (matchAllAliases || Regex.simpleMatch(aliases, value.alias())) {
boolean matched = matchAllAliases;
String alias = value.alias();
for (int i = 0; i < patterns.length; i++) {
if (include[i]) {
if (matched == false) {
String pattern = patterns[i];
matched = ALL.equals(pattern) || Regex.simpleMatch(pattern, alias);
}
} else if (matched) {
matched = Regex.simpleMatch(patterns[i], alias) == false;
}
}
if (matched) {
filteredValues.add(value);
}
}
Expand All @@ -317,15 +341,6 @@ private ImmutableOpenMap<String, List<AliasMetaData>> findAliases(String[] origi
return mapBuilder.build();
}

private static boolean matchAllAliases(final String[] aliases) {
for (String alias : aliases) {
if (alias.equals(ALL)) {
return true;
}
}
return aliases.length == 0;
}

/**
* Checks if at least one of the specified aliases exists in the specified concrete indices. Wildcards are supported in the
* alias names for partial matches.
Expand Down
32 changes: 32 additions & 0 deletions server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,38 @@ public void testFindAliases() {
}
}

public void testFindAliasWithExclusion() {
MetaData metaData = MetaData.builder().put(
IndexMetaData.builder("index")
.settings(Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT))
.numberOfShards(1)
.numberOfReplicas(0)
.putAlias(AliasMetaData.builder("alias1").build())
.putAlias(AliasMetaData.builder("alias2").build())
).build();
List<AliasMetaData> aliases =
metaData.findAliases(new GetAliasesRequest().aliases("*", "-alias1"), new String[] {"index"}).get("index");
assertThat(aliases.size(), equalTo(1));
assertThat(aliases.get(0).alias(), equalTo("alias2"));
}

public void testFindAliasWithExclusionAndOverride() {
MetaData metaData = MetaData.builder().put(
IndexMetaData.builder("index")
.settings(Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT))
.numberOfShards(1)
.numberOfReplicas(0)
.putAlias(AliasMetaData.builder("aa").build())
.putAlias(AliasMetaData.builder("ab").build())
.putAlias(AliasMetaData.builder("bb").build())
).build();
List<AliasMetaData> aliases =
metaData.findAliases(new GetAliasesRequest().aliases("a*", "-*b", "b*"), new String[] {"index"}).get("index");
assertThat(aliases.size(), equalTo(2));
assertThat(aliases.get(0).alias(), equalTo("aa"));
assertThat(aliases.get(1).alias(), equalTo("bb"));
}

public void testIndexAndAliasWithSameName() {
IndexMetaData.Builder builder = IndexMetaData.builder("index")
.settings(Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT))
Expand Down