Skip to content

Commit

Permalink
Fix SimpleNestedIT.testExplain flaky test (opensearch-project#11681) (o…
Browse files Browse the repository at this point in the history
…pensearch-project#11855)

(cherry picked from commit bbe790b)

Signed-off-by: Neetika Singhal <neetiks@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
1 parent c440508 commit 2444b9d
Show file tree
Hide file tree
Showing 2 changed files with 128 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/

package org.opensearch.search.nested;

import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.join.ScoreMode;
import org.opensearch.action.search.SearchResponse;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.util.FeatureFlags;
import org.opensearch.test.OpenSearchIntegTestCase;

import static org.opensearch.action.support.WriteRequest.RefreshPolicy.IMMEDIATE;
import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.opensearch.index.query.QueryBuilders.nestedQuery;
import static org.opensearch.index.query.QueryBuilders.termQuery;
import static org.opensearch.search.SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING;
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertNoFailures;
import static org.hamcrest.Matchers.equalTo;

/**
* Creating a separate class with no parameterization to create and index documents in a single
* test run and compare search responses across concurrent and non-concurrent search. For more details,
* refer: https://github.com/opensearch-project/OpenSearch/issues/11413
*/
public class SimpleNestedExplainIT extends OpenSearchIntegTestCase {

@Override
protected Settings featureFlagSettings() {
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
}

/*
* Tests the explain output for multiple docs. Concurrent search with multiple slices is tested
* here as call to indexRandomForMultipleSlices is made and compared with explain output for
* non-concurrent search use-case. Separate test class is created to test explain for 1 slice
* case in concurrent search, refer {@link SimpleExplainIT#testExplainWithSingleDoc}
* For more details, refer: https://github.com/opensearch-project/OpenSearch/issues/11413
* */
public void testExplainMultipleDocs() throws Exception {
assertAcked(
prepareCreate("test").setMapping(
jsonBuilder().startObject()
.startObject("properties")
.startObject("nested1")
.field("type", "nested")
.endObject()
.endObject()
.endObject()
)
);

ensureGreen();

client().prepareIndex("test")
.setId("1")
.setSource(
jsonBuilder().startObject()
.field("field1", "value1")
.startArray("nested1")
.startObject()
.field("n_field1", "n_value1")
.endObject()
.startObject()
.field("n_field1", "n_value1")
.endObject()
.endArray()
.endObject()
)
.setRefreshPolicy(IMMEDIATE)
.get();

indexRandomForMultipleSlices("test");

// Turn off the concurrent search setting to test search with non-concurrent search
client().admin()
.cluster()
.prepareUpdateSettings()
.setPersistentSettings(Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), false).build())
.get();

SearchResponse nonConSearchResp = client().prepareSearch("test")
.setQuery(nestedQuery("nested1", termQuery("nested1.n_field1", "n_value1"), ScoreMode.Total))
.setExplain(true)
.get();
assertNoFailures(nonConSearchResp);
assertThat(nonConSearchResp.getHits().getTotalHits().value, equalTo(1L));
Explanation nonConSearchExplain = nonConSearchResp.getHits().getHits()[0].getExplanation();
assertThat(nonConSearchExplain.getValue(), equalTo(nonConSearchResp.getHits().getHits()[0].getScore()));

// Turn on the concurrent search setting to test search with concurrent search
client().admin()
.cluster()
.prepareUpdateSettings()
.setPersistentSettings(Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), true).build())
.get();

SearchResponse conSearchResp = client().prepareSearch("test")
.setQuery(nestedQuery("nested1", termQuery("nested1.n_field1", "n_value1"), ScoreMode.Total))
.setExplain(true)
.get();
assertNoFailures(conSearchResp);
assertThat(conSearchResp.getHits().getTotalHits().value, equalTo(1L));
Explanation conSearchExplain = conSearchResp.getHits().getHits()[0].getExplanation();
assertThat(conSearchExplain.getValue(), equalTo(conSearchResp.getHits().getHits()[0].getScore()));

// assert that the explanation for concurrent search should be equal to the non-concurrent search's explanation
assertEquals(nonConSearchExplain, conSearchExplain);
client().admin()
.cluster()
.prepareUpdateSettings()
.setPersistentSettings(Settings.builder().putNull(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey()).build())
.get();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,13 @@ public void testDeleteNestedDocsWithAlias() throws Exception {
assertDocumentCount("test", 6);
}

public void testExplain() throws Exception {
/*
* Tests the explain output for single doc. Concurrent search with only slice 1 is tested
* here as call to indexRandomForMultipleSlices has implications on the range of child docs
* in the explain output. Separate test class is created to test explain for multiple slices
* case in concurrent search, refer {@link SimpleNestedExplainIT}
* */
public void testExplainWithSingleDoc() throws Exception {
assertAcked(
prepareCreate("test").setMapping(
jsonBuilder().startObject()
Expand Down Expand Up @@ -487,7 +493,6 @@ public void testExplain() throws Exception {
)
.setRefreshPolicy(IMMEDIATE)
.get();
indexRandomForConcurrentSearch("test");

SearchResponse searchResponse = client().prepareSearch("test")
.setQuery(nestedQuery("nested1", termQuery("nested1.n_field1", "n_value1"), ScoreMode.Total))
Expand Down

0 comments on commit 2444b9d

Please sign in to comment.