This is an automated email from the ASF dual-hosted git repository.
xuba pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/amoro.git
The following commit(s) were added to refs/heads/master by this push:
new 7e9edbf41 [AMORO-3742] Fix errors in sql scripts (#3745)
7e9edbf41 is described below
commit 7e9edbf41c229c2d36388ac0985485a7170e15f2
Author: Jzjsnow <[email protected]>
AuthorDate: Sat Aug 23 00:07:05 2025 +0800
[AMORO-3742] Fix errors in sql scripts (#3745)
* [AMORO-3742] Fix errors in sql scripts
* fixup! [AMORO-3742] Fix errors in sql scripts
---
.../src/main/resources/derby/ams-derby-init.sql | 15 +++++++++++
amoro-ams/src/main/resources/mysql/upgrade.sql | 17 +++++++++++-
.../main/resources/postgres/ams-postgres-init.sql | 30 ++++++++++++++++++++--
amoro-ams/src/main/resources/postgres/upgrade.sql | 26 +++++++++++++++++++
4 files changed, 85 insertions(+), 3 deletions(-)
diff --git a/amoro-ams/src/main/resources/derby/ams-derby-init.sql
b/amoro-ams/src/main/resources/derby/ams-derby-init.sql
index d04589f10..a3283447b 100644
--- a/amoro-ams/src/main/resources/derby/ams-derby-init.sql
+++ b/amoro-ams/src/main/resources/derby/ams-derby-init.sql
@@ -170,6 +170,21 @@ CREATE TABLE task_runtime (
CONSTRAINT task_runtime_pk PRIMARY KEY (process_id, task_id)
);
+CREATE TABLE table_process_state
+(
+ process_id BIGINT NOT NULL,
+ action VARCHAR(16) NOT NULL,
+ table_id BIGINT NOT NULL,
+ retry_num INT DEFAULT NULL,
+ status VARCHAR(10) NOT NULL,
+ start_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ end_time TIMESTAMP DEFAULT NULL,
+ fail_reason VARCHAR(4096) DEFAULT NULL,
+ summary CLOB,
+ CONSTRAINT table_process_state_pk PRIMARY KEY (process_id)
+);
+CREATE INDEX table_process_state_table_idx ON table_process_state (table_id,
start_time);
+
CREATE TABLE optimizing_task_quota (
process_id BIGINT NOT NULL,
task_id INT NOT NULL,
diff --git a/amoro-ams/src/main/resources/mysql/upgrade.sql
b/amoro-ams/src/main/resources/mysql/upgrade.sql
index ebbfc6010..3544483e8 100644
--- a/amoro-ams/src/main/resources/mysql/upgrade.sql
+++ b/amoro-ams/src/main/resources/mysql/upgrade.sql
@@ -25,6 +25,21 @@ UPDATE `task_runtime` SET `process_id` = `process_id` /10 <<
13;
UPDATE `optimizing_task_quota` SET `process_id` = `process_id` /10 << 13;
UPDATE `table_runtime` SET `optimizing_process_id` = `optimizing_process_id`
/10 << 13;
+CREATE TABLE `table_process_state`
+(
+ `process_id` bigint(20) NOT NULL COMMENT
'optimizing_procedure UUID',
+ `action` varchar(16) NOT NULL COMMENT 'process
action',
+ `table_id` bigint(20) NOT NULL,
+ `retry_num` int(11) DEFAULT NULL COMMENT 'Retry times',
+ `status` varchar(10) NOT NULL COMMENT 'Direct to
TableOptimizingStatus',
+ `start_time` timestamp DEFAULT CURRENT_TIMESTAMP
COMMENT 'First plan time',
+ `end_time` timestamp NULL DEFAULT NULL COMMENT
'finish time or failed time',
+ `fail_reason` varchar(4096) DEFAULT NULL COMMENT 'Error
message after task failed',
+ `summary` mediumtext COMMENT 'state summary, usually
a map',
+ PRIMARY KEY (`process_id`),
+ KEY `table_index` (`table_id`, `start_time`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT 'History of optimizing after
each commit';
+
CREATE TABLE `table_process`
(
`process_id` bigint(20) NOT NULL COMMENT 'table process
id',
@@ -50,7 +65,7 @@ CREATE TABLE `optimizing_process_state`
`rewrite_input` longblob DEFAULT NULL COMMENT 'rewrite
files input',
`from_sequence` mediumtext COMMENT 'from or min sequence
of each partition',
`to_sequence` mediumtext COMMENT 'to or max sequence of
each partition',
- PRIMARY KEY (`process_id`)
+ PRIMARY KEY (`process_id`),
KEY `table_index` (`table_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT 'History of optimizing after
each commit';
diff --git a/amoro-ams/src/main/resources/postgres/ams-postgres-init.sql
b/amoro-ams/src/main/resources/postgres/ams-postgres-init.sql
index ae0382530..f2494b7af 100644
--- a/amoro-ams/src/main/resources/postgres/ams-postgres-init.sql
+++ b/amoro-ams/src/main/resources/postgres/ams-postgres-init.sql
@@ -284,7 +284,7 @@ CREATE TABLE task_runtime
properties TEXT,
PRIMARY KEY (process_id, task_id)
);
-CREATE INDEX task_runtime_index ON table_optimizing_process (table_id,
process_id);
+CREATE INDEX task_runtime_index ON task_runtime (table_id, process_id);
COMMENT ON TABLE task_runtime IS 'Optimize task basic information';
COMMENT ON COLUMN task_runtime.process_id IS 'Process ID';
@@ -304,6 +304,32 @@ COMMENT ON COLUMN task_runtime.rewrite_output IS 'Rewrite
files output';
COMMENT ON COLUMN task_runtime.metrics_summary IS 'Metrics summary';
COMMENT ON COLUMN task_runtime.properties IS 'Task properties';
+CREATE TABLE table_process_state
+(
+ process_id BIGINT NOT NULL,
+ action VARCHAR(16) NOT NULL,
+ table_id BIGINT NOT NULL,
+ retry_num INT DEFAULT NULL,
+ status VARCHAR(10) NOT NULL,
+ start_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ end_time TIMESTAMP DEFAULT NULL,
+ fail_reason VARCHAR(4096) DEFAULT NULL,
+ summary TEXT,
+ PRIMARY KEY (process_id)
+);
+CREATE INDEX table_process_state_index ON table_process_state (table_id,
start_time);
+
+COMMENT ON TABLE table_process_state IS 'History of optimizing after each
commit';
+
+COMMENT ON COLUMN table_process_state.process_id IS 'optimizing_procedure
UUID';
+COMMENT ON COLUMN table_process_state.action IS 'process action';
+COMMENT ON COLUMN table_process_state.retry_num IS 'Retry times';
+COMMENT ON COLUMN table_process_state.status IS 'Direct to
TableOptimizingStatus';
+COMMENT ON COLUMN table_process_state.start_time IS 'First plan time';
+COMMENT ON COLUMN table_process_state.end_time IS 'finish time or failed time';
+COMMENT ON COLUMN table_process_state.fail_reason IS 'Error message after task
failed';
+COMMENT ON COLUMN table_process_state.summary IS 'state summary, usually a
map';
+
CREATE TABLE optimizing_task_quota
(
process_id BIGINT NOT NULL,
@@ -315,7 +341,7 @@ CREATE TABLE optimizing_task_quota
fail_reason VARCHAR(4096),
PRIMARY KEY (process_id, task_id, retry_num)
);
-CREATE INDEX quota_index ON table_optimizing_process (table_id);
+CREATE INDEX quota_index ON optimizing_task_quota (table_id);
COMMENT ON TABLE optimizing_task_quota IS 'Optimize task basic information';
COMMENT ON COLUMN optimizing_task_quota.process_id IS 'Optimizing procedure
UUID';
diff --git a/amoro-ams/src/main/resources/postgres/upgrade.sql
b/amoro-ams/src/main/resources/postgres/upgrade.sql
index eba85a18d..62b91a410 100644
--- a/amoro-ams/src/main/resources/postgres/upgrade.sql
+++ b/amoro-ams/src/main/resources/postgres/upgrade.sql
@@ -27,6 +27,32 @@ UPDATE task_runtime SET process_id = process_id /10 << 13;
UPDATE optimizing_task_quota SET process_id = process_id /10 << 13;
UPDATE table_runtime SET optimizing_process_id = optimizing_process_id /10 <<
13;
+CREATE TABLE table_process_state
+(
+ process_id BIGINT NOT NULL,
+ action VARCHAR(16) NOT NULL,
+ table_id BIGINT NOT NULL,
+ retry_num INT DEFAULT NULL,
+ status VARCHAR(10) NOT NULL,
+ start_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+ end_time TIMESTAMP DEFAULT NULL,
+ fail_reason VARCHAR(4096) DEFAULT NULL,
+ summary TEXT,
+ PRIMARY KEY (process_id)
+);
+CREATE INDEX table_process_state_index ON table_process_state (table_id,
start_time);
+
+COMMENT ON TABLE table_process_state IS 'History of optimizing after each
commit';
+
+COMMENT ON COLUMN table_process_state.process_id IS 'optimizing_procedure
UUID';
+COMMENT ON COLUMN table_process_state.action IS 'process action';
+COMMENT ON COLUMN table_process_state.retry_num IS 'Retry times';
+COMMENT ON COLUMN table_process_state.status IS 'Direct to
TableOptimizingStatus';
+COMMENT ON COLUMN table_process_state.start_time IS 'First plan time';
+COMMENT ON COLUMN table_process_state.end_time IS 'finish time or failed time';
+COMMENT ON COLUMN table_process_state.fail_reason IS 'Error message after task
failed';
+COMMENT ON COLUMN table_process_state.summary IS 'state summary, usually a
map';
+
CREATE TABLE table_process (
process_id bigserial PRIMARY KEY,
table_id bigint NOT NULL,
