Skip to content

Commit 5d54c0e

Browse files
ddwolf715feng.dujiansheng.xuxjs1983boy
authored
Dev oracle (#1142)
任务类型增加对Oracle库的支持。#1062 --------- Co-authored-by: feng.du <[email protected]> Co-authored-by: jiansheng.xu <[email protected]> Co-authored-by: xjs1983boy <[email protected]>
1 parent 0b0d081 commit 5d54c0e

File tree

8 files changed

+33
-4
lines changed

8 files changed

+33
-4
lines changed

sql/1.5/1.5_increment.sql

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,8 @@ INSERT INTO task_param_template (task_type, task_name, task_version, params, gmt
9393
9494
## 开启spark推测行为,默认false
9595
# spark.speculation=false', now(), now(), 0);
96+
97+
-- 2023-11-22 add by xjs1983boy OracleSQL to dict
98+
insert into dict(dict_code,dict_name,dict_value,dict_desc,type,sort,data_type,depend_name,is_default,gmt_create,gmt_modified,is_deleted)
99+
values('27','OracleSQL','{"actions":["SAVE_TASK","RUN_TASK","STOP_TASK","SUBMIT_TASK","OPERATOR_TASK"],"barItem":["task","dependency","task_params","env_params"],"formField":["datasource"],"renderKind":"editor","dataTypeCodes":[2]}','',30,0,'STRING','',0,'2023-11-06 13:35:00','2023-11-06 13:35:00',0);
100+
COMMIT;

sql/init.sql

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2542,3 +2542,8 @@ INSERT INTO task_param_template (task_type, task_name, task_version, params, gmt
25422542
## 开启spark推测行为,默认false
25432543
# spark.speculation=false', now(), now(), 0);
25442544
COMMIT;
2545+
2546+
-- 2023-11-22 add by xjs1983boy OracleSQL to dict
2547+
insert into dict(dict_code,dict_name,dict_value,dict_desc,type,sort,data_type,depend_name,is_default,gmt_create,gmt_modified,is_deleted)
2548+
values('27','OracleSQL','{"actions":["SAVE_TASK","RUN_TASK","STOP_TASK","SUBMIT_TASK","OPERATOR_TASK"],"barItem":["task","dependency","task_params","env_params"],"formField":["datasource"],"renderKind":"editor","dataTypeCodes":[2]}','',30,0,'STRING','',0,'2023-11-06 13:35:00','2023-11-06 13:35:00',0);
2549+
COMMIT;

taier-common/src/main/java/com/dtstack/taier/common/enums/EScheduleJobType.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,8 @@ public enum EScheduleJobType {
117117
MAXCOMPUTE(24, "MaxCompute", EJobType.SQL.getType(), 4, null, EComputeType.BATCH, EJobClientType.DATASOURCE_PLUGIN),
118118
HADOOP_MR(25, "HadoopMR", EJobType.MR.getType(), 16, EComponentType.HDFS, EComputeType.BATCH, EJobClientType.WORKER_PLUGIN),
119119
DATAX(26,"DataX", EJobType.PYTHON.getType(),14, EComponentType.DATAX, EComputeType.BATCH, EJobClientType.WORKER_PLUGIN),
120+
121+
ORACLE_SQL(27, "OracleSQL", EJobType.SQL.getType(), 4, null, EComputeType.BATCH, EJobClientType.DATASOURCE_PLUGIN),
120122
;
121123

122124
private final Integer type;
@@ -216,4 +218,4 @@ public EComponentType getComponentType() {
216218
public EJobClientType getJobClientType() {
217219
return jobClientType;
218220
}
219-
}
221+
}

taier-data-develop/src/main/java/com/dtstack/taier/develop/service/develop/runner/DefaultSQLTaskRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ public List<EScheduleJobType> support() {
3636
EScheduleJobType.DORIS_SQL, EScheduleJobType.CLICK_HOUSE_SQL, EScheduleJobType.MYSQL,
3737
EScheduleJobType.GREENPLUM, EScheduleJobType.GAUSS_DB, EScheduleJobType.POSTGRESQL,
3838
EScheduleJobType.SQLSERVER, EScheduleJobType.TIDB, EScheduleJobType.VERTICA,
39-
EScheduleJobType.MAXCOMPUTE);
39+
EScheduleJobType.MAXCOMPUTE,EScheduleJobType.ORACLE_SQL);
4040
}
4141
}

taier-datasource/taier-datasource-plugin/taier-datasource-plugin-oracle/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
<groupId>com.oracle.database.jdbc</groupId>
5555
<artifactId>ojdbc8</artifactId>
5656
<version>${ojdbc8.version}</version>
57-
<scope>provided</scope>
5857
</dependency>
5958

6059
<dependency>
@@ -135,4 +134,4 @@
135134
</plugin>
136135
</plugins>
137136
</build>
138-
</project>
137+
</project>

taier-ui/src/components/icon/index.tsx

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -718,3 +718,17 @@ export const DataxIcon = ({ style }: IConProps) => {
718718
</span>
719719
);
720720
};
721+
722+
export const OracleSQLIcon = ({ style }: IConProps) => {
723+
return (
724+
<span title="Oracle" style={{ fontSize: 0, ...style }}>
725+
<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" className="icon" viewBox="0 0 1024 1024">
726+
<path
727+
d="M700.245333 188.245333h-376.32a323.754667 323.754667 0 0 0-0.341333 647.509334h376.661333a323.754667 323.754667 0 0 0 0-647.509334z m-8.234666 533.418667H332.202667a209.706667 209.706667 0 0 1 0-419.328h359.808a209.664 209.664 0 1 1 0 419.328z"
728+
p-id="2568" fill="#d81e06"
729+
>
730+
</path>
731+
</svg>
732+
</span>
733+
);
734+
};

taier-ui/src/constant/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,7 @@ export enum TASK_TYPE_ENUM {
270270
MAX_COMPUTE = 24,
271271
HADOOP_MR = 25,
272272
DATAX,
273+
ORACLE_SQL = 27,
273274
}
274275

275276
/**

taier-ui/src/services/taskRenderService.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import {
2020
HiveSQLIcon,
2121
MysqlIcon,
2222
OceanBaseIcon,
23+
OracleSQLIcon,
2324
PostgreSqlIcon,
2425
PythonIcon,
2526
ShellIcon,
@@ -251,6 +252,8 @@ export default class TaskRenderService extends Component<ITaskRenderState> {
251252
return <DorisIcon />;
252253
case TASK_TYPE_ENUM.MYSQL:
253254
return <MysqlIcon />;
255+
case TASK_TYPE_ENUM.ORACLE_SQL:
256+
return <OracleSQLIcon />;
254257
case TASK_TYPE_ENUM.GREENPLUM:
255258
return <GreenPlumIcon />;
256259
case TASK_TYPE_ENUM.POSTGRE_SQL:

0 commit comments

Comments
 (0)