Fix NPE for PushStatsToSource

craigtaverner · Oct 31, 2024 · b95d1f0 · b95d1f0
1 parent b2cb257
commit b95d1f0
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/stats/SearchStats.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/stats/SearchStats.java
@@ -75,7 +75,7 @@ public long count() {
     }
 
     public long count(String field) {
-        var stat = cache.computeIfAbsent(field, s -> new FieldStat());
+        var stat = cache.computeIfAbsent(field, this::makeFieldStat);
         if (stat.count == null) {
             var count = new long[] { 0 };
             boolean completed = doWithContexts(r -> {
@@ -156,7 +156,7 @@ public boolean hasDocValues(String field) {
     }
 
     public byte[] min(String field, DataType dataType) {
-        var stat = cache.computeIfAbsent(field, s -> new FieldStat());
+        var stat = cache.computeIfAbsent(field, this::makeFieldStat);
         if (stat.min == null) {
             var min = new byte[][] { null };
             doWithContexts(r -> {
@@ -178,7 +178,7 @@ public byte[] min(String field, DataType dataType) {
     }
 
     public byte[] max(String field, DataType dataType) {
-        var stat = cache.computeIfAbsent(field, s -> new FieldStat());
+        var stat = cache.computeIfAbsent(field, this::makeFieldStat);
         if (stat.max == null) {
             var max = new byte[][] { null };
             doWithContexts(r -> {
@@ -200,7 +200,7 @@ public byte[] max(String field, DataType dataType) {
     }
 
     public boolean isSingleValue(String field) {
-        var stat = cache.computeIfAbsent(field, s -> new FieldStat());
+        var stat = cache.computeIfAbsent(field, this::makeFieldStat);
         if (stat.singleValue == null) {
             // there's no such field so no need to worry about multi-value fields
             if (exists(field) == false) {