You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by GitBox <gi...@apache.org> on 2022/08/01 15:59:14 UTC
[GitHub] [incubator-seatunnel] iture123 opened a new pull request, #2330: [Feature][Connector-V2] new connecotor of Elasticsearch sink(#2326)
iture123 opened a new pull request, #2330:
URL: https://github.com/apache/incubator-seatunnel/pull/2330
<!--
Thank you for contributing to SeaTunnel! Please make sure that your code changes
are covered with tests. And in case of new features or big changes
remember to adjust the documentation.
Feel free to ping committers for the review!
## Contribution Checklist
- Make sure that the pull request corresponds to a [GITHUB issue](https://github.com/apache/incubator-seatunnel/issues).
- Name the pull request in the form "[Feature] [component] Title of the pull request", where *Feature* can be replaced by `Hotfix`, `Bug`, etc.
- Minor fixes should be named following this pattern: `[hotfix] [docs] Fix typo in README.md doc`.
-->
## Purpose of this pull request
This pull request add new connecotor of Elasticsearch sink.
## Check list
* [ √] Code changed are covered with tests, or it does not need tests for reason:
* [ √ ] If any new Jar binary package adding in your PR, please add License Notice according
[New License Guide](https://github.com/apache/incubator-seatunnel/blob/dev/docs/en/contribution/new-license.md)
* [√ ] If necessary, please update the documentation to describe the new feature. https://github.com/apache/incubator-seatunnel/tree/dev/docs
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@seatunnel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-seatunnel] CalvinKirs commented on pull request #2330: [Feature][Connector-V2] new connecotor of Elasticsearch sink(#2326)
Posted by GitBox <gi...@apache.org>.
CalvinKirs commented on PR #2330:
URL: https://github.com/apache/incubator-seatunnel/pull/2330#issuecomment-1204711554
@Hisoka-X hi,PTAL,thx
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@seatunnel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-seatunnel] iture123 commented on a diff in pull request #2330: [Feature][Connector-V2] new connecotor of Elasticsearch sink(#2326)
Posted by GitBox <gi...@apache.org>.
iture123 commented on code in PR #2330:
URL: https://github.com/apache/incubator-seatunnel/pull/2330#discussion_r935710865
##########
seatunnel-connectors-v2/connector-elasticsearch/src/java/org/apache/seatunnel/connectors/seatunnel/elasticsearch/client/EsRestClient.java:
##########
@@ -0,0 +1,120 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.seatunnel.connectors.seatunnel.elasticsearch.client;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.util.EntityUtils;
+import org.apache.seatunnel.connectors.seatunnel.elasticsearch.dto.BulkResponse;
+import org.apache.seatunnel.connectors.seatunnel.elasticsearch.exception.BulkElasticsearchException;
+import org.apache.seatunnel.connectors.seatunnel.elasticsearch.exception.GetElasticsearchVersionException;
+import org.elasticsearch.client.Request;
+import org.elasticsearch.client.Response;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestClientBuilder;
+
+import java.io.IOException;
+import java.util.List;
+
+public class EsRestClient {
+
+ private static EsRestClient esRestClient;
+ private static RestClient restClient;
+
+ private EsRestClient() {
+
+ }
+
+ private static RestClientBuilder getRestClientBuilder(List<String> hosts, String username, String password) {
+ HttpHost[] httpHosts = new HttpHost[hosts.size()];
+ for (int i = 0; i < hosts.size(); i++) {
+ String[] hostInfo = hosts.get(i).replace("http://", "").split(":");
+ httpHosts[i] = new HttpHost(hostInfo[0], Integer.parseInt(hostInfo[1]));
+ }
+
+ RestClientBuilder builder = RestClient.builder(httpHosts)
+ .setRequestConfigCallback(requestConfigBuilder -> requestConfigBuilder
+ .setConnectionRequestTimeout(10 * 1000)
+ .setSocketTimeout(5 * 60 * 1000));
+
+ if (StringUtils.isNotEmpty(username)) {
+ CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+ credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(username, password));
+ builder.setHttpClientConfigCallback(httpAsyncClientBuilder -> httpAsyncClientBuilder.setDefaultCredentialsProvider(credentialsProvider));
+ }
+ return builder;
+ }
+
+ public static EsRestClient getInstance(List<String> hosts, String username, String password) {
+ if (restClient == null) {
+ RestClientBuilder restClientBuilder = getRestClientBuilder(hosts, username, password);
+ restClient = restClientBuilder.build();
+ esRestClient = new EsRestClient();
+ }
+ return esRestClient;
+ }
+
+ public BulkResponse bulk(String requestBody) {
+ Request request = new Request("POST", "_bulk");
+ request.setJsonEntity(requestBody);
+ try {
+ Response response = restClient.performRequest(request);
+ if (response.getStatusLine().getStatusCode() == 200) {
Review Comment:
I have revised it according to your suggestion.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@seatunnel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-seatunnel] CalvinKirs commented on a diff in pull request #2330: [Feature][Connector-V2] new connecotor of Elasticsearch sink(#2326)
Posted by GitBox <gi...@apache.org>.
CalvinKirs commented on code in PR #2330:
URL: https://github.com/apache/incubator-seatunnel/pull/2330#discussion_r935073908
##########
seatunnel-connectors-v2/connector-elasticsearch/src/java/org/apache/seatunnel/connectors/seatunnel/elasticsearch/client/EsRestClient.java:
##########
@@ -0,0 +1,120 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.seatunnel.connectors.seatunnel.elasticsearch.client;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.util.EntityUtils;
+import org.apache.seatunnel.connectors.seatunnel.elasticsearch.dto.BulkResponse;
+import org.apache.seatunnel.connectors.seatunnel.elasticsearch.exception.BulkElasticsearchException;
+import org.apache.seatunnel.connectors.seatunnel.elasticsearch.exception.GetElasticsearchVersionException;
+import org.elasticsearch.client.Request;
+import org.elasticsearch.client.Response;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestClientBuilder;
+
+import java.io.IOException;
+import java.util.List;
+
+public class EsRestClient {
+
+ private static EsRestClient esRestClient;
+ private static RestClient restClient;
+
+ private EsRestClient() {
+
+ }
+
+ private static RestClientBuilder getRestClientBuilder(List<String> hosts, String username, String password) {
+ HttpHost[] httpHosts = new HttpHost[hosts.size()];
+ for (int i = 0; i < hosts.size(); i++) {
+ String[] hostInfo = hosts.get(i).replace("http://", "").split(":");
+ httpHosts[i] = new HttpHost(hostInfo[0], Integer.parseInt(hostInfo[1]));
+ }
+
+ RestClientBuilder builder = RestClient.builder(httpHosts)
+ .setRequestConfigCallback(requestConfigBuilder -> requestConfigBuilder
+ .setConnectionRequestTimeout(10 * 1000)
+ .setSocketTimeout(5 * 60 * 1000));
+
+ if (StringUtils.isNotEmpty(username)) {
+ CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+ credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(username, password));
+ builder.setHttpClientConfigCallback(httpAsyncClientBuilder -> httpAsyncClientBuilder.setDefaultCredentialsProvider(credentialsProvider));
+ }
+ return builder;
+ }
+
+ public static EsRestClient getInstance(List<String> hosts, String username, String password) {
+ if (restClient == null) {
+ RestClientBuilder restClientBuilder = getRestClientBuilder(hosts, username, password);
+ restClient = restClientBuilder.build();
+ esRestClient = new EsRestClient();
+ }
+ return esRestClient;
+ }
+
+ public BulkResponse bulk(String requestBody) {
+ Request request = new Request("POST", "_bulk");
+ request.setJsonEntity(requestBody);
+ try {
+ Response response = restClient.performRequest(request);
+ if (response.getStatusLine().getStatusCode() == 200) {
Review Comment:
And maybe be NPE?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@seatunnel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-seatunnel] CalvinKirs merged pull request #2330: [Feature][Connector-V2] new connecotor of Elasticsearch sink(#2326)
Posted by GitBox <gi...@apache.org>.
CalvinKirs merged PR #2330:
URL: https://github.com/apache/incubator-seatunnel/pull/2330
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@seatunnel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-seatunnel] CalvinKirs commented on a diff in pull request #2330: [Feature][Connector-V2] new connecotor of Elasticsearch sink(#2326)
Posted by GitBox <gi...@apache.org>.
CalvinKirs commented on code in PR #2330:
URL: https://github.com/apache/incubator-seatunnel/pull/2330#discussion_r935073606
##########
seatunnel-connectors-v2/connector-elasticsearch/src/java/org/apache/seatunnel/connectors/seatunnel/elasticsearch/client/EsRestClient.java:
##########
@@ -0,0 +1,120 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.seatunnel.connectors.seatunnel.elasticsearch.client;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpHost;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.util.EntityUtils;
+import org.apache.seatunnel.connectors.seatunnel.elasticsearch.dto.BulkResponse;
+import org.apache.seatunnel.connectors.seatunnel.elasticsearch.exception.BulkElasticsearchException;
+import org.apache.seatunnel.connectors.seatunnel.elasticsearch.exception.GetElasticsearchVersionException;
+import org.elasticsearch.client.Request;
+import org.elasticsearch.client.Response;
+import org.elasticsearch.client.RestClient;
+import org.elasticsearch.client.RestClientBuilder;
+
+import java.io.IOException;
+import java.util.List;
+
+public class EsRestClient {
+
+ private static EsRestClient esRestClient;
+ private static RestClient restClient;
+
+ private EsRestClient() {
+
+ }
+
+ private static RestClientBuilder getRestClientBuilder(List<String> hosts, String username, String password) {
+ HttpHost[] httpHosts = new HttpHost[hosts.size()];
+ for (int i = 0; i < hosts.size(); i++) {
+ String[] hostInfo = hosts.get(i).replace("http://", "").split(":");
+ httpHosts[i] = new HttpHost(hostInfo[0], Integer.parseInt(hostInfo[1]));
+ }
+
+ RestClientBuilder builder = RestClient.builder(httpHosts)
+ .setRequestConfigCallback(requestConfigBuilder -> requestConfigBuilder
+ .setConnectionRequestTimeout(10 * 1000)
+ .setSocketTimeout(5 * 60 * 1000));
+
+ if (StringUtils.isNotEmpty(username)) {
+ CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+ credentialsProvider.setCredentials(AuthScope.ANY, new UsernamePasswordCredentials(username, password));
+ builder.setHttpClientConfigCallback(httpAsyncClientBuilder -> httpAsyncClientBuilder.setDefaultCredentialsProvider(credentialsProvider));
+ }
+ return builder;
+ }
+
+ public static EsRestClient getInstance(List<String> hosts, String username, String password) {
+ if (restClient == null) {
+ RestClientBuilder restClientBuilder = getRestClientBuilder(hosts, username, password);
+ restClient = restClientBuilder.build();
+ esRestClient = new EsRestClient();
+ }
+ return esRestClient;
+ }
+
+ public BulkResponse bulk(String requestBody) {
+ Request request = new Request("POST", "_bulk");
+ request.setJsonEntity(requestBody);
+ try {
+ Response response = restClient.performRequest(request);
+ if (response.getStatusLine().getStatusCode() == 200) {
Review Comment:
It's better use` HttpStatus` judge.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@seatunnel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-seatunnel] iture123 commented on a diff in pull request #2330: [Feature][Connector-V2] new connecotor of Elasticsearch sink(#2326)
Posted by GitBox <gi...@apache.org>.
iture123 commented on code in PR #2330:
URL: https://github.com/apache/incubator-seatunnel/pull/2330#discussion_r935712389
##########
seatunnel-connectors-v2/connector-elasticsearch/pom.xml:
##########
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connectors-v2</artifactId>
+ <version>${revision}</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>connector-elasticsearch</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.elasticsearch.client</groupId>
+ <artifactId>elasticsearch-rest-client</artifactId>
+ <version>8.1.3</version>
Review Comment:
Yes,I have optimized it.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@seatunnel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-seatunnel] Hisoka-X commented on pull request #2330: [Feature][Connector-V2] new connecotor of Elasticsearch sink(#2326)
Posted by GitBox <gi...@apache.org>.
Hisoka-X commented on PR #2330:
URL: https://github.com/apache/incubator-seatunnel/pull/2330#issuecomment-1204858653
Hi please resolve dependency check error
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@seatunnel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-seatunnel] CalvinKirs commented on pull request #2330: [Feature][Connector-V2] new connecotor of Elasticsearch sink(#2326)
Posted by GitBox <gi...@apache.org>.
CalvinKirs commented on PR #2330:
URL: https://github.com/apache/incubator-seatunnel/pull/2330#issuecomment-1203399510
could you submit this PR to dev branch(not api-draft)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@seatunnel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [incubator-seatunnel] CalvinKirs commented on a diff in pull request #2330: [Feature][Connector-V2] new connecotor of Elasticsearch sink(#2326)
Posted by GitBox <gi...@apache.org>.
CalvinKirs commented on code in PR #2330:
URL: https://github.com/apache/incubator-seatunnel/pull/2330#discussion_r935071098
##########
seatunnel-connectors-v2/connector-elasticsearch/pom.xml:
##########
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-connectors-v2</artifactId>
+ <version>${revision}</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>connector-elasticsearch</artifactId>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.seatunnel</groupId>
+ <artifactId>seatunnel-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.elasticsearch.client</groupId>
+ <artifactId>elasticsearch-rest-client</artifactId>
+ <version>8.1.3</version>
Review Comment:
The version is best managed uniformly in the `root pom`.(DependencyManagent)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@seatunnel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org