peng-yongsheng closed pull request #1960: fixed bug: multiple formatIndexName
in forceUpdate method
URL: https://github.com/apache/incubator-skywalking/pull/1960
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
index f7c4b5cb04..2d0feb7571 100644
---
a/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
+++
b/oap-server/server-library/library-client/src/main/java/org/apache/skywalking/oap/server/library/client/elasticsearch/ElasticSearchClient.java
@@ -142,7 +142,6 @@ public void forceInsert(String indexName, String id,
XContentBuilder source) thr
}
public void forceUpdate(String indexName, String id, XContentBuilder
source, long version) throws IOException {
- indexName = formatIndexName(indexName);
UpdateRequest request = prepareUpdate(indexName, id, source);
request.version(version);
request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
@@ -150,7 +149,6 @@ public void forceUpdate(String indexName, String id,
XContentBuilder source, lon
}
public void forceUpdate(String indexName, String id, XContentBuilder
source) throws IOException {
- indexName = formatIndexName(indexName);
UpdateRequest request = prepareUpdate(indexName, id, source);
request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
client.update(request);
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
