Repository: kylin Updated Branches: refs/heads/master 62ccd7a26 -> a1f4ef433
minor, replace jcl logger with slf4j logger where possible Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/92d57ec2 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/92d57ec2 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/92d57ec2 Branch: refs/heads/master Commit: 92d57ec2e9379f399f3f7138cee6945694e6b6d6 Parents: 62ccd7a Author: Hongbin Ma <[email protected]> Authored: Tue Jul 12 16:05:07 2016 +0800 Committer: Hongbin Ma <[email protected]> Committed: Tue Jul 12 16:05:14 2016 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/job/DeployLocalMetaToRemoteTest.java | 6 +++--- .../java/org/apache/kylin/common/util/Log4jConfigurer.java | 6 ++---- .../main/java/org/apache/kylin/common/util/MailService.java | 6 ++---- .../org/apache/kylin/cube/cli/CubeSignatureRefresher.java | 7 ++++--- .../apache/kylin/engine/mr/steps/FactDistinctColumnsJob.java | 2 ++ .../org/apache/kylin/engine/mr/steps/InMemCuboidMapper.java | 7 ++++--- .../org/apache/kylin/engine/mr/steps/KVGTRecordWriter.java | 7 ++++--- .../kylin/engine/mr/steps/MapContextGTRecordWriter.java | 3 --- .../java/org/apache/kylin/provision/BuildCubeWithEngine.java | 8 ++++---- .../apache/kylin/storage/hbase/util/UpdateHTableHostCLI.java | 8 ++++---- .../kylin/storage/hbase/steps/SandboxMetastoreCLI.java | 6 +++--- 11 files changed, 32 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/92d57ec2/assembly/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java ---------------------------------------------------------------------- diff --git a/assembly/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java b/assembly/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java index a6c2f01..03509cb 100644 --- a/assembly/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java +++ b/assembly/src/test/java/org/apache/kylin/job/DeployLocalMetaToRemoteTest.java @@ -21,8 +21,6 @@ package org.apache.kylin.job; import java.io.File; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.kylin.common.KylinConfig; import org.apache.kylin.common.util.ClassUtil; import org.apache.kylin.common.util.HBaseMetadataTestCase; @@ -31,6 +29,8 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This test case is ONLY for dev use, it deploys local meta to sandbox @@ -38,7 +38,7 @@ import org.junit.Test; @Ignore("dev use only") public class DeployLocalMetaToRemoteTest { - private static final Log logger = LogFactory.getLog(DeployLocalMetaToRemoteTest.class); + private static final Logger logger = LoggerFactory.getLogger(DeployLocalMetaToRemoteTest.class); @BeforeClass public static void beforeClass() throws Exception { http://git-wip-us.apache.org/repos/asf/kylin/blob/92d57ec2/core-common/src/main/java/org/apache/kylin/common/util/Log4jConfigurer.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/util/Log4jConfigurer.java b/core-common/src/main/java/org/apache/kylin/common/util/Log4jConfigurer.java index 59eaa4b..8b89180 100644 --- a/core-common/src/main/java/org/apache/kylin/common/util/Log4jConfigurer.java +++ b/core-common/src/main/java/org/apache/kylin/common/util/Log4jConfigurer.java @@ -26,14 +26,12 @@ import org.apache.log4j.LogManager; import org.apache.log4j.Logger; import org.apache.log4j.PropertyConfigurator; -/** - * Created by dongli on 11/24/15. - */ public class Log4jConfigurer { private static boolean INITIALIZED = false; - public static void initLogger() { + public static synchronized void initLogger() { if (!INITIALIZED && !isConfigured()) { + System.out.println("Initing the logger"); InputStream is = Log4jConfigurer.class.getClassLoader().getResourceAsStream("kylin-log4j.properties"); PropertyConfigurator.configure(is); IOUtils.closeQuietly(is); http://git-wip-us.apache.org/repos/asf/kylin/blob/92d57ec2/core-common/src/main/java/org/apache/kylin/common/util/MailService.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/util/MailService.java b/core-common/src/main/java/org/apache/kylin/common/util/MailService.java index 9a4ec64..ec0eaac 100644 --- a/core-common/src/main/java/org/apache/kylin/common/util/MailService.java +++ b/core-common/src/main/java/org/apache/kylin/common/util/MailService.java @@ -21,17 +21,17 @@ package org.apache.kylin.common.util; import java.io.IOException; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.commons.mail.Email; import org.apache.commons.mail.EmailException; import org.apache.commons.mail.HtmlEmail; import org.apache.kylin.common.KylinConfig; +import org.slf4j.LoggerFactory; /** * @author xduo */ public class MailService { + private static final org.slf4j.Logger logger = LoggerFactory.getLogger(MailService.class); private Boolean enabled = Boolean.TRUE; private String host; @@ -39,8 +39,6 @@ public class MailService { private String password; private String sender; - private static final Log logger = LogFactory.getLog(MailService.class); - public MailService(KylinConfig config) { this(config.isMailEnabled(), config.getMailHost(), config.getMailUsername(), config.getMailPassword(), config.getMailSender()); } http://git-wip-us.apache.org/repos/asf/kylin/blob/92d57ec2/core-cube/src/main/java/org/apache/kylin/cube/cli/CubeSignatureRefresher.java ---------------------------------------------------------------------- diff --git a/core-cube/src/main/java/org/apache/kylin/cube/cli/CubeSignatureRefresher.java b/core-cube/src/main/java/org/apache/kylin/cube/cli/CubeSignatureRefresher.java index 979ac4e..1db804f 100644 --- a/core-cube/src/main/java/org/apache/kylin/cube/cli/CubeSignatureRefresher.java +++ b/core-cube/src/main/java/org/apache/kylin/cube/cli/CubeSignatureRefresher.java @@ -21,8 +21,6 @@ package org.apache.kylin.cube.cli; import java.util.List; import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.kylin.common.KylinConfig; import org.apache.kylin.common.persistence.ResourceStore; import org.apache.kylin.cube.CubeDescManager; @@ -30,6 +28,8 @@ import org.apache.kylin.cube.CubeManager; import org.apache.kylin.cube.model.CubeDesc; import org.apache.kylin.metadata.MetadataManager; import org.apache.kylin.metadata.project.ProjectManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.collect.Lists; @@ -38,7 +38,8 @@ import com.google.common.collect.Lists; * won't be useful unless something went wrong. */ public class CubeSignatureRefresher { - private static final Log logger = LogFactory.getLog(CubeSignatureRefresher.class); + private static final Logger logger = LoggerFactory.getLogger(CubeSignatureRefresher.class); + private KylinConfig config = null; private ResourceStore store; private String[] cubeNames; http://git-wip-us.apache.org/repos/asf/kylin/blob/92d57ec2/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/FactDistinctColumnsJob.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/FactDistinctColumnsJob.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/FactDistinctColumnsJob.java index c163b55..d24ad5d 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/FactDistinctColumnsJob.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/FactDistinctColumnsJob.java @@ -88,8 +88,10 @@ public class FactDistinctColumnsJob extends AbstractHadoopJob { CubeSegment segment = cube.getSegment(segmentName, SegmentStatusEnum.NEW); if (segment == null) { logger.error("Failed to find {} in cube {}", segmentName, cube); + System.out.println("Failed to find {} in cube {} " + segmentName + "," + cube); for (CubeSegment s : cube.getSegments()) { logger.error(s.getName() + " with status " + s.getStatus()); + System.out.println(s.getName() + " with status " + s.getStatus()); } throw new IllegalStateException(); } http://git-wip-us.apache.org/repos/asf/kylin/blob/92d57ec2/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/InMemCuboidMapper.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/InMemCuboidMapper.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/InMemCuboidMapper.java index 91f0234..7baf5c5 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/InMemCuboidMapper.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/InMemCuboidMapper.java @@ -30,8 +30,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.kylin.common.KylinConfig; import org.apache.kylin.common.util.Dictionary; @@ -49,6 +47,8 @@ import org.apache.kylin.engine.mr.common.AbstractHadoopJob; import org.apache.kylin.engine.mr.common.BatchConstants; import org.apache.kylin.metadata.model.SegmentStatusEnum; import org.apache.kylin.metadata.model.TblColRef; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.collect.Maps; @@ -56,7 +56,8 @@ import com.google.common.collect.Maps; */ public class InMemCuboidMapper<KEYIN> extends KylinMapper<KEYIN, Object, ByteArrayWritable, ByteArrayWritable> { - private static final Log logger = LogFactory.getLog(InMemCuboidMapper.class); + private static final Logger logger = LoggerFactory.getLogger(InMemCuboidMapper.class); + private CubeInstance cube; private CubeDesc cubeDesc; private CubeSegment cubeSegment; http://git-wip-us.apache.org/repos/asf/kylin/blob/92d57ec2/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/KVGTRecordWriter.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/KVGTRecordWriter.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/KVGTRecordWriter.java index de8b6d4..0c4fa56 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/KVGTRecordWriter.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/KVGTRecordWriter.java @@ -22,8 +22,6 @@ import java.io.IOException; import java.nio.BufferOverflowException; import java.nio.ByteBuffer; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.kylin.common.util.ImmutableBitSet; import org.apache.kylin.cube.CubeSegment; import org.apache.kylin.cube.cuboid.Cuboid; @@ -33,12 +31,15 @@ import org.apache.kylin.cube.model.CubeDesc; import org.apache.kylin.engine.mr.ByteArrayWritable; import org.apache.kylin.gridtable.GTRecord; import org.apache.kylin.measure.BufferedMeasureEncoder; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** */ public abstract class KVGTRecordWriter implements ICuboidWriter { - private static final Log logger = LogFactory.getLog(KVGTRecordWriter.class); + private static final Logger logger = LoggerFactory.getLogger(KVGTRecordWriter.class); + private Long lastCuboidId; protected CubeSegment cubeSegment; protected CubeDesc cubeDesc; http://git-wip-us.apache.org/repos/asf/kylin/blob/92d57ec2/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MapContextGTRecordWriter.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MapContextGTRecordWriter.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MapContextGTRecordWriter.java index 8057602..aedf541 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MapContextGTRecordWriter.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MapContextGTRecordWriter.java @@ -20,8 +20,6 @@ package org.apache.kylin.engine.mr.steps; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.mapreduce.MapContext; import org.apache.kylin.cube.CubeSegment; import org.apache.kylin.cube.model.CubeDesc; @@ -31,7 +29,6 @@ import org.apache.kylin.engine.mr.ByteArrayWritable; */ public class MapContextGTRecordWriter extends KVGTRecordWriter { - private static final Log logger = LogFactory.getLog(MapContextGTRecordWriter.class); protected MapContext<?, ?, ByteArrayWritable, ByteArrayWritable> mapContext; public MapContextGTRecordWriter(MapContext<?, ?, ByteArrayWritable, ByteArrayWritable> mapContext, CubeDesc cubeDesc, CubeSegment cubeSegment) { http://git-wip-us.apache.org/repos/asf/kylin/blob/92d57ec2/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java ---------------------------------------------------------------------- diff --git a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java index a37d7b8..9ce2bf2 100644 --- a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java +++ b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java @@ -32,8 +32,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -61,6 +59,8 @@ import org.apache.kylin.job.manager.ExecutableManager; import org.apache.kylin.storage.hbase.util.HBaseRegionSizeCalculator; import org.apache.kylin.storage.hbase.util.StorageCleanupJob; import org.apache.kylin.storage.hbase.util.ZookeeperJobLock; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.collect.Lists; @@ -71,7 +71,7 @@ public class BuildCubeWithEngine { protected ExecutableManager jobService; private static boolean fastBuildMode = false; - private static final Log logger = LogFactory.getLog(BuildCubeWithEngine.class); + private static final Logger logger = LoggerFactory.getLogger(BuildCubeWithEngine.class); public static void main(String[] args) throws Exception { try { @@ -209,7 +209,7 @@ public class BuildCubeWithEngine { } } } catch (Exception ex) { - logger.error(ex); + logger.error("error", ex); throw ex; } } http://git-wip-us.apache.org/repos/asf/kylin/blob/92d57ec2/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/UpdateHTableHostCLI.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/UpdateHTableHostCLI.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/UpdateHTableHostCLI.java index b1f275f..e36f662 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/UpdateHTableHostCLI.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/UpdateHTableHostCLI.java @@ -24,8 +24,6 @@ import java.util.Arrays; import java.util.List; import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.HBaseAdmin; @@ -35,8 +33,9 @@ import org.apache.kylin.cube.CubeManager; import org.apache.kylin.cube.CubeSegment; import org.apache.kylin.metadata.model.SegmentStatusEnum; import org.apache.kylin.metadata.realization.IRealizationConstants; -import org.apache.kylin.metadata.realization.RealizationStatusEnum; import org.apache.kylin.storage.hbase.HBaseConnection; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.google.common.collect.Lists; @@ -44,7 +43,8 @@ import com.google.common.collect.Lists; * Created by dongli on 1/18/16. */ public class UpdateHTableHostCLI { - private static final Log logger = LogFactory.getLog(UpdateHTableHostCLI.class); + private static final Logger logger = LoggerFactory.getLogger(UpdateHTableHostCLI.class); + private List<String> updatedResources = Lists.newArrayList(); private List<String> errorMsgs = Lists.newArrayList(); http://git-wip-us.apache.org/repos/asf/kylin/blob/92d57ec2/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/SandboxMetastoreCLI.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/SandboxMetastoreCLI.java b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/SandboxMetastoreCLI.java index 3d6ac57..2356861 100644 --- a/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/SandboxMetastoreCLI.java +++ b/storage-hbase/src/test/java/org/apache/kylin/storage/hbase/steps/SandboxMetastoreCLI.java @@ -21,12 +21,12 @@ package org.apache.kylin.storage.hbase.steps; import java.io.File; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.kylin.common.KylinConfig; import org.apache.kylin.common.persistence.ResourceTool; import org.apache.kylin.common.util.ClassUtil; import org.apache.kylin.common.util.HBaseMetadataTestCase; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This is a helper class for developer to directly manipulate the metadata store in sandbox @@ -37,7 +37,7 @@ import org.apache.kylin.common.util.HBaseMetadataTestCase; */ public class SandboxMetastoreCLI { - private static final Log logger = LogFactory.getLog(SandboxMetastoreCLI.class); + private static final Logger logger = LoggerFactory.getLogger(SandboxMetastoreCLI.class); public static void main(String[] args) throws Exception { logger.info("Adding to classpath: " + new File(HBaseMetadataTestCase.SANDBOX_TEST_DATA).getAbsolutePath());
