* [Cherry-pick-3.0.1][fix-#11691] Add lz4-java in clickhouse datasource. #11697 * [Cherry-pick-3.0.1][fix-#11689] change replaceAll to replace in method of tryExecuteSqlResolveColumnNames #11696 * [fix-11378] fix API-Server release response message typo (#11400) * [fix-11295] remove duplicate classes * [fix-11378] fix response message error Co-authored-by: fuchanghai <changhai.fu@marketingforce.com> Co-authored-by: fuchanghai <33984497+fuchanghai@users.noreply.github.com> Co-authored-by: fuchanghai <changhai.fu@marketingforce.com>
This commit is contained in:
parent
257187c521
commit
5df86d0b7e
|
|
@ -242,8 +242,8 @@ public enum Status {
|
|||
PROCESS_INSTANCE_NOT_EXIST(50001, "process instance {0} does not exist", "工作流实例[{0}]不存在"),
|
||||
PROCESS_INSTANCE_EXIST(50002, "process instance {0} already exists", "工作流实例[{0}]已存在"),
|
||||
PROCESS_DEFINE_NOT_EXIST(50003, "process definition {0} does not exist", "工作流定义[{0}]不存在"),
|
||||
PROCESS_DEFINE_NOT_RELEASE(50004, "process definition {0} process version {1} not on line", "工作流定义[{0}] 工作流版本[{1}]不是上线状态"),
|
||||
SUB_PROCESS_DEFINE_NOT_RELEASE(50004, "exist sub process definition not on line", "存在子工作流定义不是上线状态"),
|
||||
PROCESS_DEFINE_NOT_RELEASE(50004, "process definition {0} process version {1} not online", "工作流定义[{0}] 工作流版本[{1}]不是上线状态"),
|
||||
SUB_PROCESS_DEFINE_NOT_RELEASE(50004, "exist sub process definition not online", "存在子工作流定义不是上线状态"),
|
||||
PROCESS_INSTANCE_ALREADY_CHANGED(50005, "the status of process instance {0} is already {1}", "工作流实例[{0}]的状态已经是[{1}]"),
|
||||
PROCESS_INSTANCE_STATE_OPERATION_ERROR(50006, "the status of process instance {0} is {1},Cannot perform {2} operation", "工作流实例[{0}]的状态是[{1}],无法执行[{2}]操作"),
|
||||
SUB_PROCESS_INSTANCE_NOT_EXIST(50007, "the task belong to process instance does not exist", "子工作流实例不存在"),
|
||||
|
|
@ -263,9 +263,9 @@ public enum Status {
|
|||
DATA_IS_NULL(50018, "data {0} is null", "数据[{0}]不能为空"),
|
||||
PROCESS_NODE_HAS_CYCLE(50019, "process node has cycle", "流程节点间存在循环依赖"),
|
||||
PROCESS_NODE_S_PARAMETER_INVALID(50020, "process node {0} parameter invalid", "流程节点[{0}]参数无效"),
|
||||
PROCESS_DEFINE_STATE_ONLINE(50021, "process definition [{0}] is already on line", "工作流定义[{0}]已上线"),
|
||||
PROCESS_DEFINE_STATE_ONLINE(50021, "process definition [{0}] is already online", "工作流定义[{0}]已上线"),
|
||||
DELETE_PROCESS_DEFINE_BY_CODE_ERROR(50022, "delete process definition by code error", "删除工作流定义错误"),
|
||||
SCHEDULE_CRON_STATE_ONLINE(50023, "the status of schedule {0} is already on line", "调度配置[{0}]已上线"),
|
||||
SCHEDULE_CRON_STATE_ONLINE(50023, "the status of schedule {0} is already online", "调度配置[{0}]已上线"),
|
||||
DELETE_SCHEDULE_CRON_BY_ID_ERROR(50024, "delete schedule by id error", "删除调度配置错误"),
|
||||
BATCH_DELETE_PROCESS_DEFINE_ERROR(50025, "batch delete process definition error", "批量删除工作流定义错误"),
|
||||
BATCH_DELETE_PROCESS_DEFINE_BY_CODES_ERROR(50026, "batch delete process definition by codes {0} error", "批量删除工作流定义[{0}]错误"),
|
||||
|
|
@ -293,7 +293,7 @@ public enum Status {
|
|||
MOVE_PROCESS_TASK_RELATION_ERROR(50047, "move process task relation error", "移动任务到其他工作流错误"),
|
||||
DELETE_TASK_PROCESS_RELATION_ERROR(50048, "delete process task relation error", "删除工作流任务关系错误"),
|
||||
QUERY_TASK_PROCESS_RELATION_ERROR(50049, "query process task relation error", "查询工作流任务关系错误"),
|
||||
TASK_DEFINE_STATE_ONLINE(50050, "task definition [{0}] is already on line", "任务定义[{0}]已上线"),
|
||||
TASK_DEFINE_STATE_ONLINE(50050, "task definition [{0}] is already online", "任务定义[{0}]已上线"),
|
||||
TASK_HAS_DOWNSTREAM(50051, "Task exists downstream [{0}] dependence", "任务存在下游[{0}]依赖"),
|
||||
TASK_HAS_UPSTREAM(50052, "Task [{0}] exists upstream dependence", "任务[{0}]存在上游依赖"),
|
||||
MAIN_TABLE_USING_VERSION(50053, "the version that the master table is using", "主表正在使用该版本"),
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@
|
|||
<commons-io.version>2.11.0</commons-io.version>
|
||||
<oshi-core.version>6.1.1</oshi-core.version>
|
||||
<clickhouse-jdbc.version>0.1.52</clickhouse-jdbc.version>
|
||||
<lz4-java.version>1.4.0</lz4-java.version>
|
||||
<mssql-jdbc.version>6.1.0.jre8</mssql-jdbc.version>
|
||||
<presto-jdbc.version>0.238.1</presto-jdbc.version>
|
||||
<servlet-api.version>2.5</servlet-api.version>
|
||||
|
|
@ -603,6 +604,12 @@
|
|||
<version>${aws-sdk.version}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.lz4</groupId>
|
||||
<artifactId>lz4-java</artifactId>
|
||||
<version>${lz4-java.version}</version>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
|
||||
</dependencyManagement>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ public enum ReleaseState {
|
|||
|
||||
/**
|
||||
* 0 offline
|
||||
* 1 on line
|
||||
* 1 online
|
||||
*/
|
||||
OFFLINE(0, "offline"),
|
||||
ONLINE(1, "online");
|
||||
|
|
|
|||
|
|
@ -67,6 +67,11 @@
|
|||
|
||||
|
||||
|
||||
<dependency>
|
||||
<groupId>org.lz4</groupId>
|
||||
<artifactId>lz4-java</artifactId>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>org.mockito</groupId>
|
||||
<artifactId>mockito-core</artifactId>
|
||||
|
|
|
|||
|
|
@ -227,6 +227,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
|
|||
caffeine 2.9.2: https://mvnrepository.com/artifact/com.github.ben-manes.caffeine/caffeine/2.9.2, Apache 2.0
|
||||
classmate 1.5.1: https://mvnrepository.com/artifact/com.fasterxml/classmate/1.5.1, Apache 2.0
|
||||
clickhouse-jdbc 0.1.52: https://mvnrepository.com/artifact/ru.yandex.clickhouse/clickhouse-jdbc/0.1.52, Apache 2.0
|
||||
lz4-java 1.4.0: https://mvnrepository.com/artifact/org.lz4/lz4-java/1.4.0, Apache 2.0
|
||||
commons-beanutils 1.9.4 https://mvnrepository.com/artifact/commons-beanutils/commons-beanutils/1.9.4, Apache 2.0
|
||||
commons-cli 1.2: https://mvnrepository.com/artifact/commons-cli/commons-cli/1.2, Apache 2.0
|
||||
commons-codec 1.11: https://mvnrepository.com/artifact/commons-codec/commons-codec/1.11, Apache 2.0
|
||||
|
|
|
|||
|
|
@ -557,7 +557,7 @@ public class DataxTask extends AbstractTaskExecutor {
|
|||
int num = md.getColumnCount();
|
||||
columnNames = new String[num];
|
||||
for (int i = 1; i <= num; i++) {
|
||||
columnNames[i - 1] = md.getColumnName(i);
|
||||
columnNames[i - 1] = md.getColumnName(i).replace("t.","");
|
||||
}
|
||||
} catch (SQLException | ExecutionException e) {
|
||||
logger.error(e.getMessage(), e);
|
||||
|
|
|
|||
|
|
@ -22,6 +22,8 @@ checker-qual-3.5.0.jar
|
|||
classmate-1.5.1.jar
|
||||
clickhouse-jdbc-0.1.52.jar
|
||||
commons-email-1.5.jar
|
||||
lz4-java-1.4.0.jar
|
||||
commons-beanutils-1.9.4.jar
|
||||
commons-cli-1.2.jar
|
||||
commons-codec-1.11.jar
|
||||
commons-collections-3.2.2.jar
|
||||
|
|
|
|||
Loading…
Reference in New Issue