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 58d1f6cd3 Optimize database configuration for mysql5.6. (#2961)
58d1f6cd3 is described below
commit 58d1f6cd37b16534b50601572c0187787bab21e7
Author: feng xiaohang <[email protected]>
AuthorDate: Tue Jul 16 12:05:36 2024 +0800
Optimize database configuration for mysql5.6. (#2961)
* Optimize database configuration for mysql5.6.
* Update
amoro-ams/amoro-ams-server/src/main/resources/mysql/ams-mysql-init.sql
Co-authored-by: ZhouJinsong <[email protected]>
---------
Co-authored-by: xiaosefeng <[email protected]>
Co-authored-by: ZhouJinsong <[email protected]>
Co-authored-by: ConradJam <[email protected]>
---
.../src/main/resources/mysql/ams-mysql-init.sql | 6 ++--
.../resources/mysql/upgrade-0.4.0-to-0.4.1.sql | 2 +-
.../resources/mysql/upgrade-0.4.1-to-0.5.0.sql | 4 +--
amoro-ams/dist/src/main/amoro-bin/conf/config.yaml | 42 +++++++++++-----------
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git
a/amoro-ams/amoro-ams-server/src/main/resources/mysql/ams-mysql-init.sql
b/amoro-ams/amoro-ams-server/src/main/resources/mysql/ams-mysql-init.sql
index ce2c88ad3..82fe7072d 100644
--- a/amoro-ams/amoro-ams-server/src/main/resources/mysql/ams-mysql-init.sql
+++ b/amoro-ams/amoro-ams-server/src/main/resources/mysql/ams-mysql-init.sql
@@ -82,7 +82,7 @@ CREATE TABLE `table_identifier`
`format` VARCHAR(32) NOT NULL COMMENT 'Table Format',
PRIMARY KEY (`table_id`),
UNIQUE KEY `table_name_index` (`catalog_name`,`db_name`,`table_name`)
-);
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT 'Table identifier for AMS'
ROW_FORMAT=DYNAMIC;
CREATE TABLE `table_metadata`
(
@@ -131,7 +131,7 @@ CREATE TABLE `table_runtime`
`pending_input` mediumtext,
PRIMARY KEY (`table_id`),
UNIQUE KEY `table_index` (`catalog_name`,`db_name`,`table_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT 'Optimize running information
of each table';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT 'Optimize running information
of each table' ROW_FORMAT=DYNAMIC;
CREATE TABLE `table_optimizing_process`
(
@@ -221,4 +221,4 @@ CREATE TABLE `table_blocker` (
`properties` mediumtext COMMENT 'Blocker properties',
PRIMARY KEY (`blocker_id`),
KEY `table_index` (`catalog_name`,`db_name`,`table_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Table blockers';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Table blockers'
ROW_FORMAT=DYNAMIC;
diff --git
a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql
b/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql
index 609499e11..c4d705d86 100644
---
a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql
+++
b/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.0-to-0.4.1.sql
@@ -24,7 +24,7 @@ CREATE TABLE `table_blocker` (
`properties` mediumtext COMMENT 'Blocker properties',
PRIMARY KEY (`blocker_id`),
KEY `table_index` (`catalog_name`,`db_name`,`table_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Table blockers';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Table blockers'
ROW_FORMAT=DYNAMIC;
ALTER TABLE `optimize_group` ADD COLUMN `scheduling_policy` varchar(20)
COMMENT 'Optimize group scheduling policy' after `name`;
ALTER TABLE `optimize_task` CHANGE `max_change_transaction_id` `to_sequence`
bigint(20) NOT NULL DEFAULT '-1' COMMENT 'to sequence';
diff --git
a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql
b/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql
index 89292b95b..f293d1958 100644
---
a/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql
+++
b/amoro-ams/amoro-ams-server/src/main/resources/mysql/upgrade-0.4.1-to-0.5.0.sql
@@ -59,7 +59,7 @@ CREATE TABLE `table_identifier`
`table_name` varchar(128) NOT NULL COMMENT 'Table name',
PRIMARY KEY (`table_id`),
UNIQUE KEY `table_name_index` (`catalog_name`,`db_name`,`table_name`)
-);
+) ROW_FORMAT=DYNAMIC;
INSERT INTO `table_identifier` (`catalog_name`, `db_name`, `table_name`)
SELECT `catalog_name`, `db_name`, `table_name` FROM `table_metadata`;
-- table_metadata
@@ -126,7 +126,7 @@ CREATE TABLE `table_runtime`
`optimizing_config` mediumtext,
`pending_input` mediumtext,
PRIMARY KEY (`table_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT 'Optimize running information
of each table';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT 'Optimize running information
of each table' ROW_FORMAT=DYNAMIC;
diff --git a/amoro-ams/dist/src/main/amoro-bin/conf/config.yaml
b/amoro-ams/dist/src/main/amoro-bin/conf/config.yaml
index 9402ab2fb..cdea70084 100644
--- a/amoro-ams/dist/src/main/amoro-bin/conf/config.yaml
+++ b/amoro-ams/dist/src/main/amoro-bin/conf/config.yaml
@@ -92,27 +92,27 @@ ams:
connection-pool-max-idle: 16
connection-pool-max-wait-millis: 1000
-# MySQL database configuration.
-# database:
-# type: mysql
-# jdbc-driver-class: com.mysql.cj.jdbc.Driver
-# url:
jdbc:mysql://127.0.0.1:3306/db?useUnicode=true&characterEncoding=UTF8&autoReconnect=true&useAffectedRows=true&allowPublicKeyRetrieval=true&useSSL=false
-# username: root
-# password: root
-# connection-pool-max-total: 20
-# connection-pool-max-idle: 16
-# connection-pool-max-wait-millis: 1000
-
- # Postgres database configuration.
- # database:
- # type: postgres
- # jdbc-driver-class: org.postgresql.Driver
- # url: jdbc:postgresql://127.0.0.1:5432/db
- # username: user
- # password: passwd
- # connection-pool-max-total: 20
- # connection-pool-max-idle: 16
- # connection-pool-max-wait-millis: 1000
+# MySQL database configuration.
+# database:
+# type: mysql
+# jdbc-driver-class: com.mysql.cj.jdbc.Driver
+# url:
jdbc:mysql://127.0.0.1:3306/db?useUnicode=true&characterEncoding=UTF8&autoReconnect=true&useAffectedRows=true&allowPublicKeyRetrieval=true&useSSL=false
+# username: root
+# password: root
+# connection-pool-max-total: 20
+# connection-pool-max-idle: 16
+# connection-pool-max-wait-millis: 1000
+
+# Postgres database configuration.
+# database:
+# type: postgres
+# jdbc-driver-class: org.postgresql.Driver
+# url: jdbc:postgresql://127.0.0.1:5432/db
+# username: user
+# password: passwd
+# connection-pool-max-total: 20
+# connection-pool-max-idle: 16
+# connection-pool-max-wait-millis: 1000
terminal:
backend: local
