Fix #2189: 'Matches' doesn't show up for every search results (#2605)

This commit is contained in:
Sriharsha Chintalapani 2022-02-03 20:08:48 -08:00 committed by GitHub
parent be975848c6
commit 09476bf4b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions

View File

@ -633,7 +633,7 @@ class DashboardESIndex extends ElasticSearchIndex {
@Value @Value
@JsonInclude(JsonInclude.Include.NON_NULL) @JsonInclude(JsonInclude.Include.NON_NULL)
class PipelineESIndex extends ElasticSearchIndex { class PipelineESIndex extends ElasticSearchIndex {
@JsonProperty("pipeine_id") @JsonProperty("pipeline_id")
String pipelineId; String pipelineId;
@JsonProperty("task_names") @JsonProperty("task_names")
@ -666,9 +666,10 @@ class PipelineESIndex extends ElasticSearchIndex {
internalBuilder() internalBuilder()
.pipelineId(pipeline.getId().toString()) .pipelineId(pipeline.getId().toString())
.deleted(pipeline.getDeleted()) .deleted(pipeline.getDeleted())
.name(pipeline.getDisplayName()) .name(
.displayName(description) displayName) // pipeline names can be unique ids from source, hence use displayName for search indexing
.description(displayName) .displayName(displayName)
.description(description)
.fqdn(pipeline.getFullyQualifiedName()) .fqdn(pipeline.getFullyQualifiedName())
.lastUpdatedTimestamp(updatedTimestamp) .lastUpdatedTimestamp(updatedTimestamp)
.taskNames(taskNames) .taskNames(taskNames)

View File

@ -257,7 +257,7 @@ public class SearchResource {
private SearchSourceBuilder buildTopicSearchBuilder(String query, int from, int size) { private SearchSourceBuilder buildTopicSearchBuilder(String query, int from, int size) {
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
HighlightBuilder.Field highlightTopicName = new HighlightBuilder.Field("topic_name"); HighlightBuilder.Field highlightTopicName = new HighlightBuilder.Field("name");
highlightTopicName.highlighterType("unified"); highlightTopicName.highlighterType("unified");
HighlightBuilder.Field highlightDescription = new HighlightBuilder.Field("description"); HighlightBuilder.Field highlightDescription = new HighlightBuilder.Field("description");
highlightDescription.highlighterType("unified"); highlightDescription.highlighterType("unified");
@ -282,7 +282,7 @@ public class SearchResource {
private SearchSourceBuilder buildDashboardSearchBuilder(String query, int from, int size) { private SearchSourceBuilder buildDashboardSearchBuilder(String query, int from, int size) {
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
HighlightBuilder.Field highlightDashboardName = new HighlightBuilder.Field("dashboard_name"); HighlightBuilder.Field highlightDashboardName = new HighlightBuilder.Field("name");
highlightDashboardName.highlighterType("unified"); highlightDashboardName.highlighterType("unified");
HighlightBuilder.Field highlightDescription = new HighlightBuilder.Field("description"); HighlightBuilder.Field highlightDescription = new HighlightBuilder.Field("description");
highlightDescription.highlighterType("unified"); highlightDescription.highlighterType("unified");