You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by GitBox <gi...@apache.org> on 2022/06/21 08:46:16 UTC
[GitHub] [inlong] luchunliang opened a new pull request, #4728: [INLONG-4726][SortStandalone] Support ClickHouse sink.
luchunliang opened a new pull request, #4728:
URL: https://github.com/apache/inlong/pull/4728
### Prepare a Pull Request
- Title: [INLONG-4726][SortStandalone] Support ClickHouse sink
- Fixes #4726
### Motivation
*Explain here the context, and why you're making that change. What is the problem you're trying to solve?*
### Modifications
*Describe the modifications you've done.*
### Verifying this change
*(Please pick either of the following options)*
- [ ] This change is a trivial rework/code cleanup without any test coverage.
- [ ] This change is already covered by existing tests, such as:
*(please describe tests)*
- [ ] This change added tests and can be verified as follows:
*(example:)*
- *Added integration tests for end-to-end deployment with large payloads (10MB)*
- *Extended integration test for recovery after broker failure*
### Documentation
- Does this pull request introduce a new feature? (yes / no)
- If yes, how is the feature documented? (not applicable / docs / JavaDocs / not documented)
- If a feature is not applicable for documentation, explain why?
- If a feature is not documented yet in this PR, please create a follow-up issue for adding the documentation
--
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@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] vernedeng commented on a diff in pull request #4728: [INLONG-4726][SortStandalone] Support ClickHouse sink.
Posted by GitBox <gi...@apache.org>.
vernedeng commented on code in PR #4728:
URL: https://github.com/apache/inlong/pull/4728#discussion_r904652724
##########
inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/sink/clickhouse/ClickHouseSink.java:
##########
@@ -0,0 +1,155 @@
+/**
+ * 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.inlong.sort.standalone.sink.clickhouse;
+
+import org.apache.flume.Channel;
+import org.apache.flume.Context;
+import org.apache.flume.Event;
+import org.apache.flume.EventDeliveryException;
+import org.apache.flume.Transaction;
+import org.apache.flume.conf.Configurable;
+import org.apache.flume.sink.AbstractSink;
+import org.apache.inlong.sort.standalone.channel.ProfileEvent;
+import org.apache.inlong.sort.standalone.dispatch.DispatchManager;
+import org.apache.inlong.sort.standalone.dispatch.DispatchProfile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * ClickHouseSink
+ */
+public class ClickHouseSink extends AbstractSink implements Configurable {
+
+ public static final Logger LOG = LoggerFactory.getLogger(ClickHouseSink.class);
+
+ private Context parentContext;
+ private ClickHouseSinkContext context;
+ private DispatchManager dispatchManager;
+ private LinkedBlockingQueue<DispatchProfile> dispatchQueue = new LinkedBlockingQueue<>();
+ // workers
+ private List<ClickHouseChannelWorker> workers = new ArrayList<>();
+ // schedule
+ private ScheduledExecutorService scheduledPool;
+
+ /**
+ * start
+ */
+ @Override
+ public void start() {
+ super.start();
+ try {
+ this.context = new ClickHouseSinkContext(getName(), parentContext, getChannel(), dispatchQueue);
+ this.context.start();
+ for (int i = 0; i < context.getMaxThreads(); i++) {
+ ClickHouseChannelWorker worker = new ClickHouseChannelWorker(context, i);
+ this.workers.add(worker);
+ worker.start();
+ }
+ this.dispatchManager = new DispatchManager(parentContext, dispatchQueue);
+ this.scheduledPool = Executors.newScheduledThreadPool(2);
Review Comment:
use single threadpool is enough
--
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@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] luchunliang commented on a diff in pull request #4728: [INLONG-4726][SortStandalone] Support ClickHouse sink.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on code in PR #4728:
URL: https://github.com/apache/inlong/pull/4728#discussion_r910569753
##########
inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/sink/clickhouse/DefaultEventHandler.java:
##########
@@ -0,0 +1,333 @@
+/*
+ * 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.inlong.sort.standalone.sink.clickhouse;
+
+import org.apache.commons.math3.util.Pair;
+import org.apache.inlong.sdk.commons.protocol.EventConstants;
+import org.apache.inlong.sort.standalone.channel.ProfileEvent;
+import org.apache.inlong.sort.standalone.utils.UnescapeHelper;
+import org.apache.pulsar.shade.org.apache.commons.lang3.math.NumberUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.sql.Date;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.sql.Types;
+import java.text.SimpleDateFormat;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * DefaultEventHandler
+ */
+public class DefaultEventHandler implements IEventHandler {
+
+ public static final Logger LOG = LoggerFactory.getLogger(DefaultEventHandler.class);
+
+ public static final String KEY_EXTINFO = "extinfo";
+
+ private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+ /**
+ * parse
+ * @param idConfig
+ * @param event
+ * @return
+ */
+ @Override
+ public Map<String, String> parse(ClickHouseIdConfig idConfig, ProfileEvent event) {
+ final Map<String, String> resultMap = new HashMap<>();
+ // parse fields
+ String delimeter = idConfig.getSeparator();
+ char cDelimeter = delimeter.charAt(0);
+ String strContext = null;
+ // for tab separator
+ byte[] bodyBytes = event.getBody();
+ int msgLength = event.getBody().length;
+ int contentOffset = idConfig.getContentOffset();
+ if (contentOffset > 0 && msgLength >= 1) {
+ strContext = new String(bodyBytes, contentOffset, msgLength - contentOffset, Charset.defaultCharset());
+ } else {
+ strContext = new String(bodyBytes, Charset.defaultCharset());
+ }
+ // unescape
+ List<String> columnValues = UnescapeHelper.toFiledList(strContext, cDelimeter);
+ // column size
+ List<String> contentFieldList = idConfig.getContentFieldList();
+ int matchSize = Math.min(contentFieldList.size(), columnValues.size());
+ for (int i = 0; i < matchSize; i++) {
+ resultMap.put(contentFieldList.get(i), columnValues.get(i));
+ }
+
+ // ftime
+ String ftime = dateFormat.format(new Date(event.getRawLogTime()));
+ resultMap.put("ftime", ftime);
+ // extinfo
+ String extinfo = getExtInfo(event);
+ resultMap.put("extinfo", extinfo);
+ return resultMap;
+ }
+
+ /**
+ * getExtInfo
+ *
+ * @param event
+ * @return
+ */
+ public static String getExtInfo(ProfileEvent event) {
+ String extinfoValue = event.getHeaders().get(KEY_EXTINFO);
+ if (extinfoValue != null) {
+ return KEY_EXTINFO + "=" + extinfoValue;
+ }
+ extinfoValue = KEY_EXTINFO + "=" + event.getHeaders().get(EventConstants.HEADER_KEY_SOURCE_IP);
+ return extinfoValue;
+ }
+
+ /**
+ * setValue
+ * @param idConfig
+ * @param columnValueMap
+ * @param pstat
+ * @throws SQLException
+ */
+ public void setValue(ClickHouseIdConfig idConfig, Map<String, String> columnValueMap, PreparedStatement pstat)
+ throws SQLException {
+ List<Pair<String, Integer>> dbFieldList = idConfig.getDbFieldList();
+ for (int i = 1; i <= dbFieldList.size(); i++) {
+ Pair<String, Integer> pair = dbFieldList.get(i - 1);
+ String fieldValue = columnValueMap.getOrDefault(pair.getKey(), "");
+ int fieldType = pair.getValue();
+ switch (fieldType) {
+ case Types.ARRAY :
+ // ARRAY = 2003;
+ // pstat.setArray(1, null); // String
+ pstat.setString(i, fieldValue);
Review Comment:
fix 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@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] dockerzhang commented on pull request #4728: [INLONG-4726][SortStandalone] Support ClickHouse sink.
Posted by GitBox <gi...@apache.org>.
dockerzhang commented on PR #4728:
URL: https://github.com/apache/inlong/pull/4728#issuecomment-1170817399
@luchunliang please add license for the new dependency
--
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@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] healchow commented on a diff in pull request #4728: [INLONG-4726][SortStandalone] Support ClickHouse sink.
Posted by GitBox <gi...@apache.org>.
healchow commented on code in PR #4728:
URL: https://github.com/apache/inlong/pull/4728#discussion_r904447756
##########
inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/sink/clickhouse/ClickHouseChannelWorker.java:
##########
@@ -0,0 +1,158 @@
+/**
Review Comment:
The header seems incorrect, please change it to this:
```java
/*
* 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.
*/
```
--
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@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] dockerzhang merged pull request #4728: [INLONG-4726][SortStandalone] Support ClickHouse sink
Posted by GitBox <gi...@apache.org>.
dockerzhang merged PR #4728:
URL: https://github.com/apache/inlong/pull/4728
--
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@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] dockerzhang commented on pull request #4728: [INLONG-4726][SortStandalone] Support ClickHouse sink
Posted by GitBox <gi...@apache.org>.
dockerzhang commented on PR #4728:
URL: https://github.com/apache/inlong/pull/4728#issuecomment-1171980344
the license added in https://github.com/apache/inlong/pull/4747
--
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@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] healchow commented on a diff in pull request #4728: [INLONG-4726][SortStandalone] Support ClickHouse sink.
Posted by GitBox <gi...@apache.org>.
healchow commented on code in PR #4728:
URL: https://github.com/apache/inlong/pull/4728#discussion_r909309960
##########
inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/sink/clickhouse/DefaultEventHandler.java:
##########
@@ -0,0 +1,333 @@
+/*
+ * 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.inlong.sort.standalone.sink.clickhouse;
+
+import org.apache.commons.math3.util.Pair;
+import org.apache.inlong.sdk.commons.protocol.EventConstants;
+import org.apache.inlong.sort.standalone.channel.ProfileEvent;
+import org.apache.inlong.sort.standalone.utils.UnescapeHelper;
+import org.apache.pulsar.shade.org.apache.commons.lang3.math.NumberUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.charset.Charset;
+import java.sql.Date;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.sql.Types;
+import java.text.SimpleDateFormat;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * DefaultEventHandler
+ */
+public class DefaultEventHandler implements IEventHandler {
+
+ public static final Logger LOG = LoggerFactory.getLogger(DefaultEventHandler.class);
+
+ public static final String KEY_EXTINFO = "extinfo";
+
+ private SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+ /**
+ * parse
+ * @param idConfig
+ * @param event
+ * @return
+ */
+ @Override
+ public Map<String, String> parse(ClickHouseIdConfig idConfig, ProfileEvent event) {
+ final Map<String, String> resultMap = new HashMap<>();
+ // parse fields
+ String delimeter = idConfig.getSeparator();
+ char cDelimeter = delimeter.charAt(0);
+ String strContext = null;
+ // for tab separator
+ byte[] bodyBytes = event.getBody();
+ int msgLength = event.getBody().length;
+ int contentOffset = idConfig.getContentOffset();
+ if (contentOffset > 0 && msgLength >= 1) {
+ strContext = new String(bodyBytes, contentOffset, msgLength - contentOffset, Charset.defaultCharset());
+ } else {
+ strContext = new String(bodyBytes, Charset.defaultCharset());
+ }
+ // unescape
+ List<String> columnValues = UnescapeHelper.toFiledList(strContext, cDelimeter);
+ // column size
+ List<String> contentFieldList = idConfig.getContentFieldList();
+ int matchSize = Math.min(contentFieldList.size(), columnValues.size());
+ for (int i = 0; i < matchSize; i++) {
+ resultMap.put(contentFieldList.get(i), columnValues.get(i));
+ }
+
+ // ftime
+ String ftime = dateFormat.format(new Date(event.getRawLogTime()));
+ resultMap.put("ftime", ftime);
+ // extinfo
+ String extinfo = getExtInfo(event);
+ resultMap.put("extinfo", extinfo);
+ return resultMap;
+ }
+
+ /**
+ * getExtInfo
+ *
+ * @param event
+ * @return
+ */
+ public static String getExtInfo(ProfileEvent event) {
+ String extinfoValue = event.getHeaders().get(KEY_EXTINFO);
+ if (extinfoValue != null) {
+ return KEY_EXTINFO + "=" + extinfoValue;
+ }
+ extinfoValue = KEY_EXTINFO + "=" + event.getHeaders().get(EventConstants.HEADER_KEY_SOURCE_IP);
+ return extinfoValue;
+ }
+
+ /**
+ * setValue
+ * @param idConfig
+ * @param columnValueMap
+ * @param pstat
+ * @throws SQLException
+ */
+ public void setValue(ClickHouseIdConfig idConfig, Map<String, String> columnValueMap, PreparedStatement pstat)
+ throws SQLException {
+ List<Pair<String, Integer>> dbFieldList = idConfig.getDbFieldList();
+ for (int i = 1; i <= dbFieldList.size(); i++) {
+ Pair<String, Integer> pair = dbFieldList.get(i - 1);
+ String fieldValue = columnValueMap.getOrDefault(pair.getKey(), "");
+ int fieldType = pair.getValue();
+ switch (fieldType) {
+ case Types.ARRAY :
+ // ARRAY = 2003;
+ // pstat.setArray(1, null); // String
+ pstat.setString(i, fieldValue);
Review Comment:
There are so many `pstat.setString(i, fieldValue);` in some different cases, suggest change as following:
```java
case A:
case B:
case C:
pstat.setString(i, fieldValue);
break;
case D:
// ...
```
--
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@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] luchunliang commented on a diff in pull request #4728: [INLONG-4726][SortStandalone] Support ClickHouse sink.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on code in PR #4728:
URL: https://github.com/apache/inlong/pull/4728#discussion_r904662247
##########
inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/sink/clickhouse/ClickHouseSink.java:
##########
@@ -0,0 +1,155 @@
+/**
+ * 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.inlong.sort.standalone.sink.clickhouse;
+
+import org.apache.flume.Channel;
+import org.apache.flume.Context;
+import org.apache.flume.Event;
+import org.apache.flume.EventDeliveryException;
+import org.apache.flume.Transaction;
+import org.apache.flume.conf.Configurable;
+import org.apache.flume.sink.AbstractSink;
+import org.apache.inlong.sort.standalone.channel.ProfileEvent;
+import org.apache.inlong.sort.standalone.dispatch.DispatchManager;
+import org.apache.inlong.sort.standalone.dispatch.DispatchProfile;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * ClickHouseSink
+ */
+public class ClickHouseSink extends AbstractSink implements Configurable {
+
+ public static final Logger LOG = LoggerFactory.getLogger(ClickHouseSink.class);
+
+ private Context parentContext;
+ private ClickHouseSinkContext context;
+ private DispatchManager dispatchManager;
+ private LinkedBlockingQueue<DispatchProfile> dispatchQueue = new LinkedBlockingQueue<>();
+ // workers
+ private List<ClickHouseChannelWorker> workers = new ArrayList<>();
+ // schedule
+ private ScheduledExecutorService scheduledPool;
+
+ /**
+ * start
+ */
+ @Override
+ public void start() {
+ super.start();
+ try {
+ this.context = new ClickHouseSinkContext(getName(), parentContext, getChannel(), dispatchQueue);
+ this.context.start();
+ for (int i = 0; i < context.getMaxThreads(); i++) {
+ ClickHouseChannelWorker worker = new ClickHouseChannelWorker(context, i);
+ this.workers.add(worker);
+ worker.start();
+ }
+ this.dispatchManager = new DispatchManager(parentContext, dispatchQueue);
+ this.scheduledPool = Executors.newScheduledThreadPool(2);
Review Comment:
Change thread number
--
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@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [inlong] luchunliang commented on a diff in pull request #4728: [INLONG-4726][SortStandalone] Support ClickHouse sink.
Posted by GitBox <gi...@apache.org>.
luchunliang commented on code in PR #4728:
URL: https://github.com/apache/inlong/pull/4728#discussion_r904662076
##########
inlong-sort-standalone/sort-standalone-source/src/main/java/org/apache/inlong/sort/standalone/sink/clickhouse/ClickHouseChannelWorker.java:
##########
@@ -0,0 +1,158 @@
+/**
Review Comment:
Change thread number, remove redundant space and asterisk.
--
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@inlong.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org