This is an automated email from the ASF dual-hosted git repository.
wuzhiguo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/bigtop-manager.git
The following commit(s) were added to refs/heads/main by this push:
new 552ce4b9 BIGTOP-4330: Fix some bugs related to ORM (#150)
552ce4b9 is described below
commit 552ce4b945f88863c175f6f9ef1f057564c5c009
Author: haopeng <[email protected]>
AuthorDate: Tue Jan 21 00:09:55 2025 +0800
BIGTOP-4330: Fix some bugs related to ORM (#150)
---
.../src/main/java/org/apache/bigtop/manager/dao/sql/SQLBuilder.java | 1 +
bigtop-manager-dao/src/main/resources/mapper/mysql/HostMapper.xml | 2 +-
bigtop-manager-server/src/main/resources/ddl/MySQL-DDL-CREATE.sql | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/sql/SQLBuilder.java
b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/sql/SQLBuilder.java
index 19171d4b..10209c97 100644
---
a/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/sql/SQLBuilder.java
+++
b/bigtop-manager-dao/src/main/java/org/apache/bigtop/manager/dao/sql/SQLBuilder.java
@@ -182,6 +182,7 @@ public class SQLBuilder {
}
idx++;
}
+ break;
}
default: {
diff --git a/bigtop-manager-dao/src/main/resources/mapper/mysql/HostMapper.xml
b/bigtop-manager-dao/src/main/resources/mapper/mysql/HostMapper.xml
index 2d27411f..14ce2b37 100644
--- a/bigtop-manager-dao/src/main/resources/mapper/mysql/HostMapper.xml
+++ b/bigtop-manager-dao/src/main/resources/mapper/mysql/HostMapper.xml
@@ -26,7 +26,7 @@
<sql id="baseColumns">
id, hostname, agent_dir, ssh_user, ssh_port, auth_type, ssh_password,
ssh_key_string, ssh_key_filename, ssh_key_password,
grpc_port, ipv4, ipv6, os, arch, available_processors,
free_memory_size, total_memory_size,
- free_disk, total_disk, desc, status, err_info, cluster_id
+ free_disk, total_disk, `desc`, status, err_info, cluster_id
</sql>
<sql id="baseColumnsV2">
diff --git a/bigtop-manager-server/src/main/resources/ddl/MySQL-DDL-CREATE.sql
b/bigtop-manager-server/src/main/resources/ddl/MySQL-DDL-CREATE.sql
index 88c94961..e9f91e53 100644
--- a/bigtop-manager-server/src/main/resources/ddl/MySQL-DDL-CREATE.sql
+++ b/bigtop-manager-server/src/main/resources/ddl/MySQL-DDL-CREATE.sql
@@ -177,7 +177,7 @@ CREATE TABLE `service_config_snapshot`
`id` BIGINT NOT NULL AUTO_INCREMENT,
`name` VARCHAR(255),
`desc` VARCHAR(255),
- `config_json` TEXT,
+ `config_json` LONGTEXT,
`service_id` BIGINT,
`create_time` DATETIME DEFAULT CURRENT_TIMESTAMP,
`update_time` DATETIME DEFAULT CURRENT_TIMESTAMP ON UPDATE
CURRENT_TIMESTAMP,
