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

fixed MetaData#concreteIndices to throw exception with a single index argument in case allowNoIndices == false and ignoreUnavailable == true 

Closes #6137
This commit is contained in:
javanna 2014-05-12 22:55:42 +02:00 committed by Luca Cavanna
parent 233aaa63c9
commit c69c66bb7a
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/elasticsearch/cluster/metadata/MetaData.java
View File

@ -654,7 +654,7 @@ public class MetaData implements Iterable<IndexMetaData> {
return aliasesOrIndices;
}
String[] actualLst = aliasAndIndexToIndexMap.getOrDefault(aliasOrIndex, Strings.EMPTY_ARRAY);
if (!indicesOptions.allowNoIndices() && actualLst == null) {
if (actualLst.length == 0 && !indicesOptions.allowNoIndices()) {
throw new IndexMissingException(new Index(aliasOrIndex));
} else {
return actualLst;

18
src/test/java/org/elasticsearch/cluster/metadata/MetaDataTests.java
View File

@ -129,7 +129,7 @@ public class MetaDataTests extends ElasticsearchTestCase {
}
@Test
public void testIndexOptions_allowUnavailableExpandOpenDisAllowEmpty() {
public void testIndexOptions_allowUnavailableExpandOpenDisallowEmpty() {
MetaData.Builder mdBuilder = MetaData.builder()
.put(indexBuilder("foo"))
.put(indexBuilder("foobar"))
@ -145,18 +145,26 @@ public class MetaDataTests extends ElasticsearchTestCase {
assertEquals(1, results.length);
assertEquals("foo", results[0]);
results = md.concreteIndices(new String[]{"bar"}, options);
assertThat(results, emptyArray());
try {
md.concreteIndices(new String[]{"bar"}, options);
fail();
} catch(IndexMissingException e) {
assertThat(e.index().name(), equalTo("bar"));
}
try {
md.concreteIndices(new String[]{"baz*"}, options);
fail();
} catch (IndexMissingException e) {}
} catch (IndexMissingException e) {
assertThat(e.index().name(), equalTo("baz*"));
}
try {
md.concreteIndices(new String[]{"foo", "baz*"}, options);
fail();
} catch (IndexMissingException e) {}
} catch (IndexMissingException e) {
assertThat(e.index().name(), equalTo("baz*"));
}
}
@Test