This is an automated email from the ASF dual-hosted git repository.
fanjia pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new 51d5bcba1 options in conditional need add to required or optional
options (#3501)
51d5bcba1 is described below
commit 51d5bcba10ba8047e744cf4c03fe8aad06b4fe76
Author: Eric <[email protected]>
AuthorDate: Tue Nov 22 14:01:55 2022 +0800
options in conditional need add to required or optional options (#3501)
---
.../seatunnel/clickhouse/sink/{client => }/ClickhouseSinkFactory.java | 2 +-
.../seatunnel/connectors/seatunnel/kafka/source/KafkaSourceFactory.java | 2 +-
.../seatunnel/connectors/seatunnel/redis/sink/RedisSinkFactory.java | 2 +-
.../seatunnel/connectors/seatunnel/redis/source/RedisSourceFactory.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/seatunnel-connectors-v2/connector-clickhouse/src/main/java/org/apache/seatunnel/connectors/seatunnel/clickhouse/sink/client/ClickhouseSinkFactory.java
b/seatunnel-connectors-v2/connector-clickhouse/src/main/java/org/apache/seatunnel/connectors/seatunnel/clickhouse/sink/ClickhouseSinkFactory.java
similarity index 99%
rename from
seatunnel-connectors-v2/connector-clickhouse/src/main/java/org/apache/seatunnel/connectors/seatunnel/clickhouse/sink/client/ClickhouseSinkFactory.java
rename to
seatunnel-connectors-v2/connector-clickhouse/src/main/java/org/apache/seatunnel/connectors/seatunnel/clickhouse/sink/ClickhouseSinkFactory.java
index ca67b7056..3a9dedf44 100644
---
a/seatunnel-connectors-v2/connector-clickhouse/src/main/java/org/apache/seatunnel/connectors/seatunnel/clickhouse/sink/client/ClickhouseSinkFactory.java
+++
b/seatunnel-connectors-v2/connector-clickhouse/src/main/java/org/apache/seatunnel/connectors/seatunnel/clickhouse/sink/ClickhouseSinkFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.seatunnel.connectors.seatunnel.clickhouse.sink.client;
+package org.apache.seatunnel.connectors.seatunnel.clickhouse.sink;
import static
org.apache.seatunnel.connectors.seatunnel.clickhouse.config.ClickhouseConfig.BULK_SIZE;
import static
org.apache.seatunnel.connectors.seatunnel.clickhouse.config.ClickhouseConfig.CLICKHOUSE_PREFIX;
diff --git
a/seatunnel-connectors-v2/connector-kafka/src/main/java/org/apache/seatunnel/connectors/seatunnel/kafka/source/KafkaSourceFactory.java
b/seatunnel-connectors-v2/connector-kafka/src/main/java/org/apache/seatunnel/connectors/seatunnel/kafka/source/KafkaSourceFactory.java
index 747a3542f..b115059b8 100644
---
a/seatunnel-connectors-v2/connector-kafka/src/main/java/org/apache/seatunnel/connectors/seatunnel/kafka/source/KafkaSourceFactory.java
+++
b/seatunnel-connectors-v2/connector-kafka/src/main/java/org/apache/seatunnel/connectors/seatunnel/kafka/source/KafkaSourceFactory.java
@@ -38,7 +38,7 @@ public class KafkaSourceFactory implements TableSourceFactory
{
public OptionRule optionRule() {
return OptionRule.builder()
.required(Config.TOPIC, Config.BOOTSTRAP_SERVERS)
- .optional(Config.PATTERN, Config.CONSUMER_GROUP,
Config.COMMIT_ON_CHECKPOINT, Config.KAFKA_CONFIG_PREFIX, Config.SCHEMA,
+ .optional(Config.START_MODE, Config.PATTERN,
Config.CONSUMER_GROUP, Config.COMMIT_ON_CHECKPOINT, Config.KAFKA_CONFIG_PREFIX,
Config.SCHEMA,
Config.FORMAT, Config.KEY_PARTITION_DISCOVERY_INTERVAL_MILLIS)
.conditional(Condition.of(Config.START_MODE, StartMode.TIMESTAMP),
Config.START_MODE_TIMESTAMP)
.conditional(Condition.of(Config.START_MODE,
StartMode.SPECIFIC_OFFSETS), Config.START_MODE_OFFSETS)
diff --git
a/seatunnel-connectors-v2/connector-redis/src/main/java/org/apache/seatunnel/connectors/seatunnel/redis/sink/RedisSinkFactory.java
b/seatunnel-connectors-v2/connector-redis/src/main/java/org/apache/seatunnel/connectors/seatunnel/redis/sink/RedisSinkFactory.java
index 9cc3525dc..2f43a6b69 100644
---
a/seatunnel-connectors-v2/connector-redis/src/main/java/org/apache/seatunnel/connectors/seatunnel/redis/sink/RedisSinkFactory.java
+++
b/seatunnel-connectors-v2/connector-redis/src/main/java/org/apache/seatunnel/connectors/seatunnel/redis/sink/RedisSinkFactory.java
@@ -35,7 +35,7 @@ public class RedisSinkFactory implements TableSinkFactory {
public OptionRule optionRule() {
return OptionRule.builder()
.required(RedisConfig.HOST, RedisConfig.PORT, RedisConfig.KEY,
RedisConfig.DATA_TYPE)
- .optional(RedisConfig.AUTH, RedisConfig.USER,
RedisConfig.KEY_PATTERN, RedisConfig.FORMAT)
+ .optional(RedisConfig.MODE, RedisConfig.AUTH, RedisConfig.USER,
RedisConfig.KEY_PATTERN, RedisConfig.FORMAT)
.conditional(RedisConfig.MODE, RedisConfig.RedisMode.CLUSTER,
RedisConfig.NODES)
.build();
}
diff --git
a/seatunnel-connectors-v2/connector-redis/src/main/java/org/apache/seatunnel/connectors/seatunnel/redis/source/RedisSourceFactory.java
b/seatunnel-connectors-v2/connector-redis/src/main/java/org/apache/seatunnel/connectors/seatunnel/redis/source/RedisSourceFactory.java
index 1a20713e4..23b506da4 100644
---
a/seatunnel-connectors-v2/connector-redis/src/main/java/org/apache/seatunnel/connectors/seatunnel/redis/source/RedisSourceFactory.java
+++
b/seatunnel-connectors-v2/connector-redis/src/main/java/org/apache/seatunnel/connectors/seatunnel/redis/source/RedisSourceFactory.java
@@ -36,7 +36,7 @@ public class RedisSourceFactory implements TableSourceFactory
{
public OptionRule optionRule() {
return OptionRule.builder()
.required(RedisConfig.HOST, RedisConfig.PORT, RedisConfig.KEY,
RedisConfig.DATA_TYPE)
- .optional(RedisConfig.HASH_KEY_PARSE_MODE, RedisConfig.AUTH,
RedisConfig.USER, RedisConfig.KEY_PATTERN)
+ .optional(RedisConfig.MODE, RedisConfig.HASH_KEY_PARSE_MODE,
RedisConfig.AUTH, RedisConfig.USER, RedisConfig.KEY_PATTERN)
.conditional(RedisConfig.MODE, RedisConfig.RedisMode.CLUSTER,
RedisConfig.NODES)
.bundled(RedisConfig.FORMAT, SeaTunnelSchema.SCHEMA)
.build();
