Skip to content

Commit 38e5420

Browse files
committed
Add NOOP IgnoredFieldsLoader
1 parent 5a44487 commit 38e5420

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

server/src/main/java/org/elasticsearch/index/mapper/IgnoredSourceFieldMapper.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,16 @@ public static Set<String> ensureLoaded(Set<String> fieldsToLoadForSyntheticSourc
269269
}
270270

271271
public enum IgnoredFieldsLoader {
272+
NO_IGNORED_SOURCE {
273+
@Override
274+
public Map<String, List<IgnoredSourceFieldMapper.NameValue>> loadIgnoredFields(
275+
SourceFilter filter,
276+
LeafStoredFieldLoader storedFieldLoader,
277+
Map<String, SourceLoader.SyntheticFieldLoader.StoredFieldLoader> storedFieldLoaders
278+
) {
279+
return Map.of();
280+
}
281+
},
272282
SINGLE_IGNORED_SOURCE {
273283
@Override
274284
public Map<String, List<IgnoredSourceFieldMapper.NameValue>> loadIgnoredFields(

server/src/main/java/org/elasticsearch/index/mapper/Mapping.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public SourceLoader.SyntheticFieldLoader syntheticFieldLoader(@Nullable SourceFi
155155
public IgnoredSourceFieldMapper.IgnoredFieldsLoader ignoredFieldsLoader() {
156156
IgnoredSourceFieldMapper isfm = (IgnoredSourceFieldMapper) metadataMappersByName.get(IgnoredSourceFieldMapper.NAME);
157157
if (isfm == null) {
158-
return null;
158+
return IgnoredSourceFieldMapper.IgnoredFieldsLoader.NO_IGNORED_SOURCE;
159159
}
160160
return isfm.ignoredFieldsLoader();
161161
}

0 commit comments

Comments
 (0)