Merge pull request alibaba#921 from alibaba/feature_derby_size_fix

derby size 32KB limit fix
IT-zhengang · Mar 18, 2019 · fe65c77 · fe65c77
2 parents 24f6b20 + 4cf86df
commit fe65c77
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/config/src/main/resources/META-INF/schema.sql b/config/src/main/resources/META-INF/schema.sql
@@ -6,7 +6,7 @@ CREATE TABLE config_info (
   group_id varchar(128) NOT NULL,
   tenant_id varchar(128) default '',
   app_name varchar(128),
-  content LONG VARCHAR NOT NULL,
+  content CLOB,
   md5 varchar(32) DEFAULT NULL,
   gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
   gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
@@ -31,7 +31,7 @@ CREATE TABLE his_config_info (
   group_id varchar(128) NOT NULL,
   tenant_id varchar(128) default '',
   app_name varchar(128),
-  content LONG VARCHAR NOT NULL,
+  content CLOB,
   md5 varchar(32) DEFAULT NULL,
   gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00.000',
   gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00.000',
@@ -51,7 +51,7 @@ CREATE TABLE config_info_beta (
   group_id varchar(128) NOT NULL,
   tenant_id varchar(128) default '',
   app_name varchar(128),
-  content LONG VARCHAR NOT NULL,
+  content CLOB,
   beta_ips varchar(1024),
   md5 varchar(32) DEFAULT NULL,
   gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
@@ -68,7 +68,7 @@ CREATE TABLE config_info_tag (
   tenant_id varchar(128) default '',
   tag_id varchar(128) NOT NULL,
   app_name varchar(128),
-  content LONG VARCHAR NOT NULL,
+  content CLOB,
   md5 varchar(32) DEFAULT NULL,
   gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
   gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
@@ -84,7 +84,7 @@ CREATE TABLE config_info_aggr (
   tenant_id varchar(128) default '',
   datum_id varchar(255) NOT NULL,
   app_name varchar(128),
-  content LONG VARCHAR NOT NULL,
+  content CLOB,
   gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
   constraint configinfoaggr_id_key PRIMARY KEY (id),
   constraint uk_configinfoaggr_datagrouptenantdatum UNIQUE (data_id,group_id,tenant_id,datum_id));
@@ -158,7 +158,7 @@ CREATE TABLE tenant_capacity (
   gmt_modified timestamp DEFAULT '2010-05-05 00:00:00',
   constraint tenant_capacity_id_key PRIMARY KEY (id),
   constraint uk_tenant_id UNIQUE (tenant_id));
-  
+
 CREATE TABLE tenant_info (
   id bigint NOT NULL generated by default as identity,
   kp varchar(128) NOT NULL,

diff --git a/console/src/main/resources/META-INF/schema.sql b/console/src/main/resources/META-INF/schema.sql
@@ -6,7 +6,7 @@ CREATE TABLE config_info (
   group_id varchar(128) NOT NULL,
   tenant_id varchar(128) default '',
   app_name varchar(128),
-  content LONG VARCHAR NOT NULL,
+  content CLOB,
   md5 varchar(32) DEFAULT NULL,
   gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
   gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
@@ -31,7 +31,7 @@ CREATE TABLE his_config_info (
   group_id varchar(128) NOT NULL,
   tenant_id varchar(128) default '',
   app_name varchar(128),
-  content LONG VARCHAR NOT NULL,
+  content CLOB,
   md5 varchar(32) DEFAULT NULL,
   gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00.000',
   gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00.000',
@@ -51,7 +51,7 @@ CREATE TABLE config_info_beta (
   group_id varchar(128) NOT NULL,
   tenant_id varchar(128) default '',
   app_name varchar(128),
-  content LONG VARCHAR NOT NULL,
+  content CLOB,
   beta_ips varchar(1024),
   md5 varchar(32) DEFAULT NULL,
   gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
@@ -68,7 +68,7 @@ CREATE TABLE config_info_tag (
   tenant_id varchar(128) default '',
   tag_id varchar(128) NOT NULL,
   app_name varchar(128),
-  content LONG VARCHAR NOT NULL,
+  content CLOB,
   md5 varchar(32) DEFAULT NULL,
   gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
   gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
@@ -84,7 +84,7 @@ CREATE TABLE config_info_aggr (
   tenant_id varchar(128) default '',
   datum_id varchar(255) NOT NULL,
   app_name varchar(128),
-  content LONG VARCHAR NOT NULL,
+  content CLOB,
   gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
   constraint configinfoaggr_id_key PRIMARY KEY (id),
   constraint uk_configinfoaggr_datagrouptenantdatum UNIQUE (data_id,group_id,tenant_id,datum_id));

diff --git a/distribution/conf/schema.sql b/distribution/conf/schema.sql
@@ -6,7 +6,7 @@ CREATE TABLE config_info (
   group_id varchar(128) NOT NULL,
   tenant_id varchar(128) default '',
   app_name varchar(128),
-  content LONG VARCHAR NOT NULL,
+  content CLOB,
   md5 varchar(32) DEFAULT NULL,
   gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
   gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
@@ -31,7 +31,7 @@ CREATE TABLE his_config_info (
   group_id varchar(128) NOT NULL,
   tenant_id varchar(128) default '',
   app_name varchar(128),
-  content LONG VARCHAR NOT NULL,
+  content CLOB,
   md5 varchar(32) DEFAULT NULL,
   gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00.000',
   gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00.000',
@@ -51,7 +51,7 @@ CREATE TABLE config_info_beta (
   group_id varchar(128) NOT NULL,
   tenant_id varchar(128) default '',
   app_name varchar(128),
-  content LONG VARCHAR NOT NULL,
+  content CLOB,
   beta_ips varchar(1024),
   md5 varchar(32) DEFAULT NULL,
   gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
@@ -68,7 +68,7 @@ CREATE TABLE config_info_tag (
   tenant_id varchar(128) default '',
   tag_id varchar(128) NOT NULL,
   app_name varchar(128),
-  content LONG VARCHAR NOT NULL,
+  content CLOB,
   md5 varchar(32) DEFAULT NULL,
   gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
   gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
@@ -84,7 +84,7 @@ CREATE TABLE config_info_aggr (
   tenant_id varchar(128) default '',
   datum_id varchar(255) NOT NULL,
   app_name varchar(128),
-  content LONG VARCHAR NOT NULL,
+  content CLOB,
   gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
   constraint configinfoaggr_id_key PRIMARY KEY (id),
   constraint uk_configinfoaggr_datagrouptenantdatum UNIQUE (data_id,group_id,tenant_id,datum_id));

diff --git a/test/src/test/resources/schema.sql b/test/src/test/resources/schema.sql
@@ -6,7 +6,7 @@ CREATE TABLE config_info (
   group_id varchar(128) NOT NULL,
   tenant_id varchar(128) default '',
   app_name varchar(128),
-  content LONG VARCHAR NOT NULL,
+  content CLOB,
   md5 varchar(32) DEFAULT NULL,
   gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
   gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
@@ -31,7 +31,7 @@ CREATE TABLE his_config_info (
   group_id varchar(128) NOT NULL,
   tenant_id varchar(128) default '',
   app_name varchar(128),
-  content LONG VARCHAR NOT NULL,
+  content CLOB,
   md5 varchar(32) DEFAULT NULL,
   gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00.000',
   gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00.000',
@@ -51,7 +51,7 @@ CREATE TABLE config_info_beta (
   group_id varchar(128) NOT NULL,
   tenant_id varchar(128) default '',
   app_name varchar(128),
-  content LONG VARCHAR NOT NULL,
+  content CLOB,
   beta_ips varchar(1024),
   md5 varchar(32) DEFAULT NULL,
   gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
@@ -68,7 +68,7 @@ CREATE TABLE config_info_tag (
   tenant_id varchar(128) default '',
   tag_id varchar(128) NOT NULL,
   app_name varchar(128),
-  content LONG VARCHAR NOT NULL,
+  content CLOB,
   md5 varchar(32) DEFAULT NULL,
   gmt_create timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
   gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
@@ -84,7 +84,7 @@ CREATE TABLE config_info_aggr (
   tenant_id varchar(128) default '',
   datum_id varchar(255) NOT NULL,
   app_name varchar(128),
-  content LONG VARCHAR NOT NULL,
+  content CLOB,
   gmt_modified timestamp NOT NULL DEFAULT '2010-05-05 00:00:00',
   constraint configinfoaggr_id_key PRIMARY KEY (id),
   constraint uk_configinfoaggr_datagrouptenantdatum UNIQUE (data_id,group_id,tenant_id,datum_id));