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

- Explain api opens 2 engine searchers, but closes only 1 engine searcher. Closes #2206

This commit is contained in:
Martijn van Groningen 2012-08-26 15:23:04 +02:00 committed by Shay Banon
parent da61ddee3c
commit 1d4aee6086
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/elasticsearch/action/explain/TransportExplainAction.java
View File

@ -95,7 +95,7 @@ public class TransportExplainAction extends TransportShardSingleOperationAction<
0,
new InternalSearchRequest().types(new String[]{request.type()})
.filteringAliases(request.filteringAlias()),
null, indexShard.searcher(), indexService, indexShard,
null, result.searcher(), indexService, indexShard,
scriptService
);
SearchContext.setCurrent(context);

11
src/test/java/org/elasticsearch/test/integration/explain/ExplainActionTests.java
View File

@ -24,6 +24,7 @@ import org.elasticsearch.client.Client;
import org.elasticsearch.common.settings.ImmutableSettings;
import org.elasticsearch.index.query.FilterBuilders;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.indices.IndexMissingException;
import org.elasticsearch.test.integration.AbstractNodesTests;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
@ -56,10 +57,13 @@ public class ExplainActionTests extends AbstractNodesTests {
@Test
public void testSimple() throws Exception {
client.admin().indices().prepareDelete("test").execute().actionGet();
try {
client.admin().indices().prepareDelete("test").execute().actionGet();
} catch (IndexMissingException e) {}
client.admin().indices().prepareCreate("test").setSettings(
ImmutableSettings.settingsBuilder().put("index.refresh_interval", -1)
).execute().actionGet();
client.admin().cluster().prepareHealth("test").setWaitForGreenStatus().execute().actionGet();
client.prepareIndex("test", "test", "1")
.setSource("field", "value1")
@ -116,9 +120,12 @@ public class ExplainActionTests extends AbstractNodesTests {
@Test
public void testExplainWithAlias() throws Exception {
client.admin().indices().prepareDelete().execute().actionGet();
try {
client.admin().indices().prepareDelete("test").execute().actionGet();
} catch (IndexMissingException e) {}
client.admin().indices().prepareCreate("test")
.execute().actionGet();
client.admin().cluster().prepareHealth("test").setWaitForGreenStatus().execute().actionGet();
client.admin().indices().prepareAliases().addAlias("test", "alias1", FilterBuilders.termFilter("field2", "value2"))
.execute().actionGet();