yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-06-27 04:22:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed migrate-all issue in search (#13667)

Browse Source 
* fixed migrate-all issue in search

* re-run checks

* re-run checks

* fix checkstyle
This commit is contained in:
07Himank 2023-10-20 18:50:02 +05:30 committed by GitHub
parent cc5b4d8251
commit 2454da18fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,6 +21,7 @@ import static org.openmetadata.service.search.EntityBuilderConstant.SCHEMA_FIELD
import static org.openmetadata.service.search.EntityBuilderConstant.UNIFIED; import static org.openmetadata.service.search.EntityBuilderConstant.UNIFIED;
import static org.openmetadata.service.search.UpdateSearchEventsConstant.SENDING_REQUEST_TO_ELASTIC_SEARCH; import static org.openmetadata.service.search.UpdateSearchEventsConstant.SENDING_REQUEST_TO_ELASTIC_SEARCH;
import com.fasterxml.jackson.databind.JsonNode;
import es.org.elasticsearch.action.ActionListener; import es.org.elasticsearch.action.ActionListener;
import es.org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest; import es.org.elasticsearch.action.admin.indices.alias.IndicesAliasesRequest;
import es.org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest; import es.org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
@ -232,7 +233,8 @@ public class ElasticSearchClient implements SearchClient {
public void updateIndex(IndexMapping indexMapping, String indexMappingContent) { public void updateIndex(IndexMapping indexMapping, String indexMappingContent) {
try { try {
PutMappingRequest request = new PutMappingRequest(indexMapping.getIndexName()); PutMappingRequest request = new PutMappingRequest(indexMapping.getIndexName());
request.source(indexMappingContent, XContentType.JSON); JsonNode readProperties = JsonUtils.readTree(indexMappingContent).get("mappings");
request.source(JsonUtils.getMap(readProperties));
AcknowledgedResponse putMappingResponse = client.indices().putMapping(request, RequestOptions.DEFAULT); AcknowledgedResponse putMappingResponse = client.indices().putMapping(request, RequestOptions.DEFAULT);
LOG.debug("{} Updated {}", indexMapping.getIndexMappingFile(), putMappingResponse.isAcknowledged()); LOG.debug("{} Updated {}", indexMapping.getIndexMappingFile(), putMappingResponse.isAcknowledged());
} catch (Exception e) { } catch (Exception e) {

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

@ -21,6 +21,7 @@ import static org.openmetadata.service.search.EntityBuilderConstant.SCHEMA_FIELD
import static org.openmetadata.service.search.EntityBuilderConstant.UNIFIED; import static org.openmetadata.service.search.EntityBuilderConstant.UNIFIED;
import static org.openmetadata.service.search.UpdateSearchEventsConstant.SENDING_REQUEST_TO_ELASTIC_SEARCH; import static org.openmetadata.service.search.UpdateSearchEventsConstant.SENDING_REQUEST_TO_ELASTIC_SEARCH;
import com.fasterxml.jackson.databind.JsonNode;
import java.io.IOException; import java.io.IOException;
import java.text.ParseException; import java.text.ParseException;
import java.util.ArrayList; import java.util.ArrayList;
@ -225,7 +226,8 @@ public class OpenSearchClient implements SearchClient {
public void updateIndex(IndexMapping indexMapping, String indexMappingContent) { public void updateIndex(IndexMapping indexMapping, String indexMappingContent) {
try { try {
PutMappingRequest request = new PutMappingRequest(indexMapping.getIndexName()); PutMappingRequest request = new PutMappingRequest(indexMapping.getIndexName());
request.source(indexMappingContent, XContentType.JSON); JsonNode readProperties = JsonUtils.readTree(indexMappingContent).get("mappings");
request.source(JsonUtils.getMap(readProperties));
AcknowledgedResponse putMappingResponse = client.indices().putMapping(request, RequestOptions.DEFAULT); AcknowledgedResponse putMappingResponse = client.indices().putMapping(request, RequestOptions.DEFAULT);
LOG.debug("{} Updated {}", indexMapping.getIndexMappingFile(), putMappingResponse.isAcknowledged()); LOG.debug("{} Updated {}", indexMapping.getIndexMappingFile(), putMappingResponse.isAcknowledged());
} catch (Exception e) { } catch (Exception e) {

3
openmetadata-shaded-deps/elasticsearch-dep/src/main/java/elasticsearch/ElasticSearchNoop.java
View File

@ -1,4 +1,3 @@
package elasticsearch; package elasticsearch;
public class ElasticSearchNoop { public class ElasticSearchNoop {}
}

3
openmetadata-shaded-deps/opensearch-dep/src/main/java/opensearch/OpenSearchNoop.java
View File

@ -1,4 +1,3 @@
package opensearch; package opensearch;
public class OpenSearchNoop { public class OpenSearchNoop {}
}