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.

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

[Feature][scaleph-plugin-seatunnel-connectors] upgrade seatunnel file connectors to 2.3.2 #605

Merged
merged 2 commits into from
Aug 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions index.d.ts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,11 @@ public enum FileProperties {
.addValidator(Validators.NON_BLANK_VALIDATOR)
.validateAndBuild();

public static final PropertyDescriptor<String> SHEET_NAME = new PropertyDescriptor.Builder()
.name("sheet_name")
.description("Reader the sheet of the workbook,Only used when file_format is excel.")
.type(PropertyType.STRING)
.parser(Parsers.STRING_PARSER)
.addValidator(Validators.NON_BLANK_VALIDATOR)
.validateAndBuild();
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ public enum FileSinkProperties {

public static final PropertyDescriptor<String> FILE_FORMAT = new PropertyDescriptor.Builder<String>()
.name("file_format")
.description("We supported as the following file types:text, csv, parquet, orc, json")
.description("We supported as the following file types:text, csv, excel, parquet, orc, json")
.type(PropertyType.STRING)
.defaultValue("text")
.allowableValues("text", "csv", "parquet", "orc", "json")
.allowableValues("text", "csv", "excel", "parquet", "orc", "json")
.parser(Parsers.STRING_PARSER)
.addValidator(Validators.NON_BLANK_VALIDATOR)
.validateAndBuild();
Expand Down Expand Up @@ -146,4 +146,12 @@ public enum FileSinkProperties {
.addValidator(Validators.NON_BLANK_VALIDATOR)
.validateAndBuild();

public static final PropertyDescriptor<Integer> MAX_ROWS_IN_MEMORY = new PropertyDescriptor.Builder()
.name("max_rows_in_memory")
.description("The compress codec of files")
.type(PropertyType.INT)
.parser(Parsers.INTEGER_PARSER)
.addValidator(Validators.POSITIVE_INTEGER_VALIDATOR)
.validateAndBuild();

}
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ public enum FileSourceProperties {

public static final PropertyDescriptor<String> FILE_FORMAT_TYPE = new PropertyDescriptor.Builder<String>()
.name("file_format_type")
.description("We support the following file types: text, csv, parquet, orc, json")
.description("We support the following file types: text, csv, excel, parquet, orc, json")
.type(PropertyType.STRING)
.parser(Parsers.STRING_PARSER)
.allowableValues("text", "csv", "parquet", "orc", "json")
.allowableValues("text", "csv", "excel", "parquet", "orc", "json")
.properties(Property.Required)
.addValidator(Validators.NON_BLANK_VALIDATOR)
.validateAndBuild();

public static final PropertyDescriptor<Long> SKIP_HEADER_ROW_NUMBER = new PropertyDescriptor.Builder<Long>()
public static final PropertyDescriptor<Long> SKIP_HEADER_ROW_NUMBER = new PropertyDescriptor.Builder()
.name("skip_header_row_number")
.description("Skip the first few lines, but only for the txt and csv.")
.type(PropertyType.INT)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.util.List;

import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.PATH;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.SHEET_NAME;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileSinkProperties.*;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.ftp.FtpFileProperties.*;

Expand Down Expand Up @@ -63,6 +64,8 @@ public FtpFileSinkPlugin() {
props.add(IS_ENABLE_TRANSACTION);
props.add(BATCH_SIZE);
props.add(COMPRESS_CODEC);
props.add(MAX_ROWS_IN_MEMORY);
props.add(SHEET_NAME);
props.add(CommonProperties.PARALLELISM);
props.add(CommonProperties.SOURCE_TABLE_NAME);
supportedProperties = Collections.unmodifiableList(props);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.util.List;

import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.PATH;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.SHEET_NAME;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileSourceProperties.*;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.ftp.FtpFileProperties.*;

Expand All @@ -50,6 +51,7 @@ public FtpFileSourcePlugin() {
final List<PropertyDescriptor> props = new ArrayList<>();
props.add(PATH);
props.add(SKIP_HEADER_ROW_NUMBER);
props.add(SHEET_NAME);
props.add(FILE_FORMAT_TYPE);
props.add(READ_COLUMNS);
props.add(SCHEMA);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import java.util.List;

import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.PATH;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.SHEET_NAME;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileSinkProperties.*;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.hdfs.HDFSProperties.FS_DEFAULT_FS;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.hdfs.HDFSProperties.HDFS_SITE_PATH;
Expand All @@ -52,16 +53,20 @@ public HDFSFileSinkPlugin() {
final List<PropertyDescriptor> props = new ArrayList<>();
props.add(PATH);
props.add(FILE_FORMAT);
props.add(CUSTOM_FILENAME);
props.add(FILE_NAME_EXPRESSION);
props.add(FILENAME_TIME_FORMAT);
props.add(FIELD_DELIMITER);
props.add(ROW_DELIMITER);
props.add(HAVE_PARTITION);
props.add(PARTITION_BY);
props.add(PARTITION_DIR_EXPRESSION);
props.add(IS_PARTITION_FIELD_WRITE_IN_FILE);
props.add(SINK_COLUMNS);
props.add(IS_ENABLE_TRANSACTION);
props.add(BATCH_SIZE);
props.add(MAX_ROWS_IN_MEMORY);
props.add(SHEET_NAME);
props.add(CommonProperties.PARALLELISM);
props.add(CommonProperties.SOURCE_TABLE_NAME);
supportedProperties = Collections.unmodifiableList(props);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import java.util.List;

import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.PATH;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.SHEET_NAME;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileSourceProperties.*;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.hdfs.HDFSProperties.FS_DEFAULT_FS;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.hdfs.HDFSProperties.HDFS_SITE_PATH;
Expand All @@ -52,6 +53,7 @@ public HDFSFileSourcePlugin() {
final List<PropertyDescriptor> props = new ArrayList<>();
props.add(PATH);
props.add(SKIP_HEADER_ROW_NUMBER);
props.add(SHEET_NAME);
props.add(FILE_FORMAT_TYPE);
props.add(READ_COLUMNS);
props.add(SCHEMA);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.util.List;

import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.PATH;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.SHEET_NAME;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileSinkProperties.*;

@AutoService(SeaTunnelConnectorPlugin.class)
Expand All @@ -43,16 +44,21 @@ public LocalFileSinkPlugin() {
final List<PropertyDescriptor> props = new ArrayList<>();
props.add(PATH);
props.add(FILE_FORMAT);
props.add(CUSTOM_FILENAME);
props.add(FILE_NAME_EXPRESSION);
props.add(FILENAME_TIME_FORMAT);
props.add(FIELD_DELIMITER);
props.add(ROW_DELIMITER);
props.add(HAVE_PARTITION);
props.add(PARTITION_BY);
props.add(PARTITION_DIR_EXPRESSION);
props.add(IS_PARTITION_FIELD_WRITE_IN_FILE);
props.add(SINK_COLUMNS);
props.add(IS_ENABLE_TRANSACTION);
props.add(BATCH_SIZE);
props.add(COMPRESS_CODEC);
props.add(MAX_ROWS_IN_MEMORY);
props.add(SHEET_NAME);
props.add(CommonProperties.PARALLELISM);
props.add(CommonProperties.SOURCE_TABLE_NAME);
supportedProperties = Collections.unmodifiableList(props);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.util.List;

import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.PATH;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.SHEET_NAME;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileSourceProperties.*;

@AutoService(SeaTunnelConnectorPlugin.class)
Expand All @@ -43,6 +44,7 @@ public LocalFileSourcePlugin() {
final List<PropertyDescriptor> props = new ArrayList<>();
props.add(PATH);
props.add(SKIP_HEADER_ROW_NUMBER);
props.add(SHEET_NAME);
props.add(FILE_FORMAT_TYPE);
props.add(READ_COLUMNS);
props.add(SCHEMA);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.util.List;

import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.PATH;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.SHEET_NAME;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileSinkProperties.*;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.oss.OSSProperties.*;

Expand All @@ -50,16 +51,20 @@ public OSSSinkPlugin() {
final List<PropertyDescriptor> props = new ArrayList<>();
props.add(PATH);
props.add(FILE_FORMAT);
props.add(CUSTOM_FILENAME);
props.add(FILE_NAME_EXPRESSION);
props.add(FILENAME_TIME_FORMAT);
props.add(FIELD_DELIMITER);
props.add(ROW_DELIMITER);
props.add(HAVE_PARTITION);
props.add(PARTITION_BY);
props.add(PARTITION_DIR_EXPRESSION);
props.add(IS_PARTITION_FIELD_WRITE_IN_FILE);
props.add(SINK_COLUMNS);
props.add(IS_ENABLE_TRANSACTION);
props.add(BATCH_SIZE);
props.add(MAX_ROWS_IN_MEMORY);
props.add(SHEET_NAME);
props.add(CommonProperties.PARALLELISM);
props.add(CommonProperties.SOURCE_TABLE_NAME);
supportedProperties = Collections.unmodifiableList(props);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.util.List;

import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.PATH;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.SHEET_NAME;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileSourceProperties.*;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.oss.OSSProperties.*;

Expand All @@ -50,6 +51,7 @@ public OSSSourcePlugin() {
final List<PropertyDescriptor> props = new ArrayList<>();
props.add(PATH);
props.add(SKIP_HEADER_ROW_NUMBER);
props.add(SHEET_NAME);
props.add(FILE_FORMAT_TYPE);
props.add(READ_COLUMNS);
props.add(SCHEMA);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.util.List;

import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.PATH;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.SHEET_NAME;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileSinkProperties.*;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.ossjindo.OSSJindoProperties.*;

Expand All @@ -50,16 +51,20 @@ public OSSJindoSinkPlugin() {
final List<PropertyDescriptor> props = new ArrayList<>();
props.add(PATH);
props.add(FILE_FORMAT);
props.add(CUSTOM_FILENAME);
props.add(FILE_NAME_EXPRESSION);
props.add(FILENAME_TIME_FORMAT);
props.add(FIELD_DELIMITER);
props.add(ROW_DELIMITER);
props.add(HAVE_PARTITION);
props.add(PARTITION_BY);
props.add(PARTITION_DIR_EXPRESSION);
props.add(IS_PARTITION_FIELD_WRITE_IN_FILE);
props.add(SINK_COLUMNS);
props.add(IS_ENABLE_TRANSACTION);
props.add(BATCH_SIZE);
props.add(MAX_ROWS_IN_MEMORY);
props.add(SHEET_NAME);
props.add(CommonProperties.PARALLELISM);
props.add(CommonProperties.SOURCE_TABLE_NAME);
supportedProperties = Collections.unmodifiableList(props);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.util.List;

import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.PATH;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.SHEET_NAME;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileSourceProperties.*;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.ossjindo.OSSJindoProperties.*;

Expand All @@ -50,6 +51,7 @@ public OSSJindoSourcePlugin() {
final List<PropertyDescriptor> props = new ArrayList<>();
props.add(PATH);
props.add(SKIP_HEADER_ROW_NUMBER);
props.add(SHEET_NAME);
props.add(FILE_FORMAT_TYPE);
props.add(READ_COLUMNS);
props.add(SCHEMA);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.util.List;

import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.PATH;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.SHEET_NAME;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileSinkProperties.*;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.s3.S3Properties.*;

Expand All @@ -51,16 +52,20 @@ public S3SinkPlugin() {
props.add(HADOOP_S3_PROPERTIES);
props.add(PATH);
props.add(FILE_FORMAT);
props.add(CUSTOM_FILENAME);
props.add(FILE_NAME_EXPRESSION);
props.add(FILENAME_TIME_FORMAT);
props.add(FIELD_DELIMITER);
props.add(ROW_DELIMITER);
props.add(HAVE_PARTITION);
props.add(PARTITION_BY);
props.add(PARTITION_DIR_EXPRESSION);
props.add(IS_PARTITION_FIELD_WRITE_IN_FILE);
props.add(SINK_COLUMNS);
props.add(IS_ENABLE_TRANSACTION);
props.add(BATCH_SIZE);
props.add(MAX_ROWS_IN_MEMORY);
props.add(SHEET_NAME);
props.add(CommonProperties.PARALLELISM);
props.add(CommonProperties.SOURCE_TABLE_NAME);
supportedProperties = Collections.unmodifiableList(props);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.util.List;

import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.PATH;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.SHEET_NAME;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileSourceProperties.*;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.s3.S3Properties.*;

Expand All @@ -51,6 +52,7 @@ public S3SourcePlugin() {
props.add(HADOOP_S3_PROPERTIES);
props.add(PATH);
props.add(SKIP_HEADER_ROW_NUMBER);
props.add(SHEET_NAME);
props.add(FILE_FORMAT_TYPE);
props.add(READ_COLUMNS);
props.add(SCHEMA);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.util.List;

import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.PATH;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.SHEET_NAME;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileSinkProperties.*;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.sftp.SftpFileProperties.*;

Expand All @@ -50,16 +51,20 @@ public SftpFileSinkPlugin() {
final List<PropertyDescriptor> props = new ArrayList<>();
props.add(PATH);
props.add(FILE_FORMAT);
props.add(CUSTOM_FILENAME);
props.add(FILE_NAME_EXPRESSION);
props.add(FILENAME_TIME_FORMAT);
props.add(FIELD_DELIMITER);
props.add(ROW_DELIMITER);
props.add(HAVE_PARTITION);
props.add(PARTITION_BY);
props.add(PARTITION_DIR_EXPRESSION);
props.add(IS_PARTITION_FIELD_WRITE_IN_FILE);
props.add(SINK_COLUMNS);
props.add(IS_ENABLE_TRANSACTION);
props.add(BATCH_SIZE);
props.add(MAX_ROWS_IN_MEMORY);
props.add(SHEET_NAME);
props.add(CommonProperties.PARALLELISM);
props.add(CommonProperties.SOURCE_TABLE_NAME);
supportedProperties = Collections.unmodifiableList(props);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.util.List;

import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.PATH;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileProperties.SHEET_NAME;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.FileSourceProperties.*;
import static cn.sliew.scaleph.plugin.seatunnel.flink.connectors.file.sftp.SftpFileProperties.*;

Expand All @@ -50,6 +51,7 @@ public SftpFileSourcePlugin() {
final List<PropertyDescriptor> props = new ArrayList<>();
props.add(PATH);
props.add(SKIP_HEADER_ROW_NUMBER);
props.add(SHEET_NAME);
props.add(FILE_FORMAT_TYPE);
props.add(READ_COLUMNS);
props.add(SCHEMA);
Expand Down
3 changes: 3 additions & 0 deletions scaleph-ui-react/src/locales/zh-CN/pages/project.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ export default {
'pages.project.di.step.schema.fields.type': 'type',
'pages.project.di.step.schema.delimiter': '字段分隔符',
'pages.project.di.step.schema.skipHeaderRowNumber': '跳过头部行号',
'pages.project.di.step.schema.sheetName': 'Sheet',

// column
'pages.project.di.step.column': '列',
Expand Down Expand Up @@ -227,6 +228,8 @@ export default {
'pages.project.di.step.baseFile.isEnableTransaction': '启用事务',
'pages.project.di.step.baseFile.batchSize': '单个文件最大行数',
'pages.project.di.step.baseFile.compressCodec': '压缩方式',
'pages.project.di.step.baseFile.maxRowsInMemory': '内存中缓存数据量',
'pages.project.di.step.baseFile.sheetName': 'Sheet',

// hdfs file
'pages.project.di.step.hdfsFile.defaultFS': 'fs.defaultFS',
Expand Down
Loading