You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by te...@apache.org on 2021/07/04 02:48:35 UTC

[shardingsphere-elasticjob] branch master updated: Use a auto increment unique identity to Mysql InnoDB PRIMARY KEY (#1896)

This is an automated email from the ASF dual-hosted git repository.

technoboy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git


The following commit(s) were added to refs/heads/master by this push:
     new d25ed64  Use  a auto increment unique identity to Mysql InnoDB PRIMARY KEY (#1896)
d25ed64 is described below

commit d25ed6407df58f3b97f717f8b5e80a578dedaf2d
Author: skai <sk...@gmail.com>
AuthorDate: Sun Jul 4 10:48:22 2021 +0800

    Use  a auto increment unique identity to Mysql InnoDB PRIMARY KEY (#1896)
---
 .../main/resources/META-INF/sql/MySQL.properties   | 38 ++++++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/main/resources/META-INF/sql/MySQL.properties b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/main/resources/META-INF/sql/MySQL.properties
index 8be48c5..7b5cc53 100644
--- a/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/main/resources/META-INF/sql/MySQL.properties
+++ b/elasticjob-ecosystem/elasticjob-tracing/elasticjob-tracing-rdb/src/main/resources/META-INF/sql/MySQL.properties
@@ -15,7 +15,23 @@
 # limitations under the License.
 #
 
-JOB_EXECUTION_LOG.TABLE.CREATE=CREATE TABLE IF NOT EXISTS JOB_EXECUTION_LOG (id VARCHAR(40) NOT NULL, job_name VARCHAR(100) NOT NULL, task_id VARCHAR(255) NOT NULL, hostname VARCHAR(255) NOT NULL, ip VARCHAR(50) NOT NULL, sharding_item INT NOT NULL, execution_source VARCHAR(20) NOT NULL, failure_cause VARCHAR(4000) NULL, is_success INT NOT NULL, start_time TIMESTAMP NULL, complete_time TIMESTAMP NULL, PRIMARY KEY (id))
+JOB_EXECUTION_LOG.TABLE.CREATE = CREATE TABLE \
+    IF NOT EXISTS JOB_EXECUTION_LOG (   \
+        auto_id int NOT NULL AUTO_INCREMENT,    \
+        id VARCHAR (40) NOT NULL,               \
+        job_name VARCHAR (100) NOT NULL,        \
+        task_id VARCHAR (255) NOT NULL,         \
+        hostname VARCHAR (255) NOT NULL,        \
+        ip VARCHAR (50) NOT NULL,               \
+        sharding_item INT NOT NULL,             \
+        execution_source VARCHAR (20) NOT NULL, \
+        failure_cause VARCHAR (4000) NULL,      \
+        is_success INT NOT NULL,                \
+        start_time TIMESTAMP NULL,              \
+        complete_time TIMESTAMP NULL,           \
+        PRIMARY KEY (auto_id),                  \
+        UNIQUE KEY `id` (`id`)                  \
+    ) ENGINE=InnoDB
 
 JOB_EXECUTION_LOG.INSERT=INSERT INTO JOB_EXECUTION_LOG (id, job_name, task_id, hostname, ip, sharding_item, execution_source, is_success, start_time) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
 JOB_EXECUTION_LOG.INSERT_COMPLETE=INSERT INTO JOB_EXECUTION_LOG (id, job_name, task_id, hostname, ip, sharding_item, execution_source, is_success, start_time, complete_time) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
@@ -23,9 +39,25 @@ JOB_EXECUTION_LOG.INSERT_FAILURE=INSERT INTO JOB_EXECUTION_LOG (id, job_name, ta
 JOB_EXECUTION_LOG.UPDATE=UPDATE JOB_EXECUTION_LOG SET is_success = ?, complete_time = ? WHERE id = ?
 JOB_EXECUTION_LOG.UPDATE_FAILURE=UPDATE JOB_EXECUTION_LOG SET is_success = ?, complete_time = ?, failure_cause = ? WHERE id = ?
 
-JOB_STATUS_TRACE_LOG.TABLE.CREATE=CREATE TABLE IF NOT EXISTS JOB_STATUS_TRACE_LOG (id VARCHAR(40) NOT NULL, job_name VARCHAR(100) NOT NULL, original_task_id VARCHAR(255) NOT NULL, task_id VARCHAR(255) NOT NULL, slave_id VARCHAR(50) NOT NULL, source VARCHAR(50) NOT NULL, execution_type VARCHAR(20) NOT NULL, sharding_item VARCHAR(100) NOT NULL, state VARCHAR(20) NOT NULL, message VARCHAR(4000) NULL, creation_time TIMESTAMP NULL, PRIMARY KEY (id))
+JOB_STATUS_TRACE_LOG.TABLE.CREATE= CREATE TABLE \
+    IF NOT EXISTS JOB_STATUS_TRACE_LOG ( \
+        auto_id int NOT NULL AUTO_INCREMENT,     \
+        id VARCHAR (40) NOT NULL,                \
+        job_name VARCHAR (100) NOT NULL,         \
+        original_task_id VARCHAR (255) NOT NULL, \
+        task_id VARCHAR (255) NOT NULL,          \
+        slave_id VARCHAR (50) NOT NULL,          \
+        source VARCHAR (50) NOT NULL,            \
+        execution_type VARCHAR (20) NOT NULL,    \
+        sharding_item VARCHAR (100) NOT NULL,    \
+        state VARCHAR (20) NOT NULL,             \
+        message VARCHAR (4000) NULL,             \
+        creation_time TIMESTAMP NULL,            \
+        PRIMARY KEY (auto_id)                    \
+    ) ENGINE=InnoDB
+
 TASK_ID_STATE_INDEX.INDEX.CREATE=CREATE INDEX TASK_ID_STATE_INDEX ON JOB_STATUS_TRACE_LOG (task_id(128), state)
 
 JOB_STATUS_TRACE_LOG.INSERT=INSERT INTO JOB_STATUS_TRACE_LOG (id, job_name, original_task_id, task_id, slave_id, source, execution_type, sharding_item, state, message, creation_time) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
-JOB_STATUS_TRACE_LOG.SELECT=SELECT * FROM JOB_STATUS_TRACE_LOG WHERE task_id = ?
+JOB_STATUS_TRACE_LOG.SELECT=SELECT id, job_name, original_task_id, task_id, slave_id, source, execution_type, sharding_item, state, message, creation_time FROM JOB_STATUS_TRACE_LOG WHERE task_id = ?
 JOB_STATUS_TRACE_LOG.SELECT_ORIGINAL_TASK_ID=SELECT original_task_id FROM JOB_STATUS_TRACE_LOG WHERE task_id = ? and state= 'TASK_STAGING' LIMIT 1