diff options
| author | LAPTOP-CUUVN8AS\wk <[email protected]> | 2022-06-01 16:53:52 +0800 |
|---|---|---|
| committer | LAPTOP-CUUVN8AS\wk <[email protected]> | 2022-06-01 16:53:52 +0800 |
| commit | 386fe585fd676ebb6bf701a4c058fc8d6b889dbd (patch) | |
| tree | ddd244e0dea9b767765803d16bcfb51812ce79bf | |
| parent | 36748438ad5c637c8351b95239752a0f28843bae (diff) | |
根据schema修改ttl默认为null，修改逻辑判断
| -rw-r--r-- | galaxy-job-executor/pom.xml | 2 | ||||
| -rw-r--r-- | galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageTtlJob.java | 23 |
2 files changed, 19 insertions, 6 deletions
diff --git a/galaxy-job-executor/pom.xml b/galaxy-job-executor/pom.xml index 60ef76a..0d2f1f9 100644 --- a/galaxy-job-executor/pom.xml +++ b/galaxy-job-executor/pom.xml @@ -180,7 +180,7 @@ <JAR_FILE>${project.build.finalName}.xjar</JAR_FILE> </buildArgs> <imageTags> - <imageTag>v1.3.220426-dev</imageTag> + <imageTag>v1.3.220601</imageTag> </imageTags> <resources> <resource> diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageTtlJob.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageTtlJob.java index 47669dd..3218471 100644 --- a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageTtlJob.java +++ b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageTtlJob.java @@ -77,6 +77,8 @@ public class LogStorageTtlJob { } else { logger.info("ddl queue busy "); + XxlJobLogger.log("ddl queue busy "); + return ReturnT.FAIL; } @@ -397,14 +399,25 @@ public class LogStorageTtlJob { if (schemaColumnHasDoc.containsKey("ttl")) { Integer ttltime = (Integer) schemaColumnHasDoc.get("ttl"); - String ttlvalue = "toDateTime(" + partitionKey + ") + toIntervalSecond(" + ttltime + ")"; - if (!ttlvalue.equals(tableobj.get(column).getTtl().trim())) { - tableobj.get(column).setTtl(ttlvalue); - modifyTtlColumns.put(column, tableobj.get(column)); - // XxlJobLogger.log("ChangeTtlColumns error! ip:"+ip+" tablename :"+tablename+" different ttl columns: "+be.getMessage()); + if(ttltime!=null) { + String ttlvalue = "toDateTime(" + partitionKey + ") + toIntervalSecond(" + ttltime + ")"; + if (!ttlvalue.equals(tableobj.get(column).getTtl().trim())) { + tableobj.get(column).setTtl(ttlvalue); + modifyTtlColumns.put(column, tableobj.get(column)); + // XxlJobLogger.log("ChangeTtlColumns error! ip:"+ip+" tablename :"+tablename+" different ttl columns: "+be.getMessage()); + } } + else { + if (tableobj.containsKey(column)) { + if (tableobj.get(column).getTtl() != null && !("").equals(tableobj.get(column).getTtl())) { + tableobj.get(column).setTtl(""); + dropTtlColumns.put(column, tableobj.get(column)); + } + } + + } } else { |