inline, copy-paste

Signed-off-by: mikhail-khludnev <[email protected]>
opensearch-project · Nov 15, 2024 · ca7569d · ca7569d
1 parent f522622
commit ca7569d
Showing 1 changed file with 11 additions and 14 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
@@ -252,21 +252,10 @@ public Query termQuery(Object value, @Nullable QueryShardContext context) {
                     true
                 );
             }
-            return indexOrDvQuery(pointQuery, dvQuery);
-        }
-
-        private Query indexOrDvQuery(Query pointQuery, Query dvQuery) {
             if (isSearchable() && hasDocValues()) {
-                assert pointQuery != null && dvQuery != null;
                 return new IndexOrDocValuesQuery(pointQuery, dvQuery);
             } else {
-                if (isSearchable()) {
-                    assert pointQuery != null;
-                    return pointQuery;
-                } else {
-                    assert dvQuery != null;
-                    return dvQuery;
-                }
+                return isSearchable() ? pointQuery : dvQuery;
             }
         }
 
@@ -305,7 +294,11 @@ public Query termsQuery(List<?> values, QueryShardContext context) {
             if (isSearchable()) {
                 pointQuery = InetAddressPoint.newSetQuery(name(), addresses);
             }
-            return indexOrDvQuery(pointQuery, dvQuery);
+            if (isSearchable() && hasDocValues()) {
+                return new IndexOrDocValuesQuery(pointQuery, dvQuery);
+            } else {
+                return isSearchable() ? pointQuery : dvQuery;
+            }
         }
 
         @Override
@@ -323,7 +316,11 @@ public Query rangeQuery(Object lowerTerm, Object upperTerm, boolean includeLower
                         true
                     );
                 }
-                return indexOrDvQuery(pointQuery, dvQuery);
+                if (isSearchable() && hasDocValues()) {
+                    return new IndexOrDocValuesQuery(pointQuery, dvQuery);
+                } else {
+                    return isSearchable() ? pointQuery : dvQuery;
+                }
             });
         }