feat(search): support sorting on multiple fields (#10775)

datahub-project · Aug 9, 2024 · 06562f3 · 06562f3
1 parent 4d2af40
commit 06562f3
Show file tree

Hide file tree

Showing 69 changed files with 519 additions and 294 deletions.
diff --git a/...core/src/main/java/com/linkedin/datahub/graphql/analytics/resolver/GetChartsResolver.java b/...core/src/main/java/com/linkedin/datahub/graphql/analytics/resolver/GetChartsResolver.java
@@ -159,9 +159,10 @@ private SearchResult searchForNewUsers(@Nonnull final OperationContext opContext
                                             .setValue(
                                                 String.valueOf(
                                                     trailingMonthDateRange.getStart())))))))),
-        new SortCriterion()
-            .setField(CORP_USER_STATUS_LAST_MODIFIED_FIELD_NAME)
-            .setOrder(SortOrder.DESCENDING),
+        Collections.singletonList(
+            new SortCriterion()
+                .setField(CORP_USER_STATUS_LAST_MODIFIED_FIELD_NAME)
+                .setOrder(SortOrder.DESCENDING)),
         0,
         100);
   }

diff --git a/...in/java/com/linkedin/datahub/graphql/analytics/resolver/GetMetadataAnalyticsResolver.java b/...in/java/com/linkedin/datahub/graphql/analytics/resolver/GetMetadataAnalyticsResolver.java
@@ -77,7 +77,8 @@ private List<AnalyticsChart> getCharts(MetadataAnalyticsInput input, OperationCo
     }
 
     SearchResult searchResult =
-        _entityClient.searchAcrossEntities(opContext, entities, query, filter, 0, 0, null, null);
+        _entityClient.searchAcrossEntities(
+            opContext, entities, query, filter, 0, 0, Collections.emptyList(), null);
 
     List<AggregationMetadata> aggregationMetadataList =
         searchResult.getMetadata().getAggregations();

diff --git a/...l-core/src/main/java/com/linkedin/datahub/graphql/resolvers/auth/DebugAccessResolver.java b/...l-core/src/main/java/com/linkedin/datahub/graphql/resolvers/auth/DebugAccessResolver.java
@@ -33,6 +33,7 @@
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -181,7 +182,7 @@ private Set<Urn> getPoliciesFor(
             Constants.POLICY_ENTITY_NAME,
             "",
             buildFilterToGetPolicies(user, groups, roles),
-            sortCriterion,
+            Collections.singletonList(sortCriterion),
             0,
             10000)
         .getEntities()

diff --git a/...e/src/main/java/com/linkedin/datahub/graphql/resolvers/auth/ListAccessTokensResolver.java b/...e/src/main/java/com/linkedin/datahub/graphql/resolvers/auth/ListAccessTokensResolver.java
@@ -59,10 +59,11 @@ public CompletableFuture<ListAccessTokenResult> get(DataFetchingEnvironment envi
           if (AuthorizationUtils.canManageTokens(context)
               || isListingSelfTokens(filters, context)) {
             try {
-              final SortCriterion sortCriterion =
-                  new SortCriterion()
-                      .setField(EXPIRES_AT_FIELD_NAME)
-                      .setOrder(SortOrder.DESCENDING);
+              final List<SortCriterion> sortCriteria =
+                  Collections.singletonList(
+                      new SortCriterion()
+                          .setField(EXPIRES_AT_FIELD_NAME)
+                          .setOrder(SortOrder.DESCENDING));
               final SearchResult searchResult =
                   _entityClient.search(
                       context
@@ -74,7 +75,7 @@ public CompletableFuture<ListAccessTokenResult> get(DataFetchingEnvironment envi
                           filters,
                           Collections.emptyList(),
                           context.getOperationContext().getAspectRetriever()),
-                      sortCriterion,
+                      sortCriteria,
                       start,
                       count);
 

diff --git a/...main/java/com/linkedin/datahub/graphql/resolvers/container/ContainerEntitiesResolver.java b/...main/java/com/linkedin/datahub/graphql/resolvers/container/ContainerEntitiesResolver.java
@@ -19,6 +19,7 @@
 import com.linkedin.metadata.query.filter.Filter;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import lombok.extern.slf4j.Slf4j;
@@ -92,7 +93,7 @@ public CompletableFuture<SearchResults> get(final DataFetchingEnvironment enviro
                                         new CriterionArray(ImmutableList.of(filterCriterion))))),
                     start,
                     count,
-                    null,
+                    Collections.emptyList(),
                     null));
 
           } catch (Exception e) {

diff --git a/...e/src/main/java/com/linkedin/datahub/graphql/resolvers/domain/DomainEntitiesResolver.java b/...e/src/main/java/com/linkedin/datahub/graphql/resolvers/domain/DomainEntitiesResolver.java
@@ -19,6 +19,7 @@
 import com.linkedin.metadata.query.filter.Filter;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
+import java.util.Collections;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
@@ -98,7 +99,7 @@ public CompletableFuture<SearchResults> get(final DataFetchingEnvironment enviro
                                 new ConjunctiveCriterion().setAnd(criteria))),
                     start,
                     count,
-                    null,
+                    Collections.emptyList(),
                     null));
 
           } catch (Exception e) {

diff --git a/...core/src/main/java/com/linkedin/datahub/graphql/resolvers/domain/ListDomainsResolver.java b/...core/src/main/java/com/linkedin/datahub/graphql/resolvers/domain/ListDomainsResolver.java
@@ -22,6 +22,7 @@
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
@@ -66,9 +67,10 @@ public CompletableFuture<ListDomainsResult> get(final DataFetchingEnvironment en
                     Constants.DOMAIN_ENTITY_NAME,
                     query,
                     filter,
-                    new SortCriterion()
-                        .setField(DOMAIN_CREATED_TIME_INDEX_FIELD_NAME)
-                        .setOrder(SortOrder.DESCENDING),
+                    Collections.singletonList(
+                        new SortCriterion()
+                            .setField(DOMAIN_CREATED_TIME_INDEX_FIELD_NAME)
+                            .setOrder(SortOrder.DESCENDING)),
                     start,
                     count);
 

diff --git a/...l-core/src/main/java/com/linkedin/datahub/graphql/resolvers/group/ListGroupsResolver.java b/...l-core/src/main/java/com/linkedin/datahub/graphql/resolvers/group/ListGroupsResolver.java
@@ -21,6 +21,7 @@
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -64,9 +65,10 @@ public CompletableFuture<ListGroupsResult> get(final DataFetchingEnvironment env
                       CORP_GROUP_ENTITY_NAME,
                       query,
                       null,
-                      new SortCriterion()
-                          .setField(CORP_GROUP_CREATED_TIME_INDEX_FIELD_NAME)
-                          .setOrder(SortOrder.DESCENDING),
+                      Collections.singletonList(
+                          new SortCriterion()
+                              .setField(CORP_GROUP_CREATED_TIME_INDEX_FIELD_NAME)
+                              .setOrder(SortOrder.DESCENDING)),
                       start,
                       count);
 

diff --git a/...rc/main/java/com/linkedin/datahub/graphql/resolvers/incident/EntityIncidentsResolver.java b/...rc/main/java/com/linkedin/datahub/graphql/resolvers/incident/EntityIncidentsResolver.java
@@ -21,6 +21,7 @@
 import graphql.schema.DataFetchingEnvironment;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -60,13 +61,13 @@ public CompletableFuture<EntityIncidentsResult> get(DataFetchingEnvironment envi
             // Index!
             // We use the search index so that we can easily sort by the last updated time.
             final Filter filter = buildIncidentsEntityFilter(entityUrn, maybeState);
-            final SortCriterion sortCriterion = buildIncidentsSortCriterion();
+            final List<SortCriterion> sortCriteria = buildIncidentsSortCriteria();
             final SearchResult searchResult =
                 _entityClient.filter(
                     context.getOperationContext(),
                     Constants.INCIDENT_ENTITY_NAME,
                     filter,
-                    sortCriterion,
+                    sortCriteria,
                     start,
                     count);
 
@@ -118,10 +119,10 @@ private Filter buildIncidentsEntityFilter(
     return QueryUtils.newFilter(criterionMap);
   }
 
-  private SortCriterion buildIncidentsSortCriterion() {
+  private List<SortCriterion> buildIncidentsSortCriteria() {
     final SortCriterion sortCriterion = new SortCriterion();
     sortCriterion.setField(CREATED_TIME_SEARCH_INDEX_FIELD_NAME);
     sortCriterion.setOrder(SortOrder.DESCENDING);
-    return sortCriterion;
+    return Collections.singletonList(sortCriterion);
   }
 }
diff --git a/.../datahub/graphql/resolvers/ingest/execution/IngestionSourceExecutionRequestsResolver.java b/.../datahub/graphql/resolvers/ingest/execution/IngestionSourceExecutionRequestsResolver.java
@@ -23,6 +23,7 @@
 import com.linkedin.metadata.search.SearchResult;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
@@ -76,9 +77,10 @@ public CompletableFuture<IngestionSourceExecutionRequests> get(
                                 new ConjunctiveCriterion()
                                     .setAnd(
                                         new CriterionArray(ImmutableList.of(filterCriterion))))),
-                    new SortCriterion()
-                        .setField(REQUEST_TIME_MS_FIELD_NAME)
-                        .setOrder(SortOrder.DESCENDING),
+                    Collections.singletonList(
+                        new SortCriterion()
+                            .setField(REQUEST_TIME_MS_FIELD_NAME)
+                            .setOrder(SortOrder.DESCENDING)),
                     start,
                     count);
 

diff --git a/...c/main/java/com/linkedin/datahub/graphql/resolvers/ingest/secret/ListSecretsResolver.java b/...c/main/java/com/linkedin/datahub/graphql/resolvers/ingest/secret/ListSecretsResolver.java
@@ -26,6 +26,7 @@
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -73,9 +74,10 @@ public CompletableFuture<ListSecretsResult> get(final DataFetchingEnvironment en
                       Constants.SECRETS_ENTITY_NAME,
                       query,
                       null,
-                      new SortCriterion()
-                          .setField(DOMAIN_CREATED_TIME_INDEX_FIELD_NAME)
-                          .setOrder(SortOrder.DESCENDING),
+                      Collections.singletonList(
+                          new SortCriterion()
+                              .setField(DOMAIN_CREATED_TIME_INDEX_FIELD_NAME)
+                              .setOrder(SortOrder.DESCENDING)),
                       start,
                       count);
 

diff --git a/...l-core/src/main/java/com/linkedin/datahub/graphql/resolvers/jobs/DataJobRunsResolver.java b/...l-core/src/main/java/com/linkedin/datahub/graphql/resolvers/jobs/DataJobRunsResolver.java
@@ -26,6 +26,7 @@
 import graphql.schema.DataFetchingEnvironment;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -61,13 +62,13 @@ public CompletableFuture<DataProcessInstanceResult> get(DataFetchingEnvironment
             // Index!
             // We use the search index so that we can easily sort by the last updated time.
             final Filter filter = buildTaskRunsEntityFilter(entityUrn);
-            final SortCriterion sortCriterion = buildTaskRunsSortCriterion();
+            final List<SortCriterion> sortCriteria = buildTaskRunsSortCriteria();
             final SearchResult gmsResult =
                 _entityClient.filter(
                     context.getOperationContext(),
                     Constants.DATA_PROCESS_INSTANCE_ENTITY_NAME,
                     filter,
-                    sortCriterion,
+                    sortCriteria,
                     start,
                     count);
             final List<Urn> dataProcessInstanceUrns =
@@ -123,10 +124,10 @@ private Filter buildTaskRunsEntityFilter(final String entityUrn) {
     return filter;
   }
 
-  private SortCriterion buildTaskRunsSortCriterion() {
+  private List<SortCriterion> buildTaskRunsSortCriteria() {
     final SortCriterion sortCriterion = new SortCriterion();
     sortCriterion.setField(CREATED_TIME_SEARCH_INDEX_FIELD_NAME);
     sortCriterion.setOrder(SortOrder.DESCENDING);
-    return sortCriterion;
+    return Collections.singletonList(sortCriterion);
   }
 }
diff --git a/...ql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/jobs/EntityRunsResolver.java b/...ql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/jobs/EntityRunsResolver.java
@@ -27,6 +27,7 @@
 import graphql.schema.DataFetchingEnvironment;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -67,13 +68,13 @@ public CompletableFuture<DataProcessInstanceResult> get(DataFetchingEnvironment
             // Index!
             // We use the search index so that we can easily sort by the last updated time.
             final Filter filter = buildTaskRunsEntityFilter(entityUrn, direction);
-            final SortCriterion sortCriterion = buildTaskRunsSortCriterion();
+            final List<SortCriterion> sortCriteria = buildTaskRunsSortCriteria();
             final SearchResult gmsResult =
                 _entityClient.filter(
                     context.getOperationContext(),
                     Constants.DATA_PROCESS_INSTANCE_ENTITY_NAME,
                     filter,
-                    sortCriterion,
+                    sortCriteria,
                     start,
                     count);
             final List<Urn> dataProcessInstanceUrns =
@@ -133,10 +134,10 @@ private Filter buildTaskRunsEntityFilter(
     return filter;
   }
 
-  private SortCriterion buildTaskRunsSortCriterion() {
+  private List<SortCriterion> buildTaskRunsSortCriteria() {
     final SortCriterion sortCriterion = new SortCriterion();
     sortCriterion.setField(CREATED_TIME_SEARCH_INDEX_FIELD_NAME);
     sortCriterion.setOrder(SortOrder.DESCENDING);
-    return sortCriterion;
+    return Collections.singletonList(sortCriterion);
   }
 }
diff --git a/...ain/java/com/linkedin/datahub/graphql/resolvers/ownership/ListOwnershipTypesResolver.java b/...ain/java/com/linkedin/datahub/graphql/resolvers/ownership/ListOwnershipTypesResolver.java
@@ -67,7 +67,7 @@ public CompletableFuture<ListOwnershipTypesResult> get(DataFetchingEnvironment e
                         filters,
                         Collections.emptyList(),
                         context.getOperationContext().getAspectRetriever()),
-                    DEFAULT_SORT_CRITERION,
+                    Collections.singletonList(DEFAULT_SORT_CRITERION),
                     start,
                     count);
 

diff --git a/...hql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/post/ListPostsResolver.java b/...hql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/post/ListPostsResolver.java
@@ -18,7 +18,9 @@
 import com.linkedin.metadata.search.SearchResult;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
+import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
@@ -49,10 +51,11 @@ public CompletableFuture<ListPostsResult> get(final DataFetchingEnvironment envi
     return GraphQLConcurrencyUtils.supplyAsync(
         () -> {
           try {
-            final SortCriterion sortCriterion =
-                new SortCriterion()
-                    .setField(LAST_MODIFIED_FIELD_NAME)
-                    .setOrder(SortOrder.DESCENDING);
+            final List<SortCriterion> sortCriteria =
+                Collections.singletonList(
+                    new SortCriterion()
+                        .setField(LAST_MODIFIED_FIELD_NAME)
+                        .setOrder(SortOrder.DESCENDING));
 
             // First, get all Post Urns.
             final SearchResult gmsResult =
@@ -61,7 +64,7 @@ public CompletableFuture<ListPostsResult> get(final DataFetchingEnvironment envi
                     POST_ENTITY_NAME,
                     query,
                     null,
-                    sortCriterion,
+                    sortCriteria,
                     start,
                     count);
 

diff --git a/...-core/src/main/java/com/linkedin/datahub/graphql/resolvers/query/ListQueriesResolver.java b/...-core/src/main/java/com/linkedin/datahub/graphql/resolvers/query/ListQueriesResolver.java
@@ -61,8 +61,9 @@ public CompletableFuture<ListQueriesResult> get(final DataFetchingEnvironment en
     return GraphQLConcurrencyUtils.supplyAsync(
         () -> {
           try {
-            final SortCriterion sortCriterion =
-                new SortCriterion().setField(CREATED_AT_FIELD).setOrder(SortOrder.DESCENDING);
+            final List<SortCriterion> sortCriteria =
+                Collections.singletonList(
+                    new SortCriterion().setField(CREATED_AT_FIELD).setOrder(SortOrder.DESCENDING));
 
             // First, get all Query Urns.
             final SearchResult gmsResult =
@@ -74,7 +75,7 @@ public CompletableFuture<ListQueriesResult> get(final DataFetchingEnvironment en
                     QUERY_ENTITY_NAME,
                     query,
                     buildFilters(input, context.getOperationContext().getAspectRetriever()),
-                    sortCriterion,
+                    sortCriteria,
                     start,
                     count);
 

diff --git a/...n/java/com/linkedin/datahub/graphql/resolvers/search/AggregateAcrossEntitiesResolver.java b/...n/java/com/linkedin/datahub/graphql/resolvers/search/AggregateAcrossEntitiesResolver.java
@@ -22,6 +22,7 @@
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
@@ -94,7 +95,7 @@ public CompletableFuture<AggregateResults> get(DataFetchingEnvironment environme
                         : inputFilter,
                     0,
                     0, // 0 entity count because we don't want resolved entities
-                    null,
+                    Collections.emptyList(),
                     facets));
           } catch (Exception e) {
             log.error(

diff --git a/.../src/main/java/com/linkedin/datahub/graphql/resolvers/search/GetQuickFiltersResolver.java b/.../src/main/java/com/linkedin/datahub/graphql/resolvers/search/GetQuickFiltersResolver.java
@@ -25,6 +25,7 @@
 import graphql.schema.DataFetchingEnvironment;
 import io.datahubproject.metadata.context.OperationContext;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
@@ -107,7 +108,7 @@ private SearchResult getSearchResults(
             : null,
         0,
         0,
-        null,
+        Collections.emptyList(),
         null);
   }