Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[hotfix-769][clickhouse] repair bug due to ru.yandex.clickhouse.Click… #786

Merged
merged 1 commit into from
May 10, 2022
Merged

[hotfix-769][clickhouse] repair bug due to ru.yandex.clickhouse.Click… #786

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 65 additions & 0 deletions ...e/src/main/java/com/dtstack/flinkx/connector/clickhouse/source/ClickhouseInputFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,20 @@

import com.dtstack.flinkx.connector.clickhouse.util.ClickhouseUtil;
import com.dtstack.flinkx.connector.jdbc.source.JdbcInputFormat;
import com.dtstack.flinkx.connector.jdbc.source.JdbcInputSplit;
import com.dtstack.flinkx.util.ColumnBuildUtil;
import com.dtstack.flinkx.util.TableUtil;

import org.apache.flink.core.io.InputSplit;
import org.apache.flink.table.types.logical.RowType;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair;

import java.sql.Connection;
import java.sql.SQLException;
import java.util.LinkedList;
import java.util.List;

/**
* @program: flinkx
Expand All @@ -31,6 +42,60 @@
*/
public class ClickhouseInputFormat extends JdbcInputFormat {

@Override
public void openInternal(InputSplit inputSplit) {
JdbcInputSplit jdbcInputSplit = (JdbcInputSplit) inputSplit;
initMetric(jdbcInputSplit);
if (!canReadData(jdbcInputSplit)) {
LOG.warn(
"Not read data when the start location are equal to end location, start = {}, end = {}",
jdbcInputSplit.getStartLocation(),
jdbcInputSplit.getEndLocation());
hasNext = false;
return;
}

String querySQL = null;
try {
dbConn = getConnection();

Pair<List<String>, List<String>> pair = null;
List<String> fullColumnList = new LinkedList<>();
List<String> fullColumnTypeList = new LinkedList<>();
if (StringUtils.isBlank(jdbcConf.getCustomSql())) {
pair = getTableMetaData();
fullColumnList = pair.getLeft();
fullColumnTypeList = pair.getRight();
}
Pair<List<String>, List<String>> columnPair =
ColumnBuildUtil.handleColumnList(
jdbcConf.getColumn(), fullColumnList, fullColumnTypeList);
columnNameList = columnPair.getLeft();
columnTypeList = columnPair.getRight();

querySQL = buildQuerySql(jdbcInputSplit);
jdbcConf.setQuerySql(querySQL);
executeQuery(jdbcInputSplit.getStartLocation());
if (!resultSet.isClosed()) {
columnCount = resultSet.getMetaData().getColumnCount();
}
// 增量任务
isUpdateLocation =
jdbcConf.isIncrement() && !jdbcConf.isPolling() && !jdbcConf.isUseMaxFunc();
RowType rowType =
TableUtil.createRowType(
columnNameList, columnTypeList, jdbcDialect.getRawTypeConverter());
setRowConverter(
rowConverter == null
? jdbcDialect.getColumnConverter(rowType, jdbcConf)
: rowConverter);
} catch (SQLException se) {
String expMsg = se.getMessage();
expMsg = querySQL == null ? expMsg : expMsg + "\n querySQL: " + querySQL;
throw new IllegalArgumentException("open() failed." + expMsg, se);
}
}

@Override
protected Connection getConnection() throws SQLException {
return ClickhouseUtil.getConnection(
Expand Down