This is an automated email from the ASF dual-hosted git repository.

jinsongzhou 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 f2dabe8e9 [AMORO-3414] Fix syntax errors in postgresql scripts (#3415)
f2dabe8e9 is described below

commit f2dabe8e9111ae02fe048c4e7493f3bc2137f891
Author: Jzjsnow <5797...@qq.com>
AuthorDate: Tue Jan 21 20:04:13 2025 +0800

    [AMORO-3414] Fix syntax errors in postgresql scripts (#3415)
    
    Co-authored-by: jzjsnow <snow.jian...@gmail.com>
---
 .../main/resources/postgres/ams-postgres-init.sql  |  3 +-
 amoro-ams/src/main/resources/postgres/upgrade.sql  | 35 +++++++++++-----------
 2 files changed, 19 insertions(+), 19 deletions(-)

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 c7722e802..362c991b0 100644
--- a/amoro-ams/src/main/resources/postgres/ams-postgres-init.sql
+++ b/amoro-ams/src/main/resources/postgres/ams-postgres-init.sql
@@ -205,8 +205,7 @@ COMMENT ON COLUMN 
table_runtime.last_optimized_change_snapshotId IS 'Last optimi
 COMMENT ON COLUMN table_runtime.last_major_optimizing_time IS 'Latest Major 
Optimize time for all partitions';
 COMMENT ON COLUMN table_runtime.last_minor_optimizing_time IS 'Latest Minor 
Optimize time for all partitions';
 COMMENT ON COLUMN table_runtime.last_full_optimizing_time IS 'Latest Full 
Optimize time for all partitions';
-COMMENT ON COLUMN table_runtime.optimizing_status_code IS 'Table optimize 
status code: 100(FULL_OPTIMIZING),' ||
-        ' 200(MAJOR_OPTIMIZING), 300(MINOR_OPTIMIZING), 400(COMMITTING), 
500(PLANING), 600(PENDING), 700(IDLE)';
+COMMENT ON COLUMN table_runtime.optimizing_status_code IS 'Table optimize 
status code: 100(FULL_OPTIMIZING), 200(MAJOR_OPTIMIZING), 
300(MINOR_OPTIMIZING), 400(COMMITTING), 500(PLANING), 600(PENDING), 700(IDLE)';
 COMMENT ON COLUMN table_runtime.optimizing_status_start_time IS 'Table 
optimize status start time';
 COMMENT ON COLUMN table_runtime.optimizing_process_id IS 'Optimizing procedure 
UUID';
 COMMENT ON COLUMN table_runtime.optimizer_group IS 'Optimizer group';
diff --git a/amoro-ams/src/main/resources/postgres/upgrade.sql 
b/amoro-ams/src/main/resources/postgres/upgrade.sql
index 5d4387422..096560826 100644
--- a/amoro-ams/src/main/resources/postgres/upgrade.sql
+++ b/amoro-ams/src/main/resources/postgres/upgrade.sql
@@ -86,36 +86,37 @@ COMMENT ON COLUMN http_session.max_interval IS 'Max 
internal';
 COMMENT ON COLUMN http_session.data_store IS 'Session data store';
 COMMENT ON TABLE http_session IS 'Http session store';
 
-    -- update resource group memory unit
+-- update resource group memory unit
 UPDATE resource_group
 SET properties = jsonb_set(
-        properties,
-        '{flink-conf,jobmanager,memory,process,size}',
-        (properties->>'flink-conf.jobmanager.memory.process.size') || 'MB'
+        properties::jsonb,
+        '{flink-conf.jobmanager.memory.process.size}',
+        ('"' || 
(properties::jsonb->>'flink-conf.jobmanager.memory.process.size') || 
'MB"')::jsonb
     )
-WHERE (properties->>'flink-conf.jobmanager.memory.process.size') ~ '^[0-9]+$';
+WHERE (properties::jsonb->>'flink-conf.jobmanager.memory.process.size') ~ 
'^[0-9]+$';
+
 
 UPDATE resource_group
 SET properties = jsonb_set(
-        properties,
-        '{flink-conf,taskmanager,memory,process,size}',
-        (properties->>'flink-conf.taskmanager.memory.process.size') || 'MB'
+        properties::jsonb,
+        '{flink-conf.taskmanager.memory.process.size}',
+        ('"' || 
(properties::jsonb->>'flink-conf.taskmanager.memory.process.size') || 
'MB"')::jsonb
     )
-WHERE (properties->>'flink-conf.taskmanager.memory.process.size') ~ '^[0-9]+$';
+WHERE (properties::jsonb->>'flink-conf.taskmanager.memory.process.size') ~ 
'^[0-9]+$';
 
 -- update resource memory unit
 UPDATE resource
 SET properties = jsonb_set(
-        properties,
-        '{flink-conf,jobmanager,memory,process,size}',
-        (properties->>'flink-conf.jobmanager.memory.process.size') || 'MB'
+        properties::jsonb,
+        '{flink-conf.jobmanager.memory.process.size}',
+        ('"' || 
(properties::jsonb->>'flink-conf.jobmanager.memory.process.size') || 
'MB"')::jsonb
     )
-WHERE (properties->>'flink-conf.jobmanager.memory.process.size') ~ '^[0-9]+$';
+WHERE (properties::jsonb->>'flink-conf.jobmanager.memory.process.size') ~ 
'^[0-9]+$';
 
 UPDATE resource
 SET properties = jsonb_set(
-        properties,
-        '{flink-conf,taskmanager,memory,process,size}',
-        (properties->>'flink-conf.taskmanager.memory.process.size') || 'MB'
+        properties::jsonb,
+        '{flink-conf.taskmanager.memory.process.size}',
+        ('"' || 
(properties::jsonb->>'flink-conf.taskmanager.memory.process.size') || 
'MB"')::jsonb
     )
-WHERE (properties->>'flink-conf.taskmanager.memory.process.size') ~ '^[0-9]+$';
\ No newline at end of file
+WHERE (properties::jsonb->>'flink-conf.taskmanager.memory.process.size') ~ 
'^[0-9]+$';
\ No newline at end of file

Reply via email to