From 39945aba1e1c76a1bc7a63490eea7f4ef95ed3c2 Mon Sep 17 00:00:00 2001 From: Mingyu Chen Date: Thu, 15 Jul 2021 10:47:59 +0800 Subject: [PATCH] [s3][bug] Remove log4j1 (#6211) There are jar package conflict Co-authored-by: chenmingyu --- .../main/java/org/apache/doris/analysis/StorageBackend.java | 5 +++-- .../src/main/java/org/apache/doris/analysis/StorageDesc.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageBackend.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageBackend.java index e73a90e8c2..933153b728 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageBackend.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageBackend.java @@ -27,12 +27,13 @@ import org.apache.doris.thrift.TStorageBackendType; import com.google.common.base.Strings; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Map; public class StorageBackend extends StorageDesc implements ParseNode { - private static Logger LOG = Logger.getLogger(StorageBackend.class); + private static final Logger LOG = LoggerFactory.getLogger(StorageBackend.class); private String location; private StorageType storageType; diff --git a/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageDesc.java b/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageDesc.java index 83e51105f2..914e085473 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageDesc.java +++ b/fe/fe-core/src/main/java/org/apache/doris/analysis/StorageDesc.java @@ -23,14 +23,15 @@ import org.apache.doris.common.Config; import org.apache.commons.collections.map.CaseInsensitiveMap; import org.apache.commons.lang3.StringUtils; import org.apache.http.client.utils.URIBuilder; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.net.URI; import java.net.URISyntaxException; import java.util.Map; public abstract class StorageDesc { - private static Logger LOG = Logger.getLogger(StorageBackend.class); + private static final Logger LOG = LoggerFactory.getLogger(StorageBackend.class); // for dfs public static final String HADOOP_JOB_UGI = "hadoop.job.ugi"; public static final String HADOOP_JOB_GROUP_NAME = "hadoop.job.group.name";