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

Fix bug when searching concrete and routing aliased indices 

Closes #2683
This commit is contained in:
Benjamin Devèze 2013-02-25 00:01:41 +01:00 committed by Simon Willnauer
parent 881cb7900c
commit 09f20e3d4c
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/elasticsearch/cluster/routing/operation/plain/PlainOperationRouting.java
View File

@ -169,6 +169,13 @@ public class PlainOperationRouting extends AbstractComponent implements Operatio
set.add(iterator);
}
}
} else {
for (IndexShardRoutingTable indexShard : indexRouting) {
ShardIterator iterator = preferenceActiveShardIterator(indexShard, clusterState.nodes().localNodeId(), clusterState.nodes(), preference);
if (iterator != null) {
set.add(iterator);
}
}
}
}
return new GroupShardsIterator(set);

28
src/test/java/org/elasticsearch/test/integration/routing/AliasRoutingTests.java
View File

@ -314,6 +314,34 @@ public class AliasRoutingTests extends AbstractNodesTests {
}
}
@Test
public void testAliasSearchRoutingWithConcreteAndAliasedIndices() throws Exception {
try {
client.admin().indices().prepareDelete("index").execute().actionGet();
client.admin().indices().prepareDelete("index_2").execute().actionGet();
} catch (Exception e) {
// ignore
}
client.admin().indices().prepareCreate("index").execute().actionGet();
client.admin().indices().prepareCreate("index_2").execute().actionGet();
client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet();
client.admin().indices().prepareAliases()
.addAliasAction(newAddAliasAction("index", "index_1").routing("1"))
.execute().actionGet();
logger.info("--> indexing on index_1 which is an alias for index with routing [1]");
client.prepareIndex("index_1", "type1", "1").setSource("field", "value1").setRefresh(true).execute().actionGet();
logger.info("--> indexing on index_2 which is a concrete index");
client.prepareIndex("index_2", "type2", "2").setSource("field", "value2").setRefresh(true).execute().actionGet();
logger.info("--> search all on index_* should find two");
for (int i = 0; i < 5; i++) {
assertThat(client.prepareSearch("index_*").setQuery(QueryBuilders.matchAllQuery()).execute().actionGet().getHits().totalHits(), equalTo(2l));
}
}
@Test
public void testRequiredRoutingMappingWithAlias() throws Exception {
try {