yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-10-22 14:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Custom Property Backend Support and list approved glossary terms (#13496)

Browse Source
This commit is contained in:
07Himank 2023-10-10 21:20:28 +05:30 committed by GitHub
parent 02a3bc334f
commit 352b025fd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java
View File

@ -354,6 +354,10 @@ public class ElasticSearchClient implements SearchClient {
searchSourceBuilder.sort(request.getSortFieldParam(), SortOrder.fromString(request.getSortOrder()));
}
if (request.getIndex().equalsIgnoreCase("glossary_term_search_index")) {
searchSourceBuilder.query(QueryBuilders.boolQuery().must(QueryBuilders.matchQuery("status", "Approved")));
}
/* for performance reasons ElasticSearch doesn't provide accurate hits
if we enable trackTotalHits parameter it will try to match every result, count and return hits
however in most cases for search results an approximate value is good enough.
@ -1498,7 +1502,6 @@ public class ElasticSearchClient implements SearchClient {
requestConfigBuilder
.setConnectTimeout(esConfig.getConnectionTimeoutSecs() * 1000)
.setSocketTimeout(esConfig.getSocketTimeoutSecs() * 1000));
// return new RestHighLevelClient(restClientBuilder);
return new RestHighLevelClientBuilder(restClient).setApiCompatibilityMode(true).build();
} catch (Exception e) {
LOG.error("Failed to create elastic search client ", e);

4
openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchClient.java
View File

@ -346,6 +346,10 @@ public class OpenSearchClient implements SearchClient {
searchSourceBuilder.sort(request.getSortFieldParam(), SortOrder.fromString(request.getSortOrder()));
}
if (request.getIndex().equalsIgnoreCase("glossary_term_search_index")) {
searchSourceBuilder.query(QueryBuilders.boolQuery().must(QueryBuilders.matchQuery("status", "Approved")));
}
/* for performance reasons OpenSearch doesn't provide accurate hits
if we enable trackTotalHits parameter it will try to match every result, count and return hits
however in most cases for search results an approximate value is good enough.

2
openmetadata-service/src/main/resources/elasticsearch/en/container_index_mapping.json
View File

@ -220,7 +220,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"children": {
"properties": {

2
openmetadata-service/src/main/resources/elasticsearch/en/dashboard_index_mapping.json
View File

@ -228,7 +228,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"dataProducts": {
"properties": {

2
openmetadata-service/src/main/resources/elasticsearch/en/database_index_mapping.json
View File

@ -166,7 +166,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"owner": {
"properties": {

2
openmetadata-service/src/main/resources/elasticsearch/en/database_schema_index_mapping.json
View File

@ -144,7 +144,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"owner": {
"properties": {

2
openmetadata-service/src/main/resources/elasticsearch/en/mlmodel_index_mapping.json
View File

@ -134,7 +134,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"mlFeatures": {
"properties": {

2
openmetadata-service/src/main/resources/elasticsearch/en/pipeline_index_mapping.json
View File

@ -161,7 +161,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"owner": {
"properties": {

2
openmetadata-service/src/main/resources/elasticsearch/en/search_entity_index_mapping.json
View File

@ -362,7 +362,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"dataProducts": {
"properties": {

2
openmetadata-service/src/main/resources/elasticsearch/en/stored_procedure_index_mapping.json
View File

@ -434,7 +434,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"sourceUrl": {
"type": "keyword"

2
openmetadata-service/src/main/resources/elasticsearch/en/table_index_mapping.json
View File

@ -346,7 +346,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"dataProducts": {
"properties": {

2
openmetadata-service/src/main/resources/elasticsearch/en/topic_index_mapping.json
View File

@ -130,7 +130,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"dataProducts": {
"properties": {

2
openmetadata-service/src/main/resources/elasticsearch/jp/container_index_mapping.json
View File

@ -165,7 +165,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"dataModel": {
"properties": {

2
openmetadata-service/src/main/resources/elasticsearch/jp/dashboard_index_mapping.json
View File

@ -131,7 +131,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"dataProducts": {
"properties": {

2
openmetadata-service/src/main/resources/elasticsearch/jp/database_index_mapping.json
View File

@ -141,7 +141,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"state": {
"type": "keyword"

2
openmetadata-service/src/main/resources/elasticsearch/jp/database_schema_index_mapping.json
View File

@ -153,7 +153,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"owner": {
"properties": {

2
openmetadata-service/src/main/resources/elasticsearch/jp/mlmodel_index_mapping.json
View File

@ -136,7 +136,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"mlFeatures": {
"properties": {

2
openmetadata-service/src/main/resources/elasticsearch/jp/search_entity_index_mapping.json
View File

@ -361,7 +361,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"lifeCycle": {
"type": "object"

2
openmetadata-service/src/main/resources/elasticsearch/jp/stored_procedure_index_mapping.json
View File

@ -436,7 +436,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"sourceUrl": {
"type": "keyword"

2
openmetadata-service/src/main/resources/elasticsearch/jp/table_index_mapping.json
View File

@ -355,7 +355,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"dataProducts": {
"properties": {

3
openmetadata-service/src/main/resources/elasticsearch/jp/topic_index_mapping.json
View File

@ -286,6 +286,9 @@
}
}
},
"extension": {
"type": "object"
},
"dataProducts": {
"properties": {
"id": {

2
openmetadata-service/src/main/resources/elasticsearch/zh/container_index_mapping.json
View File

@ -218,7 +218,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"children": {
"properties": {

2
openmetadata-service/src/main/resources/elasticsearch/zh/dashboard_index_mapping.json
View File

@ -157,7 +157,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"dataProducts": {
"properties": {

2
openmetadata-service/src/main/resources/elasticsearch/zh/database_index_mapping.json
View File

@ -146,7 +146,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"owner": {
"properties": {

2
openmetadata-service/src/main/resources/elasticsearch/zh/database_schema_index_mapping.json
View File

@ -129,7 +129,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"owner": {
"properties": {

2
openmetadata-service/src/main/resources/elasticsearch/zh/mlmodel_index_mapping.json
View File

@ -105,7 +105,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"mlFeatures": {
"properties": {

2
openmetadata-service/src/main/resources/elasticsearch/zh/search_entity_index_mapping.json
View File

@ -348,7 +348,7 @@
"type": "object"
},
"extension": {
"type": "keyword"
"type": "object"
},
"dataProducts": {
"properties": {

2
openmetadata-service/src/main/resources/elasticsearch/zh/stored_procedure_index_mapping.json
View File

@ -423,7 +423,7 @@
"type": "object"
},
"extension": {
"type": "keyword"
"type": "object"
},
"sourceUrl": {
"type": "keyword"

2
openmetadata-service/src/main/resources/elasticsearch/zh/table_index_mapping.json
View File

@ -333,7 +333,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"dataProducts": {
"properties": {

2
openmetadata-service/src/main/resources/elasticsearch/zh/topic_index_mapping.json
View File

@ -107,7 +107,7 @@
}
},
"extension": {
"type": "keyword"
"type": "object"
},
"dataProducts": {
"properties": {