Skip to content

Commit 6337db1

Browse files
committed
fix sync issue
1 parent 6185361 commit 6337db1

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

server/src/main/java/org/elasticsearch/index/codec/PerFieldFormatSupplier.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -150,24 +150,18 @@ public DocValuesFormat getDocValuesFormatForField(String field) {
150150
}
151151

152152
boolean useTSDBDocValuesFormat(final String field) {
153-
if (excludeFields(field)) {
153+
if (excludeFields(field) || excludeMapperTypes(field)) {
154154
return false;
155155
}
156-
157-
if (excludeMapperTypes(field)) {
158-
return false;
159-
}
160-
161156
return mapperService != null
162157
&& mapperService.getIndexSettings().useTimeSeriesDocValuesFormat()
163158
&& mapperService.getIndexSettings().isES87TSDBCodecEnabled();
164159
}
165160

166161
boolean useLogsDocValuesFormat(final String field) {
167-
if (excludeFields(field)) {
162+
if (excludeFields(field) || excludeMapperTypes(field)) {
168163
return false;
169164
}
170-
171165
return mapperService != null
172166
&& mapperService.getIndexSettings().useLogsDocValuesFormat()
173167
&& mapperService.getIndexSettings().isES87TSDBCodecEnabled();

0 commit comments

Comments
 (0)