Skip to content

Randomly disable sequence numbers in SimpleNestedIT #144093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
romseygeek wants to merge 2 commits into from
Closed

Randomly disable sequence numbers in SimpleNestedIT #144093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd826aa
Randomly disable sequence numbers in SimpleNestedIT
romseygeek Mar 12, 2026
7340d01
Correctly handle feature flag in RandomScoreFunctionBuilderTests
romseygeek Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
246 changes: 137 additions & 109 deletions server/src/internalClusterTest/java/org/elasticsearch/search/nested/SimpleNestedIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
import org.elasticsearch.cluster.health.ClusterHealthStatus;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.core.TimeValue;
import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.mapper.SeqNoFieldMapper;
import org.elasticsearch.index.query.InnerHitBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.builder.SearchSourceBuilder;
Expand Down Expand Up @@ -54,8 +56,20 @@

public class SimpleNestedIT extends ESIntegTestCase {

private static Settings.Builder maybeDisableSequenceNumbers() {
return maybeDisableSequenceNumbers(Settings.builder());
}

private static Settings.Builder maybeDisableSequenceNumbers(Settings.Builder builder) {
if (IndexSettings.DISABLE_SEQUENCE_NUMBERS_FEATURE_FLAG && randomBoolean()) {
builder.put(IndexSettings.DISABLE_SEQUENCE_NUMBERS.getKey(), true)
.put(IndexSettings.SEQ_NO_INDEX_OPTIONS_SETTING.getKey(), SeqNoFieldMapper.SeqNoIndexOptions.DOC_VALUES_ONLY);
}
return builder;
}

public void testSimpleNested() throws Exception {
assertAcked(prepareCreate("test").setMapping("nested1", "type=nested"));
assertAcked(prepareCreate("test").setSettings(maybeDisableSequenceNumbers()).setMapping("nested1", "type=nested"));
ensureGreen();

// check on no data, see it works
Expand Down Expand Up @@ -181,22 +195,23 @@ public void testSimpleNested() throws Exception {

public void testMultiNested() throws Exception {
assertAcked(
prepareCreate("test").setMapping(
jsonBuilder().startObject()
.startObject("_doc")
.startObject("properties")
.startObject("nested1")
.field("type", "nested")
.startObject("properties")
.startObject("nested2")
.field("type", "nested")
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
)
prepareCreate("test").setSettings(maybeDisableSequenceNumbers())
.setMapping(
jsonBuilder().startObject()
.startObject("_doc")
.startObject("properties")
.startObject("nested1")
.field("type", "nested")
.startObject("properties")
.startObject("nested2")
.field("type", "nested")
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
)
);

ensureGreen();
Expand Down Expand Up @@ -328,7 +343,9 @@ public void testMultiNested() throws Exception {
// This IncludeNestedDocsQuery also needs to be aware of the filter from alias
public void testDeleteNestedDocsWithAlias() throws Exception {
assertAcked(
prepareCreate("test").setSettings(Settings.builder().put(indexSettings()).put("index.refresh_interval", -1).build())
prepareCreate("test").setSettings(
maybeDisableSequenceNumbers(Settings.builder().put(indexSettings()).put("index.refresh_interval", -1))
)
.setMapping(
jsonBuilder().startObject()
.startObject("_doc")
Expand Down Expand Up @@ -394,17 +411,18 @@ public void testDeleteNestedDocsWithAlias() throws Exception {

public void testExplain() throws Exception {
assertAcked(
prepareCreate("test").setMapping(
jsonBuilder().startObject()
.startObject("_doc")
.startObject("properties")
.startObject("nested1")
.field("type", "nested")
.endObject()
.endObject()
.endObject()
.endObject()
)
prepareCreate("test").setSettings(maybeDisableSequenceNumbers())
.setMapping(
jsonBuilder().startObject()
.startObject("_doc")
.startObject("properties")
.startObject("nested1")
.field("type", "nested")
.endObject()
.endObject()
.endObject()
.endObject()
)
);

ensureGreen();
Expand Down Expand Up @@ -441,7 +459,9 @@ public void testExplain() throws Exception {

public void testSimpleNestedSorting() throws Exception {
assertAcked(
prepareCreate("test").setSettings(Settings.builder().put(indexSettings()).put("index.refresh_interval", -1))
prepareCreate("test").setSettings(
maybeDisableSequenceNumbers(Settings.builder().put(indexSettings()).put("index.refresh_interval", -1))
)
.setMapping(
jsonBuilder().startObject()
.startObject("_doc")
Expand Down Expand Up @@ -539,7 +559,9 @@ public void testSimpleNestedSorting() throws Exception {

public void testSimpleNestedSortingWithNestedFilterMissing() throws Exception {
assertAcked(
prepareCreate("test").setSettings(Settings.builder().put(indexSettings()).put("index.refresh_interval", -1))
prepareCreate("test").setSettings(
maybeDisableSequenceNumbers(Settings.builder().put(indexSettings()).put("index.refresh_interval", -1))
)
.setMapping(
jsonBuilder().startObject()
.startObject("_doc")
Expand Down Expand Up @@ -663,7 +685,7 @@ public void testSimpleNestedSortingWithNestedFilterMissing() throws Exception {
}

public void testNestedSortWithMultiLevelFiltering() throws Exception {
assertAcked(prepareCreate("test").setMapping("""
assertAcked(prepareCreate("test").setSettings(maybeDisableSequenceNumbers()).setMapping("""
{
"properties": {
"acl": {
Expand Down Expand Up @@ -892,31 +914,33 @@ public void testNestedSortWithMultiLevelFiltering() throws Exception {

// https://github.com/elastic/elasticsearch/issues/31554
public void testLeakingSortValues() throws Exception {
assertAcked(prepareCreate("test").setSettings(Settings.builder().put("number_of_shards", 1)).setMapping("""
{
"_doc": {
"dynamic": "strict",
"properties": {
"nested1": {
"type": "nested",
assertAcked(
prepareCreate("test").setSettings(maybeDisableSequenceNumbers(Settings.builder().put("number_of_shards", 1))).setMapping("""
{
"_doc": {
"dynamic": "strict",
"properties": {
"nested2": {
"nested1": {
"type": "nested",
"properties": {
"nested2_keyword": {
"type": "keyword"
},
"sortVal": {
"type": "integer"
"nested2": {
"type": "nested",
"properties": {
"nested2_keyword": {
"type": "keyword"
},
"sortVal": {
"type": "integer"
}
}
}
}
}
}
}
}
}
}
"""));
""")
);
ensureGreen();

prepareIndex("test").setId("1").setSource("""
Expand Down Expand Up @@ -972,34 +996,35 @@ public void testLeakingSortValues() throws Exception {

public void testSortNestedWithNestedFilter() throws Exception {
assertAcked(
prepareCreate("test").setMapping(
XContentFactory.jsonBuilder()
.startObject()
.startObject("_doc")
.startObject("properties")
.startObject("grand_parent_values")
.field("type", "long")
.endObject()
.startObject("parent")
.field("type", "nested")
.startObject("properties")
.startObject("parent_values")
.field("type", "long")
.endObject()
.startObject("child")
.field("type", "nested")
.startObject("properties")
.startObject("child_values")
.field("type", "long")
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
)
prepareCreate("test").setSettings(maybeDisableSequenceNumbers())
.setMapping(
XContentFactory.jsonBuilder()
.startObject()
.startObject("_doc")
.startObject("properties")
.startObject("grand_parent_values")
.field("type", "long")
.endObject()
.startObject("parent")
.field("type", "nested")
.startObject("properties")
.startObject("parent_values")
.field("type", "long")
.endObject()
.startObject("child")
.field("type", "nested")
.startObject("properties")
.startObject("child_values")
.field("type", "long")
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
)
);
ensureGreen();

Expand Down Expand Up @@ -1316,37 +1341,38 @@ public void testSortNestedWithNestedFilter() throws Exception {
// Issue #9305
public void testNestedSortingWithNestedFilterAsFilter() throws Exception {
assertAcked(
prepareCreate("test").setMapping(
jsonBuilder().startObject()
.startObject("properties")
.startObject("officelocation")
.field("type", "text")
.endObject()
.startObject("users")
.field("type", "nested")
.startObject("properties")
.startObject("first")
.field("type", "keyword")
.endObject()
.startObject("last")
.field("type", "keyword")
.endObject()
.startObject("workstations")
.field("type", "nested")
.startObject("properties")
.startObject("stationid")
.field("type", "text")
.endObject()
.startObject("phoneid")
.field("type", "text")
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
)
prepareCreate("test").setSettings(maybeDisableSequenceNumbers())
.setMapping(
jsonBuilder().startObject()
.startObject("properties")
.startObject("officelocation")
.field("type", "text")
.endObject()
.startObject("users")
.field("type", "nested")
.startObject("properties")
.startObject("first")
.field("type", "keyword")
.endObject()
.startObject("last")
.field("type", "keyword")
.endObject()
.startObject("workstations")
.field("type", "nested")
.startObject("properties")
.startObject("stationid")
.field("type", "text")
.endObject()
.startObject("phoneid")
.field("type", "text")
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
.endObject()
)
);

DocWriteResponse indexResponse1 = prepareIndex("test").setId("1")
Expand Down Expand Up @@ -1484,7 +1510,9 @@ public void testNestedSortingWithNestedFilterAsFilter() throws Exception {

public void testCheckFixedBitSetCache() throws Exception {
boolean loadFixedBitSeLazily = randomBoolean();
Settings.Builder settingsBuilder = Settings.builder().put(indexSettings()).put("index.refresh_interval", -1);
Settings.Builder settingsBuilder = maybeDisableSequenceNumbers(
Settings.builder().put(indexSettings()).put("index.refresh_interval", -1)
);
if (loadFixedBitSeLazily) {
settingsBuilder.put("index.load_fixed_bitset_filters_eagerly", false);
}
Expand Down Expand Up @@ -1537,7 +1565,7 @@ public void testCheckFixedBitSetCache() throws Exception {
}

public void testSkipNestedInnerHits() throws Exception {
assertAcked(prepareCreate("test").setMapping("nested1", "type=nested"));
assertAcked(prepareCreate("test").setSettings(maybeDisableSequenceNumbers()).setMapping("nested1", "type=nested"));
ensureGreen();

prepareIndex("test").setId("1")
Expand Down
4 changes: 3 additions & 1 deletion ...est/java/org/elasticsearch/index/query/functionscore/RandomScoreFunctionBuilderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ public class RandomScoreFunctionBuilderTests extends AbstractBuilderTestCase {

@Override
protected Settings createTestIndexSettings() {
assumeTrue("Test requires disable_sequence_numbers feature flag", IndexSettings.DISABLE_SEQUENCE_NUMBERS_FEATURE_FLAG);
if (IndexSettings.DISABLE_SEQUENCE_NUMBERS_FEATURE_FLAG == false) {
return super.createTestIndexSettings();
}
return Settings.builder()
.put("index.version.created", IndexVersion.current())
.put(IndexSettings.DISABLE_SEQUENCE_NUMBERS.getKey(), true)
Expand Down
Loading