(amoro) branch master updated: [Hotfix] Fix syntax errors in upgrade.sql scripts (#3816)

[xuba]

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 af85d1b40 [Hotfix] Fix syntax errors in upgrade.sql scripts (#3816)
af85d1b40 is described below

commit af85d1b40ce6f140423421e56aa76c270a4879f8
Author: Jzjsnow <snow.jian...@gmail.com>
AuthorDate: Mon Oct 13 19:55:10 2025 +0800

    [Hotfix] Fix syntax errors in upgrade.sql scripts (#3816)
    
    [hotfix] Fix syntax errors in upgrade.sql scripts
---
 amoro-ams/src/main/resources/mysql/upgrade.sql    | 11 ++++++-----
 amoro-ams/src/main/resources/postgres/upgrade.sql |  6 +++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/amoro-ams/src/main/resources/mysql/upgrade.sql 
b/amoro-ams/src/main/resources/mysql/upgrade.sql
index 266f43045..65dbbde48 100644
--- a/amoro-ams/src/main/resources/mysql/upgrade.sql
+++ b/amoro-ams/src/main/resources/mysql/upgrade.sql
@@ -19,8 +19,6 @@
 -- Update the precision from s level to ms.
 ALTER TABLE `table_runtime` MODIFY COLUMN `optimizing_status_start_time` 
TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) COMMENT 'Table optimize status start 
time';
 
-ALTER TABLE `table_runtime` ADD COLUMN `bucket_id` VARCHAR(4)  DEFAULT NULL 
COMMENT 'Bucket number to which the record table belongs'
-
 -- Update processId to SnowflakeId
 UPDATE `table_optimizing_process` SET `process_id` = `process_id` /10 << 13;
 UPDATE `task_runtime` SET `process_id` = `process_id` /10 << 13;
@@ -144,9 +142,9 @@ INSERT INTO table_runtime_state
 SELECT
 `table_id`, 'optimizing_state', JSON_OBJECT(
     'currentSnapshotId', `current_snapshot_id`,
-    'currentChangeSnapshotId', `current_change_snapshot_id`,
-    'lastOptimizedSnapshotId', `last_optimized_snapshot_id`,
-    'lastOptimizedChangeSnapshotId', `last_optimized_change_snapshot_id`,
+    'currentChangeSnapshotId', `current_change_snapshotId`,
+    'lastOptimizedSnapshotId', `last_optimized_snapshotId`,
+    'lastOptimizedChangeSnapshotId', `last_optimized_change_snapshotId`,
     'lastMajorOptimizingTime', `last_major_optimizing_time`,
     'lastFullOptimizingTime', `last_full_optimizing_time`,
     'lastMinorOptimizingTime', `last_minor_optimizing_time`
@@ -154,3 +152,6 @@ SELECT
 FROM table_runtime_old;
 
 DROP TABLE IF EXISTS table_runtime_old;
+
+-- ADD bucket_id to table_runtime
+ALTER TABLE `table_runtime` ADD COLUMN `bucket_id` VARCHAR(4)  DEFAULT NULL 
COMMENT 'Bucket number to which the record table belongs';
diff --git a/amoro-ams/src/main/resources/postgres/upgrade.sql 
b/amoro-ams/src/main/resources/postgres/upgrade.sql
index 401b62b2f..803c4ec68 100644
--- a/amoro-ams/src/main/resources/postgres/upgrade.sql
+++ b/amoro-ams/src/main/resources/postgres/upgrade.sql
@@ -203,9 +203,9 @@ INSERT INTO table_runtime_state 
(table_id,state_key,state_value)
 SELECT table_id,'optimizing_state',
        jsonb_build_object(
         'currentSnapshotId',current_snapshot_id,
-        'currentChangeSnapshotId',current_change_snapshot_id,
-        'lastOptimizedSnapshotId',last_optimized_snapshot_id,
-        'lastOptimizedChangeSnapshotId',last_optimized_change_snapshot_id,
+        'currentChangeSnapshotId',current_change_snapshotId,
+        'lastOptimizedSnapshotId',last_optimized_snapshotId,
+        'lastOptimizedChangeSnapshotId',last_optimized_change_snapshotId,
         'lastMajorOptimizingTime',last_major_optimizing_time,
         'lastFullOptimizingTime',last_full_optimizing_time,
         'lastMinorOptimizingTime',last_minor_optimizing_time)::text