Merge pull request #3238 from atlanhq/plt-1651-search-after

Plt 1651, beta, search_after
atlanhq · Jun 12, 2024 · 9620b35 · 9620b35
2 parents 388edb9 + 3b2a6f1
commit 9620b35
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/intg/src/main/java/org/apache/atlas/model/discovery/AtlasSearchResult.java b/intg/src/main/java/org/apache/atlas/model/discovery/AtlasSearchResult.java
@@ -174,12 +174,12 @@ public void addSort(String guid, ArrayList sort) {
         if(MapUtils.isEmpty(this.searchMetadata)) {
             this.searchMetadata = new LinkedHashMap<>();
         }
-        ElasticsearchMetadata v = this.searchMetadata.getOrDefault(guid, new ElasticsearchMetadata());
-        v.addSort(sort);
+        ElasticsearchMetadata sortMetadata = this.searchMetadata.getOrDefault(guid, new ElasticsearchMetadata());
+        sortMetadata.addSort(sort);
         if (this.searchMetadata.containsKey(guid)) {
-           this.searchMetadata.replace(guid, v);
+           this.searchMetadata.replace(guid, sortMetadata);
         } else {
-            this.searchMetadata.put(guid, v);
+            this.searchMetadata.put(guid, sortMetadata);
         }
     }
 

diff --git a/intg/src/main/java/org/apache/atlas/model/discovery/ElasticsearchMetadata.java b/intg/src/main/java/org/apache/atlas/model/discovery/ElasticsearchMetadata.java
@@ -31,13 +31,7 @@ public void addHighlights(Map<String, List<String>> highlights) {
     public Object getSort() { return sort; }
 
     public void addSort(ArrayList<Object> sort) {
-
-        if(!sort.isEmpty()) {
-            if (MapUtils.isEmpty(this.highlights)) {
-                this.sort = new ArrayList<>();
-            }
-            this.sort = sort;
-        }
+        this.sort = sort;
     }
 
     @Override