http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/dictionary/server/NonSecureDictionaryServerHandler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/server/NonSecureDictionaryServerHandler.java b/core/src/main/java/org/apache/carbondata/core/dictionary/server/NonSecureDictionaryServerHandler.java index 82efe80..0f076a4 100644 --- a/core/src/main/java/org/apache/carbondata/core/dictionary/server/NonSecureDictionaryServerHandler.java +++ b/core/src/main/java/org/apache/carbondata/core/dictionary/server/NonSecureDictionaryServerHandler.java @@ -16,7 +16,6 @@ */ package org.apache.carbondata.core.dictionary.server; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.dictionary.generator.ServerDictionaryGenerator; import org.apache.carbondata.core.dictionary.generator.key.DictionaryMessage; @@ -26,6 +25,7 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; +import org.apache.log4j.Logger; /** * Handler for Dictionary server. @@ -33,7 +33,7 @@ import io.netty.channel.ChannelInboundHandlerAdapter; @ChannelHandler.Sharable public class NonSecureDictionaryServerHandler extends ChannelInboundHandlerAdapter { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(NonSecureDictionaryServerHandler.class.getName()); /** @@ -77,7 +77,7 @@ import io.netty.channel.ChannelInboundHandlerAdapter; * @param cause */ @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) { - LOGGER.error(cause, "exceptionCaught"); + LOGGER.error("exceptionCaught", cause); ctx.close(); }
http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/dictionary/service/AbstractDictionaryServer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/service/AbstractDictionaryServer.java b/core/src/main/java/org/apache/carbondata/core/dictionary/service/AbstractDictionaryServer.java index 754f253..5703051 100644 --- a/core/src/main/java/org/apache/carbondata/core/dictionary/service/AbstractDictionaryServer.java +++ b/core/src/main/java/org/apache/carbondata/core/dictionary/service/AbstractDictionaryServer.java @@ -27,13 +27,12 @@ import java.util.Collections; import java.util.Enumeration; import java.util.List; -import org.apache.carbondata.common.logging.LogService; - import org.apache.commons.lang3.SystemUtils; +import org.apache.log4j.Logger; public abstract class AbstractDictionaryServer { - public String findLocalIpAddress(LogService LOGGER) { + public String findLocalIpAddress(Logger LOGGER) { try { String defaultIpOverride = System.getenv("SPARK_LOCAL_IP"); if (defaultIpOverride != null) { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/fileoperations/AtomicFileOperationsImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/fileoperations/AtomicFileOperationsImpl.java b/core/src/main/java/org/apache/carbondata/core/fileoperations/AtomicFileOperationsImpl.java index f9f8647..13f10d7 100644 --- a/core/src/main/java/org/apache/carbondata/core/fileoperations/AtomicFileOperationsImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/fileoperations/AtomicFileOperationsImpl.java @@ -21,7 +21,6 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastore.filesystem.CarbonFile; @@ -29,12 +28,14 @@ import org.apache.carbondata.core.datastore.impl.FileFactory; import org.apache.carbondata.core.datastore.impl.FileFactory.FileType; import org.apache.carbondata.core.util.CarbonUtil; +import org.apache.log4j.Logger; + class AtomicFileOperationsImpl implements AtomicFileOperations { /** * Logger instance */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(AtomicFileOperationsImpl.class.getName()); private String filePath; http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDataMapIndexStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDataMapIndexStore.java b/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDataMapIndexStore.java index ed709c5..5f1bca4 100644 --- a/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDataMapIndexStore.java +++ b/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDataMapIndexStore.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.cache.Cache; import org.apache.carbondata.core.cache.CarbonLRUCache; @@ -41,6 +40,7 @@ import org.apache.carbondata.core.metadata.schema.table.CarbonTable; import org.apache.carbondata.core.util.BlockletDataMapUtil; import org.apache.hadoop.conf.Configuration; +import org.apache.log4j.Logger; /** * Class to handle loading, unloading,clearing,storing of the table @@ -48,7 +48,7 @@ import org.apache.hadoop.conf.Configuration; */ public class BlockletDataMapIndexStore implements Cache<TableBlockIndexUniqueIdentifierWrapper, BlockletDataMapIndexWrapper> { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(BlockletDataMapIndexStore.class.getName()); /** * CarbonLRU cache http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDetailInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDetailInfo.java b/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDetailInfo.java index 973a240..9ce932c 100644 --- a/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDetailInfo.java +++ b/core/src/main/java/org/apache/carbondata/core/indexstore/BlockletDetailInfo.java @@ -24,13 +24,13 @@ import java.io.IOException; import java.io.Serializable; import java.util.List; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.metadata.blocklet.BlockletInfo; import org.apache.carbondata.core.metadata.schema.table.column.ColumnSchema; import org.apache.carbondata.core.util.BlockletDataMapUtil; import org.apache.hadoop.io.Writable; +import org.apache.log4j.Logger; /** * Blocklet detail information to be sent to each executor @@ -40,7 +40,7 @@ public class BlockletDetailInfo implements Serializable, Writable { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(BlockletDetailInfo.class.getName()); private static final long serialVersionUID = 7957493757421513808L; @@ -128,13 +128,13 @@ public class BlockletDetailInfo implements Serializable, Writable { try { blockletInfo.readFields(inputStream); } catch (IOException e) { - LOGGER.error("Problem in reading blocklet info"); + LOGGER.error("Problem in reading blocklet info", e); throw new IOException("Problem in reading blocklet info." + e.getMessage()); } finally { try { inputStream.close(); } catch (IOException e) { - LOGGER.error(e, "Problem in closing input stream of reading blocklet info."); + LOGGER.error("Problem in closing input stream of reading blocklet info.", e); } } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockDataMap.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockDataMap.java b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockDataMap.java index d7b7977..5a25bc5 100644 --- a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockDataMap.java +++ b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/BlockDataMap.java @@ -16,11 +16,15 @@ */ package org.apache.carbondata.core.indexstore.blockletindex; -import java.io.*; +import java.io.IOException; +import java.io.Serializable; +import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.BitSet; +import java.util.List; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datamap.dev.DataMapModel; @@ -66,6 +70,7 @@ import org.apache.carbondata.core.util.path.CarbonTablePath; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.fs.Path; +import org.apache.log4j.Logger; /** * Datamap implementation for block. @@ -73,7 +78,7 @@ import org.apache.hadoop.fs.Path; public class BlockDataMap extends CoarseGrainDataMap implements BlockletDataMapRowIndexes, Serializable { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(BlockDataMap.class.getName()); protected static final long serialVersionUID = -2170289352240810993L; http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/SegmentIndexFileStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/SegmentIndexFileStore.java b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/SegmentIndexFileStore.java index f19c9c9..909d79f 100644 --- a/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/SegmentIndexFileStore.java +++ b/core/src/main/java/org/apache/carbondata/core/indexstore/blockletindex/SegmentIndexFileStore.java @@ -27,7 +27,6 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastore.block.TableBlockInfo; @@ -49,6 +48,7 @@ import org.apache.carbondata.format.MergedBlockIndex; import org.apache.carbondata.format.MergedBlockIndexHeader; import org.apache.hadoop.conf.Configuration; +import org.apache.log4j.Logger; import org.apache.thrift.TBase; /** @@ -60,7 +60,7 @@ public class SegmentIndexFileStore { /** * Logger constant */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(SegmentIndexFileStore.class.getName()); /** * Stores the indexfile name and related binary file data in it. http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/DateDirectDictionaryGenerator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/DateDirectDictionaryGenerator.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/DateDirectDictionaryGenerator.java index 1caa3e4..a49eced 100644 --- a/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/DateDirectDictionaryGenerator.java +++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/DateDirectDictionaryGenerator.java @@ -21,13 +21,14 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.TimeZone; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.keygenerator.directdictionary.DirectDictionaryGenerator; import org.apache.carbondata.core.metadata.datatype.DataType; import org.apache.carbondata.core.metadata.datatype.DataTypes; +import org.apache.log4j.Logger; + /** * The class provides the method to generate dictionary key and getting the actual value from * the dictionaryKey for direct dictionary column for TIMESTAMP type. @@ -53,7 +54,7 @@ public class DateDirectDictionaryGenerator implements DirectDictionaryGenerator /** * Logger instance */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(DateDirectDictionaryGenerator.class.getName()); static { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGenerator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGenerator.java b/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGenerator.java index 72ed66c..1e5a1f1 100644 --- a/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGenerator.java +++ b/core/src/main/java/org/apache/carbondata/core/keygenerator/directdictionary/timestamp/TimeStampDirectDictionaryGenerator.java @@ -20,7 +20,6 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.keygenerator.directdictionary.DirectDictionaryGenerator; @@ -33,6 +32,8 @@ import static org.apache.carbondata.core.keygenerator.directdictionary.timestamp import static org.apache.carbondata.core.keygenerator.directdictionary.timestamp.TimeStampGranularityConstants.TIME_GRAN_MIN; import static org.apache.carbondata.core.keygenerator.directdictionary.timestamp.TimeStampGranularityConstants.TIME_GRAN_SEC; +import org.apache.log4j.Logger; + /** * The class provides the method to generate dictionary key and getting the actual value from * the dictionaryKey for direct dictionary column for TIMESTAMP type. @@ -56,7 +57,7 @@ public class TimeStampDirectDictionaryGenerator implements DirectDictionaryGener /** * Logger instance */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(TimeStampDirectDictionaryGenerator.class.getName()); /* http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/locks/CarbonLockFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/locks/CarbonLockFactory.java b/core/src/main/java/org/apache/carbondata/core/locks/CarbonLockFactory.java index 79bad6c..b98ebb7 100644 --- a/core/src/main/java/org/apache/carbondata/core/locks/CarbonLockFactory.java +++ b/core/src/main/java/org/apache/carbondata/core/locks/CarbonLockFactory.java @@ -17,12 +17,13 @@ package org.apache.carbondata.core.locks; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.util.CarbonProperties; +import org.apache.log4j.Logger; + /** * This class is a Lock factory class which is used to provide lock objects. * Using this lock object client can request the lock and unlock. @@ -32,7 +33,7 @@ public class CarbonLockFactory { /** * Attribute for LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonLockFactory.class.getName()); /** * lockTypeConfigured to check if zookeeper feature is enabled or not for carbon. http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/locks/CarbonLockUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/locks/CarbonLockUtil.java b/core/src/main/java/org/apache/carbondata/core/locks/CarbonLockUtil.java index ca6cddb..3d86587 100644 --- a/core/src/main/java/org/apache/carbondata/core/locks/CarbonLockUtil.java +++ b/core/src/main/java/org/apache/carbondata/core/locks/CarbonLockUtil.java @@ -17,7 +17,6 @@ package org.apache.carbondata.core.locks; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastore.filesystem.CarbonFile; @@ -29,13 +28,14 @@ import org.apache.carbondata.core.util.CarbonProperties; import org.apache.carbondata.core.util.path.CarbonTablePath; import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; /** * This class contains all carbon lock utilities */ public class CarbonLockUtil { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonLockUtil.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/locks/HdfsFileLock.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/locks/HdfsFileLock.java b/core/src/main/java/org/apache/carbondata/core/locks/HdfsFileLock.java index bc65ece..b7b2c97 100644 --- a/core/src/main/java/org/apache/carbondata/core/locks/HdfsFileLock.java +++ b/core/src/main/java/org/apache/carbondata/core/locks/HdfsFileLock.java @@ -20,18 +20,19 @@ package org.apache.carbondata.core.locks; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastore.impl.FileFactory; import org.apache.carbondata.core.util.path.CarbonTablePath; +import org.apache.log4j.Logger; + /** * This class is used to handle the HDFS File locking. * This is achieved using the concept of acquiring the data out stream using Append option. */ public class HdfsFileLock extends AbstractCarbonLock { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(HdfsFileLock.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java b/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java index 5e3033e..35b4a1d 100644 --- a/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java +++ b/core/src/main/java/org/apache/carbondata/core/locks/LocalFileLock.java @@ -24,12 +24,13 @@ import java.nio.channels.OverlappingFileLockException; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastore.impl.FileFactory; import org.apache.carbondata.core.util.CarbonUtil; import org.apache.carbondata.core.util.path.CarbonTablePath; +import org.apache.log4j.Logger; + /** * This class handles the file locking in the local file system. * This will be handled using the file channel lock API. @@ -53,7 +54,7 @@ public class LocalFileLock extends AbstractCarbonLock { /** * LOGGER for logging the messages. */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(LocalFileLock.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/locks/S3FileLock.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/locks/S3FileLock.java b/core/src/main/java/org/apache/carbondata/core/locks/S3FileLock.java index 10bab28..e9d9aed 100644 --- a/core/src/main/java/org/apache/carbondata/core/locks/S3FileLock.java +++ b/core/src/main/java/org/apache/carbondata/core/locks/S3FileLock.java @@ -20,19 +20,20 @@ package org.apache.carbondata.core.locks; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastore.impl.FileFactory; import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.util.path.CarbonTablePath; +import org.apache.log4j.Logger; + /** * This class is used to handle the S3 File locking. * This is acheived using the concept of acquiring the data out stream using Append option. */ public class S3FileLock extends AbstractCarbonLock { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(S3FileLock.class.getName()); /** @@ -93,7 +94,7 @@ public class S3FileLock extends AbstractCarbonLock { FileFactory.getFileType(lockFilePath)); return true; } catch (IOException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); return false; } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/locks/ZooKeeperLocking.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/locks/ZooKeeperLocking.java b/core/src/main/java/org/apache/carbondata/core/locks/ZooKeeperLocking.java index 5a055ab..de8d6a6 100644 --- a/core/src/main/java/org/apache/carbondata/core/locks/ZooKeeperLocking.java +++ b/core/src/main/java/org/apache/carbondata/core/locks/ZooKeeperLocking.java @@ -20,13 +20,13 @@ package org.apache.carbondata.core.locks; import java.util.Collections; import java.util.List; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.util.CarbonProperties; import org.apache.carbondata.core.util.path.CarbonTablePath; +import org.apache.log4j.Logger; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.ZooDefs.Ids; @@ -37,7 +37,7 @@ import org.apache.zookeeper.ZooKeeper; */ public class ZooKeeperLocking extends AbstractCarbonLock { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(ZooKeeperLocking.class.getName()); /** @@ -106,7 +106,7 @@ public class ZooKeeperLocking extends AbstractCarbonLock { zk.create(this.lockTypeFolder, new byte[1], Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT); } } catch (KeeperException | InterruptedException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); } initRetry(); } @@ -167,7 +167,7 @@ public class ZooKeeperLocking extends AbstractCarbonLock { return false; } } catch (KeeperException | InterruptedException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); return false; } } @@ -183,7 +183,7 @@ public class ZooKeeperLocking extends AbstractCarbonLock { lockPath = null; } } catch (KeeperException | InterruptedException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); return false; } return true; http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/locks/ZookeeperInit.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/locks/ZookeeperInit.java b/core/src/main/java/org/apache/carbondata/core/locks/ZookeeperInit.java index 102ea4c..5e59593 100644 --- a/core/src/main/java/org/apache/carbondata/core/locks/ZookeeperInit.java +++ b/core/src/main/java/org/apache/carbondata/core/locks/ZookeeperInit.java @@ -19,9 +19,9 @@ package org.apache.carbondata.core.locks; import java.io.IOException; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; +import org.apache.log4j.Logger; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; import org.apache.zookeeper.ZooKeeper; @@ -31,7 +31,7 @@ import org.apache.zookeeper.ZooKeeper; */ public class ZookeeperInit { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(ZookeeperInit.class.getName()); private static ZookeeperInit zooKeeperInit; http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/memory/IntPointerBuffer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/memory/IntPointerBuffer.java b/core/src/main/java/org/apache/carbondata/core/memory/IntPointerBuffer.java index 58d873c..c596b08 100644 --- a/core/src/main/java/org/apache/carbondata/core/memory/IntPointerBuffer.java +++ b/core/src/main/java/org/apache/carbondata/core/memory/IntPointerBuffer.java @@ -17,15 +17,16 @@ package org.apache.carbondata.core.memory; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; +import org.apache.log4j.Logger; + /** * Holds the pointers for rows. */ public class IntPointerBuffer { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(IntPointerBuffer.class.getName()); private int length; http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/memory/UnsafeMemoryManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/memory/UnsafeMemoryManager.java b/core/src/main/java/org/apache/carbondata/core/memory/UnsafeMemoryManager.java index 048c058..6a69dfd 100644 --- a/core/src/main/java/org/apache/carbondata/core/memory/UnsafeMemoryManager.java +++ b/core/src/main/java/org/apache/carbondata/core/memory/UnsafeMemoryManager.java @@ -23,17 +23,18 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.util.CarbonProperties; +import org.apache.log4j.Logger; + /** * Manages memory for instance. */ public class UnsafeMemoryManager { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(UnsafeMemoryManager.class.getName()); private static boolean offHeap = Boolean.parseBoolean(CarbonProperties.getInstance() http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/memory/UnsafeSortMemoryManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/memory/UnsafeSortMemoryManager.java b/core/src/main/java/org/apache/carbondata/core/memory/UnsafeSortMemoryManager.java index 67b8d43..8dcf915 100644 --- a/core/src/main/java/org/apache/carbondata/core/memory/UnsafeSortMemoryManager.java +++ b/core/src/main/java/org/apache/carbondata/core/memory/UnsafeSortMemoryManager.java @@ -22,11 +22,12 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.util.CarbonProperties; +import org.apache.log4j.Logger; + /** * Memory manager to keep track of * all memory for storing the sorted data @@ -36,7 +37,7 @@ public class UnsafeSortMemoryManager { /** * logger */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(UnsafeSortMemoryManager.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/metadata/SegmentFileStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/SegmentFileStore.java b/core/src/main/java/org/apache/carbondata/core/metadata/SegmentFileStore.java index 44a2f7e..1e1e303 100644 --- a/core/src/main/java/org/apache/carbondata/core/metadata/SegmentFileStore.java +++ b/core/src/main/java/org/apache/carbondata/core/metadata/SegmentFileStore.java @@ -20,7 +20,6 @@ import java.io.*; import java.nio.charset.Charset; import java.util.*; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datamap.DataMapStoreManager; @@ -51,13 +50,14 @@ import org.apache.carbondata.core.util.path.CarbonTablePath; import com.google.gson.Gson; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; +import org.apache.log4j.Logger; /** * Provide read and write support for segment file associated with each segment */ public class SegmentFileStore { - private static LogService LOGGER = LogServiceFactory.getLogService( + private static final Logger LOGGER = LogServiceFactory.getLogService( SegmentFileStore.class.getCanonicalName()); private SegmentFile segmentFile; http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/CarbonTable.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/CarbonTable.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/CarbonTable.java index e57605a..2f68754 100644 --- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/CarbonTable.java +++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/CarbonTable.java @@ -28,7 +28,6 @@ import java.util.List; import java.util.Map; import org.apache.carbondata.common.exceptions.sql.MalformedDataMapCommandException; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datamap.DataMapStoreManager; @@ -64,13 +63,14 @@ import static org.apache.carbondata.core.metadata.schema.datamap.DataMapClassPro import static org.apache.carbondata.core.util.CarbonUtil.thriftColumnSchemaToWrapperColumnSchema; import org.apache.hadoop.conf.Configuration; +import org.apache.log4j.Logger; /** * Mapping class for Carbon actual table */ public class CarbonTable implements Serializable { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonTable.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableInfo.java b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableInfo.java index 38145e5..b3e9e7e 100644 --- a/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableInfo.java +++ b/core/src/main/java/org/apache/carbondata/core/metadata/schema/table/TableInfo.java @@ -30,7 +30,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; @@ -38,13 +37,15 @@ import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.carbondata.core.metadata.schema.table.column.ColumnSchema; import org.apache.carbondata.core.metadata.schema.table.column.ParentColumnTableRelation; +import org.apache.log4j.Logger; + /** * Store the information about the table. * it stores the fact table as well as aggregate table present in the schema */ public class TableInfo implements Serializable, Writable { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(TableInfo.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/mutate/CarbonUpdateUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/mutate/CarbonUpdateUtil.java b/core/src/main/java/org/apache/carbondata/core/mutate/CarbonUpdateUtil.java index d52eeb2..3924c0d 100644 --- a/core/src/main/java/org/apache/carbondata/core/mutate/CarbonUpdateUtil.java +++ b/core/src/main/java/org/apache/carbondata/core/mutate/CarbonUpdateUtil.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datamap.Segment; @@ -48,13 +47,14 @@ import org.apache.carbondata.core.util.CarbonUtil; import org.apache.carbondata.core.util.path.CarbonTablePath; import org.apache.hadoop.fs.Path; +import org.apache.log4j.Logger; /** * This class contains all update utility methods */ public class CarbonUpdateUtil { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonUpdateUtil.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/mutate/DeleteDeltaBlockDetails.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/mutate/DeleteDeltaBlockDetails.java b/core/src/main/java/org/apache/carbondata/core/mutate/DeleteDeltaBlockDetails.java index b0a0139..045f0e7 100644 --- a/core/src/main/java/org/apache/carbondata/core/mutate/DeleteDeltaBlockDetails.java +++ b/core/src/main/java/org/apache/carbondata/core/mutate/DeleteDeltaBlockDetails.java @@ -25,9 +25,10 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; +import org.apache.log4j.Logger; + /** * This class stores the block details of delete delta file */ @@ -41,7 +42,7 @@ public class DeleteDeltaBlockDetails implements Serializable { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(DeleteDeltaBlockDetails.class.getName()); public DeleteDeltaBlockDetails(String blockName) { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/mutate/SegmentUpdateDetails.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/mutate/SegmentUpdateDetails.java b/core/src/main/java/org/apache/carbondata/core/mutate/SegmentUpdateDetails.java index 583e2ec..a6fbb4f 100644 --- a/core/src/main/java/org/apache/carbondata/core/mutate/SegmentUpdateDetails.java +++ b/core/src/main/java/org/apache/carbondata/core/mutate/SegmentUpdateDetails.java @@ -19,10 +19,11 @@ package org.apache.carbondata.core.mutate; import java.io.Serializable; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.statusmanager.SegmentStatus; +import org.apache.log4j.Logger; + /** * This class stores the segment details of table update status file */ @@ -40,7 +41,7 @@ public class SegmentUpdateDetails implements Serializable { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(SegmentUpdateDetails.class.getName()); public String getDeleteDeltaEndTimestamp() { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteDeltaFileReaderImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteDeltaFileReaderImpl.java b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteDeltaFileReaderImpl.java index b2260f0..49dec4c 100644 --- a/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteDeltaFileReaderImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteDeltaFileReaderImpl.java @@ -23,8 +23,6 @@ import java.io.IOException; import java.io.InputStreamReader; import java.io.StringWriter; -import org.apache.carbondata.common.logging.LogService; -import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastore.impl.FileFactory; import org.apache.carbondata.core.fileoperations.AtomicFileOperationFactory; @@ -39,12 +37,6 @@ import com.google.gson.Gson; */ public class CarbonDeleteDeltaFileReaderImpl implements CarbonDeleteDeltaFileReader { - /** - * LOGGER - */ - private static final LogService LOGGER = - LogServiceFactory.getLogService(CarbonDeleteDeltaFileReaderImpl.class.getName()); - private String filePath; private FileFactory.FileType fileType; http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteFilesDataReader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteFilesDataReader.java b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteFilesDataReader.java index cc6e53f..32eb60d 100644 --- a/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteFilesDataReader.java +++ b/core/src/main/java/org/apache/carbondata/core/reader/CarbonDeleteFilesDataReader.java @@ -30,7 +30,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastore.impl.FileFactory; @@ -39,6 +38,7 @@ import org.apache.carbondata.core.mutate.DeleteDeltaBlockletDetails; import org.apache.carbondata.core.mutate.DeleteDeltaVo; import org.apache.carbondata.core.util.CarbonProperties; +import org.apache.log4j.Logger; /** * This class perform the functionality of reading multiple delete delta files @@ -48,7 +48,7 @@ public class CarbonDeleteFilesDataReader { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonDeleteFilesDataReader.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/reader/sortindex/CarbonDictionarySortIndexReaderImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/reader/sortindex/CarbonDictionarySortIndexReaderImpl.java b/core/src/main/java/org/apache/carbondata/core/reader/sortindex/CarbonDictionarySortIndexReaderImpl.java index 439a93e..ef40c16 100644 --- a/core/src/main/java/org/apache/carbondata/core/reader/sortindex/CarbonDictionarySortIndexReaderImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/reader/sortindex/CarbonDictionarySortIndexReaderImpl.java @@ -19,7 +19,6 @@ package org.apache.carbondata.core.reader.sortindex; import java.io.IOException; import java.util.List; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.cache.dictionary.DictionaryColumnUniqueIdentifier; import org.apache.carbondata.core.datastore.impl.FileFactory; @@ -29,6 +28,7 @@ import org.apache.carbondata.core.reader.CarbonDictionaryMetadataReaderImpl; import org.apache.carbondata.core.reader.ThriftReader; import org.apache.carbondata.format.ColumnSortInfo; +import org.apache.log4j.Logger; import org.apache.thrift.TBase; /** @@ -54,7 +54,7 @@ public class CarbonDictionarySortIndexReaderImpl implements CarbonDictionarySort /** * Comment for <code>LOGGER</code> */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonDictionarySortIndexReaderImpl.class.getName()); /** @@ -97,7 +97,7 @@ public class CarbonDictionarySortIndexReaderImpl implements CarbonDictionarySort try { columnSortInfo = (ColumnSortInfo) dictionarySortIndexThriftReader.read(); } catch (IOException ie) { - LOGGER.error(ie, "problem while reading the column sort info."); + LOGGER.error("problem while reading the column sort info.", ie); throw new IOException("problem while reading the column sort info.", ie); } finally { if (null != dictionarySortIndexThriftReader) { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/scan/collector/ResultCollectorFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/collector/ResultCollectorFactory.java b/core/src/main/java/org/apache/carbondata/core/scan/collector/ResultCollectorFactory.java index e0a0b90..68f8ae6 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/collector/ResultCollectorFactory.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/collector/ResultCollectorFactory.java @@ -16,11 +16,21 @@ */ package org.apache.carbondata.core.scan.collector; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; -import org.apache.carbondata.core.scan.collector.impl.*; +import org.apache.carbondata.core.scan.collector.impl.AbstractScannedResultCollector; +import org.apache.carbondata.core.scan.collector.impl.DictionaryBasedResultCollector; +import org.apache.carbondata.core.scan.collector.impl.DictionaryBasedVectorResultCollector; +import org.apache.carbondata.core.scan.collector.impl.RawBasedResultCollector; +import org.apache.carbondata.core.scan.collector.impl.RestructureBasedDictionaryResultCollector; +import org.apache.carbondata.core.scan.collector.impl.RestructureBasedRawResultCollector; +import org.apache.carbondata.core.scan.collector.impl.RestructureBasedVectorResultCollector; +import org.apache.carbondata.core.scan.collector.impl.RowIdBasedResultCollector; +import org.apache.carbondata.core.scan.collector.impl.RowIdRawBasedResultCollector; +import org.apache.carbondata.core.scan.collector.impl.RowIdRestructureBasedRawResultCollector; import org.apache.carbondata.core.scan.executor.infos.BlockExecutionInfo; +import org.apache.log4j.Logger; + /** * This class will provide the result collector instance based on the required type */ @@ -29,7 +39,7 @@ public class ResultCollectorFactory { /** * logger of result collector factory */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(ResultCollectorFactory.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedRawResultCollector.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedRawResultCollector.java b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedRawResultCollector.java index 33f0db7..ed8d48e 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedRawResultCollector.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/collector/impl/RestructureBasedRawResultCollector.java @@ -19,8 +19,6 @@ package org.apache.carbondata.core.scan.collector.impl; import java.util.ArrayList; import java.util.List; -import org.apache.carbondata.common.logging.LogService; -import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastore.block.SegmentProperties; import org.apache.carbondata.core.keygenerator.KeyGenException; @@ -47,12 +45,6 @@ import org.apache.commons.lang3.ArrayUtils; public class RestructureBasedRawResultCollector extends RawBasedResultCollector { /** - * logger - */ - private static final LogService LOGGER = - LogServiceFactory.getLogService(RestructureBasedRawResultCollector.class.getName()); - - /** * Key generator which will form the mdKey according to latest schema */ private KeyGenerator restructuredKeyGenerator; http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java b/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java index a419c02..6a6a929 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/AbstractQueryExecutor.java @@ -30,9 +30,7 @@ import java.util.Set; import java.util.concurrent.ExecutorService; import org.apache.carbondata.common.CarbonIterator; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; -import org.apache.carbondata.common.logging.impl.StandardLogService; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.constants.CarbonV3DataFormatConstants; import org.apache.carbondata.core.datamap.Segment; @@ -78,6 +76,7 @@ import org.apache.carbondata.core.util.path.CarbonTablePath; import org.apache.commons.lang3.ArrayUtils; import org.apache.hadoop.conf.Configuration; +import org.apache.log4j.Logger; /** * This class provides a skeletal implementation of the {@link QueryExecutor} @@ -86,7 +85,7 @@ import org.apache.hadoop.conf.Configuration; */ public abstract class AbstractQueryExecutor<E> implements QueryExecutor<E> { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(AbstractQueryExecutor.class.getName()); /** * holder for query properties which will be used to execute the query @@ -119,9 +118,6 @@ public abstract class AbstractQueryExecutor<E> implements QueryExecutor<E> { * @param queryModel */ protected void initQuery(QueryModel queryModel) throws IOException { - StandardLogService.setThreadName(StandardLogService.getPartitionID( - queryModel.getAbsoluteTableIdentifier().getCarbonTableIdentifier().getTableName()), - queryModel.getQueryId()); LOGGER.info("Query will be executed on table: " + queryModel.getAbsoluteTableIdentifier() .getCarbonTableIdentifier().getTableName()); this.freeUnsafeMemory = queryModel.isFreeUnsafeMemory(); http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/SearchModeDetailQueryExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/SearchModeDetailQueryExecutor.java b/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/SearchModeDetailQueryExecutor.java index 6d03540..fe91442 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/SearchModeDetailQueryExecutor.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/SearchModeDetailQueryExecutor.java @@ -22,7 +22,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import org.apache.carbondata.common.CarbonIterator; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.scan.executor.exception.QueryExecutionException; @@ -32,9 +31,10 @@ import org.apache.carbondata.core.scan.result.iterator.SearchModeResultIterator; import org.apache.carbondata.core.util.CarbonProperties; import org.apache.hadoop.conf.Configuration; +import org.apache.log4j.Logger; public class SearchModeDetailQueryExecutor extends AbstractQueryExecutor<Object> { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(SearchModeDetailQueryExecutor.class.getName()); private static ExecutorService executorService = null; http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/SearchModeVectorDetailQueryExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/SearchModeVectorDetailQueryExecutor.java b/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/SearchModeVectorDetailQueryExecutor.java index 418ef42..dd5f364 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/SearchModeVectorDetailQueryExecutor.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/executor/impl/SearchModeVectorDetailQueryExecutor.java @@ -22,7 +22,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import org.apache.carbondata.common.CarbonIterator; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.scan.executor.exception.QueryExecutionException; import org.apache.carbondata.core.scan.executor.infos.BlockExecutionInfo; @@ -33,12 +32,13 @@ import org.apache.carbondata.core.util.CarbonProperties; import static org.apache.carbondata.core.constants.CarbonCommonConstants.CARBON_SEARCH_MODE_SCAN_THREAD; import org.apache.hadoop.conf.Configuration; +import org.apache.log4j.Logger; /** * Below class will be used to execute the detail query and returns columnar vectors. */ public class SearchModeVectorDetailQueryExecutor extends AbstractQueryExecutor<Object> { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(SearchModeVectorDetailQueryExecutor.class.getName()); private static ExecutorService executorService = null; http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/scan/expression/RangeExpressionEvaluator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/expression/RangeExpressionEvaluator.java b/core/src/main/java/org/apache/carbondata/core/scan/expression/RangeExpressionEvaluator.java index 585bf60..c47d5ff 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/expression/RangeExpressionEvaluator.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/expression/RangeExpressionEvaluator.java @@ -23,7 +23,6 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.metadata.datatype.DataType; @@ -43,8 +42,10 @@ import static org.apache.carbondata.core.scan.filter.intf.ExpressionType.GREATER import static org.apache.carbondata.core.scan.filter.intf.ExpressionType.LESSTHAN; import static org.apache.carbondata.core.scan.filter.intf.ExpressionType.LESSTHAN_EQUALTO; +import org.apache.log4j.Logger; + public class RangeExpressionEvaluator { - private static final LogService LOG = + private static final Logger LOG = LogServiceFactory.getLogService(RangeExpressionEvaluator.class.getName()); private Expression expr; private Expression srcNode; http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessor.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessor.java index fcb374f..7269304 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessor.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterExpressionProcessor.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.util.BitSet; import java.util.List; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastore.DataRefNode; import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; @@ -64,9 +63,11 @@ import org.apache.carbondata.core.scan.filter.resolver.resolverinfo.TrueConditio import org.apache.carbondata.core.scan.partition.PartitionUtil; import org.apache.carbondata.core.scan.partition.Partitioner; +import org.apache.log4j.Logger; + public class FilterExpressionProcessor implements FilterProcessor { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(FilterExpressionProcessor.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java index fe92c42..06672f5 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/FilterUtil.java @@ -36,7 +36,6 @@ import java.util.SortedMap; import java.util.TreeMap; import java.util.TreeSet; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.cache.Cache; import org.apache.carbondata.core.cache.CacheProvider; @@ -113,10 +112,11 @@ import org.apache.carbondata.core.util.comparator.Comparator; import org.apache.carbondata.core.util.comparator.SerializableComparator; import org.apache.commons.lang.ArrayUtils; +import org.apache.log4j.Logger; import org.roaringbitmap.RoaringBitmap; public final class FilterUtil { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(FilterUtil.class.getName()); private FilterUtil() { @@ -1888,7 +1888,7 @@ public final class FilterUtil { */ public static void logError(Throwable e, boolean invalidRowsPresent) { if (!invalidRowsPresent) { - LOGGER.error(e, CarbonCommonConstants.FILTER_INVALID_MEMBER + e.getMessage()); + LOGGER.error(CarbonCommonConstants.FILTER_INVALID_MEMBER + e.getMessage(), e); } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelFilterExecuterImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelFilterExecuterImpl.java b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelFilterExecuterImpl.java index a5faacc..28c3f87 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelFilterExecuterImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/filter/executer/RowLevelFilterExecuterImpl.java @@ -29,7 +29,6 @@ import java.util.BitSet; import java.util.List; import java.util.Map; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.cache.dictionary.Dictionary; import org.apache.carbondata.core.constants.CarbonCommonConstants; @@ -63,9 +62,11 @@ import org.apache.carbondata.core.util.ByteUtil; import org.apache.carbondata.core.util.CarbonUtil; import org.apache.carbondata.core.util.DataTypeUtil; +import org.apache.log4j.Logger; + public class RowLevelFilterExecuterImpl implements FilterExecuter { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(RowLevelFilterExecuterImpl.class.getName()); List<DimColumnResolvedFilterInfo> dimColEvaluatorInfoList; List<MeasureColumnResolvedFilterInfo> msrColEvalutorInfoList; http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/scan/model/QueryModelBuilder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/model/QueryModelBuilder.java b/core/src/main/java/org/apache/carbondata/core/scan/model/QueryModelBuilder.java index f1bbe15..4f934ce 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/model/QueryModelBuilder.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/model/QueryModelBuilder.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.metadata.encoder.Encoding; import org.apache.carbondata.core.metadata.schema.table.CarbonTable; @@ -34,6 +33,8 @@ import org.apache.carbondata.core.scan.expression.Expression; import org.apache.carbondata.core.scan.filter.resolver.FilterResolverIntf; import org.apache.carbondata.core.util.DataTypeConverter; +import org.apache.log4j.Logger; + public class QueryModelBuilder { private CarbonTable table; @@ -45,7 +46,7 @@ public class QueryModelBuilder { /** * log information */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(QueryModelBuilder.class.getName()); public QueryModelBuilder(CarbonTable table) { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/scan/result/BlockletScannedResult.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/BlockletScannedResult.java b/core/src/main/java/org/apache/carbondata/core/scan/result/BlockletScannedResult.java index 0f9ba22..9191d08 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/result/BlockletScannedResult.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/result/BlockletScannedResult.java @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastore.chunk.DimensionColumnPage; @@ -45,12 +44,14 @@ import org.apache.carbondata.core.stats.QueryStatisticsConstants; import org.apache.carbondata.core.stats.QueryStatisticsModel; import org.apache.carbondata.core.util.CarbonUtil; +import org.apache.log4j.Logger; + /** * Scanned result class which will store and provide the result on request */ public abstract class BlockletScannedResult { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(BlockletScannedResult.class.getName()); /** * current row number http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/AbstractDetailQueryResultIterator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/AbstractDetailQueryResultIterator.java b/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/AbstractDetailQueryResultIterator.java index 5d430de..ed78aa7 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/AbstractDetailQueryResultIterator.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/AbstractDetailQueryResultIterator.java @@ -23,7 +23,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import org.apache.carbondata.common.CarbonIterator; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastore.DataRefNode; @@ -44,6 +43,8 @@ import org.apache.carbondata.core.stats.QueryStatisticsModel; import org.apache.carbondata.core.stats.QueryStatisticsRecorder; import org.apache.carbondata.core.util.CarbonProperties; +import org.apache.log4j.Logger; + /** * In case of detail query we cannot keep all the records in memory so for * executing that query are returning a iterator over block and every time next @@ -54,7 +55,7 @@ public abstract class AbstractDetailQueryResultIterator<E> extends CarbonIterato /** * LOGGER. */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(AbstractDetailQueryResultIterator.class.getName()); private static final Map<DeleteDeltaInfo, Object> deleteDeltaToLockObjectMap = http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/RawResultIterator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/RawResultIterator.java b/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/RawResultIterator.java index efa5b8a..29d8751 100644 --- a/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/RawResultIterator.java +++ b/core/src/main/java/org/apache/carbondata/core/scan/result/iterator/RawResultIterator.java @@ -17,13 +17,14 @@ package org.apache.carbondata.core.scan.result.iterator; import org.apache.carbondata.common.CarbonIterator; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastore.block.SegmentProperties; import org.apache.carbondata.core.keygenerator.KeyGenException; import org.apache.carbondata.core.scan.result.RowBatch; import org.apache.carbondata.core.scan.wrappers.ByteArrayWrapper; +import org.apache.log4j.Logger; + /** * This is a wrapper iterator over the detail raw query iterator. * This iterator will handle the processing of the raw rows. @@ -49,7 +50,7 @@ public class RawResultIterator extends CarbonIterator<Object[]> { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(RawResultIterator.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/stats/DriverQueryStatisticsRecorderImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/stats/DriverQueryStatisticsRecorderImpl.java b/core/src/main/java/org/apache/carbondata/core/stats/DriverQueryStatisticsRecorderImpl.java index 1e30fe6..7dfc5dd 100644 --- a/core/src/main/java/org/apache/carbondata/core/stats/DriverQueryStatisticsRecorderImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/stats/DriverQueryStatisticsRecorderImpl.java @@ -22,19 +22,20 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; +import org.apache.carbondata.common.logging.impl.StatisticLevel; import static org.apache.carbondata.core.util.CarbonUtil.printLine; import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.Logger; /** * Class will be used to record and log the query statistics */ public class DriverQueryStatisticsRecorderImpl implements QueryStatisticsRecorder { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(DriverQueryStatisticsRecorderImpl.class.getName()); /** @@ -119,7 +120,7 @@ public class DriverQueryStatisticsRecorderImpl implements QueryStatisticsRecorde if (entry.getValue().size() >= 2) { String tableInfo = collectDriverStatistics(entry.getValue(), queryId); if (null != tableInfo) { - LOGGER.statistic(tableInfo); + LOGGER.log(StatisticLevel.STATISTIC, tableInfo); // clear the statistics that has been printed entries.remove(); } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/stats/QueryStatisticsRecorderImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/stats/QueryStatisticsRecorderImpl.java b/core/src/main/java/org/apache/carbondata/core/stats/QueryStatisticsRecorderImpl.java index 78ebd09..661bf93 100644 --- a/core/src/main/java/org/apache/carbondata/core/stats/QueryStatisticsRecorderImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/stats/QueryStatisticsRecorderImpl.java @@ -20,15 +20,17 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; +import org.apache.carbondata.common.logging.impl.StatisticLevel; + +import org.apache.log4j.Logger; /** * Class will be used to record and log the query statistics */ public class QueryStatisticsRecorderImpl implements QueryStatisticsRecorder, Serializable { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(QueryStatisticsRecorderImpl.class.getName()); /** @@ -67,7 +69,7 @@ public class QueryStatisticsRecorderImpl implements QueryStatisticsRecorder, Ser */ public void logStatistics() { for (QueryStatistic statistic : queryStatistics) { - LOGGER.statistic(statistic.getStatistics(queryId)); + LOGGER.log(StatisticLevel.STATISTIC, statistic.getStatistics(queryId)); } } @@ -76,7 +78,8 @@ public class QueryStatisticsRecorderImpl implements QueryStatisticsRecorder, Ser */ public void logStatisticsForTask(TaskStatistics result) { if (null != result) { - LOGGER.statistic("Print query statistic for each task id:" + "\n" + result.toString()); + LOGGER.log(StatisticLevel.STATISTIC, + "Print query statistic for each task id:" + "\n" + result.toString()); } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/statusmanager/LoadMetadataDetails.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/statusmanager/LoadMetadataDetails.java b/core/src/main/java/org/apache/carbondata/core/statusmanager/LoadMetadataDetails.java index 9dc8fe6..b19e774 100644 --- a/core/src/main/java/org/apache/carbondata/core/statusmanager/LoadMetadataDetails.java +++ b/core/src/main/java/org/apache/carbondata/core/statusmanager/LoadMetadataDetails.java @@ -22,10 +22,11 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.log4j.Logger; + /* Prior to Carbon 1.3 the the loadMetaData @timestamp and @loadStartTime was stored as as date string format "dd-MM-yyyy HH:mm:ss:SSS". The date string value is specific @@ -95,7 +96,7 @@ public class LoadMetadataDetails implements Serializable { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(LoadMetadataDetails.class.getName()); // dont remove static as the write will fail. http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentStatusManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentStatusManager.java b/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentStatusManager.java index f1ee877..9196367 100755 --- a/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentStatusManager.java +++ b/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentStatusManager.java @@ -30,8 +30,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; +import org.apache.carbondata.common.logging.impl.Audit; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datamap.Segment; import org.apache.carbondata.core.datastore.impl.FileFactory; @@ -56,13 +56,14 @@ import org.apache.carbondata.core.util.path.CarbonTablePath; import com.google.gson.Gson; import org.apache.hadoop.conf.Configuration; +import org.apache.log4j.Logger; /** * Manages Load/Segment status */ public class SegmentStatusManager { - private static final LogService LOG = + private static final Logger LOG = LogServiceFactory.getLogService(SegmentStatusManager.class.getName()); private AbsoluteTableIdentifier identifier; @@ -252,7 +253,7 @@ public class SegmentStatusManager { listOfLoadFolderDetailsArray = gsonObjectToRead.fromJson(buffReader, LoadMetadataDetails[].class); } catch (IOException e) { - LOG.error(e, "Failed to read metadata of load"); + LOG.error("Failed to read metadata of load", e); throw e; } finally { closeStreams(buffReader, inStream, dataInputStream); @@ -370,7 +371,7 @@ public class SegmentStatusManager { String errorMsg = "Delete segment by id is failed for " + tableDetails + ". Not able to acquire the table status lock due to other operation running " + "in the background."; - LOG.audit(errorMsg); + Audit.log(LOG, errorMsg); LOG.error(errorMsg); throw new Exception(errorMsg + " Please try after some time."); } @@ -380,7 +381,7 @@ public class SegmentStatusManager { } } else { - LOG.audit("Delete segment by Id is failed. No matching segment id found."); + Audit.log(LOG, "Delete segment by Id is failed. No matching segment id found."); return loadIds; } @@ -388,7 +389,7 @@ public class SegmentStatusManager { String errorMsg = "Delete segment by id is failed for " + tableDetails + ". Not able to acquire the delete segment lock due to another delete " + "operation is running in the background."; - LOG.audit(errorMsg); + Audit.log(LOG, errorMsg); LOG.error(errorMsg); throw new Exception(errorMsg + " Please try after some time."); } @@ -452,7 +453,7 @@ public class SegmentStatusManager { String errorMsg = "Delete segment by date is failed for " + tableDetails + ". Not able to acquire the table status lock due to other operation running " + "in the background."; - LOG.audit(errorMsg); + Audit.log(LOG, errorMsg); LOG.error(errorMsg); throw new Exception(errorMsg + " Please try after some time."); @@ -462,7 +463,7 @@ public class SegmentStatusManager { } } else { - LOG.audit("Delete segment by date is failed. No matching segment found."); + Audit.log(LOG, "Delete segment by date is failed. No matching segment found."); invalidLoadTimestamps.add(loadDate); return invalidLoadTimestamps; } @@ -471,7 +472,7 @@ public class SegmentStatusManager { String errorMsg = "Delete segment by date is failed for " + tableDetails + ". Not able to acquire the delete segment lock due to another delete " + "operation is running in the background."; - LOG.audit(errorMsg); + Audit.log(LOG, errorMsg); LOG.error(errorMsg); throw new Exception(errorMsg + " Please try after some time."); } @@ -578,7 +579,7 @@ public class SegmentStatusManager { } if (!loadFound) { - LOG.audit("Delete segment by ID is failed. No matching segment id found :" + loadId); + Audit.log(LOG, "Delete segment by ID is failed. No matching segment id found :" + loadId); invalidLoadIds.add(loadId); return invalidLoadIds; } @@ -632,7 +633,7 @@ public class SegmentStatusManager { if (!loadFound) { invalidLoadTimestamps.add(loadDate); - LOG.audit("Delete segment by date is failed. No matching segment found."); + Audit.log(LOG, "Delete segment by date is failed. No matching segment found."); return invalidLoadTimestamps; } return invalidLoadTimestamps; @@ -991,7 +992,7 @@ public class SegmentStatusManager { dbName + "." + tableName + ". Not able to acquire the table status lock due to other operation " + "running in the background."; - LOG.audit(errorMsg); + Audit.log(LOG, errorMsg); LOG.error(errorMsg); throw new IOException(errorMsg + " Please try after some time."); } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentUpdateStatusManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentUpdateStatusManager.java b/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentUpdateStatusManager.java index c340714..c5f5f74 100644 --- a/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentUpdateStatusManager.java +++ b/core/src/main/java/org/apache/carbondata/core/statusmanager/SegmentUpdateStatusManager.java @@ -30,7 +30,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datamap.Segment; @@ -53,6 +52,7 @@ import org.apache.carbondata.core.util.CarbonUtil; import org.apache.carbondata.core.util.path.CarbonTablePath; import com.google.gson.Gson; +import org.apache.log4j.Logger; /** * Manages Segment & block status of carbon table for Delete operation @@ -62,7 +62,7 @@ public class SegmentUpdateStatusManager { /** * logger */ - private static final LogService LOG = + private static final Logger LOG = LogServiceFactory.getLogService(SegmentUpdateStatusManager.class.getName()); private final AbsoluteTableIdentifier identifier; http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/util/CarbonLoadStatisticsImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/util/CarbonLoadStatisticsImpl.java b/core/src/main/java/org/apache/carbondata/core/util/CarbonLoadStatisticsImpl.java index 6d6e3ed..618f4d1 100644 --- a/core/src/main/java/org/apache/carbondata/core/util/CarbonLoadStatisticsImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/util/CarbonLoadStatisticsImpl.java @@ -19,9 +19,10 @@ package org.apache.carbondata.core.util; import java.util.concurrent.ConcurrentHashMap; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; +import org.apache.log4j.Logger; + /** * A util which provide methods used to record time information druing data loading. */ @@ -37,7 +38,7 @@ public class CarbonLoadStatisticsImpl implements LoadStatistics { return carbonLoadStatisticsImplInstance; } - private final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonLoadStatisticsImpl.class.getName()); /* http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/util/CarbonMetadataUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/util/CarbonMetadataUtil.java b/core/src/main/java/org/apache/carbondata/core/util/CarbonMetadataUtil.java index 231f8c4..b156ae6 100644 --- a/core/src/main/java/org/apache/carbondata/core/util/CarbonMetadataUtil.java +++ b/core/src/main/java/org/apache/carbondata/core/util/CarbonMetadataUtil.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastore.blocklet.BlockletEncodedColumnPage; import org.apache.carbondata.core.datastore.blocklet.EncodedBlocklet; @@ -51,12 +50,14 @@ import org.apache.carbondata.format.IndexHeader; import org.apache.carbondata.format.LocalDictionaryChunk; import org.apache.carbondata.format.SegmentInfo; +import org.apache.log4j.Logger; + /** * Util class to convert to thrift metdata classes */ public class CarbonMetadataUtil { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonMetadataUtil.class.getName()); private CarbonMetadataUtil() { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/util/CarbonProperties.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/util/CarbonProperties.java b/core/src/main/java/org/apache/carbondata/core/util/CarbonProperties.java index 3438c4e..a32ad52 100644 --- a/core/src/main/java/org/apache/carbondata/core/util/CarbonProperties.java +++ b/core/src/main/java/org/apache/carbondata/core/util/CarbonProperties.java @@ -29,13 +29,13 @@ import java.util.Properties; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.constants.CarbonLoadOptionConstants; import org.apache.carbondata.core.constants.CarbonV3DataFormatConstants; import org.apache.carbondata.core.datastore.impl.FileFactory; import org.apache.carbondata.core.metadata.ColumnarFormatVersion; + import static org.apache.carbondata.core.constants.CarbonCommonConstants.BLOCKLET_SIZE; import static org.apache.carbondata.core.constants.CarbonCommonConstants.CARBON_CUSTOM_BLOCK_DISTRIBUTION; import static org.apache.carbondata.core.constants.CarbonCommonConstants.CARBON_DATA_FILE_VERSION; @@ -70,12 +70,13 @@ import static org.apache.carbondata.core.constants.CarbonV3DataFormatConstants.B import static org.apache.carbondata.core.constants.CarbonV3DataFormatConstants.NUMBER_OF_COLUMN_TO_READ_IN_IO; import org.apache.hadoop.conf.Configuration; +import org.apache.log4j.Logger; public final class CarbonProperties { /** * Attribute for Carbon LOGGER. */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonProperties.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java b/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java index 937c222..77ad96d 100644 --- a/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java +++ b/core/src/main/java/org/apache/carbondata/core/util/CarbonUtil.java @@ -24,7 +24,6 @@ import java.nio.charset.Charset; import java.security.PrivilegedExceptionAction; import java.util.*; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.cache.dictionary.Dictionary; import org.apache.carbondata.core.cache.dictionary.DictionaryColumnUniqueIdentifier; @@ -112,6 +111,7 @@ import org.apache.hadoop.fs.permission.FsAction; import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.security.UserGroupInformation; +import org.apache.log4j.Logger; import org.apache.thrift.TBase; import org.apache.thrift.TException; import org.apache.thrift.protocol.TCompactProtocol; @@ -123,7 +123,7 @@ public final class CarbonUtil { /** * Attribute for Carbon LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonUtil.class.getName()); /** @@ -164,7 +164,7 @@ public final class CarbonUtil { try { closeStream(stream); } catch (IOException e) { - LOGGER.error(e, "Error while closing stream:" + e); + LOGGER.error("Error while closing stream:" + e, e); } } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java b/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java index fbcbee5..66faf20 100644 --- a/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java +++ b/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java @@ -28,7 +28,6 @@ import java.text.SimpleDateFormat; import java.util.Arrays; import java.util.Date; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastore.page.ColumnPage; @@ -42,12 +41,14 @@ import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension; import org.apache.carbondata.core.metadata.schema.table.column.CarbonMeasure; import org.apache.carbondata.core.metadata.schema.table.column.ColumnSchema; +import org.apache.log4j.Logger; + public final class DataTypeUtil { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(DataTypeUtil.class.getName()); private static final ThreadLocal<DateFormat> timeStampformatter = new ThreadLocal<DateFormat>() { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/util/DeleteLoadFolders.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/util/DeleteLoadFolders.java b/core/src/main/java/org/apache/carbondata/core/util/DeleteLoadFolders.java index a65294e..f1cc57f 100644 --- a/core/src/main/java/org/apache/carbondata/core/util/DeleteLoadFolders.java +++ b/core/src/main/java/org/apache/carbondata/core/util/DeleteLoadFolders.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datamap.DataMapStoreManager; import org.apache.carbondata.core.datamap.Segment; @@ -43,9 +42,11 @@ import org.apache.carbondata.core.statusmanager.SegmentStatusManager; import org.apache.carbondata.core.statusmanager.SegmentUpdateStatusManager; import org.apache.carbondata.core.util.path.CarbonTablePath; +import org.apache.log4j.Logger; + public final class DeleteLoadFolders { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(DeleteLoadFolders.class.getName()); private DeleteLoadFolders() {