Add missing FieldInfo null check

jordan-powers · jordan-powers · commit da28201251c2 · 2025-02-24T14:23:52.000-08:00
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java b/server/src/main/java/org/elasticsearch/cluster/metadata/DataStream.java
@@ -88,7 +88,7 @@ public static boolean isFailureStoreFeatureFlagEnabled() {
     public static final Comparator<LeafReader> TIMESERIES_LEAF_READERS_SORTER = Comparator.comparingLong((LeafReader r) -> {
         try {
             FieldInfo info = r.getFieldInfos().fieldInfo(TIMESTAMP_FIELD_NAME);
-            if (info.docValuesSkipIndexType() == DocValuesSkipIndexType.RANGE) {
+            if (info != null && info.docValuesSkipIndexType() == DocValuesSkipIndexType.RANGE) {
                 DocValuesSkipper skipper = r.getDocValuesSkipper(TIMESTAMP_FIELD_NAME);
                 return skipper.maxValue();
             }

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public static boolean isFailureStoreFeatureFlagEnabled() {`
`88`	`88`	`public static final Comparator<LeafReader> TIMESERIES_LEAF_READERS_SORTER = Comparator.comparingLong((LeafReader r) -> {`
`89`	`89`	`try {`
`90`	`90`	`FieldInfo info = r.getFieldInfos().fieldInfo(TIMESTAMP_FIELD_NAME);`
`91`		`- if (info.docValuesSkipIndexType() == DocValuesSkipIndexType.RANGE) {`
	`91`	`+ if (info != null && info.docValuesSkipIndexType() == DocValuesSkipIndexType.RANGE) {`
`92`	`92`	`DocValuesSkipper skipper = r.getDocValuesSkipper(TIMESTAMP_FIELD_NAME);`
`93`	`93`	`return skipper.maxValue();`
`94`	`94`	`}`