Removed TopN addSortItem and changed Top.topNSortItems as immutable

Author: murthy-chelankuri

Diff for: plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ElasticsearchMetadata.java

@@ -717,14 +717,15 @@ public Optional<TopNApplicationResult<ConnectorTableHandle>> applyTopN(
             return Optional.empty();
         }
 
-        TopN topN = TopN.fromLimit(topNCount);
+        ImmutableList.Builder<TopN.TopNSortItem> topNSortItems = ImmutableList.builder();
         for (SortItem sortItem : sortItems) {
             ElasticsearchColumnHandle ch = (ElasticsearchColumnHandle) assignments.get(sortItem.getName());
             if (!ch.supportsPredicates()) {
                 return Optional.empty();
             }
-            topN.addSortItem(TopN.TopNSortItem.sortBy(ch.name(), sortItem.getSortOrder()));
+            topNSortItems.add(TopN.TopNSortItem.sortBy(ch.name(), sortItem.getSortOrder()));
         }
+        TopN topN = new TopN(topNCount, topNSortItems.build());
 
         ElasticsearchTableHandle newHandle = new ElasticsearchTableHandle(
                 handle.type(),

Diff for: plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/ScanQueryPageSource.java

@@ -103,10 +103,11 @@ public ScanQueryPageSource(
 
         Optional<TopN> topN = table.topN();
         if (topN.isEmpty()) {
-            topN = Optional.of(TopN.fromLimit(NO_LIMIT));
             if (table.query().isEmpty()) {
-                // sorting by _doc (index order) get special treatment in Elasticsearch and is more efficient
-                topN.get().addSortItem(DEFAULT_SORT_BY_DOC);
+                topN = Optional.of(new TopN(NO_LIMIT, ImmutableList.of(DEFAULT_SORT_BY_DOC)));
+            }
+            else {
+                topN = Optional.of(TopN.fromLimit(NO_LIMIT));
             }
         }
 

Diff for: plugin/trino-elasticsearch/src/main/java/io/trino/plugin/elasticsearch/expression/TopN.java

@@ -25,7 +25,6 @@
 public record TopN(long limit, List<TopNSortItem> topNSortItems)
 {
     public static final long NO_LIMIT = -1;
-    public static final TopN EMPTY = fromLimit(NO_LIMIT);
 
     public static TopN fromLimit(long limit)
     {
@@ -37,12 +36,6 @@ public static TopN fromLimit(long limit)
         requireNonNull(topNSortItems, "topNSortItems is null");
     }
 
-    public TopN addSortItem(TopNSortItem sortItem)
-    {
-        topNSortItems.add(sortItem);
-        return this;
-    }
-
     public boolean isOnlyLimit()
     {
         return limit != NO_LIMIT && topNSortItems.isEmpty();