Skip to content

Commit

Permalink
add auto create table
Browse files Browse the repository at this point in the history
  • Loading branch information
wudi committed Nov 29, 2023
1 parent 734662e commit 9e62978
Show file tree
Hide file tree
Showing 8 changed files with 184 additions and 38 deletions.
1 change: 1 addition & 0 deletions ...doris-connector/src/main/java/org/apache/doris/flink/sink/schema/SchemaChangeManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ public boolean execute(String ddl, String database) throws IOException, IllegalA
if(StringUtils.isNullOrWhitespaceOnly(ddl)){
return false;
}
LOG.info("Execute query: {}", ddl);
Map<String, String> param = new HashMap<>();
param.put("stmt", ddl);
String requestUrl = String.format(SCHEMA_CHANGE_API,
Expand Down
152 changes: 124 additions & 28 deletions ...main/java/org/apache/doris/flink/sink/writer/serializer/JsonDebeziumSchemaSerializer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.fasterxml.jackson.databind.node.NullNode;
import org.apache.commons.collections.CollectionUtils;
import org.apache.doris.flink.catalog.doris.FieldSchema;
import org.apache.doris.flink.catalog.doris.TableSchema;
import org.apache.doris.flink.cfg.DorisExecutionOptions;
import org.apache.doris.flink.cfg.DorisOptions;
import org.apache.doris.flink.exception.IllegalArgumentException;
Expand All @@ -41,13 +42,15 @@
import org.apache.flink.annotation.VisibleForTesting;
import org.apache.flink.api.java.tuple.Tuple2;
import org.apache.flink.util.CollectionUtil;
import org.apache.flink.util.Preconditions;
import org.apache.flink.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
Expand All @@ -67,7 +70,6 @@ public class JsonDebeziumSchemaSerializer implements DorisRecordSerializer<Strin
private static final String OP_CREATE = "c"; // insert
private static final String OP_UPDATE = "u"; // update
private static final String OP_DELETE = "d"; // delete

public static final String EXECUTE_DDL = "ALTER TABLE %s %s COLUMN %s %s"; // alter table tbl add cloumn aca int
private static final String addDropDDLRegex
= "ALTER\\s+TABLE\\s+[^\\s]+\\s+(ADD|DROP)\\s+(COLUMN\\s+)?([^\\s]+)(\\s+([^\\s]+))?.*";
Expand Down Expand Up @@ -214,44 +216,70 @@ public boolean schemaChangeV2(JsonNode recordRoot) {
return false;
}

// db,table
Tuple2<String, String> tuple = getDorisTableTuple(recordRoot);
if(tuple == null){
return false;
}

List<String> ddlSqlList = extractDDLList(recordRoot);
if (CollectionUtils.isEmpty(ddlSqlList)) {
LOG.info("ddl can not do schema change:{}", recordRoot);
EventType eventType = extractEventType(recordRoot);
if(eventType == null){
return false;
}

List<DDLSchema> ddlSchemas = SchemaChangeHelper.getDdlSchemas();
for (int i = 0; i < ddlSqlList.size(); i++) {
DDLSchema ddlSchema = ddlSchemas.get(i);
String ddlSql = ddlSqlList.get(i);
boolean doSchemaChange = checkSchemaChange(tuple.f0, tuple.f1, ddlSchema);
status = doSchemaChange && schemaChangeManager.execute(ddlSql, tuple.f0);
LOG.info("schema change status:{}, ddl:{}", status, ddlSql);
if(eventType.equals(EventType.CREATE)){
TableSchema tableSchema = extractCreateTableSchema(recordRoot);
status = schemaChangeManager.createTable(tableSchema);
if(status){
String cdcTbl = getCdcTableIdentifier(recordRoot);
String dorisTbl = getCreateTableIdentifier(recordRoot);
tableMapping.put(cdcTbl, dorisTbl);
LOG.info("create table ddl status: {}", status);
}
} else if (eventType.equals(EventType.ALTER)){
// db,table
Tuple2<String, String> tuple = getDorisTableTuple(recordRoot);
if(tuple == null){
return false;
}
List<String> ddlSqlList = extractDDLList(recordRoot);
if (CollectionUtils.isEmpty(ddlSqlList)) {
LOG.info("ddl can not do schema change:{}", recordRoot);
return false;
}
List<DDLSchema> ddlSchemas = SchemaChangeHelper.getDdlSchemas();
for (int i = 0; i < ddlSqlList.size(); i++) {
DDLSchema ddlSchema = ddlSchemas.get(i);
String ddlSql = ddlSqlList.get(i);
boolean doSchemaChange = checkSchemaChange(tuple.f0, tuple.f1, ddlSchema);
status = doSchemaChange && schemaChangeManager.execute(ddlSql, tuple.f0);
LOG.info("schema change status:{}, ddl:{}", status, ddlSql);
}
} else{
LOG.info("Unsupported event type {}", eventType);
}
} catch (Exception ex) {
LOG.warn("schema change error :", ex);
}
return status;
}

protected JsonNode extractTableChange(JsonNode record) throws JsonProcessingException {
JsonNode historyRecord = extractHistoryRecord(record);
JsonNode tableChanges = historyRecord.get("tableChanges");
if(!Objects.isNull(tableChanges)){
JsonNode tableChange = tableChanges.get(0);
return tableChange;
}
return null;
}

/**
* Parse Alter Event
*/
@VisibleForTesting
public List<String> extractDDLList(JsonNode record) throws JsonProcessingException {
public List<String> extractDDLList(JsonNode record) throws IOException{
String dorisTable = getDorisTableIdentifier(record);
JsonNode historyRecord = extractHistoryRecord(record);
JsonNode tableChanges = historyRecord.get("tableChanges");
String ddl = extractJsonNode(historyRecord, "ddl");
if (Objects.isNull(tableChanges) || Objects.isNull(ddl)) {
return new ArrayList<>();
JsonNode tableChange = extractTableChange(record);
if (Objects.isNull(tableChange) || Objects.isNull(ddl)) {
return null;
}
LOG.debug("received debezium ddl :{}", ddl);
JsonNode tableChange = tableChanges.get(0);
if (Objects.isNull(tableChange) || !tableChange.get("type").asText().equals("ALTER")) {
if(!EventType.ALTER.equals(extractEventType(record))){
return null;
}

Expand Down Expand Up @@ -285,6 +313,46 @@ public List<String> extractDDLList(JsonNode record) throws JsonProcessingExcepti
return SchemaChangeHelper.generateDDLSql(dorisTable);
}

private TableSchema extractCreateTableSchema(JsonNode record) throws JsonProcessingException {
String dorisTable = getDorisTableIdentifier(record);
JsonNode tableChange = extractTableChange(record);
JsonNode pkColumns = tableChange.get("table").get("primaryKeyColumnNames");
JsonNode columns = tableChange.get("table").get("columns");
String tblComment = tableChange.get("table").get("comment").asText();
Map<String, FieldSchema> field = new LinkedHashMap<>();
for (JsonNode column : columns) {
buildFieldSchema(field, column);
}
List<String> pkList = new ArrayList<>();
for(JsonNode column : pkColumns){
String fieldName = column.get("name").asText();
pkList.add(fieldName);
}

TableSchema tableSchema = new TableSchema();
tableSchema.setFields(field);
tableSchema.setKeys(pkList);
tableSchema.setDistributeKeys(buildDistributeKeys(pkList, field));
tableSchema.setTableComment(tblComment);

String[] split = dorisTable.split("\\.");
Preconditions.checkArgument(split.length == 2);
tableSchema.setDatabase(split[0]);
tableSchema.setTable(split[1]);
return tableSchema;
}

private List<String> buildDistributeKeys(List<String> primaryKeys, Map<String, FieldSchema> fields) {
if (!CollectionUtil.isNullOrEmpty(primaryKeys)) {
return primaryKeys;
}
if(!fields.isEmpty()){
Map.Entry<String, FieldSchema> firstField = fields.entrySet().iterator().next();
return Collections.singletonList(firstField.getKey());
}
return new ArrayList<>();
}

@VisibleForTesting
public void setOriginFieldSchemaMap(Map<String, FieldSchema> originFieldSchemaMap) {
this.originFieldSchemaMap = originFieldSchemaMap;
Expand Down Expand Up @@ -334,6 +402,12 @@ public String getCdcTableIdentifier(JsonNode record){
return SourceSchema.getString(db, schema, table);
}

public String getCreateTableIdentifier(JsonNode record){
String db = extractJsonNode(record.get("source"), "db");
String table = extractJsonNode(record.get("source"), "table");
return db + "." + table;
}

public String getDorisTableIdentifier(String cdcTableIdentifier){
if(!StringUtils.isNullOrWhitespaceOnly(dorisOptions.getTableIdentifier())){
return dorisOptions.getTableIdentifier();
Expand Down Expand Up @@ -405,6 +479,25 @@ protected String extractTable(JsonNode record) {
return extractJsonNode(record.get("source"), "table");
}

/**
* Parse event type
*/
protected EventType extractEventType(JsonNode record) throws JsonProcessingException {
JsonNode tableChange = extractTableChange(record);
if(tableChange == null || tableChange.get("type") == null){
return null;
}
String type = tableChange.get("type").asText();
if(EventType.ALTER.toString().equalsIgnoreCase(type)){
return EventType.ALTER;
}else if(EventType.CREATE.toString().equalsIgnoreCase(type)){
return EventType.CREATE;
}else{
LOG.error("Unsupported event type {}", type);
}
return null;
}

private String extractJsonNode(JsonNode record, String key) {
return record != null && record.get(key) != null &&
!(record.get(key) instanceof NullNode) ? record.get(key).asText() : null;
Expand All @@ -425,7 +518,7 @@ private Map<String, Object> extractRow(JsonNode recordRow) {
}

private JsonNode extractHistoryRecord(JsonNode record) throws JsonProcessingException {
if (record.has("historyRecord")) {
if (record != null && record.has("historyRecord")) {
return objectMapper.readTree(record.get("historyRecord").asText());
}
// The ddl passed by some scenes will not be included in the historyRecord, such as DebeziumSourceFunction
Expand All @@ -452,8 +545,6 @@ public String extractDDL(JsonNode record) throws JsonProcessingException {
return null;
}



@VisibleForTesting
public void fillOriginSchema(JsonNode columns) {
if (Objects.nonNull(originFieldSchemaMap)) {
Expand Down Expand Up @@ -624,4 +715,9 @@ private String handleType(String type) {

}

enum EventType{
ALTER,
CREATE
}

}
2 changes: 1 addition & 1 deletion flink-doris-connector/src/main/java/org/apache/doris/flink/table/DorisConfigOptions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public class DorisConfigOptions {
.defaultValue(DORIS_DESERIALIZE_ARROW_ASYNC_DEFAULT)
.withDescription("");
public static final ConfigOption<Integer> DORIS_DESERIALIZE_QUEUE_SIZE = ConfigOptions
.key("doris.request.retriesdoris.deserialize.queue.size")
.key("doris.deserialize.queue.size")
.intType()
.defaultValue(DORIS_DESERIALIZE_QUEUE_SIZE_DEFAULT)
.withDescription("");
Expand Down
27 changes: 25 additions & 2 deletions flink-doris-connector/src/main/java/org/apache/doris/flink/tools/cdc/DatabaseSync.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import java.util.Map;
import java.util.Properties;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

public abstract class DatabaseSync {
private static final Logger LOG = LoggerFactory.getLogger(DatabaseSync.class);
Expand Down Expand Up @@ -83,6 +84,11 @@ public abstract class DatabaseSync {

public abstract DataStreamSource<String> buildCdcSource(StreamExecutionEnvironment env);

/**
* Get the prefix of a specific tableList, for example, mysql is database, oracle is schema
*/
public abstract String getTableListPrefix();

public DatabaseSync() throws SQLException {
registerDriver();
}
Expand Down Expand Up @@ -132,8 +138,7 @@ public void build() throws Exception {
System.out.println("Create table finished.");
System.exit(0);
}

config.setString(TABLE_NAME_OPTIONS, "(" + String.join("|", syncTables) + ")");
config.setString(TABLE_NAME_OPTIONS, getSyncTableList(syncTables));
DataStreamSource<String> streamSource = buildCdcSource(env);
if(singleSink){
streamSource.sinkTo(buildDorisSink());
Expand Down Expand Up @@ -259,6 +264,24 @@ protected boolean isSyncNeeded(String tableName) {
LOG.debug("table {} is synchronized? {}", tableName, sync);
return sync;
}

protected String getSyncTableList(List<String> syncTables){
if(!singleSink){
return syncTables.stream()
.map(v-> getTableListPrefix() + "\\." + v)
.collect(Collectors.joining("|"));
}else{
// includingTablePattern and ^excludingPattern
String includingPattern = String.format("(%s)\\.(%s)", getTableListPrefix(), includingTables);
if (excludingTables.isEmpty()) {
return includingPattern;
}else{
String excludingPattern = String.format("?!(^%s$)", getTableListPrefix() + "\\." + excludingTables);
return String.format("(%s)(%s)", includingPattern, excludingPattern);
}
}
}

/**
* Filter table that many tables merge to one
*/
Expand Down
10 changes: 9 additions & 1 deletion ...ris-connector/src/main/java/org/apache/doris/flink/tools/cdc/mysql/MysqlDatabaseSync.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@ public DataStreamSource<String> buildCdcSource(StreamExecutionEnvironment env) {
.username(config.get(MySqlSourceOptions.USERNAME))
.password(config.get(MySqlSourceOptions.PASSWORD))
.databaseList(databaseName)
.tableList(databaseName + "." + tableName);
.tableList(tableName)
//default open add newly table
.scanNewlyAddedTableEnabled(true);

config.getOptional(MySqlSourceOptions.SERVER_ID).ifPresent(sourceBuilder::serverId);
config
Expand Down Expand Up @@ -215,6 +217,12 @@ public DataStreamSource<String> buildCdcSource(StreamExecutionEnvironment env) {
mySqlSource, WatermarkStrategy.noWatermarks(), "MySQL Source");
}

@Override
public String getTableListPrefix() {
String databaseName = config.get(MySqlSourceOptions.DATABASE_NAME);
return databaseName;
}

/**
* set chunkkeyColumn,eg: db.table1:column1,db.table2:column2
* @param sourceBuilder
Expand Down
10 changes: 8 additions & 2 deletions ...s-connector/src/main/java/org/apache/doris/flink/tools/cdc/oracle/OracleDatabaseSync.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ public DataStreamSource<String> buildCdcSource(StreamExecutionEnvironment env) {
.port(port)
.databaseList(databaseName)
.schemaList(schemaName)
.tableList(schemaName + "." + tableName)
.tableList(tableName)
.username(username)
.password(password)
.includeSchemaChanges(true)
Expand All @@ -199,12 +199,18 @@ public DataStreamSource<String> buildCdcSource(StreamExecutionEnvironment env) {
.password(password)
.database(databaseName)
.schemaList(schemaName)
.tableList(schemaName + "." + tableName)
.tableList(tableName)
.debeziumProperties(debeziumProperties)
.startupOptions(startupOptions)
.deserializer(schema)
.build();
return env.addSource(oracleSource, "Oracle Source");
}
}

@Override
public String getTableListPrefix() {
String schemaName = config.get(OracleSourceOptions.SCHEMA_NAME);
return schemaName;
}
}
10 changes: 8 additions & 2 deletions ...nnector/src/main/java/org/apache/doris/flink/tools/cdc/postgres/PostgresDatabaseSync.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public DataStreamSource<String> buildCdcSource(StreamExecutionEnvironment env) {
.port(port)
.database(databaseName)
.schemaList(schemaName)
.tableList(schemaName + "." + tableName)
.tableList(tableName)
.username(username)
.password(password)
.deserializer(schema)
Expand All @@ -185,7 +185,7 @@ public DataStreamSource<String> buildCdcSource(StreamExecutionEnvironment env) {
.port(port)
.database(databaseName)
.schemaList(schemaName)
.tableList(schemaName + "." + tableName)
.tableList(tableName)
.username(username)
.password(password)
.debeziumProperties(debeziumProperties)
Expand All @@ -196,4 +196,10 @@ public DataStreamSource<String> buildCdcSource(StreamExecutionEnvironment env) {
return env.addSource(postgresSource, "Postgres Source");
}
}

@Override
public String getTableListPrefix() {
String schemaName = config.get(PostgresSourceOptions.SCHEMA_NAME);
return schemaName;
}
}
Loading

0 comments on commit 9e62978

Please sign in to comment.