You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampark.apache.org by be...@apache.org on 2023/04/21 13:44:05 UTC
[incubator-streampark] branch dev updated: [Bug] MySQL script error: Specified key was too long; max key length is 767 bytes (#2676)
This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new b114c0198 [Bug] MySQL script error: Specified key was too long; max key length is 767 bytes (#2676)
b114c0198 is described below
commit b114c0198795165fb3b038b6b2f55f657405caf1
Author: macksonmu <ma...@gmail.com>
AuthorDate: Fri Apr 21 21:43:58 2023 +0800
[Bug] MySQL script error: Specified key was too long; max key length is 767 bytes (#2676)
* [Bug] MySQL script error: Specified key was too long; max key length is 767 bytes
---
.../src/main/assembly/script/schema/mysql-schema.sql | 16 ++++++++--------
.../src/main/assembly/script/schema/pgsql-schema.sql | 16 ++++++++--------
.../src/main/assembly/script/upgrade/mysql/2.1.0.sql | 4 ++--
.../src/main/assembly/script/upgrade/pgsql/2.1.0.sql | 4 ++--
.../src/main/resources/db/schema-h2.sql | 16 ++++++++--------
5 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql b/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql
index c7d022ebc..b048e47c1 100644
--- a/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql
+++ b/streampark-console/streampark-console-service/src/main/assembly/script/schema/mysql-schema.sql
@@ -357,10 +357,10 @@ create table `t_setting` (
drop table if exists `t_user`;
create table `t_user` (
`user_id` bigint not null auto_increment comment 'user id',
- `username` varchar(255) collate utf8mb4_general_ci not null comment 'user name',
+ `username` varchar(50) collate utf8mb4_general_ci not null comment 'user name',
`nick_name` varchar(50) collate utf8mb4_general_ci not null comment 'nick name',
- `salt` varchar(255) collate utf8mb4_general_ci default null comment 'salt',
- `password` varchar(128) collate utf8mb4_general_ci not null comment 'password',
+ `salt` varchar(64) collate utf8mb4_general_ci default null comment 'salt',
+ `password` varchar(64) collate utf8mb4_general_ci not null comment 'password',
`email` varchar(128) collate utf8mb4_general_ci default null comment 'email',
`user_type` int not null comment 'user type 1:admin 2:user',
`login_type` tinyint default 0 comment 'login type 0:password 1:ldap',
@@ -418,9 +418,9 @@ create table `t_app_build_pipe`(
drop table if exists `t_flink_cluster`;
create table `t_flink_cluster` (
`id` bigint not null auto_increment,
- `address` varchar(255) default null comment 'url address of jobmanager',
- `cluster_id` varchar(255) default null comment 'clusterid of session mode(yarn-session:application-id,k8s-session:cluster-id)',
- `cluster_name` varchar(255) not null comment 'cluster name',
+ `address` varchar(150) default null comment 'url address of jobmanager',
+ `cluster_id` varchar(100) default null comment 'clusterid of session mode(yarn-session:application-id,k8s-session:cluster-id)',
+ `cluster_name` varchar(100) not null comment 'cluster name',
`options` text comment 'json form of parameter collection ',
`yarn_queue` varchar(100) default null comment 'the yarn queue where the task is located',
`execution_mode` tinyint not null default 1 comment 'k8s execution session mode(1:remote,3:yarn-session,5:kubernetes-session)',
@@ -501,8 +501,8 @@ drop table if exists `t_yarn_queue`;
create table `t_yarn_queue` (
`id` bigint not null primary key auto_increment comment 'queue id',
`team_id` bigint not null comment 'team id',
- `queue_label` varchar(255) collate utf8mb4_general_ci not null comment 'queue label expression',
- `description` varchar(512) collate utf8mb4_general_ci default null comment 'description of the queue label',
+ `queue_label` varchar(128) collate utf8mb4_general_ci not null comment 'queue label expression',
+ `description` varchar(256) collate utf8mb4_general_ci default null comment 'description of the queue label',
`create_time` datetime not null default current_timestamp comment 'create time',
`modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
unique key `unq_team_id_queue_label` (`team_id`, `queue_label`) using btree
diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql b/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql
index 95ab00c36..1182bc4d0 100644
--- a/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql
+++ b/streampark-console/streampark-console-service/src/main/assembly/script/schema/pgsql-schema.sql
@@ -273,9 +273,9 @@ create sequence "public"."streampark_t_flink_cluster_id_seq"
create table "public"."t_flink_cluster" (
"id" int8 not null default nextval('streampark_t_flink_cluster_id_seq'::regclass),
- "address" varchar(255) collate "pg_catalog"."default",
- "cluster_id" varchar(255) collate "pg_catalog"."default",
- "cluster_name" varchar(255) collate "pg_catalog"."default" not null,
+ "address" varchar(150) collate "pg_catalog"."default",
+ "cluster_id" varchar(100) collate "pg_catalog"."default",
+ "cluster_name" varchar(100) collate "pg_catalog"."default" not null,
"options" text collate "pg_catalog"."default",
"yarn_queue" varchar(100) collate "pg_catalog"."default",
"execution_mode" int2 not null default 1,
@@ -668,10 +668,10 @@ create sequence "public"."streampark_t_user_id_seq"
create table "public"."t_user" (
"user_id" int8 not null default nextval('streampark_t_user_id_seq'::regclass),
- "username" varchar(255) collate "pg_catalog"."default" not null,
+ "username" varchar(50) collate "pg_catalog"."default" not null,
"nick_name" varchar(50) collate "pg_catalog"."default" not null,
- "salt" varchar(255) collate "pg_catalog"."default",
- "password" varchar(128) collate "pg_catalog"."default" not null,
+ "salt" varchar(64) collate "pg_catalog"."default",
+ "password" varchar(64) collate "pg_catalog"."default" not null,
"email" varchar(128) collate "pg_catalog"."default",
"user_type" int4,
"login_type" int2 default 0,
@@ -760,8 +760,8 @@ create sequence "public"."streampark_t_yarn_queue_id_seq"
create table "public"."t_yarn_queue" (
"id" int8 not null default nextval('streampark_t_yarn_queue_id_seq'::regclass),
"team_id" int8 not null,
- "queue_label" varchar(255) not null collate "pg_catalog"."default",
- "description" varchar(512) collate "pg_catalog"."default",
+ "queue_label" varchar(128) not null collate "pg_catalog"."default",
+ "description" varchar(256) collate "pg_catalog"."default",
"create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
"modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
)
diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.1.0.sql b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.1.0.sql
index 4a0ae0b7d..e31ecb6c8 100644
--- a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.1.0.sql
+++ b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/mysql/2.1.0.sql
@@ -35,8 +35,8 @@ drop table if exists `t_yarn_queue`;
create table `t_yarn_queue` (
`id` bigint not null primary key auto_increment comment 'queue id',
`team_id` bigint not null comment 'team id',
- `queue_label` varchar(255) collate utf8mb4_general_ci not null comment 'queue and label expression',
- `description` varchar(512) collate utf8mb4_general_ci default null comment 'description of the queue label',
+ `queue_label` varchar(128) collate utf8mb4_general_ci not null comment 'queue and label expression',
+ `description` varchar(256) collate utf8mb4_general_ci default null comment 'description of the queue label',
`create_time` datetime not null default current_timestamp comment 'create time',
`modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
unique key `unq_team_id_queue_label` (`team_id`, `queue_label`) using btree
diff --git a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.1.0.sql b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.1.0.sql
index 192b60cad..e22b4149a 100644
--- a/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.1.0.sql
+++ b/streampark-console/streampark-console-service/src/main/assembly/script/upgrade/pgsql/2.1.0.sql
@@ -40,8 +40,8 @@ create sequence "public"."streampark_t_yarn_queue_id_seq" increment 1 start 1000
create table "public"."t_yarn_queue" (
"id" int8 not null default nextval('streampark_t_yarn_queue_id_seq'::regclass),
"team_id" int8 not null,
- "queue_label" varchar(255) not null collate "pg_catalog"."default",
- "description" varchar(512) collate "pg_catalog"."default",
+ "queue_label" varchar(128) not null collate "pg_catalog"."default",
+ "description" varchar(256) collate "pg_catalog"."default",
"create_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone),
"modify_time" timestamp(6) not null default timezone('UTC-8'::text, (now())::timestamp(0) without time zone)
);
diff --git a/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql b/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql
index f2e9afc46..68b475257 100644
--- a/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql
+++ b/streampark-console/streampark-console-service/src/main/resources/db/schema-h2.sql
@@ -317,10 +317,10 @@ create table if not exists `t_setting` (
-- ----------------------------
create table if not exists `t_user` (
`user_id` bigint generated by default as identity not null comment 'user id',
- `username` varchar(255) not null comment 'user name',
+ `username` varchar(50) not null comment 'user name',
`nick_name` varchar(50) not null comment 'nick name',
- `salt` varchar(255) default null comment 'salt',
- `password` varchar(128) not null comment 'password',
+ `salt` varchar(64) default null comment 'salt',
+ `password` varchar(64) not null comment 'password',
`email` varchar(128) default null comment 'email',
`user_type` int not null comment 'user type 1:admin 2:user',
`login_type` tinyint default 0 comment 'login type 0:password 1:ldap',
@@ -372,9 +372,9 @@ create table if not exists `t_app_build_pipe` (
-- ----------------------------
create table if not exists `t_flink_cluster` (
`id` bigint generated by default as identity not null,
- `address` varchar(255) default null comment 'url address of jobmanager',
- `cluster_id` varchar(255) default null comment 'clusterId of session mode(yarn-session:application-id,k8s-session:cluster-id)',
- `cluster_name` varchar(255) not null comment 'cluster name',
+ `address` varchar(150) default null comment 'url address of jobmanager',
+ `cluster_id` varchar(100) default null comment 'clusterId of session mode(yarn-session:application-id,k8s-session:cluster-id)',
+ `cluster_name` varchar(100) not null comment 'cluster name',
`options` text comment 'json form of parameter collection ',
`yarn_queue` varchar(100) default null comment 'the yarn queue where the task is located',
`execution_mode` tinyint not null default 1 comment 'k8s execution session mode(1:remote,3:yarn-session,5:kubernetes-session)',
@@ -454,8 +454,8 @@ drop table if exists `t_yarn_queue`;
create table if not exists `t_yarn_queue` (
`id` bigint generated by default as identity not null comment 'queue id',
`team_id` bigint not null comment 'team id',
- `queue_label` varchar(255) not null comment 'queue label expression',
- `description` varchar(512) default null comment 'description of the queue label',
+ `queue_label` varchar(128) not null comment 'queue label expression',
+ `description` varchar(256) default null comment 'description of the queue label',
`create_time` datetime not null default current_timestamp comment 'create time',
`modify_time` datetime not null default current_timestamp on update current_timestamp comment 'modify time',
unique key (`team_id`,`queue_label`),