Skip to content

Commit 27bfb34

Browse files
committed
better logging on missing format, and allow to configure format on a type on the index level
1 parent 09cc70b commit 27bfb34

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

src/main/java/org/elasticsearch/index/fielddata/IndexFieldDataService.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,16 @@ public <IFD extends IndexFieldData> IFD getForField(FieldMapper.Names fieldNames
121121
IndexFieldData.Builder builder = null;
122122
if (type.getFormat() != null) {
123123
builder = buildersByTypeAndFormat.get(Tuple.tuple(type.getType(), type.getFormat()));
124+
if (builder == null) {
125+
logger.warn("failed to find format [" + type.getFormat() + "] for field [" + fieldNames.fullName() + "], will use default");
126+
}
127+
}
128+
String format = indexSettings.get("index.fielddata.type." + type.getType() + ".format", null);
129+
if (format != null) {
130+
builder = buildersByTypeAndFormat.get(Tuple.tuple(type.getType(), type.getFormat()));
131+
if (builder == null) {
132+
logger.warn("failed to find index level type format [" + format + "] for field [" + fieldNames.fullName() + "], will use default");
133+
}
124134
}
125135
if (builder == null) {
126136
builder = buildersByType.get(type.getType());

0 commit comments

Comments
 (0)