You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2022/04/01 08:25:54 UTC
[pulsar] branch master updated (acac76e -> 4574052)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git.
from acac76e [fix][doc] Fix 404 URL issue (#14977)
add 4574052 [pulsar-io] Elasticsearch sink support for Elastic 8 - switch to java-client (#14805)
No new revisions were added by this update.
Summary of changes:
pom.xml | 7 +
pulsar-io/elastic-search/pom.xml | 5 +
.../io/elasticsearch/ElasticSearchClient.java | 482 +++++----------------
.../io/elasticsearch/ElasticSearchConfig.java | 18 +
.../io/elasticsearch/RandomExponentialRetry.java | 5 +-
.../io/elasticsearch/client/BulkProcessor.java | 84 ++++
.../pulsar/io/elasticsearch/client/RestClient.java | 212 +++++++++
.../io/elasticsearch/client/RestClientFactory.java | 106 +++++
.../client/elastic/ElasticBulkProcessor.java | 356 +++++++++++++++
.../elastic/ElasticSearchJavaRestClient.java | 201 +++++++++
.../client/elastic/package-info.java} | 19 +-
.../opensearch/OpenSearchHighLevelRestClient.java | 289 ++++++++++++
.../RandomExponentialBackoffPolicy.java | 5 +-
.../client/opensearch/package-info.java} | 19 +-
.../io/elasticsearch/client/package-info.java} | 19 +-
.../io/elasticsearch/ElasticSearchBWCTests.java | 2 +-
.../elasticsearch/ElasticSearchClientSslTests.java | 6 +-
.../io/elasticsearch/ElasticSearchClientTests.java | 93 ++--
.../io/elasticsearch/ElasticSearchConfigTests.java | 2 +
.../elasticsearch/ElasticSearchExtractTests.java | 16 +-
.../ElasticSearchSinkRawDataTests.java | 17 +-
.../io/elasticsearch/ElasticSearchSinkTests.java | 60 ++-
.../io/elasticsearch/ElasticSearchTestBase.java | 31 +-
.../client/RestClientFactoryTest.java | 47 ++
.../OpenSearchClientSslTests.java} | 98 ++---
.../OpenSearchClientTests.java} | 18 +-
.../OpenSearchSinkRawDataTests.java} | 19 +-
.../OpenSearchSinkTests.java} | 18 +-
.../ElasticSearch7ClientSslTests.java} | 18 +-
.../ElasticSearch7ClientTests.java} | 18 +-
.../ElasticSearch7SinkRawDataTests.java} | 19 +-
.../ElasticSearch7SinkTests.java} | 18 +-
.../ElasticSearch8ClientSslTests.java} | 18 +-
.../ElasticSearch8ClientTests.java} | 18 +-
.../ElasticSearch8SinkRawDataTests.java} | 19 +-
.../ElasticSearch8SinkTests.java} | 18 +-
.../src/test/resources/ssl/elasticsearch.pem | 28 ++
site2/docs/io-elasticsearch-sink.md | 1 +
tests/integration/pom.xml | 15 +-
.../containers/ElasticSearchContainer.java | 51 ---
.../io/sinks/ElasticSearch7SinkTester.java | 18 +-
.../io/sinks/ElasticSearch8SinkTester.java | 22 +-
.../io/sinks/ElasticSearchSinkTester.java | 58 +--
.../integration/io/sinks/OpenSearchSinkTester.java | 77 ++++
.../integration/io/sinks/PulsarSinksTest.java | 28 +-
45 files changed, 1874 insertions(+), 824 deletions(-)
create mode 100644 pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/BulkProcessor.java
create mode 100644 pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/RestClient.java
create mode 100644 pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/RestClientFactory.java
create mode 100644 pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/elastic/ElasticBulkProcessor.java
create mode 100644 pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/elastic/ElasticSearchJavaRestClient.java
copy pulsar-io/elastic-search/src/{test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchTestBase.java => main/java/org/apache/pulsar/io/elasticsearch/client/elastic/package-info.java} (58%)
create mode 100644 pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/client/opensearch/OpenSearchHighLevelRestClient.java
rename pulsar-io/elastic-search/src/main/java/org/apache/pulsar/io/elasticsearch/{ => client/opensearch}/RandomExponentialBackoffPolicy.java (95%)
copy pulsar-io/elastic-search/src/{test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchTestBase.java => main/java/org/apache/pulsar/io/elasticsearch/client/opensearch/package-info.java} (58%)
copy pulsar-io/elastic-search/src/{test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchTestBase.java => main/java/org/apache/pulsar/io/elasticsearch/client/package-info.java} (58%)
create mode 100644 pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/client/RestClientFactoryTest.java
copy pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/{ElasticSearchClientSslTests.java => opensearch/OpenSearchClientSslTests.java} (51%)
copy pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/{ElasticSearchTestBase.java => opensearch/OpenSearchClientTests.java} (58%)
copy pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/{ElasticSearchTestBase.java => opensearch/OpenSearchSinkRawDataTests.java} (58%)
copy pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/{ElasticSearchTestBase.java => opensearch/OpenSearchSinkTests.java} (58%)
copy pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/{ElasticSearchTestBase.java => v7/ElasticSearch7ClientSslTests.java} (58%)
copy pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/{ElasticSearchTestBase.java => v7/ElasticSearch7ClientTests.java} (58%)
copy pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/{ElasticSearchTestBase.java => v7/ElasticSearch7SinkRawDataTests.java} (58%)
copy pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/{ElasticSearchTestBase.java => v7/ElasticSearch7SinkTests.java} (58%)
copy pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/{ElasticSearchTestBase.java => v8/ElasticSearch8ClientSslTests.java} (58%)
copy pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/{ElasticSearchTestBase.java => v8/ElasticSearch8ClientTests.java} (58%)
copy pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/{ElasticSearchTestBase.java => v8/ElasticSearch8SinkRawDataTests.java} (58%)
copy pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/{ElasticSearchTestBase.java => v8/ElasticSearch8SinkTests.java} (58%)
create mode 100644 pulsar-io/elastic-search/src/test/resources/ssl/elasticsearch.pem
delete mode 100644 tests/integration/src/test/java/org/apache/pulsar/tests/integration/containers/ElasticSearchContainer.java
copy pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchTestBase.java => tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/ElasticSearch7SinkTester.java (66%)
copy pulsar-io/elastic-search/src/test/java/org/apache/pulsar/io/elasticsearch/ElasticSearchTestBase.java => tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/ElasticSearch8SinkTester.java (56%)
create mode 100644 tests/integration/src/test/java/org/apache/pulsar/tests/integration/io/sinks/OpenSearchSinkTester.java