From 85a1fbd5d317e2c1c77c139efaa28f33a8bd3bb5 Mon Sep 17 00:00:00 2001 From: Calvin Kirs Date: Fri, 22 Sep 2023 15:23:58 +0800 Subject: [PATCH] [Improve](stats)Use Log4j class library instead of Quartz (#24732) Quartz new version not support java 8 --- fe/fe-core/pom.xml | 4 ---- .../java/org/apache/doris/analysis/AnalyzeProperties.java | 2 +- .../src/main/java/org/apache/doris/analysis/AnalyzeStmt.java | 2 +- .../main/java/org/apache/doris/statistics/AnalysisInfo.java | 2 +- .../java/org/apache/doris/statistics/AnalysisInfoBuilder.java | 2 +- .../java/org/apache/doris/statistics/AnalysisManager.java | 2 +- 6 files changed, 5 insertions(+), 9 deletions(-) diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml index 93a83ad229..de5b1da107 100644 --- a/fe/fe-core/pom.xml +++ b/fe/fe-core/pom.xml @@ -705,10 +705,6 @@ under the License. com.esotericsoftware kryo-shaded - - org.quartz-scheduler - quartz - diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeProperties.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeProperties.java index 7cd3a8d827..d7e639da3a 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeProperties.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeProperties.java @@ -24,7 +24,7 @@ import org.apache.doris.statistics.AnalysisInfo.AnalysisType; import com.google.common.collect.ImmutableSet; import com.google.gson.annotations.SerializedName; import org.apache.commons.lang3.StringUtils; -import org.quartz.CronExpression; +import org.apache.logging.log4j.core.util.CronExpression; import java.util.HashMap; import java.util.Map; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeStmt.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeStmt.java index fa3834610f..ae2c6a7ff4 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeStmt.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/AnalyzeStmt.java @@ -23,7 +23,7 @@ import org.apache.doris.statistics.AnalysisInfo.AnalysisMode; import org.apache.doris.statistics.AnalysisInfo.AnalysisType; import org.apache.doris.statistics.AnalysisInfo.ScheduleType; -import org.quartz.CronExpression; +import org.apache.logging.log4j.core.util.CronExpression; import java.util.Map; diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisInfo.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisInfo.java index ec59c61fff..5f3b0fcacf 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisInfo.java +++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisInfo.java @@ -30,7 +30,7 @@ import com.google.gson.reflect.TypeToken; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.quartz.CronExpression; +import org.apache.logging.log4j.core.util.CronExpression; import java.io.DataInput; import java.io.DataOutput; diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisInfoBuilder.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisInfoBuilder.java index c17bbc69d9..7e97b4d951 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisInfoBuilder.java +++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisInfoBuilder.java @@ -23,7 +23,7 @@ import org.apache.doris.statistics.AnalysisInfo.AnalysisType; import org.apache.doris.statistics.AnalysisInfo.JobType; import org.apache.doris.statistics.AnalysisInfo.ScheduleType; -import org.quartz.CronExpression; +import org.apache.logging.log4j.core.util.CronExpression; import java.util.List; import java.util.Map; diff --git a/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisManager.java b/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisManager.java index ce0c546675..dc6bbe89df 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisManager.java +++ b/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisManager.java @@ -65,8 +65,8 @@ import com.google.common.reflect.TypeToken; import com.google.common.util.concurrent.ThreadFactoryBuilder; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.core.util.CronExpression; import org.jetbrains.annotations.Nullable; -import org.quartz.CronExpression; import java.io.DataInput; import java.io.DataOutput;