Skip to content

Commit 066a1d3

Browse files
salvatore-campagnasalvatore-campagna
committed
test: run both in snapshot and release builds
1 parent 531a3e9 commit 066a1d3

File tree

1 file changed

+86
-128
lines changed

1 file changed

+86
-128
lines changed

‎server/src/test/java/org/elasticsearch/index/mapper/KeywordFieldMapperTests.java‎

Lines changed: 86 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
import static java.util.Collections.singletonList;
5858
import static java.util.Collections.singletonMap;
5959
import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
60-
import static org.elasticsearch.index.IndexSettings.DOC_VALUES_SPARSE_INDEX;
6160
import static org.hamcrest.Matchers.contains;
6261
import static org.hamcrest.Matchers.containsString;
6362
import static org.hamcrest.Matchers.empty;
@@ -774,8 +773,6 @@ public void testDocValuesLoadedFromStoredSynthetic() throws IOException {
774773
}
775774

776775
public void testFieldTypeWithSkipDocValues_LogsDbModeDisabledSetting() throws IOException {
777-
assumeTrue("Needs feature flag to be enabled", DOC_VALUES_SPARSE_INDEX.isEnabled());
778-
779776
final MapperService mapperService = createMapperService(
780777
Settings.builder()
781778
.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())
@@ -796,42 +793,32 @@ public void testFieldTypeWithSkipDocValues_LogsDbModeDisabledSetting() throws IO
796793
}
797794

798795
public void testFieldTypeWithSkipDocValues_LogsDbMode() throws IOException {
799-
assumeTrue("Needs feature flag to be enabled", DOC_VALUES_SPARSE_INDEX.isEnabled());
800-
801-
final MapperService mapperService = createMapperService(
802-
Settings.builder()
803-
.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())
804-
.put(IndexSortConfig.INDEX_SORT_FIELD_SETTING.getKey(), "host.name")
805-
.put(IndexSettings.USE_DOC_VALUES_SPARSE_INDEX.getKey(), true)
806-
.build(),
807-
mapping(b -> {
808-
b.startObject("host.name");
809-
b.field("type", "keyword");
810-
b.endObject();
811-
})
812-
);
796+
final Settings settings = Settings.builder()
797+
.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())
798+
.put(IndexSortConfig.INDEX_SORT_FIELD_SETTING.getKey(), "host.name")
799+
.build();
800+
final MapperService mapperService = createMapperService(settings, mapping(b -> {
801+
b.startObject("host.name");
802+
b.field("type", "keyword");
803+
b.endObject();
804+
}));
813805

814806
final KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("host.name");
815807
assertTrue(mapper.fieldType().hasDocValues());
816-
assertFalse(mapper.fieldType().isIndexed());
817-
assertTrue(mapper.fieldType().hasDocValuesSparseIndex());
808+
assertFalse(IndexSettings.USE_DOC_VALUES_SPARSE_INDEX.get(settings) && mapper.fieldType().isIndexed());
809+
assertEquals(IndexSettings.USE_DOC_VALUES_SPARSE_INDEX.get(settings), mapper.fieldType().hasDocValuesSparseIndex());
818810
}
819811

820812
public void testFieldTypeDefault_StandardMode() throws IOException {
821-
assumeTrue("Needs feature flag to be enabled", DOC_VALUES_SPARSE_INDEX.isEnabled());
822-
823-
final MapperService mapperService = createMapperService(
824-
Settings.builder()
825-
.put(IndexSettings.MODE.getKey(), IndexMode.STANDARD.name())
826-
.put(IndexSortConfig.INDEX_SORT_FIELD_SETTING.getKey(), "host.name")
827-
.put(IndexSettings.USE_DOC_VALUES_SPARSE_INDEX.getKey(), true)
828-
.build(),
829-
mapping(b -> {
830-
b.startObject("host.name");
831-
b.field("type", "keyword");
832-
b.endObject();
833-
})
834-
);
813+
final Settings settings = Settings.builder()
814+
.put(IndexSettings.MODE.getKey(), IndexMode.STANDARD.name())
815+
.put(IndexSortConfig.INDEX_SORT_FIELD_SETTING.getKey(), "host.name")
816+
.build();
817+
final MapperService mapperService = createMapperService(settings, mapping(b -> {
818+
b.startObject("host.name");
819+
b.field("type", "keyword");
820+
b.endObject();
821+
}));
835822

836823
final KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("host.name");
837824
assertTrue(mapper.fieldType().hasDocValues());
@@ -840,20 +827,15 @@ public void testFieldTypeDefault_StandardMode() throws IOException {
840827
}
841828

842829
public void testFieldTypeDefault_NonMatchingFieldName() throws IOException {
843-
assumeTrue("Needs feature flag to be enabled", DOC_VALUES_SPARSE_INDEX.isEnabled());
844-
845-
final MapperService mapperService = createMapperService(
846-
Settings.builder()
847-
.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())
848-
.put(IndexSortConfig.INDEX_SORT_FIELD_SETTING.getKey(), "hostname")
849-
.put(IndexSettings.USE_DOC_VALUES_SPARSE_INDEX.getKey(), true)
850-
.build(),
851-
mapping(b -> {
852-
b.startObject("hostname");
853-
b.field("type", "keyword");
854-
b.endObject();
855-
})
856-
);
830+
final Settings settings = Settings.builder()
831+
.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())
832+
.put(IndexSortConfig.INDEX_SORT_FIELD_SETTING.getKey(), "hostname")
833+
.build();
834+
final MapperService mapperService = createMapperService(settings, mapping(b -> {
835+
b.startObject("hostname");
836+
b.field("type", "keyword");
837+
b.endObject();
838+
}));
857839

858840
final KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("hostname");
859841
assertTrue(mapper.fieldType().hasDocValues());
@@ -862,26 +844,21 @@ public void testFieldTypeDefault_NonMatchingFieldName() throws IOException {
862844
}
863845

864846
public void testFieldTypeDefault_ConfiguredIndexedWithSettingOverride() throws IOException {
865-
assumeTrue("Needs feature flag to be enabled", DOC_VALUES_SPARSE_INDEX.isEnabled());
866-
867-
final MapperService mapperService = createMapperService(
868-
Settings.builder()
869-
.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())
870-
.put(IndexSortConfig.INDEX_SORT_FIELD_SETTING.getKey(), "host.name")
871-
.put(IndexSettings.USE_DOC_VALUES_SPARSE_INDEX.getKey(), true)
872-
.build(),
873-
mapping(b -> {
874-
b.startObject("host.name");
875-
b.field("type", "keyword");
876-
b.field("index", true);
877-
b.endObject();
878-
})
879-
);
847+
final Settings settings = Settings.builder()
848+
.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())
849+
.put(IndexSortConfig.INDEX_SORT_FIELD_SETTING.getKey(), "host.name")
850+
.build();
851+
final MapperService mapperService = createMapperService(settings, mapping(b -> {
852+
b.startObject("host.name");
853+
b.field("type", "keyword");
854+
b.field("index", true);
855+
b.endObject();
856+
}));
880857

881858
final KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("host.name");
882859
assertTrue(mapper.fieldType().hasDocValues());
883-
assertFalse(mapper.fieldType().isIndexed());
884-
assertTrue(mapper.fieldType().hasDocValuesSparseIndex());
860+
assertFalse(IndexSettings.USE_DOC_VALUES_SPARSE_INDEX.get(settings) && mapper.fieldType().isIndexed());
861+
assertEquals(IndexSettings.USE_DOC_VALUES_SPARSE_INDEX.get(settings), mapper.fieldType().hasDocValuesSparseIndex());
885862
}
886863

887864
public void testFieldTypeDefault_ConfiguredIndexedWithoutSettingOverride() throws IOException {
@@ -903,42 +880,33 @@ public void testFieldTypeDefault_ConfiguredIndexedWithoutSettingOverride() throw
903880
}
904881

905882
public void testFieldTypeDefault_ConfiguredDocValues() throws IOException {
906-
assumeTrue("Needs feature flag to be enabled", DOC_VALUES_SPARSE_INDEX.isEnabled());
907-
908-
final MapperService mapperService = createMapperService(
909-
Settings.builder()
910-
.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())
911-
.put(IndexSortConfig.INDEX_SORT_FIELD_SETTING.getKey(), "host.name")
912-
.put(IndexSettings.USE_DOC_VALUES_SPARSE_INDEX.getKey(), true)
913-
.build(),
914-
mapping(b -> {
915-
b.startObject("host.name");
916-
b.field("type", "keyword");
917-
b.field("doc_values", true);
918-
b.endObject();
919-
})
920-
);
883+
final Settings settings = Settings.builder()
884+
.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())
885+
.put(IndexSortConfig.INDEX_SORT_FIELD_SETTING.getKey(), "host.name")
886+
.build();
887+
final MapperService mapperService = createMapperService(settings, mapping(b -> {
888+
b.startObject("host.name");
889+
b.field("type", "keyword");
890+
b.field("doc_values", true);
891+
b.endObject();
892+
}));
921893

922894
final KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("host.name");
923895
assertTrue(mapper.fieldType().hasDocValues());
924-
assertFalse(mapper.fieldType().isIndexed());
925-
assertTrue(mapper.fieldType().hasDocValuesSparseIndex());
896+
assertFalse(IndexSettings.USE_DOC_VALUES_SPARSE_INDEX.get(settings) && mapper.fieldType().isIndexed());
897+
assertEquals(IndexSettings.USE_DOC_VALUES_SPARSE_INDEX.get(settings), mapper.fieldType().hasDocValuesSparseIndex());
926898
}
927899

928900
public void testFieldTypeDefault_LogsDbMode_NonSortField() throws IOException {
929-
assumeTrue("Needs feature flag to be enabled", DOC_VALUES_SPARSE_INDEX.isEnabled());
930-
931-
final MapperService mapperService = createMapperService(
932-
Settings.builder()
933-
.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())
934-
.put(IndexSettings.USE_DOC_VALUES_SPARSE_INDEX.getKey(), true)
935-
.build(),
936-
mapping(b -> {
937-
b.startObject("host.name");
938-
b.field("type", "keyword");
939-
b.endObject();
940-
})
941-
);
901+
final Settings settings = Settings.builder()
902+
.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())
903+
.put(IndexSettings.USE_DOC_VALUES_SPARSE_INDEX.getKey(), true)
904+
.build();
905+
final MapperService mapperService = createMapperService(settings, mapping(b -> {
906+
b.startObject("host.name");
907+
b.field("type", "keyword");
908+
b.endObject();
909+
}));
942910

943911
final KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("host.name");
944912
assertTrue(mapper.fieldType().hasDocValues());
@@ -947,46 +915,36 @@ public void testFieldTypeDefault_LogsDbMode_NonSortField() throws IOException {
947915
}
948916

949917
public void testFieldTypeWithSkipDocValues_IndexedFalseDocValuesTrue() throws IOException {
950-
assumeTrue("Needs feature flag to be enabled", DOC_VALUES_SPARSE_INDEX.isEnabled());
951-
952-
final MapperService mapperService = createMapperService(
953-
Settings.builder()
954-
.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())
955-
.put(IndexSortConfig.INDEX_SORT_FIELD_SETTING.getKey(), "host.name")
956-
.put(IndexSettings.USE_DOC_VALUES_SPARSE_INDEX.getKey(), true)
957-
.build(),
958-
mapping(b -> {
959-
b.startObject("host.name");
960-
b.field("type", "keyword");
961-
b.field("index", false);
962-
b.field("doc_values", true);
963-
b.endObject();
964-
})
965-
);
918+
final Settings settings = Settings.builder()
919+
.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())
920+
.put(IndexSortConfig.INDEX_SORT_FIELD_SETTING.getKey(), "host.name")
921+
.build();
922+
final MapperService mapperService = createMapperService(settings, mapping(b -> {
923+
b.startObject("host.name");
924+
b.field("type", "keyword");
925+
b.field("index", false);
926+
b.field("doc_values", true);
927+
b.endObject();
928+
}));
966929

967930
final KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("host.name");
968931
assertTrue(mapper.fieldType().hasDocValues());
969-
assertFalse(mapper.fieldType().isIndexed());
970-
assertTrue(mapper.fieldType().hasDocValuesSparseIndex());
932+
assertFalse(IndexSettings.USE_DOC_VALUES_SPARSE_INDEX.get(settings) && mapper.fieldType().isIndexed());
933+
assertEquals(IndexSettings.USE_DOC_VALUES_SPARSE_INDEX.get(settings), mapper.fieldType().hasDocValuesSparseIndex());
971934
}
972935

973936
public void testFieldTypeDefault_IndexedFalseDocValuesFalse() throws IOException {
974-
assumeTrue("Needs feature flag to be enabled", DOC_VALUES_SPARSE_INDEX.isEnabled());
975-
976-
final MapperService mapperService = createMapperService(
977-
Settings.builder()
978-
.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())
979-
.put(IndexSortConfig.INDEX_SORT_FIELD_SETTING.getKey(), "host.name")
980-
.put(IndexSettings.USE_DOC_VALUES_SPARSE_INDEX.getKey(), true)
981-
.build(),
982-
mapping(b -> {
983-
b.startObject("host.name");
984-
b.field("type", "keyword");
985-
b.field("index", false);
986-
b.field("doc_values", false);
987-
b.endObject();
988-
})
989-
);
937+
final Settings settings = Settings.builder()
938+
.put(IndexSettings.MODE.getKey(), IndexMode.LOGSDB.name())
939+
.put(IndexSortConfig.INDEX_SORT_FIELD_SETTING.getKey(), "host.name")
940+
.build();
941+
final MapperService mapperService = createMapperService(settings, mapping(b -> {
942+
b.startObject("host.name");
943+
b.field("type", "keyword");
944+
b.field("index", false);
945+
b.field("doc_values", false);
946+
b.endObject();
947+
}));
990948

991949
final KeywordFieldMapper mapper = (KeywordFieldMapper) mapperService.documentMapper().mappers().getMapper("host.name");
992950
assertFalse(mapper.fieldType().hasDocValues());

0 commit comments

Comments
 (0)