From 098d3347a0df808908aab8c554cd7c4febc5e6d9 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 26 八月 2024 11:43:59 +0800
Subject: [PATCH] !577 发布 5.2.2 正式版 安全性提升 Merge pull request !577 from 疯狂的狮子Li/dev
---
script/sql/oracle/snail_job_oracle.sql | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/script/sql/oracle/snail_job_oracle.sql b/script/sql/oracle/snail_job_oracle.sql
index 19aa07e..d2e17c1 100644
--- a/script/sql/oracle/snail_job_oracle.sql
+++ b/script/sql/oracle/snail_job_oracle.sql
@@ -2,7 +2,7 @@
SnailJob Database Transfer Tool
Source Server Type : MySQL
Target Server Type : Oracle
- Date: 2024-05-14 23:36:38
+ Date: 2024-07-06 12:49:36
*/
@@ -136,7 +136,7 @@
COMMENT ON COLUMN sj_notify_recipient.id IS '涓婚敭';
COMMENT ON COLUMN sj_notify_recipient.namespace_id IS '鍛藉悕绌洪棿id';
COMMENT ON COLUMN sj_notify_recipient.recipient_name IS '鎺ユ敹浜哄悕绉�';
-COMMENT ON COLUMN sj_notify_recipient.notify_type IS '閫氱煡绫诲瀷 1銆侀拤閽� 2銆侀偖浠� 3銆佷紒涓氬井淇� 4 椋炰功';
+COMMENT ON COLUMN sj_notify_recipient.notify_type IS '閫氱煡绫诲瀷 1銆侀拤閽� 2銆侀偖浠� 3銆佷紒涓氬井淇� 4 椋炰功 5 webhook';
COMMENT ON COLUMN sj_notify_recipient.notify_attribute IS '閰嶇疆灞炴��';
COMMENT ON COLUMN sj_notify_recipient.description IS '鎻忚堪';
COMMENT ON COLUMN sj_notify_recipient.create_dt IS '鍒涘缓鏃堕棿';
@@ -296,8 +296,8 @@
ALTER TABLE sj_retry_task_log_message
ADD CONSTRAINT pk_sj_retry_task_log_message PRIMARY KEY (id);
-CREATE INDEX idx_sj_retry_task_log_message_01 ON sj_retry_task_log_message (namespace_id, group_name, unique_id);
-CREATE INDEX idx_sj_retry_task_log_message_02 ON sj_retry_task_log_message (create_dt);
+CREATE INDEX idx_sj_rt_log_message_01 ON sj_retry_task_log_message (namespace_id, group_name, unique_id);
+CREATE INDEX idx_sj_rt_log_message_02 ON sj_retry_task_log_message (create_dt);
COMMENT ON COLUMN sj_retry_task_log_message.id IS '涓婚敭';
COMMENT ON COLUMN sj_retry_task_log_message.namespace_id IS '鍛藉悕绌洪棿id';
@@ -389,8 +389,7 @@
-- sj_distributed_lock
CREATE TABLE sj_distributed_lock
(
- id number GENERATED ALWAYS AS IDENTITY,
- name varchar2(64) NULL,
+ name varchar2(64) NOT NULL,
lock_until timestamp(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL,
locked_at timestamp(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL,
locked_by varchar2(255) NULL,
@@ -399,9 +398,8 @@
);
ALTER TABLE sj_distributed_lock
- ADD CONSTRAINT pk_sj_distributed_lock PRIMARY KEY (id);
+ ADD CONSTRAINT pk_sj_distributed_lock PRIMARY KEY (name);
-COMMENT ON COLUMN sj_distributed_lock.id IS '涓婚敭';
COMMENT ON COLUMN sj_distributed_lock.name IS '閿佸悕绉�';
COMMENT ON COLUMN sj_distributed_lock.lock_until IS '閿佸畾鏃堕暱';
COMMENT ON COLUMN sj_distributed_lock.locked_at IS '閿佸畾鏃堕棿';
@@ -449,7 +447,7 @@
ALTER TABLE sj_system_user_permission
ADD CONSTRAINT pk_sj_system_user_permission PRIMARY KEY (id);
-CREATE UNIQUE INDEX uk_sj_system_user_permission_01 ON sj_system_user_permission (namespace_id, group_name, system_user_id);
+CREATE UNIQUE INDEX uk_sj_su_permission_01 ON sj_system_user_permission (namespace_id, group_name, system_user_id);
COMMENT ON COLUMN sj_system_user_permission.id IS '涓婚敭';
COMMENT ON COLUMN sj_system_user_permission.group_name IS '缁勫悕绉�';
@@ -598,7 +596,11 @@
parent_id number DEFAULT 0 NOT NULL,
task_status smallint DEFAULT 0 NOT NULL,
retry_count number DEFAULT 0 NOT NULL,
+ mr_stage smallint DEFAULT NULL NULL,
+ leaf smallint DEFAULT '1' NOT NULL,
+ task_name varchar2(255) DEFAULT '' NULL,
client_info varchar2(128) DEFAULT NULL NULL,
+ wf_context clob DEFAULT NULL NULL,
result_message clob NULL,
args_str clob DEFAULT NULL NULL,
args_type smallint DEFAULT 1 NOT NULL,
@@ -622,7 +624,11 @@
COMMENT ON COLUMN sj_job_task.parent_id IS '鐖舵墽琛屽櫒id';
COMMENT ON COLUMN sj_job_task.task_status IS '鎵ц鐨勭姸鎬� 0銆佸け璐� 1銆佹垚鍔�';
COMMENT ON COLUMN sj_job_task.retry_count IS '閲嶈瘯娆℃暟';
+COMMENT ON COLUMN sj_job_task.mr_stage IS '鍔ㄦ�佸垎鐗囨墍澶勯樁娈� 1:map 2:reduce 3:mergeReduce';
+COMMENT ON COLUMN sj_job_task.leaf IS '鍙跺瓙鑺傜偣';
+COMMENT ON COLUMN sj_job_task.task_name IS '浠诲姟鍚嶇О';
COMMENT ON COLUMN sj_job_task.client_info IS '瀹㈡埛绔湴鍧� clientId#ip:port';
+COMMENT ON COLUMN sj_job_task.wf_context IS '宸ヤ綔娴佸叏灞�涓婁笅鏂�';
COMMENT ON COLUMN sj_job_task.result_message IS '鎵ц缁撴灉';
COMMENT ON COLUMN sj_job_task.args_str IS '鎵ц鏂规硶鍙傛暟';
COMMENT ON COLUMN sj_job_task.args_type IS '鍙傛暟绫诲瀷 ';
@@ -773,6 +779,7 @@
executor_timeout number DEFAULT 0 NOT NULL,
description varchar2(256) DEFAULT '' NULL,
flow_info clob DEFAULT NULL NULL,
+ wf_context clob DEFAULT NULL NULL,
bucket_index number DEFAULT 0 NOT NULL,
version number NOT NULL,
ext_attrs varchar2(256) DEFAULT '' NULL,
@@ -799,6 +806,7 @@
COMMENT ON COLUMN sj_workflow.executor_timeout IS '浠诲姟鎵ц瓒呮椂鏃堕棿锛屽崟浣嶇';
COMMENT ON COLUMN sj_workflow.description IS '鎻忚堪';
COMMENT ON COLUMN sj_workflow.flow_info IS '娴佺▼淇℃伅';
+COMMENT ON COLUMN sj_workflow.wf_context IS '涓婁笅鏂�';
COMMENT ON COLUMN sj_workflow.bucket_index IS 'bucket';
COMMENT ON COLUMN sj_workflow.version IS '鐗堟湰鍙�';
COMMENT ON COLUMN sj_workflow.ext_attrs IS '鎵╁睍瀛楁';
@@ -864,8 +872,10 @@
task_batch_status smallint DEFAULT 0 NOT NULL,
operation_reason smallint DEFAULT 0 NOT NULL,
flow_info clob DEFAULT NULL NULL,
+ wf_context clob DEFAULT NULL NULL,
execution_at number DEFAULT 0 NOT NULL,
ext_attrs varchar2(256) DEFAULT '' NULL,
+ version number DEFAULT 1 NOT NULL,
deleted smallint DEFAULT 0 NOT NULL,
create_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL,
update_dt date DEFAULT CURRENT_TIMESTAMP NOT NULL
@@ -885,10 +895,11 @@
COMMENT ON COLUMN sj_workflow_task_batch.task_batch_status IS '浠诲姟鎵规鐘舵�� 0銆佸け璐� 1銆佹垚鍔�';
COMMENT ON COLUMN sj_workflow_task_batch.operation_reason IS '鎿嶄綔鍘熷洜';
COMMENT ON COLUMN sj_workflow_task_batch.flow_info IS '娴佺▼淇℃伅';
+COMMENT ON COLUMN sj_workflow_task_batch.wf_context IS '鍏ㄥ眬涓婁笅鏂�';
COMMENT ON COLUMN sj_workflow_task_batch.execution_at IS '浠诲姟鎵ц鏃堕棿';
COMMENT ON COLUMN sj_workflow_task_batch.ext_attrs IS '鎵╁睍瀛楁';
+COMMENT ON COLUMN sj_workflow_task_batch.version IS '鐗堟湰鍙�';
COMMENT ON COLUMN sj_workflow_task_batch.deleted IS '閫昏緫鍒犻櫎 1銆佸垹闄�';
COMMENT ON COLUMN sj_workflow_task_batch.create_dt IS '鍒涘缓鏃堕棿';
COMMENT ON COLUMN sj_workflow_task_batch.update_dt IS '淇敼鏃堕棿';
COMMENT ON TABLE sj_workflow_task_batch IS '宸ヤ綔娴佹壒娆�';
-
--
Gitblit v1.9.3