Skip to content

Commit

Permalink
Merge branch 'main' into searh-index-entity
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ashish8689
Ashish8689 committed Sep 16, 2023
2 parents 972f957 + e0e2467 commit 4cf2c42
Show file tree
Hide file tree
Showing 54 changed files with 2,616 additions and 309 deletions.
4 changes: 4 additions & 0 deletions openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/EntityRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,10 @@ protected EntityRepository(
this.putFields.addField(allowedFields, FIELD_DOMAIN);
}
this.supportsDataProducts = allowedFields.contains(FIELD_DATA_PRODUCTS);
if (supportsDataProducts) {
this.patchFields.addField(allowedFields, FIELD_DATA_PRODUCTS);
this.putFields.addField(allowedFields, FIELD_DATA_PRODUCTS);
}
}

/**
Expand Down
3 changes: 2 additions & 1 deletion ...ervice/src/main/java/org/openmetadata/service/search/openSearch/OpenSearchClientImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,8 @@ public Response search(SearchRequest request) throws IOException {
}

/* For backward-compatibility we continue supporting the deleted argument, this should be removed in future versions */
if (request.getIndex().equalsIgnoreCase("domain_search_index")) {
if (request.getIndex().equalsIgnoreCase("domain_search_index")
|| request.getIndex().equalsIgnoreCase("data_products_search_index")) {
searchSourceBuilder.query(QueryBuilders.boolQuery().must(searchSourceBuilder.query()));
} else {
searchSourceBuilder.query(
Expand Down
46 changes: 45 additions & 1 deletion openmetadata-service/src/main/resources/elasticsearch/en/chart_Index_mapping.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,51 @@
}
},
"dataProducts" : {
"type": "keyword"
"properties": {
"id": {
"type": "keyword",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 36
}
}
},
"type": {
"type": "keyword"
},
"name": {
"type": "keyword",
"normalizer": "lowercase_normalizer",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
},
"displayName": {
"type": "keyword",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
},
"fullyQualifiedName": {
"type": "text"
},
"description": {
"type": "text"
},
"deleted": {
"type": "text"
},
"href": {
"type": "text"
}
}
}
}
}
Expand Down
46 changes: 45 additions & 1 deletion openmetadata-service/src/main/resources/elasticsearch/en/dashboard_index_mapping.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,51 @@
"type": "keyword"
},
"dataProducts": {
"type": "keyword"
"properties": {
"id": {
"type": "keyword",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 36
}
}
},
"type": {
"type": "keyword"
},
"name": {
"type": "keyword",
"normalizer": "lowercase_normalizer",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
},
"displayName": {
"type": "keyword",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
},
"fullyQualifiedName": {
"type": "text"
},
"description": {
"type": "text"
},
"deleted": {
"type": "text"
},
"href": {
"type": "text"
}
}
},
"owner": {
"properties": {
Expand Down
46 changes: 45 additions & 1 deletion openmetadata-service/src/main/resources/elasticsearch/en/search_entity_index_mapping.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,51 @@
"type": "keyword"
},
"dataProducts": {
"type": "keyword"
"properties": {
"id": {
"type": "keyword",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 36
}
}
},
"type": {
"type": "keyword"
},
"name": {
"type": "keyword",
"normalizer": "lowercase_normalizer",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
},
"displayName": {
"type": "keyword",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
},
"fullyQualifiedName": {
"type": "text"
},
"description": {
"type": "text"
},
"deleted": {
"type": "text"
},
"href": {
"type": "text"
}
}
}
}
}
Expand Down
46 changes: 45 additions & 1 deletion openmetadata-service/src/main/resources/elasticsearch/en/table_index_mapping.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,51 @@
"type": "keyword"
},
"dataProducts": {
"type": "keyword"
"properties": {
"id": {
"type": "keyword",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 36
}
}
},
"type": {
"type": "keyword"
},
"name": {
"type": "keyword",
"normalizer": "lowercase_normalizer",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
},
"displayName": {
"type": "keyword",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
},
"fullyQualifiedName": {
"type": "text"
},
"description": {
"type": "text"
},
"deleted": {
"type": "text"
},
"href": {
"type": "text"
}
}
},
"lifeCycle": {
"properties": {
Expand Down
46 changes: 45 additions & 1 deletion openmetadata-service/src/main/resources/elasticsearch/en/topic_index_mapping.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,51 @@
"type": "keyword"
},
"dataProducts": {
"type": "keyword"
"properties": {
"id": {
"type": "keyword",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 36
}
}
},
"type": {
"type": "keyword"
},
"name": {
"type": "keyword",
"normalizer": "lowercase_normalizer",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
},
"displayName": {
"type": "keyword",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
},
"fullyQualifiedName": {
"type": "text"
},
"description": {
"type": "text"
},
"deleted": {
"type": "text"
},
"href": {
"type": "text"
}
}
},
"messageSchema": {
"properties": {
Expand Down
46 changes: 45 additions & 1 deletion openmetadata-service/src/main/resources/elasticsearch/jp/chart_index_mapping.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,51 @@
}
},
"dataProducts" : {
"type": "keyword"
"properties": {
"id": {
"type": "keyword",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 36
}
}
},
"type": {
"type": "keyword"
},
"name": {
"type": "keyword",
"normalizer": "lowercase_normalizer",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
},
"displayName": {
"type": "keyword",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
},
"fullyQualifiedName": {
"type": "text"
},
"description": {
"type": "text"
},
"deleted": {
"type": "text"
},
"href": {
"type": "text"
}
}
}
}
}
Expand Down
46 changes: 45 additions & 1 deletion openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_index_mapping.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,51 @@
"type": "keyword"
},
"dataProducts": {
"type": "keyword"
"properties": {
"id": {
"type": "keyword",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 36
}
}
},
"type": {
"type": "keyword"
},
"name": {
"type": "keyword",
"normalizer": "lowercase_normalizer",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
},
"displayName": {
"type": "keyword",
"fields": {
"keyword": {
"type": "keyword",
"ignore_above": 256
}
}
},
"fullyQualifiedName": {
"type": "text"
},
"description": {
"type": "text"
},
"deleted": {
"type": "text"
},
"href": {
"type": "text"
}
}
},
"charts": {
"properties": {
Expand Down
Loading

0 comments on commit 4cf2c42

Please sign in to comment.