Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 11 commits into from
Aug 9, 2024
Merged

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

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7996852
feat(search): support sorting on multiple fields
RyanHolstien Jun 25, 2024
7f06f6b
fix test
RyanHolstien Jun 25, 2024
79e6fe2
make test less flakey
RyanHolstien Jun 25, 2024
180ffa4
Merge branch 'master' into feat/supportMultiSort
RyanHolstien Jun 26, 2024
9e1baca
Merge branch 'master' into feat/supportMultiSort
RyanHolstien Aug 7, 2024
4616f7f
missing import
RyanHolstien Aug 7, 2024
378a325
fix test
RyanHolstien Aug 7, 2024
c2ff037
Merge branch 'master' into feat/supportMultiSort
RyanHolstien Aug 9, 2024
22567fe
spotless
RyanHolstien Aug 9, 2024
8e7bc3c
Merge branch 'master' into feat/supportMultiSort
RyanHolstien Aug 9, 2024
bc6a7b7
fix lightning tests
RyanHolstien Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...core/src/main/java/com/linkedin/datahub/graphql/analytics/resolver/GetChartsResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
3 changes: 2 additions & 1 deletion ...in/java/com/linkedin/datahub/graphql/analytics/resolver/GetMetadataAnalyticsResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 2 additions & 1 deletion ...l-core/src/main/java/com/linkedin/datahub/graphql/resolvers/auth/DebugAccessResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -181,7 +182,7 @@ private Set<Urn> getPoliciesFor(
Constants.POLICY_ENTITY_NAME,
"",
buildFilterToGetPolicies(user, groups, roles),
sortCriterion,
Collections.singletonList(sortCriterion),
0,
10000)
.getEntities()
Expand Down
11 changes: 6 additions & 5 deletions ...e/src/main/java/com/linkedin/datahub/graphql/resolvers/auth/ListAccessTokensResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -74,7 +75,7 @@ public CompletableFuture<ListAccessTokenResult> get(DataFetchingEnvironment envi
filters,
Collections.emptyList(),
context.getOperationContext().getAspectRetriever()),
sortCriterion,
sortCriteria,
start,
count);

Expand Down
3 changes: 2 additions & 1 deletion ...main/java/com/linkedin/datahub/graphql/resolvers/container/ContainerEntitiesResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
3 changes: 2 additions & 1 deletion ...e/src/main/java/com/linkedin/datahub/graphql/resolvers/domain/DomainEntitiesResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -98,7 +99,7 @@ public CompletableFuture<SearchResults> get(final DataFetchingEnvironment enviro
new ConjunctiveCriterion().setAnd(criteria))),
start,
count,
null,
Collections.emptyList(),
null));

} catch (Exception e) {
Expand Down
8 changes: 5 additions & 3 deletions ...core/src/main/java/com/linkedin/datahub/graphql/resolvers/domain/ListDomainsResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
8 changes: 5 additions & 3 deletions ...l-core/src/main/java/com/linkedin/datahub/graphql/resolvers/group/ListGroupsResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
9 changes: 5 additions & 4 deletions ...rc/main/java/com/linkedin/datahub/graphql/resolvers/incident/EntityIncidentsResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);
}
}
8 changes: 5 additions & 3 deletions .../datahub/graphql/resolvers/ingest/execution/IngestionSourceExecutionRequestsResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
8 changes: 5 additions & 3 deletions ...c/main/java/com/linkedin/datahub/graphql/resolvers/ingest/secret/ListSecretsResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down
9 changes: 5 additions & 4 deletions ...l-core/src/main/java/com/linkedin/datahub/graphql/resolvers/jobs/DataJobRunsResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 =
Expand Down Expand Up @@ -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);
}
}
9 changes: 5 additions & 4 deletions ...ql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/jobs/EntityRunsResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 =
Expand Down Expand Up @@ -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);
Comment on lines +137 to +141
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Refactor suggestion: Simplify sort criteria construction.

Consider refactoring the buildTaskRunsSortCriteria method to allow for future extensions where multiple criteria might be added. This could involve parameterizing the method to accept additional criteria.

private List<SortCriterion> buildTaskRunsSortCriteria(SortCriterion... additionalCriteria) {
    List<SortCriterion> criteria = new ArrayList<>();
    criteria.add(new SortCriterion()
        .setField(CREATED_TIME_SEARCH_INDEX_FIELD_NAME)
        .setOrder(SortOrder.DESCENDING));
    Collections.addAll(criteria, additionalCriteria);
    return criteria;
}

}
}
2 changes: 1 addition & 1 deletion ...ain/java/com/linkedin/datahub/graphql/resolvers/ownership/ListOwnershipTypesResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
13 changes: 8 additions & 5 deletions ...hql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/post/ListPostsResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 =
Expand All @@ -61,7 +64,7 @@ public CompletableFuture<ListPostsResult> get(final DataFetchingEnvironment envi
POST_ENTITY_NAME,
query,
null,
sortCriterion,
sortCriteria,
start,
count);

Expand Down
7 changes: 4 additions & 3 deletions ...-core/src/main/java/com/linkedin/datahub/graphql/resolvers/query/ListQueriesResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -74,7 +75,7 @@ public CompletableFuture<ListQueriesResult> get(final DataFetchingEnvironment en
QUERY_ENTITY_NAME,
query,
buildFilters(input, context.getOperationContext().getAspectRetriever()),
sortCriterion,
sortCriteria,
start,
count);

Expand Down
3 changes: 2 additions & 1 deletion ...n/java/com/linkedin/datahub/graphql/resolvers/search/AggregateAcrossEntitiesResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down
3 changes: 2 additions & 1 deletion .../src/main/java/com/linkedin/datahub/graphql/resolvers/search/GetQuickFiltersResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -107,7 +108,7 @@ private SearchResult getSearchResults(
: null,
0,
0,
null,
Collections.emptyList(),
null);
}

Expand Down
Loading
Loading