Show displayName for database and databaseSchema in explore tree

open-metadata · Sep 17, 2024 · 71dd2a2 · 71dd2a2
1 parent 3e899fa
commit 71dd2a2
Show file tree

Hide file tree

Showing 13 changed files with 122 additions and 0 deletions.
diff --git a/...vice/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java b/...vice/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java
@@ -1334,6 +1334,14 @@ private static SearchSourceBuilder buildSearchAcrossIndexesBuilder(
  AggregationBuilders.terms("databaseSchema.name.keyword")
  .field("databaseSchema.name.keyword")
  .size(MAX_AGGREGATE_SIZE));
+ searchSourceBuilder.aggregation(
+ AggregationBuilders.terms("database.displayName")
+ .field("database.displayName")
+ .size(MAX_AGGREGATE_SIZE));
+ searchSourceBuilder.aggregation(
+ AggregationBuilders.terms("databaseSchema.displayName")
+ .field("databaseSchema.displayName")
+ .size(MAX_AGGREGATE_SIZE));
  return addAggregation(searchSourceBuilder);
  }
 

diff --git a/...ta-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchClient.java b/...ta-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchClient.java
@@ -1306,6 +1306,14 @@ private static SearchSourceBuilder buildSearchAcrossIndexesBuilder(
  AggregationBuilders.terms("databaseSchema.name.keyword")
  .field("databaseSchema.name.keyword")
  .size(MAX_AGGREGATE_SIZE));
+ searchSourceBuilder.aggregation(
+ AggregationBuilders.terms("database.displayName")
+ .field("database.displayName")
+ .size(MAX_AGGREGATE_SIZE));
+ searchSourceBuilder.aggregation(
+ AggregationBuilders.terms("databaseSchema.displayName")
+ .field("databaseSchema.displayName")
+ .size(MAX_AGGREGATE_SIZE));
  return addAggregation(searchSourceBuilder);
  }
 

diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/database_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/database_index_mapping.json
@@ -393,6 +393,16 @@
  }
  }
  },
+ "displayName": {
+ "type": "keyword",
+ "fields": {
+ "keyword": {
+ "type": "keyword",
+ "normalizer": "lowercase_normalizer",
+ "ignore_above": 256
+ }
+ }
+ },
  "fullyQualifiedName": {
  "type": "text"
  },

diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/database_schema_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/database_schema_index_mapping.json
@@ -298,6 +298,16 @@
  }
  }
  },
+ "displayName": {
+ "type": "keyword",
+ "fields": {
+ "keyword": {
+ "type": "keyword",
+ "normalizer": "lowercase_normalizer",
+ "ignore_above": 256
+ }
+ }
+ },
  "fullyQualifiedName": {
  "type": "keyword",
  "normalizer": "lowercase_normalizer"

diff --git a/openmetadata-service/src/main/resources/elasticsearch/en/stored_procedure_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/en/stored_procedure_index_mapping.json
@@ -179,6 +179,7 @@
  "fields": {
  "keyword": {
  "type": "keyword",
+ "normalizer": "lowercase_normalizer",
  "ignore_above": 256
  }
  }
@@ -225,6 +226,7 @@
  "fields": {
  "keyword": {
  "type": "keyword",
+ "normalizer": "lowercase_normalizer",
  "ignore_above": 256
  }
  }

diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/database_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/database_index_mapping.json
@@ -402,6 +402,16 @@
  }
  }
  },
+ "displayName": {
+ "type": "keyword",
+ "fields": {
+ "keyword": {
+ "type": "keyword",
+ "normalizer": "lowercase_normalizer",
+ "ignore_above": 256
+ }
+ }
+ },
  "fullyQualifiedName": {
  "type": "text"
  },

diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/database_schema_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/database_schema_index_mapping.json
@@ -307,6 +307,16 @@
  }
  }
  },
+ "displayName": {
+ "type": "keyword",
+ "fields": {
+ "keyword": {
+ "type": "keyword",
+ "normalizer": "lowercase_normalizer",
+ "ignore_above": 256
+ }
+ }
+ },
  "fullyQualifiedName": {
  "type": "keyword",
  "normalizer": "lowercase_normalizer"

diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/stored_procedure_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/stored_procedure_index_mapping.json
@@ -185,6 +185,7 @@
  "fields": {
  "keyword": {
  "type": "keyword",
+ "normalizer": "lowercase_normalizer",
  "ignore_above": 256
  }
  }
@@ -231,6 +232,7 @@
  "fields": {
  "keyword": {
  "type": "keyword",
+ "normalizer": "lowercase_normalizer",
  "ignore_above": 256
  }
  }

diff --git a/openmetadata-service/src/main/resources/elasticsearch/jp/table_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/jp/table_index_mapping.json
@@ -190,6 +190,16 @@
  }
  }
  },
+ "displayName": {
+ "type": "keyword",
+ "fields": {
+ "keyword": {
+ "type": "keyword",
+ "normalizer": "lowercase_normalizer",
+ "ignore_above": 256
+ }
+ }
+ },
  "fullyQualifiedName": {
  "type": "text"
  },
@@ -228,6 +238,16 @@
  }
  }
  },
+ "displayName": {
+ "type": "keyword",
+ "fields": {
+ "keyword": {
+ "type": "keyword",
+ "normalizer": "lowercase_normalizer",
+ "ignore_above": 256
+ }
+ }
+ },
  "fullyQualifiedName": {
  "type": "text"
  },

diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/database_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/database_index_mapping.json
@@ -375,6 +375,16 @@
  }
  }
  },
+ "displayName": {
+ "type": "keyword",
+ "fields": {
+ "keyword": {
+ "type": "keyword",
+ "normalizer": "lowercase_normalizer",
+ "ignore_above": 256
+ }
+ }
+ },
  "fullyQualifiedName": {
  "type": "text"
  },

diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/database_schema_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/database_schema_index_mapping.json
@@ -282,6 +282,16 @@
  }
  }
  },
+ "displayName": {
+ "type": "keyword",
+ "fields": {
+ "keyword": {
+ "type": "keyword",
+ "normalizer": "lowercase_normalizer",
+ "ignore_above": 256
+ }
+ }
+ },
  "fullyQualifiedName": {
  "type": "keyword",
  "normalizer": "lowercase_normalizer"

diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/stored_procedure_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/stored_procedure_index_mapping.json
@@ -165,6 +165,7 @@
  "fields": {
  "keyword": {
  "type": "keyword",
+ "normalizer": "lowercase_normalizer",
  "ignore_above": 256
  }
  }
@@ -211,6 +212,7 @@
  "fields": {
  "keyword": {
  "type": "keyword",
+ "normalizer": "lowercase_normalizer",
  "ignore_above": 256
  }
  }

diff --git a/openmetadata-service/src/main/resources/elasticsearch/zh/table_index_mapping.json b/openmetadata-service/src/main/resources/elasticsearch/zh/table_index_mapping.json
@@ -164,6 +164,16 @@
  }
  }
  },
+ "displayName": {
+ "type": "keyword",
+ "fields": {
+ "keyword": {
+ "type": "keyword",
+ "normalizer": "lowercase_normalizer",
+ "ignore_above": 256
+ }
+ }
+ },
  "fullyQualifiedName": {
  "type": "text"
  },
@@ -204,6 +214,16 @@
  }
  }
  },
+ "displayName": {
+ "type": "keyword",
+ "fields": {
+ "keyword": {
+ "type": "keyword",
+ "normalizer": "lowercase_normalizer",
+ "ignore_above": 256
+ }
+ }
+ },
  "fullyQualifiedName": {
  "type": "text"
  },