-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '1.10_release' into git_1.10_release
# Conflicts: # docs/quickstart.md # flinkx-core/src/main/java/com/dtstack/flinkx/util/RangeSplitUtil.java # flinkx-kafka/flinkx-kafka-writer/src/main/java/com/dtstack/flinkx/kafka/writer/KafkaWriter.java # flinkx-kafka10/flinkx-kafka10-writer/src/main/java/com/dtstack/flinkx/kafka10/writer/Kafka10Writer.java # flinkx-kafka11/flinkx-kafka11-writer/src/main/java/com/dtstack/flinkx/kafka11/writer/Kafka11Writer.java # flinkx-launcher/src/main/java/com/dtstack/flinkx/launcher/perJob/PerJobClusterClientBuilder.java # flinkx-launcher/src/main/resources/log4j.properties # flinkx-postgresql/flinkx-postgresql-core/src/main/java/com/dtstack/flinkx/postgresql/PostgresqlTypeConverter.java # flinkx-rdb/flinkx-rdb-core/src/main/java/com/dtstack/flinkx/rdb/util/DbUtil.java # flinkx-rdb/flinkx-rdb-writer/src/main/java/com/dtstack/flinkx/rdb/outputformat/JdbcOutputFormat.java # flinkx-test/src/main/java/com/dtstack/flinkx/test/LocalTest.java # pom.xml
- Loading branch information
Showing
262 changed files
with
7,376 additions
and
1,978 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,4 +10,5 @@ nohup.out | |
| flinkconf/ | ||
| hadoopconf/ | ||
| /default_task_id_output | ||
| /syncplugins | ||
| /syncplugins | ||
| /ci/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| { | ||
| "job": { | ||
| "content": [ | ||
| { | ||
| "reader": { | ||
| "parameter": { | ||
| "topic": "kafka09", | ||
| "groupId": "default", | ||
| "codec": "text", | ||
| "encoding": "UTF-8", | ||
| "blankIgnore": false, | ||
| "consumerSettings": { | ||
| "zookeeper.connect": "localhost:2181/kafka09" | ||
| } | ||
| }, | ||
| "name": "kafka09reader" | ||
| }, | ||
| "writer": { | ||
| "parameter": { | ||
| "print": true | ||
| }, | ||
| "name": "streamwriter" | ||
| } | ||
| } | ||
| ], | ||
| "setting": { | ||
| "restore": { | ||
| "isRestore": false, | ||
| "isStream": true | ||
| }, | ||
| "speed": { | ||
| "channel": 1 | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| { | ||
| "job": { | ||
| "content": [ | ||
| { | ||
| "reader": { | ||
| "parameter": { | ||
| "topic": "kafka10", | ||
| "groupId": "default", | ||
| "codec": "text", | ||
| "encoding": "UTF-8", | ||
| "blankIgnore": false, | ||
| "consumerSettings": { | ||
| "bootstrap.servers": "localhost:9092" | ||
| } | ||
| }, | ||
| "name": "kafka10reader" | ||
| }, | ||
| "writer": { | ||
| "parameter": { | ||
| "print": true | ||
| }, | ||
| "name": "streamwriter" | ||
| } | ||
| } | ||
| ], | ||
| "writer": { | ||
| "parameter": { | ||
| "print": true | ||
| }, | ||
| "name": "streamwriter" | ||
| } | ||
| }, | ||
| "setting": { | ||
| "restore": { | ||
| "isRestore": false, | ||
| "isStream": true | ||
| }, | ||
| "speed": { | ||
| "channel": 1 | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| { | ||
| "job": { | ||
| "content": [ | ||
| { | ||
| "reader": { | ||
| "parameter": { | ||
| "topic": "kafka11", | ||
| "groupId": "default", | ||
| "codec": "text", | ||
| "encoding": "UTF-8", | ||
| "blankIgnore": false, | ||
| "consumerSettings": { | ||
| "bootstrap.servers": "localhost:9092" | ||
| } | ||
| }, | ||
| "name": "kafka11reader" | ||
| }, | ||
| "writer": { | ||
| "parameter": { | ||
| "print": true | ||
| }, | ||
| "name": "streamwriter" | ||
| } | ||
| } | ||
| ], | ||
| "setting": { | ||
| "restore": { | ||
| "isRestore": false, | ||
| "isStream": true | ||
| }, | ||
| "speed": { | ||
| "channel": 1 | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| { | ||
| "job": { | ||
| "content": [ | ||
| { | ||
| "reader" : { | ||
| "parameter" : { | ||
| "topic" : "test", | ||
| "mode": "timestamp", | ||
| "timestamp": 1609812275000, | ||
| "codec": "text", | ||
| "consumerSettings" : { | ||
| "bootstrap.servers" : "ip1:9092,ip2:9092,ip3:9092" | ||
| } | ||
| }, | ||
| "name" : "kafkareader" | ||
| }, | ||
| "writer": { | ||
| "parameter" : { | ||
| "jdbcUrl" : "jdbc:hive2://ip:10000/test", | ||
| "fileType" : "parquet", | ||
| "writeMode" : "overwrite", | ||
| "compress" : "", | ||
| "charsetName" : "UTF-8", | ||
| "maxFileSize" : 1073741824, | ||
| "tablesColumn" : "{\"message\":[{\"part\":false,\"comment\":\"\",\"type\":\"string\",\"key\":\"message\"}]}", | ||
| "partition" : "pt", | ||
| "partitionType" : "DAY", | ||
| "defaultFS" : "hdfs://ns", | ||
| "hadoopConfig": { | ||
| "dfs.ha.namenodes.ns": "nn1,nn2", | ||
| "dfs.namenode.rpc-address.ns.nn2": "ip1:9000", | ||
| "dfs.client.failover.proxy.provider.ns": "org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider", | ||
| "dfs.namenode.rpc-address.ns.nn1": "ip2:9000", | ||
| "dfs.nameservices": "ns" | ||
| } | ||
| }, | ||
| "name" : "hivewriter" | ||
| } | ||
| } | ||
| ], | ||
| "setting": { | ||
| "restore": { | ||
| "isRestore": true, | ||
| "isStream": true | ||
| }, | ||
| "speed": { | ||
| "readerChannel": 3, | ||
| "writerChannel": 1 | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| { | ||
| "job": { | ||
| "content": [ | ||
| { | ||
| "reader": { | ||
| "parameter": { | ||
| "topic": "tudou", | ||
| "mode": "timestamp", | ||
| "timestamp": 1609812275000, | ||
| "offset": "partition:0,offset:0;partition:1,offset:1;partition:2,offset:2", | ||
| "codec": "text", | ||
| "blankIgnore": false, | ||
| "consumerSettings": { | ||
| "bootstrap.servers": "ip1:9092,ip2:9092,ip3:9092" | ||
| }, | ||
| "column": ["id","user_id","name"] | ||
| }, | ||
| "name": "kafkareader" | ||
| }, | ||
| "writer": { | ||
| "name": "mysqlwriter", | ||
| "parameter": { | ||
| "username": "root", | ||
| "password": "abc123", | ||
| "connection": [ | ||
| { | ||
| "jdbcUrl": "jdbc:mysql://localhost:3306/test", | ||
| "table": [ | ||
| "test" | ||
| ] | ||
| } | ||
| ], | ||
| "preSql": ["truncate table test;"], | ||
| "postSql": [], | ||
| "writeMode": "insert", | ||
| "column": [ | ||
| { | ||
| "name": "id", | ||
| "type": "BIGINT" | ||
| }, | ||
| { | ||
| "name": "user_id", | ||
| "type": "BIGINT" | ||
| }, | ||
| { | ||
| "name": "name", | ||
| "type": "varchar" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| ], | ||
| "setting": { | ||
| "restore": { | ||
| "isRestore": true, | ||
| "isStream": true | ||
| }, | ||
| "speed": { | ||
| "readerChannel": 3, | ||
| "writerChannel": 1 | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "job": { | ||
| "content": [ | ||
| { | ||
| "reader": { | ||
| "parameter": { | ||
| "topic": "test", | ||
| "mode": "timestamp", | ||
| "timestamp": 1609812275000, | ||
| "offset": "partition:0,offset:0;partition:1,offset:1;partition:2,offset:2", | ||
| "codec": "text", | ||
| "blankIgnore": false, | ||
| "consumerSettings": { | ||
| "bootstrap.servers": "ip1:9092,ip2:9092,ip3:9092" | ||
| } | ||
| }, | ||
| "name": "kafkareader" | ||
| }, | ||
| "writer": { | ||
| "parameter": { | ||
| "print": true | ||
| }, | ||
| "name": "streamwriter" | ||
| } | ||
| } | ||
| ], | ||
| "setting": { | ||
| "speed": { | ||
| "readerChannel": 3, | ||
| "writerChannel": 1 | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| { | ||
| "job" : { | ||
| "content" : [ { | ||
| "reader" : { | ||
| "parameter" : { | ||
| "column" : [ { | ||
| "name": "id", | ||
| "type" : "id" | ||
| }, { | ||
| "name": "string", | ||
| "type" : "string" | ||
| } ], | ||
| "sliceRecordCount" : [ "10"] | ||
| }, | ||
| "name" : "streamreader" | ||
| }, | ||
| "writer" : { | ||
| "parameter" : { | ||
| "print" : true | ||
| }, | ||
| "name" : "streamwriter" | ||
| } | ||
| } ], | ||
| "setting" : { | ||
| "speed" : { | ||
| "channel" : 1 | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.