Browse Source

cherry-pick [fix][sql] Add unique key to process_definition_log avoid TooManyResultExpection

#12503
3.1.5-release
陈家名 2 years ago committed by zhuangchong
parent
commit
ecfdebebae
  1. 3
      dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql
  2. 3
      dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql
  3. 2
      dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql
  4. 38
      dolphinscheduler-dao/src/main/resources/sql/upgrade/3.0.2_schema/mysql/dolphinscheduler_ddl.sql
  5. 16
      dolphinscheduler-dao/src/main/resources/sql/upgrade/3.0.2_schema/mysql/dolphinscheduler_dml.sql
  6. 19
      dolphinscheduler-dao/src/main/resources/sql/upgrade/3.0.2_schema/postgresql/dolphinscheduler_ddl.sql
  7. 16
      dolphinscheduler-dao/src/main/resources/sql/upgrade/3.0.2_schema/postgresql/dolphinscheduler_dml.sql
  8. 38
      dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.5_schema/mysql/dolphinscheduler_ddl.sql
  9. 16
      dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.5_schema/mysql/dolphinscheduler_dml.sql
  10. 19
      dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.5_schema/postgresql/dolphinscheduler_ddl.sql
  11. 16
      dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.5_schema/postgresql/dolphinscheduler_dml.sql

3
dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql

@ -456,7 +456,8 @@ CREATE TABLE t_ds_process_definition_log
operate_time datetime DEFAULT NULL, operate_time datetime DEFAULT NULL,
create_time datetime NOT NULL, create_time datetime NOT NULL,
update_time datetime DEFAULT NULL, update_time datetime DEFAULT NULL,
PRIMARY KEY (id) PRIMARY KEY (id),
UNIQUE KEY uniq_idx_code_version (code, version) USING BTREE
); );
-- ---------------------------- -- ----------------------------

3
dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql

@ -457,7 +457,8 @@ CREATE TABLE `t_ds_process_definition_log` (
`operate_time` datetime DEFAULT NULL COMMENT 'operate time', `operate_time` datetime DEFAULT NULL COMMENT 'operate time',
`create_time` datetime NOT NULL COMMENT 'create time', `create_time` datetime NOT NULL COMMENT 'create time',
`update_time` datetime NOT NULL COMMENT 'update time', `update_time` datetime NOT NULL COMMENT 'update time',
PRIMARY KEY (`id`) PRIMARY KEY (`id`),
UNIQUE KEY `uniq_idx_code_version` (`code`,`version`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8; ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
-- ---------------------------- -- ----------------------------

2
dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql

@ -376,6 +376,8 @@ CREATE TABLE t_ds_process_definition_log (
PRIMARY KEY (id) PRIMARY KEY (id)
) ; ) ;
create UNIQUE index uniq_idx_code_version on t_ds_process_definition_log (code,version);
-- --
-- Table structure for table t_ds_task_definition -- Table structure for table t_ds_task_definition
-- --

38
dolphinscheduler-dao/src/main/resources/sql/upgrade/3.0.2_schema/mysql/dolphinscheduler_ddl.sql

@ -0,0 +1,38 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
SET sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''));
-- add unique key to t_ds_process_definition_log
drop PROCEDURE if EXISTS add_t_ds_process_definition_log_uk_uniq_idx_code_version;
delimiter d//
CREATE PROCEDURE add_t_ds_process_definition_log_uk_uniq_idx_code_version()
BEGIN
IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.STATISTICS
WHERE TABLE_NAME='t_ds_process_definition_log'
AND TABLE_SCHEMA=(SELECT DATABASE())
AND INDEX_NAME='uniq_idx_code_version')
THEN
ALTER TABLE t_ds_process_definition_log ADD UNIQUE KEY uniq_idx_code_version(`code`,`version`);
END IF;
END;
d//
delimiter ;
CALL add_t_ds_process_definition_log_uk_uniq_idx_code_version;
DROP PROCEDURE add_t_ds_process_definition_log_uk_uniq_idx_code_version;

16
dolphinscheduler-dao/src/main/resources/sql/upgrade/3.0.2_schema/mysql/dolphinscheduler_dml.sql

@ -0,0 +1,16 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

19
dolphinscheduler-dao/src/main/resources/sql/upgrade/3.0.2_schema/postgresql/dolphinscheduler_ddl.sql

@ -0,0 +1,19 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-- add unique key to t_ds_process_definition_log
create UNIQUE index IF NOT EXISTS uniq_idx_code_version on t_ds_process_definition_log (code,version);

16
dolphinscheduler-dao/src/main/resources/sql/upgrade/3.0.2_schema/postgresql/dolphinscheduler_dml.sql

@ -0,0 +1,16 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

38
dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.5_schema/mysql/dolphinscheduler_ddl.sql

@ -0,0 +1,38 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
SET sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY',''));
-- add unique key to t_ds_process_definition_log
drop PROCEDURE if EXISTS add_t_ds_process_definition_log_uk_uniq_idx_code_version;
delimiter d//
CREATE PROCEDURE add_t_ds_process_definition_log_uk_uniq_idx_code_version()
BEGIN
IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.STATISTICS
WHERE TABLE_NAME='t_ds_process_definition_log'
AND TABLE_SCHEMA=(SELECT DATABASE())
AND INDEX_NAME='uniq_idx_code_version')
THEN
ALTER TABLE t_ds_process_definition_log ADD UNIQUE KEY uniq_idx_code_version(`code`,`version`);
END IF;
END;
d//
delimiter ;
CALL add_t_ds_process_definition_log_uk_uniq_idx_code_version;
DROP PROCEDURE add_t_ds_process_definition_log_uk_uniq_idx_code_version;

16
dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.5_schema/mysql/dolphinscheduler_dml.sql

@ -0,0 +1,16 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

19
dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.5_schema/postgresql/dolphinscheduler_ddl.sql

@ -0,0 +1,19 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-- add unique key to t_ds_process_definition_log
create UNIQUE index IF NOT EXISTS uniq_idx_code_version on t_ds_process_definition_log (code,version);

16
dolphinscheduler-dao/src/main/resources/sql/upgrade/3.1.5_schema/postgresql/dolphinscheduler_dml.sql

@ -0,0 +1,16 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
Loading…
Cancel
Save