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

feat(browse): Add sorting by doc count for browse groups #2751

Merged
merged 1 commit into from
Jun 24, 2021
Merged

feat(browse): Add sorting by doc count for browse groups #2751

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 12 additions & 9 deletions metadata-io/src/main/java/com/linkedin/metadata/search/elasticsearch/query/ESBrowseDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import lombok.RequiredArgsConstructor;
Expand All @@ -38,7 +40,6 @@
import org.elasticsearch.search.aggregations.BucketOrder;
import org.elasticsearch.search.aggregations.bucket.terms.IncludeExclude;
import org.elasticsearch.search.aggregations.bucket.terms.ParsedTerms;
import org.elasticsearch.search.aggregations.bucket.terms.Terms;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.search.sort.SortOrder;

Expand Down Expand Up @@ -212,12 +213,15 @@ private BrowseResult extractQueryResult(@Nonnull SearchResponse groupsResponse,
@Nonnull
private BrowseResultMetadata extractGroupsResponse(@Nonnull SearchResponse groupsResponse, @Nonnull String path) {
final ParsedTerms groups = (ParsedTerms) groupsResponse.getAggregations().getAsMap().get("groups");
final BrowseResultGroupArray groupsAgg = new BrowseResultGroupArray();
for (Terms.Bucket group : groups.getBuckets()) {
groupsAgg.add(
new BrowseResultGroup().setName(getSimpleName(group.getKeyAsString())).setCount(group.getDocCount()));
}
return new BrowseResultMetadata().setGroups(groupsAgg)
final List<BrowseResultGroup> groupsAgg = groups.getBuckets()
.stream()
.map(group -> new BrowseResultGroup().setName(getSimpleName(group.getKeyAsString()))
.setCount(group.getDocCount()))
// Sort by document count desc and then by name
.sorted(Comparator.<BrowseResultGroup, Long>comparing(BrowseResultGroup::getCount).reversed()
.thenComparing(Comparator.comparing(BrowseResultGroup::getName)))
.collect(Collectors.toList());
return new BrowseResultMetadata().setGroups(new BrowseResultGroupArray(groupsAgg))
.setTotalNumEntities(groupsResponse.getHits().getTotalHits().value)
.setPath(path);
}
Expand Down Expand Up @@ -287,8 +291,7 @@ private static int getPathDepth(@Nonnull String path) {
public List<String> getBrowsePaths(@Nonnull String entityName, @Nonnull Urn urn) {
final String indexName = indexConvention.getIndexName(entityRegistry.getEntitySpec(entityName));
final SearchRequest searchRequest = new SearchRequest(indexName);
searchRequest.source(
new SearchSourceBuilder().query(QueryBuilders.termQuery(URN, urn.toString())));
searchRequest.source(new SearchSourceBuilder().query(QueryBuilders.termQuery(URN, urn.toString())));
final SearchHit[] searchHits;
try {
searchHits = client.search(searchRequest, RequestOptions.DEFAULT).getHits().getHits();
Expand Down