You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@seatunnel.apache.org by fa...@apache.org on 2022/09/29 06:19:58 UTC
[incubator-seatunnel] branch st-engine updated (38efee640 -> 73a699d47)
This is an automated email from the ASF dual-hosted git repository.
fanjia pushed a change to branch st-engine
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
from 38efee640 [Engine][Merge] fix merge problem
add 1148412b1 [Improve][api][flink] extraction unified method (#2862)
add eaa979a2d [Improve][e2e] Unified e2e IT for Redis (#2924)
add 3da11ce19 [Imporve][Connector-V2] Imporve iotdb connector (#2917)
add 9ba1b2349 [e2e][spark] Upgrade spark image to 2.4.6 (#2932)
add f8dcb92c1 Update .asf.yaml (#2939)
add f907927a3 [Improve][e2e] Improve jdbc driver management (#2770)
add f3ff39bdf [Improve][e2e] modify DM-driver by downLoad and add the value comparison of all columns (#2772)
add 1a92b8369 [Bug][format][json] Fix jackson package conflict with spark (#2934)
add 73a699d47 Merge remote-tracking branch 'upstream/dev' into st-engine
No new revisions were added by this update.
Summary of changes:
.asf.yaml | 2 +-
docs/en/connector-v2/sink/IoTDB.md | 143 ++++++++---
docs/en/connector-v2/sink/Jdbc.md | 53 +++-
docs/en/connector-v2/source/IoTDB.md | 69 +++++-
docs/en/connector-v2/source/Jdbc.md | 33 ++-
pom.xml | 4 +-
.../apache/seatunnel/flink/FlinkEnvironment.java | 41 +++-
.../flink/stream/FlinkStreamExecution.java | 13 +-
.../seatunnel/common/sink/AbstractSinkWriter.java | 2 +-
.../http/source/DeserializationCollector.java | 20 +-
.../seatunnel/iotdb/config/SinkConfig.java | 47 ++--
.../seatunnel/iotdb/constant/SourceConstants.java | 2 +
.../serialize/DefaultSeaTunnelRowDeserializer.java | 107 ++++++++
.../serialize/DefaultSeaTunnelRowSerializer.java | 268 +++++++++++----------
...rializer.java => SeaTunnelRowDeserializer.java} | 6 +-
.../seatunnel/iotdb/sink/IoTDBSinkClient.java | 2 +-
.../seatunnel/iotdb/sink/IoTDBSinkWriter.java | 13 +-
.../seatunnel/iotdb/source/IoTDBSource.java | 2 +-
.../seatunnel/iotdb/source/IoTDBSourceReader.java | 83 +++----
.../seatunnel/iotdb/source/IoTDBSourceSplit.java | 3 +
.../iotdb/source/IoTDBSourceSplitEnumerator.java | 134 ++++++++---
.../seatunnel/iotdb/state/IoTDBSourceState.java | 19 +-
seatunnel-connectors-v2/connector-jdbc/pom.xml | 34 ++-
.../execution/AbstractPluginExecuteProcessor.java | 14 +-
seatunnel-e2e/pom.xml | 2 +-
.../connector-assert-e2e/pom.xml | 2 +-
.../resources/assertion/fakesource_to_assert.conf | 3 -
.../connector-jdbc-it/pom.xml | 19 +-
.../connector-redis-e2e}/pom.xml | 13 +-
.../seatunnel/e2e/connector/redis/RedisIT.java | 183 ++++++++++++++
.../src/test/resources/log4j.properties | 0
.../src/test/resources/redis-to-redis.conf} | 33 ++-
seatunnel-e2e/seatunnel-connector-v2-e2e/pom.xml | 1 +
.../spark/AbstractTestSparkContainer.java | 2 +-
.../common/junit/ContainerTestingExtension.java | 14 +-
...inerExtension.java => DisabledOnContainer.java} | 21 +-
.../junit/TestCaseInvocationContextProvider.java | 16 +-
.../e2e/flink/v2/iotdb/FakeSourceToIoTDBIT.java | 128 ----------
.../seatunnel/e2e/flink/v2/iotdb/IoTDBIT.java | 209 ++++++++++++++++
...rce_to_iotdb.conf => iotdb_source_to_sink.conf} | 43 ++--
.../connector-jdbc-flink-e2e/pom.xml | 25 +-
.../seatunnel/e2e/flink/v2/jdbc/JdbcDmdbIT.java | 22 +-
.../seatunnel/e2e/flink/v2/jdbc/JdbcE2eUtil.java | 100 ++++++++
.../seatunnel/e2e/flink/v2/jdbc/JdbcMysqlIT.java | 9 +
.../seatunnel/e2e/flink/v2/jdbc/JdbcPhoenixIT.java | 7 +
.../e2e/flink/v2/jdbc/JdbcPostgresIT.java | 9 +
.../connector-redis-flink-e2e/pom.xml | 53 ----
.../seatunnel/e2e/flink/v2/redis/RedisIT.java | 92 -------
.../resources/redis/redis_source_and_sink.conf | 68 ------
.../seatunnel-flink-connector-v2-e2e/pom.xml | 1 -
.../e2e/spark/v2/iotdb/FakeSourceToIoTDBIT.java | 127 ----------
.../seatunnel/e2e/spark/v2/iotdb/IoTDBIT.java | 208 ++++++++++++++++
.../test/resources/iotdb/fakesource_to_iotdb.conf | 41 ++--
.../resources/iotdb/iotdb_source_to_sink.conf} | 43 ++--
.../connector-jdbc-spark-e2e/pom.xml | 25 +-
.../seatunnel/e2e/spark/v2/jdbc/JdbcDmdbIT.java | 44 +++-
.../seatunnel/e2e/spark/v2/jdbc/JdbcE2eUtil.java | 100 ++++++++
.../seatunnel/e2e/spark/v2/jdbc/JdbcMysqlIT.java | 9 +
.../seatunnel/e2e/spark/v2/jdbc/JdbcPhoenixIT.java | 7 +
.../e2e/spark/v2/jdbc/JdbcPostgresIT.java | 9 +
.../resources/jdbc/jdbc_dm_source_and_sink.conf | 53 +++-
.../connector-redis-spark-e2e/pom.xml | 53 ----
.../seatunnel/e2e/spark/v2/redis/RedisIT.java | 92 -------
.../src/test/resources/log4j.properties | 22 --
.../resources/redis/redis_source_and_sink.conf | 71 ------
.../seatunnel-spark-connector-v2-e2e/pom.xml | 1 -
.../seatunnel-connector-spark-jdbc-e2e/pom.xml | 15 +-
seatunnel-formats/seatunnel-format-json/pom.xml | 43 ++++
.../format/json/JsonDeserializationSchema.java | 17 +-
.../seatunnel/format/json/JsonToRowConverters.java | 202 ++++++++++++----
.../seatunnel/format/json/RowToJsonConverters.java | 228 ++++++++++++------
seatunnel-server/pom.xml | 3 +-
seatunnel-server/seatunnel-app/pom.xml | 2 +-
73 files changed, 2293 insertions(+), 1311 deletions(-)
create mode 100644 seatunnel-connectors-v2/connector-iotdb/src/main/java/org/apache/seatunnel/connectors/seatunnel/iotdb/serialize/DefaultSeaTunnelRowDeserializer.java
copy seatunnel-connectors-v2/connector-iotdb/src/main/java/org/apache/seatunnel/connectors/seatunnel/iotdb/serialize/{SeaTunnelRowSerializer.java => SeaTunnelRowDeserializer.java} (86%)
copy {seatunnel-connectors-v2/connector-file/connector-file-hadoop => seatunnel-e2e/seatunnel-connector-v2-e2e/connector-redis-e2e}/pom.xml (85%)
create mode 100644 seatunnel-e2e/seatunnel-connector-v2-e2e/connector-redis-e2e/src/test/java/org/apache/seatunnel/e2e/connector/redis/RedisIT.java
rename seatunnel-e2e/{seatunnel-flink-connector-v2-e2e/connector-redis-flink-e2e => seatunnel-connector-v2-e2e/connector-redis-e2e}/src/test/resources/log4j.properties (100%)
copy seatunnel-e2e/{seatunnel-engine-e2e/connector-console-seatunnel-e2e/src/test/resources/fakesource_to_console.conf => seatunnel-connector-v2-e2e/connector-redis-e2e/src/test/resources/redis-to-redis.conf} (62%)
copy seatunnel-e2e/seatunnel-e2e-common/src/test/java/org/apache/seatunnel/e2e/common/junit/{TestContainerExtension.java => DisabledOnContainer.java} (65%)
delete mode 100644 seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-iotdb-flink-e2e/src/test/java/org/apache/seatunnel/e2e/flink/v2/iotdb/FakeSourceToIoTDBIT.java
create mode 100644 seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-iotdb-flink-e2e/src/test/java/org/apache/seatunnel/e2e/flink/v2/iotdb/IoTDBIT.java
copy seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-iotdb-flink-e2e/src/test/resources/iotdb/{fakesource_to_iotdb.conf => iotdb_source_to_sink.conf} (50%)
create mode 100644 seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-jdbc-flink-e2e/src/test/java/org/apache/seatunnel/e2e/flink/v2/jdbc/JdbcE2eUtil.java
delete mode 100644 seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-redis-flink-e2e/pom.xml
delete mode 100644 seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-redis-flink-e2e/src/test/java/org/apache/seatunnel/e2e/flink/v2/redis/RedisIT.java
delete mode 100644 seatunnel-e2e/seatunnel-flink-connector-v2-e2e/connector-redis-flink-e2e/src/test/resources/redis/redis_source_and_sink.conf
delete mode 100644 seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-iotdb-spark-e2e/src/test/java/org/apache/seatunnel/e2e/spark/v2/iotdb/FakeSourceToIoTDBIT.java
create mode 100644 seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-iotdb-spark-e2e/src/test/java/org/apache/seatunnel/e2e/spark/v2/iotdb/IoTDBIT.java
rename seatunnel-e2e/{seatunnel-flink-connector-v2-e2e/connector-iotdb-flink-e2e/src/test/resources/iotdb/fakesource_to_iotdb.conf => seatunnel-spark-connector-v2-e2e/connector-iotdb-spark-e2e/src/test/resources/iotdb/iotdb_source_to_sink.conf} (50%)
create mode 100644 seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-jdbc-spark-e2e/src/test/java/org/apache/seatunnel/e2e/spark/v2/jdbc/JdbcE2eUtil.java
delete mode 100644 seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-redis-spark-e2e/pom.xml
delete mode 100644 seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-redis-spark-e2e/src/test/java/org/apache/seatunnel/e2e/spark/v2/redis/RedisIT.java
delete mode 100644 seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-redis-spark-e2e/src/test/resources/log4j.properties
delete mode 100644 seatunnel-e2e/seatunnel-spark-connector-v2-e2e/connector-redis-spark-e2e/src/test/resources/redis/redis_source_and_sink.conf