Addressig review comments

Signed-off-by: Chaitanya Gohel <[email protected]>
gashutos · Nov 20, 2023 · d9270f6 · d9270f6
1 parent 5236b2f
commit d9270f6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java b/server/src/main/java/org/opensearch/search/internal/ContextIndexSearcher.java
@@ -507,10 +507,7 @@ private boolean canMatch(LeafReaderContext ctx) throws IOException {
     }
 
     private boolean canMatchSearchAfter(LeafReaderContext ctx) throws IOException {
-        if (searchContext.searchAfter() != null
-            && searchContext.sort() != null
-            && searchContext.request() != null
-            && searchContext.request().source() != null) {
+        if (searchContext.searchAfter() != null && searchContext.request() != null && searchContext.request().source() != null) {
             // Only applied on primary sort field and primary search_after.
             FieldSortBuilder primarySortField = FieldSortBuilder.getPrimaryFieldSortOrNull(searchContext.request().source());
             if (primarySortField != null) {

diff --git a/server/src/main/java/org/opensearch/search/sort/FieldSortBuilder.java b/server/src/main/java/org/opensearch/search/sort/FieldSortBuilder.java
@@ -611,7 +611,8 @@ public static FieldSortBuilder getPrimaryFieldSortOrNull(SearchSourceBuilder sou
      * and configurations return <code>null</code>.
      */
     public static MinAndMax<?> getMinMaxOrNull(QueryShardContext context, FieldSortBuilder sortBuilder) throws IOException {
-        return getMinMaxOrNullInternal(context.getIndexReader(), context, sortBuilder, null);
+        final SortAndFormats sort = SortBuilder.buildSort(Collections.singletonList(sortBuilder), context).get();
+        return getMinMaxOrNullInternal(context.getIndexReader(), context, sortBuilder, sort);
     }
 
     /**
@@ -634,9 +635,6 @@ private static MinAndMax<?> getMinMaxOrNullInternal(
         FieldSortBuilder sortBuilder,
         SortAndFormats sort
     ) throws IOException {
-        if (sort == null) {
-            sort = SortBuilder.buildSort(Collections.singletonList(sortBuilder), context).get();
-        }
         SortField sortField = sort.sort.getSort()[0];
         if (sortField.getField() == null) {
             return null;