Skip to content

Commit

Permalink
Fix SimpleNestedExplainIT.testExplainMultipleDocs flakiness
Browse files Browse the repository at this point in the history
Signed-off-by: Neetika Singhal <[email protected]>
  • Loading branch information
neetikasinghal committed Mar 21, 2024
1 parent e673b61 commit 8e3688e
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
*/
public class SimpleNestedExplainIT extends OpenSearchIntegTestCase {

@Override
protected int numberOfShards() {
return 1;
}

/*
* 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
Expand Down Expand Up @@ -70,7 +75,23 @@ public void testExplainMultipleDocs() throws Exception {
.setRefreshPolicy(IMMEDIATE)
.get();

indexRandomForMultipleSlices("test");
client().prepareIndex("test")
.setId("2")
.setSource(
jsonBuilder().startObject()
.field("field1", "value2")
.startArray("nested1")
.startObject()
.field("n_field1", "n_value2")
.endObject()
.startObject()
.field("n_field1", "n_value2")
.endObject()
.endArray()
.endObject()
)
.setRefreshPolicy(IMMEDIATE)
.get();

// Turn off the concurrent search setting to test search with non-concurrent search
client().admin()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -540,11 +540,11 @@ LeafSlice[] slicesInternal(List<LeafReaderContext> leaves, int targetMaxSlice) {
if (targetMaxSlice == 0) {
// use the default lucene slice calculation
leafSlices = super.slices(leaves);
logger.debug("Slice count using lucene default [{}]", leafSlices.length);
logger.info("Slice count using lucene default [{}]", leafSlices.length);
} else {
// use the custom slice calculation based on targetMaxSlice
leafSlices = MaxTargetSliceSupplier.getSlices(leaves, targetMaxSlice);
logger.debug("Slice count using max target slice supplier [{}]", leafSlices.length);
logger.info("Slice count using max target slice supplier [{}]", leafSlices.length);
}
return leafSlices;
}
Expand Down

0 comments on commit 8e3688e

Please sign in to comment.