drop fancy closures. one more

Signed-off-by: mikhail-khludnev <[email protected]>
mkhludnev · Nov 13, 2024 · 605a639 · 605a639
1 parent 43803dc
commit 605a639
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/server/src/main/java/org/opensearch/index/mapper/IpFieldMapper.java b/server/src/main/java/org/opensearch/index/mapper/IpFieldMapper.java
@@ -246,22 +246,24 @@ public Query termQuery(Object value, @Nullable QueryShardContext context) {
                 }
                 pointQuery = (PointRangeQuery) query;
             }
-            final Supplier<Query> dvQuery = () -> SortedSetDocValuesField.newSlowRangeQuery(
-                name(),
-                new BytesRef(pointQuery.getLowerPoint()),
-                new BytesRef(pointQuery.getUpperPoint()),
-                true,
-                true
-            );
+            Query dvQuery = null;
+            if (hasDocValues()) {
+                dvQuery = SortedSetDocValuesField.newSlowRangeQuery(
+                    name(),
+                    new BytesRef(pointQuery.getLowerPoint()),
+                    new BytesRef(pointQuery.getUpperPoint()),
+                    true,
+                    true
+                );
+            }
 
             if (isSearchable() && hasDocValues()) {
-                return new IndexOrDocValuesQuery(pointQuery, dvQuery.get());
+                return new IndexOrDocValuesQuery(pointQuery, dvQuery);
             } else {
                 if (isSearchable()) {
                     return pointQuery;
                 } else {
-                    assert hasDocValues();
-                    return dvQuery.get();
+                    return dvQuery;
                 }
             }
         }