mirror of
https://github.com/honeymoose/OpenSearch.git
synced 2025-02-14 17:05:36 +00:00
Short Curcuit response if no indices exits and make sure listener is notified.
Closes #2692
This commit is contained in:
parent
3c1f291801
commit
39f362326e
@ -86,7 +86,9 @@ public abstract class TransportIndicesReplicationOperationAction<Request extends
|
|||||||
final AtomicReferenceArray<Object> indexResponses = new AtomicReferenceArray<Object>(concreteIndices.length);
|
final AtomicReferenceArray<Object> indexResponses = new AtomicReferenceArray<Object>(concreteIndices.length);
|
||||||
|
|
||||||
Map<String, Set<String>> routingMap = resolveRouting(clusterState, request);
|
Map<String, Set<String>> routingMap = resolveRouting(clusterState, request);
|
||||||
|
if (concreteIndices == null || concreteIndices.length == 0) {
|
||||||
|
listener.onResponse(newResponseInstance(request, indexResponses));
|
||||||
|
} else {
|
||||||
for (final String index : concreteIndices) {
|
for (final String index : concreteIndices) {
|
||||||
Set<String> routing = null;
|
Set<String> routing = null;
|
||||||
if (routingMap != null) {
|
if (routingMap != null) {
|
||||||
@ -118,6 +120,7 @@ public abstract class TransportIndicesReplicationOperationAction<Request extends
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
protected abstract Request newRequestInstance();
|
protected abstract Request newRequestInstance();
|
||||||
|
|
||||||
|
@ -0,0 +1,88 @@
|
|||||||
|
/*
|
||||||
|
* Licensed to ElasticSearch and Shay Banon under one
|
||||||
|
* or more contributor license agreements. See the NOTICE file
|
||||||
|
* distributed with this work for additional information
|
||||||
|
* regarding copyright ownership. ElasticSearch licenses this
|
||||||
|
* file to you under the Apache License, Version 2.0 (the
|
||||||
|
* "License"); you may not use this file except in compliance
|
||||||
|
* with the License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.elasticsearch.test.integration.deleteByQuery;
|
||||||
|
|
||||||
|
import org.elasticsearch.action.deletebyquery.DeleteByQueryRequestBuilder;
|
||||||
|
import org.elasticsearch.action.deletebyquery.DeleteByQueryResponse;
|
||||||
|
import org.elasticsearch.action.search.SearchResponse;
|
||||||
|
import org.elasticsearch.client.Client;
|
||||||
|
import org.elasticsearch.index.query.QueryBuilders;
|
||||||
|
import org.elasticsearch.test.integration.AbstractNodesTests;
|
||||||
|
import org.testng.annotations.AfterClass;
|
||||||
|
import org.testng.annotations.BeforeClass;
|
||||||
|
import org.testng.annotations.Test;
|
||||||
|
|
||||||
|
import static org.hamcrest.MatcherAssert.assertThat;
|
||||||
|
import static org.hamcrest.Matchers.equalTo;
|
||||||
|
import static org.hamcrest.Matchers.notNullValue;
|
||||||
|
|
||||||
|
public class DeleteByQueryTests extends AbstractNodesTests {
|
||||||
|
|
||||||
|
private Client client;
|
||||||
|
|
||||||
|
@BeforeClass
|
||||||
|
public void createNodes() throws Exception {
|
||||||
|
startNode("server1");
|
||||||
|
startNode("server2");
|
||||||
|
client = getClient();
|
||||||
|
}
|
||||||
|
|
||||||
|
@AfterClass
|
||||||
|
public void closeNodes() {
|
||||||
|
client.close();
|
||||||
|
closeAllNodes();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected Client getClient() {
|
||||||
|
return client("server1");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testDeleteAllNoIndices() {
|
||||||
|
client.admin().indices().prepareDelete().execute().actionGet();
|
||||||
|
client.admin().indices().prepareRefresh().execute().actionGet();
|
||||||
|
DeleteByQueryRequestBuilder deleteByQueryRequestBuilder = new DeleteByQueryRequestBuilder(client);
|
||||||
|
deleteByQueryRequestBuilder.setQuery(QueryBuilders.matchAllQuery());
|
||||||
|
DeleteByQueryResponse actionGet = deleteByQueryRequestBuilder.execute().actionGet();
|
||||||
|
assertThat(actionGet.getIndices().size(), equalTo(0));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testDeleteAllOneIndex() {
|
||||||
|
client.admin().indices().prepareDelete().execute().actionGet();
|
||||||
|
|
||||||
|
String json = "{" + "\"user\":\"kimchy\"," + "\"postDate\":\"2013-01-30\"," + "\"message\":\"trying out Elastic Search\"" + "}";
|
||||||
|
|
||||||
|
client.prepareIndex("twitter", "tweet").setSource(json).setRefresh(true).execute().actionGet();
|
||||||
|
|
||||||
|
SearchResponse search = client.prepareSearch().setQuery(QueryBuilders.matchAllQuery()).execute().actionGet();
|
||||||
|
assertThat(search.getHits().totalHits(), equalTo(1l));
|
||||||
|
DeleteByQueryRequestBuilder deleteByQueryRequestBuilder = new DeleteByQueryRequestBuilder(client);
|
||||||
|
deleteByQueryRequestBuilder.setQuery(QueryBuilders.matchAllQuery());
|
||||||
|
|
||||||
|
DeleteByQueryResponse actionGet = deleteByQueryRequestBuilder.execute().actionGet();
|
||||||
|
assertThat(actionGet.getIndex("twitter"), notNullValue());
|
||||||
|
assertThat(actionGet.getIndex("twitter").getFailedShards(), equalTo(0));
|
||||||
|
|
||||||
|
client.admin().indices().prepareRefresh().execute().actionGet();
|
||||||
|
search = client.prepareSearch().setQuery(QueryBuilders.matchAllQuery()).execute().actionGet();
|
||||||
|
assertThat(search.getHits().totalHits(), equalTo(0l));
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user