Skip to content

Commit 7cc6828

Browse files
committed
Enable skippers for fields with index=false and doc_values=true
This applies to boolean, date, ip, keyword and number-type fields excluding scaled_float. It can be disabled by setting the `index.mapping.use_doc_value_skipper` field to `false`
1 parent 6f70507 commit 7cc6828

File tree

37 files changed

+231
-7
lines changed

37 files changed

+231
-7
lines changed

modules/legacy-geo/src/test/java/org/elasticsearch/legacygeo/mapper/LegacyGeoShapeFieldMapperTests.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -671,4 +671,9 @@ protected IngestScriptSupport ingestScriptSupport() {
671671
protected List<SortShortcutSupport> getSortShortcutSupport() {
672672
return List.of();
673673
}
674+
675+
@Override
676+
protected boolean supportsDocValuesSkippers() {
677+
return false;
678+
}
674679
}

modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/MatchOnlyTextFieldMapperTests.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,4 +390,9 @@ public void testLoadSyntheticSourceFromStringOrBytesRef() throws IOException {
390390
protected List<SortShortcutSupport> getSortShortcutSupport() {
391391
return List.of();
392392
}
393+
394+
@Override
395+
protected boolean supportsDocValuesSkippers() {
396+
return false;
397+
}
393398
}

modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/RankFeatureFieldMapperTests.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,4 +220,9 @@ protected IngestScriptSupport ingestScriptSupport() {
220220
protected List<SortShortcutSupport> getSortShortcutSupport() {
221221
return List.of();
222222
}
223+
224+
@Override
225+
protected boolean supportsDocValuesSkippers() {
226+
return false;
227+
}
223228
}

modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/RankFeaturesFieldMapperTests.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,4 +214,9 @@ protected IngestScriptSupport ingestScriptSupport() {
214214
protected List<SortShortcutSupport> getSortShortcutSupport() {
215215
return List.of();
216216
}
217+
218+
@Override
219+
protected boolean supportsDocValuesSkippers() {
220+
return false;
221+
}
217222
}

modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/ScaledFloatFieldMapperTests.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -657,4 +657,9 @@ protected List<SortShortcutSupport> getSortShortcutSupport() {
657657
new SortShortcutSupport(this::minimalMapping, this::writeField, false)
658658
);
659659
}
660+
661+
@Override
662+
protected boolean supportsDocValuesSkippers() {
663+
return false;
664+
}
660665
}

modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/SearchAsYouTypeFieldMapperTests.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -882,4 +882,9 @@ protected IngestScriptSupport ingestScriptSupport() {
882882
protected List<SortShortcutSupport> getSortShortcutSupport() {
883883
return List.of();
884884
}
885+
886+
@Override
887+
protected boolean supportsDocValuesSkippers() {
888+
return false;
889+
}
885890
}

modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/extras/TokenCountFieldMapperTests.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,4 +269,9 @@ public void testAggregationsDocValuesDisabled() throws IOException {
269269
protected List<SortShortcutSupport> getSortShortcutSupport() {
270270
return List.of(new SortShortcutSupport(this::minimalMapping, this::writeField, true));
271271
}
272+
273+
@Override
274+
protected boolean supportsDocValuesSkippers() {
275+
return false;
276+
}
272277
}

plugins/analysis-icu/src/test/java/org/elasticsearch/plugin/analysis/icu/ICUCollationKeywordFieldMapperTests.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,4 +323,9 @@ protected IngestScriptSupport ingestScriptSupport() {
323323
protected List<SortShortcutSupport> getSortShortcutSupport() {
324324
return List.of(new SortShortcutSupport(this::minimalMapping, this::writeField, true));
325325
}
326+
327+
@Override
328+
protected boolean supportsDocValuesSkippers() {
329+
return false;
330+
}
326331
}

plugins/mapper-annotated-text/src/test/java/org/elasticsearch/index/mapper/annotatedtext/AnnotatedTextFieldMapperTests.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -709,4 +709,9 @@ protected IngestScriptSupport ingestScriptSupport() {
709709
protected List<SortShortcutSupport> getSortShortcutSupport() {
710710
return List.of();
711711
}
712+
713+
@Override
714+
protected boolean supportsDocValuesSkippers() {
715+
return false;
716+
}
712717
}

plugins/mapper-murmur3/src/test/java/org/elasticsearch/index/mapper/murmur3/Murmur3FieldMapperTests.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,4 +153,9 @@ protected IngestScriptSupport ingestScriptSupport() {
153153
protected List<SortShortcutSupport> getSortShortcutSupport() {
154154
return List.of(new SortShortcutSupport(this::minimalMapping, this::writeField, false));
155155
}
156+
157+
@Override
158+
protected boolean supportsDocValuesSkippers() {
159+
return false;
160+
}
156161
}

0 commit comments

Comments
 (0)