honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-17 18:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

multiget requests which referred to missing indexes blocked and never returned.

Browse Source
This commit is contained in:
Boaz Leskes 2013-07-15 09:51:02 +02:00
parent 8e0d23b147
commit 9e8c42f0c6
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/elasticsearch/action/get/TransportMultiGetAction.java
View File

@ -84,6 +84,11 @@ public class TransportMultiGetAction extends TransportAction<MultiGetRequest, Mu
shardRequest.add(i, item.type(), item.id(), item.fields());
}
if (shardRequests.size() == 0) {
// only failures..
listener.onResponse(new MultiGetResponse(responses));
}
final AtomicInteger counter = new AtomicInteger(shardRequests.size());
for (final MultiGetShardRequest shardRequest : shardRequests.values()) {

24
src/test/java/org/elasticsearch/test/integration/mget/SimpleMgetTests.java
View File

@ -41,7 +41,7 @@ public class SimpleMgetTests extends AbstractSharedClusterTest {
MultiGetResponse mgetResponse = client().prepareMultiGet()
.add(new MultiGetRequest.Item("test", "test", "1"))
.add(new MultiGetRequest.Item("nonExistingIndex", "test", "1"))
.execute().actionGet();
.execute().actionGet();
assertThat(mgetResponse.getResponses().length, is(2));
assertThat(mgetResponse.getResponses()[0].getIndex(), is("test"));
@ -50,20 +50,30 @@ public class SimpleMgetTests extends AbstractSharedClusterTest {
assertThat(mgetResponse.getResponses()[1].getIndex(), is("nonExistingIndex"));
assertThat(mgetResponse.getResponses()[1].isFailed(), is(true));
assertThat(mgetResponse.getResponses()[1].getFailure().getMessage(), is("[nonExistingIndex] missing"));
mgetResponse = client().prepareMultiGet()
.add(new MultiGetRequest.Item("nonExistingIndex", "test", "1"))
.execute().actionGet();
assertThat(mgetResponse.getResponses().length, is(1));
assertThat(mgetResponse.getResponses()[0].getIndex(), is("nonExistingIndex"));
assertThat(mgetResponse.getResponses()[0].isFailed(), is(true));
assertThat(mgetResponse.getResponses()[0].getFailure().getMessage(), is("[nonExistingIndex] missing"));
}
@Test
public void testThatParentPerDocumentIsSupported() throws Exception {
public void testThatParentPerDocumentIsSupported() throws Exception {
createIndex("test");
ensureYellow();
client().admin().indices().preparePutMapping("test").setType("test").setSource(jsonBuilder()
.startObject()
.startObject()
.startObject("test")
.startObject("_parent")
.field("type", "foo")
.endObject()
.startObject("_parent")
.field("type", "foo")
.endObject()
.endObject().
endObject()
endObject()
).execute().actionGet();
client().prepareIndex("test", "test", "1").setParent("4").setRefresh(true)