[CARBONDATA-3024] Refactor to use log4j Logger directly Currently CarbonData's log is printing the line number in StandardLogService, it is not good for maintainability, a better way is to use log4j Logger directly so that it will print line number of where we are logging.
This closes #2827 Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/06adb5a0 Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/06adb5a0 Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/06adb5a0 Branch: refs/heads/master Commit: 06adb5a0376255c15f8c393257d6db0736e35f31 Parents: 15d3826 Author: Jacky Li <[email protected]> Authored: Wed Oct 17 20:27:15 2018 +0800 Committer: xuchuanyin <[email protected]> Committed: Thu Oct 18 09:56:12 2018 +0800 ---------------------------------------------------------------------- .../carbondata/common/logging/LogService.java | 80 ++++++- .../common/logging/LogServiceFactory.java | 6 +- .../carbondata/common/logging/impl/Audit.java | 49 ++++ .../common/logging/impl/StandardLogService.java | 236 ------------------- .../logging/LogServiceFactoryTest_UT.java | 7 +- .../logging/ft/LoggingServiceTest_FT.java | 9 +- .../logging/impl/StandardLogServiceTest_UT.java | 140 ----------- .../carbondata/core/cache/CacheProvider.java | 5 +- .../carbondata/core/cache/CarbonLRUCache.java | 5 +- .../dictionary/ForwardDictionaryCache.java | 5 +- .../dictionary/ManageDictionaryAndBTree.java | 5 +- .../dictionary/ReverseDictionaryCache.java | 5 +- .../core/constants/CarbonVersionConstants.java | 9 +- .../core/datamap/DataMapStoreManager.java | 10 +- .../carbondata/core/datamap/DataMapUtil.java | 4 +- .../status/DiskBasedDataMapStatusProvider.java | 17 +- .../block/SegmentPropertiesAndSchemaHolder.java | 5 +- .../blocklet/BlockletEncodedColumnPage.java | 5 +- .../datastore/compression/SnappyCompressor.java | 32 +-- .../filesystem/AbstractDFSCarbonFile.java | 4 +- .../datastore/filesystem/AlluxioCarbonFile.java | 6 +- .../datastore/filesystem/HDFSCarbonFile.java | 4 +- .../datastore/filesystem/LocalCarbonFile.java | 7 +- .../core/datastore/filesystem/S3CarbonFile.java | 4 +- .../datastore/filesystem/ViewFSCarbonFile.java | 4 +- .../core/datastore/impl/FileFactory.java | 4 +- .../datastore/page/LocalDictColumnPage.java | 9 +- .../page/encoding/ColumnPageEncoder.java | 5 +- .../client/NonSecureDictionaryClient.java | 7 +- .../NonSecureDictionaryClientHandler.java | 13 +- .../IncrementalColumnDictionaryGenerator.java | 7 +- .../generator/TableDictionaryGenerator.java | 5 +- .../server/NonSecureDictionaryServer.java | 6 +- .../NonSecureDictionaryServerHandler.java | 6 +- .../service/AbstractDictionaryServer.java | 5 +- .../AtomicFileOperationsImpl.java | 5 +- .../indexstore/BlockletDataMapIndexStore.java | 4 +- .../core/indexstore/BlockletDetailInfo.java | 8 +- .../indexstore/blockletindex/BlockDataMap.java | 13 +- .../blockletindex/SegmentIndexFileStore.java | 4 +- .../DateDirectDictionaryGenerator.java | 5 +- .../TimeStampDirectDictionaryGenerator.java | 5 +- .../core/locks/CarbonLockFactory.java | 5 +- .../carbondata/core/locks/CarbonLockUtil.java | 4 +- .../carbondata/core/locks/HdfsFileLock.java | 5 +- .../carbondata/core/locks/LocalFileLock.java | 5 +- .../carbondata/core/locks/S3FileLock.java | 7 +- .../carbondata/core/locks/ZooKeeperLocking.java | 10 +- .../carbondata/core/locks/ZookeeperInit.java | 4 +- .../core/memory/IntPointerBuffer.java | 5 +- .../core/memory/UnsafeMemoryManager.java | 5 +- .../core/memory/UnsafeSortMemoryManager.java | 5 +- .../core/metadata/SegmentFileStore.java | 4 +- .../core/metadata/schema/table/CarbonTable.java | 4 +- .../core/metadata/schema/table/TableInfo.java | 5 +- .../core/mutate/CarbonUpdateUtil.java | 4 +- .../core/mutate/DeleteDeltaBlockDetails.java | 5 +- .../core/mutate/SegmentUpdateDetails.java | 5 +- .../reader/CarbonDeleteDeltaFileReaderImpl.java | 8 - .../reader/CarbonDeleteFilesDataReader.java | 4 +- .../CarbonDictionarySortIndexReaderImpl.java | 6 +- .../scan/collector/ResultCollectorFactory.java | 16 +- .../RestructureBasedRawResultCollector.java | 8 - .../executor/impl/AbstractQueryExecutor.java | 8 +- .../impl/SearchModeDetailQueryExecutor.java | 4 +- .../SearchModeVectorDetailQueryExecutor.java | 4 +- .../expression/RangeExpressionEvaluator.java | 5 +- .../scan/filter/FilterExpressionProcessor.java | 5 +- .../carbondata/core/scan/filter/FilterUtil.java | 6 +- .../executer/RowLevelFilterExecuterImpl.java | 5 +- .../core/scan/model/QueryModelBuilder.java | 5 +- .../core/scan/result/BlockletScannedResult.java | 5 +- .../AbstractDetailQueryResultIterator.java | 5 +- .../scan/result/iterator/RawResultIterator.java | 5 +- .../DriverQueryStatisticsRecorderImpl.java | 7 +- .../core/stats/QueryStatisticsRecorderImpl.java | 11 +- .../core/statusmanager/LoadMetadataDetails.java | 5 +- .../statusmanager/SegmentStatusManager.java | 25 +- .../SegmentUpdateStatusManager.java | 4 +- .../core/util/CarbonLoadStatisticsImpl.java | 5 +- .../core/util/CarbonMetadataUtil.java | 5 +- .../carbondata/core/util/CarbonProperties.java | 5 +- .../apache/carbondata/core/util/CarbonUtil.java | 6 +- .../carbondata/core/util/DataTypeUtil.java | 5 +- .../carbondata/core/util/DeleteLoadFolders.java | 5 +- .../core/util/ObjectSizeCalculator.java | 7 +- .../carbondata/core/util/SessionParams.java | 9 +- .../carbondata/core/util/TaskMetricsMap.java | 4 +- .../core/util/path/HDFSLeaseUtils.java | 8 +- .../writer/CarbonDeleteDeltaWriterImpl.java | 4 +- .../core/writer/CarbonDictionaryWriterImpl.java | 6 +- .../CarbonDictionarySortIndexWriterImpl.java | 9 +- .../filesystem/HDFSCarbonFileTest.java | 18 +- .../core/load/LoadMetadataDetailsUnitTest.java | 13 +- .../bloom/AbstractBloomDataMapWriter.java | 4 - .../datamap/bloom/BloomCoarseGrainDataMap.java | 18 +- .../bloom/BloomCoarseGrainDataMapFactory.java | 11 +- .../datamap/bloom/BloomDataMapCache.java | 4 - .../datamap/bloom/BloomIndexFileStore.java | 20 +- .../datamap/examples/MinMaxDataWriter.java | 4 +- .../datamap/examples/MinMaxIndexDataMap.java | 4 +- .../examples/MinMaxIndexDataMapFactory.java | 4 +- .../datamap/lucene/LuceneDataMapBuilder.java | 4 +- .../lucene/LuceneDataMapFactoryBase.java | 6 +- .../datamap/lucene/LuceneDataMapWriter.java | 4 +- .../datamap/lucene/LuceneFineGrainDataMap.java | 6 +- .../carbondata/mv/datamap/MVAnalyzerRule.scala | 3 +- .../carbondata/examples/sdk/SDKS3Example.java | 10 +- .../examples/sdk/SDKS3ReadExample.java | 6 +- .../hadoop/api/CarbonOutputCommitter.java | 4 +- .../hadoop/testutil/StoreCreator.java | 4 +- .../hadoop/util/CarbonInputFormatUtil.java | 4 +- .../hive/MapredCarbonInputFormat.java | 5 +- .../carbondata/presto/CarbondataPageSource.java | 11 +- .../presto/impl/CarbonTableReader.java | 12 +- .../blockprune/BlockPruneQueryTestCase.scala | 6 +- .../CarbonCustomBlockDistributionTest.scala | 6 +- .../client/SecureDictionaryClient.java | 9 +- .../client/SecureDictionaryClientHandler.java | 6 +- .../server/SecureDictionaryServer.java | 24 +- .../server/SecureDictionaryServerHandler.java | 4 +- .../org/apache/carbondata/api/CarbonStore.scala | 13 +- .../load/DataLoadProcessorStepOnSpark.scala | 8 +- .../spark/rdd/AlterTableDropColumnRDD.scala | 2 +- .../carbondata/spark/rdd/CarbonMergerRDD.scala | 2 +- .../spark/rdd/NewCarbonDataLoadRDD.scala | 10 +- .../carbondata/spark/rdd/PartitionDropper.scala | 8 +- .../spark/rdd/PartitionSplitter.scala | 6 +- .../carbondata/spark/rdd/StreamHandoffRDD.scala | 8 +- .../carbondata/spark/util/CarbonScalaUtil.scala | 3 +- .../spark/util/GlobalDictionaryUtil.scala | 6 +- .../command/carbonTableSchemaCommon.scala | 8 +- .../streaming/CarbonAppendableStreamSink.scala | 2 +- .../sql/test/ResourceRegisterAndCopier.scala | 4 +- .../vectorreader/ColumnarVectorWrapper.java | 1 - .../VectorizedCarbonRecordReader.java | 4 +- .../datamap/IndexDataMapRebuildRDD.scala | 4 +- .../spark/rdd/AggregateDataMapCompactor.scala | 6 +- .../spark/rdd/CarbonDataRDDFactory.scala | 34 +-- .../spark/rdd/CarbonTableCompactor.scala | 12 +- .../apache/carbondata/spark/rdd/Compactor.scala | 2 +- .../carbondata/stream/StreamJobManager.scala | 7 +- .../org/apache/spark/sql/CarbonSession.scala | 2 +- .../events/MergeBloomIndexEventListener.scala | 7 +- .../sql/events/MergeIndexEventListener.scala | 17 +- .../datamap/CarbonCreateDataMapCommand.scala | 4 +- .../datamap/CarbonDropDataMapCommand.scala | 9 +- .../CarbonAlterTableCompactionCommand.scala | 15 +- .../CarbonAlterTableFinishStreaming.scala | 2 +- .../management/CarbonCleanFilesCommand.scala | 2 +- .../management/CarbonInsertIntoCommand.scala | 2 +- .../management/CarbonLoadDataCommand.scala | 29 +-- .../management/RefreshCarbonTableCommand.scala | 14 +- .../CarbonProjectForDeleteCommand.scala | 6 +- .../CarbonProjectForUpdateCommand.scala | 2 +- .../command/mutation/DeleteExecution.scala | 19 +- .../command/mutation/HorizontalCompaction.scala | 17 +- .../CarbonAlterTableDropPartitionCommand.scala | 21 +- .../CarbonAlterTableSplitPartitionCommand.scala | 18 +- .../preaaggregate/PreAggregateListeners.scala | 4 +- .../preaaggregate/PreAggregateUtil.scala | 5 +- .../CarbonAlterTableAddColumnCommand.scala | 11 +- .../CarbonAlterTableDataTypeChangeCommand.scala | 15 +- .../CarbonAlterTableDropColumnCommand.scala | 11 +- .../schema/CarbonAlterTableRenameCommand.scala | 15 +- .../CarbonCreateTableAsSelectCommand.scala | 8 +- .../table/CarbonCreateTableCommand.scala | 12 +- .../command/table/CarbonDropTableCommand.scala | 12 +- .../sql/execution/strategy/DDLStrategy.scala | 3 +- .../sql/parser/CarbonSpark2SqlParser.scala | 4 +- .../org/apache/spark/util/AlterTableUtil.scala | 10 +- .../datamap/DataMapWriterListener.java | 7 +- .../processing/datatypes/PrimitiveDataType.java | 5 +- .../loading/AbstractDataLoadProcessorStep.java | 5 +- .../processing/loading/BadRecordsLogger.java | 5 +- .../processing/loading/DataLoadExecutor.java | 7 +- .../loading/DataLoadProcessBuilder.java | 4 +- .../loading/TableProcessingOperations.java | 6 +- .../impl/MeasureFieldConverterImpl.java | 5 +- .../converter/impl/RowConverterImpl.java | 5 +- .../loading/csvinput/CSVInputFormat.java | 4 +- .../csvinput/CSVRecordReaderIterator.java | 2 - .../loading/model/CarbonLoadModelBuilder.java | 4 +- .../processing/loading/model/LoadOption.java | 4 +- .../partition/impl/RangePartitionerImpl.java | 5 +- .../processing/loading/sort/SorterFactory.java | 5 +- .../sort/impl/ParallelReadMergeSorterImpl.java | 5 +- ...allelReadMergeSorterWithColumnRangeImpl.java | 5 +- .../UnsafeBatchParallelReadMergeSorterImpl.java | 5 +- .../impl/UnsafeParallelReadMergeSorterImpl.java | 5 +- ...allelReadMergeSorterWithColumnRangeImpl.java | 4 +- .../loading/sort/unsafe/UnsafeSortDataRows.java | 5 +- .../holder/UnsafeFinalMergePageHolder.java | 5 +- .../unsafe/holder/UnsafeInmemoryHolder.java | 5 +- .../holder/UnsafeInmemoryMergeHolder.java | 5 +- .../holder/UnsafeSortTempFileChunkHolder.java | 5 +- .../UnsafeInMemoryIntermediateDataMerger.java | 7 +- .../merger/UnsafeIntermediateFileMerger.java | 9 +- .../unsafe/merger/UnsafeIntermediateMerger.java | 7 +- .../UnsafeSingleThreadFinalSortFilesMerger.java | 5 +- .../CarbonRowDataWriterProcessorStepImpl.java | 15 +- .../steps/DataWriterBatchProcessorStepImpl.java | 9 +- .../steps/DataWriterProcessorStepImpl.java | 17 +- .../merger/CarbonCompactionExecutor.java | 6 +- .../processing/merger/CarbonCompactionUtil.java | 4 +- .../processing/merger/CarbonDataMergerUtil.java | 17 +- .../merger/CompactionResultSortProcessor.java | 7 +- .../merger/RowResultMergerProcessor.java | 5 +- .../spliter/AbstractCarbonQueryExecutor.java | 6 +- .../partition/spliter/CarbonSplitExecutor.java | 4 +- .../partition/spliter/RowResultProcessor.java | 7 +- .../sort/sortdata/IntermediateFileMerger.java | 9 +- .../SingleThreadFinalSortFilesMerger.java | 5 +- .../processing/sort/sortdata/SortDataRows.java | 7 +- .../sortdata/SortIntermediateFileMerger.java | 7 +- .../sort/sortdata/SortParameters.java | 4 +- .../sort/sortdata/SortTempFileChunkHolder.java | 5 +- .../store/CarbonFactDataHandlerColumnar.java | 17 +- .../store/CarbonFactDataHandlerModel.java | 5 +- .../carbondata/processing/store/TablePage.java | 5 +- .../store/writer/AbstractFactDataWriter.java | 5 +- .../writer/v3/CarbonFactDataWriterImplV3.java | 11 +- .../processing/util/CarbonBadRecordUtil.java | 4 +- .../util/CarbonDataProcessorUtil.java | 6 +- .../processing/util/CarbonLoaderUtil.java | 9 +- .../processing/util/CarbonLoaderUtilTest.java | 4 +- .../carbondata/sdk/file/AvroCarbonWriter.java | 4 +- .../carbondata/store/LocalCarbonStore.java | 4 +- .../carbondata/sdk/file/CarbonReaderTest.java | 7 +- .../store/worker/SearchRequestHandler.java | 13 +- .../streaming/CarbonStreamRecordWriter.java | 5 +- .../streaming/segment/StreamSegment.java | 8 +- 232 files changed, 1017 insertions(+), 1139 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/common/src/main/java/org/apache/carbondata/common/logging/LogService.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/carbondata/common/logging/LogService.java b/common/src/main/java/org/apache/carbondata/common/logging/LogService.java index ee02aba..55dade6 100644 --- a/common/src/main/java/org/apache/carbondata/common/logging/LogService.java +++ b/common/src/main/java/org/apache/carbondata/common/logging/LogService.java @@ -17,35 +17,89 @@ package org.apache.carbondata.common.logging; +import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; + +import org.apache.carbondata.common.logging.impl.AuditLevel; +import org.apache.carbondata.common.logging.impl.StatisticLevel; + +import org.apache.hadoop.security.UserGroupInformation; +import org.apache.log4j.Logger; + /** - * for Log Services + * Log Services, wrapper of org.apache.log4j.Logger */ -public interface LogService { +public class LogService extends Logger { + + private static String hostName; + private static String username; + + { + try { + hostName = InetAddress.getLocalHost().getHostName(); + } catch (UnknownHostException e) { + hostName = "localhost"; + } + try { + username = UserGroupInformation.getCurrentUser().getShortUserName(); + } catch (IOException e) { + username = "unknown"; + } + } + + protected LogService(String name) { + super(name); + } - void debug(String message); + public void debug(String message) { + super.debug(message); + } - void info(String message); + public void info(String message) { + super.info(message); + } - void warn(String message); + public void warn(String message) { + super.warn(message); + } - void error(String message); + public void error(String message) { + super.error(message); + } - void error(Throwable throwable); + public void error(Throwable throwable) { + super.error(throwable); + } - void error(Throwable throwable, String message); + public void error(Throwable throwable, String message) { + super.error(message, throwable); + } - void audit(String message); + public void audit(String message) { + String threadid = Thread.currentThread().getId() + ""; + super.log(AuditLevel.AUDIT, + "[" + hostName + "]" + "[" + username + "]" + "[Thread-" + threadid + "]" + message); + } /** * Below method will be used to log the statistic information * * @param message statistic message */ - void statistic(String message); + public void statistic(String message) { + super.log(StatisticLevel.STATISTIC, message); + } - boolean isDebugEnabled(); + public boolean isDebugEnabled() { + return super.isDebugEnabled(); + } - boolean isWarnEnabled(); + public boolean isWarnEnabled() { + return super.isEnabledFor(org.apache.log4j.Level.WARN); + } - boolean isInfoEnabled(); + public boolean isInfoEnabled() { + return super.isInfoEnabled(); + } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/common/src/main/java/org/apache/carbondata/common/logging/LogServiceFactory.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/carbondata/common/logging/LogServiceFactory.java b/common/src/main/java/org/apache/carbondata/common/logging/LogServiceFactory.java index cf84d2d..abe0b1c 100644 --- a/common/src/main/java/org/apache/carbondata/common/logging/LogServiceFactory.java +++ b/common/src/main/java/org/apache/carbondata/common/logging/LogServiceFactory.java @@ -17,7 +17,7 @@ package org.apache.carbondata.common.logging; -import org.apache.carbondata.common.logging.impl.StandardLogService; +import org.apache.log4j.Logger; /** * Log Service factory @@ -33,7 +33,7 @@ public final class LogServiceFactory { * @param className provides class name * @return LogService */ - public static LogService getLogService(final String className) { - return new StandardLogService(className); + public static Logger getLogService(final String className) { + return Logger.getLogger(className); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/common/src/main/java/org/apache/carbondata/common/logging/impl/Audit.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/carbondata/common/logging/impl/Audit.java b/common/src/main/java/org/apache/carbondata/common/logging/impl/Audit.java new file mode 100644 index 0000000..1c822b9 --- /dev/null +++ b/common/src/main/java/org/apache/carbondata/common/logging/impl/Audit.java @@ -0,0 +1,49 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.carbondata.common.logging.impl; + +import java.io.IOException; +import java.net.InetAddress; +import java.net.UnknownHostException; + +import org.apache.hadoop.security.UserGroupInformation; +import org.apache.log4j.Logger; + +public class Audit { + private static String hostName; + private static String username; + + static { + try { + hostName = InetAddress.getLocalHost().getHostName(); + } catch (UnknownHostException e) { + hostName = "localhost"; + } + try { + username = UserGroupInformation.getCurrentUser().getShortUserName(); + } catch (IOException e) { + username = "unknown"; + } + } + + public static void log(Logger logger, String message) { + String threadid = String.valueOf(Thread.currentThread().getId()); + logger.log(AuditLevel.AUDIT, + "[" + hostName + "]" + "[" + username + "]" + "[Thread-" + threadid + "]" + message); + } +} http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/common/src/main/java/org/apache/carbondata/common/logging/impl/StandardLogService.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/carbondata/common/logging/impl/StandardLogService.java b/common/src/main/java/org/apache/carbondata/common/logging/impl/StandardLogService.java deleted file mode 100644 index bec4b5d..0000000 --- a/common/src/main/java/org/apache/carbondata/common/logging/impl/StandardLogService.java +++ /dev/null @@ -1,236 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.carbondata.common.logging.impl; - -import java.io.IOException; -import java.net.InetAddress; -import java.net.UnknownHostException; - -import org.apache.carbondata.common.logging.LogService; - -import org.apache.hadoop.security.UserGroupInformation; -import org.apache.log4j.Logger; -import org.apache.log4j.MDC; - -/** - * Default Implementation of the <code>LogService</code> - */ -public final class StandardLogService implements LogService { - - private static final String PARTITION_ID = "[partitionID:"; - private Logger logger; - - /** - * Constructor. - * - * @param clazzName for which the Logging is required - */ - public StandardLogService(String clazzName) { - logger = Logger.getLogger(clazzName); - } - - public StandardLogService() { - this("Carbon"); - } - - public static String getPartitionID(String tableName) { - return tableName.substring(tableName.lastIndexOf('_') + 1, tableName.length()); - } - - public static void setThreadName(String partitionID, String queryID) { - StringBuilder b = new StringBuilder(PARTITION_ID); - b.append(partitionID); - if (null != queryID) { - b.append(";queryID:"); - b.append(queryID); - } - b.append("]"); - Thread.currentThread().setName(getThreadName() + b.toString()); - } - - private static String getThreadName() { - String name = Thread.currentThread().getName(); - int index = name.indexOf(PARTITION_ID); - if (index > -1) { - name = name.substring(0, index); - } else { - name = '[' + name + ']'; - } - return name.trim(); - } - - public boolean isDebugEnabled() { - return logger.isDebugEnabled(); - } - - public boolean isWarnEnabled() { - return logger.isEnabledFor(org.apache.log4j.Level.WARN); - } - - public void debug(String message) { - if (logger.isDebugEnabled()) { - logMessage(Level.DEBUG, null, message); - } - } - - public void error(String message) { - logMessage(Level.ERROR, null, message); - } - - public void error(Throwable throwable, String message) { - logMessage(Level.ERROR, throwable, message); - } - - public void error(Throwable throwable) { - logMessage(Level.ERROR, throwable, ""); - } - - public void info(String message) { - if (logger.isInfoEnabled()) { - logMessage(Level.INFO, null, message); - } - } - - /** - * Utility Method to log the the Message. - */ - private void logMessage(Level logLevel, Throwable throwable, String message) { - try { - //Append the partition id and query id if exist - StringBuilder buff = new StringBuilder(Thread.currentThread().getName()); - buff.append(" "); - buff.append(message); - message = buff.toString(); - if (Level.ERROR.toString().equalsIgnoreCase(logLevel.toString())) { - logErrorMessage(throwable, message); - } else if (Level.DEBUG.toString().equalsIgnoreCase(logLevel.toString())) { - logDebugMessage(throwable, message); - } else if (Level.INFO.toString().equalsIgnoreCase(logLevel.toString())) { - logInfoMessage(throwable, message); - } else if (Level.WARN.toString().equalsIgnoreCase(logLevel.toString())) { - logWarnMessage(throwable, message); - } else if (Level.AUDIT.toString().equalsIgnoreCase(logLevel.toString())) { - audit(message); - } else if (Level.STATISTICS == logLevel) { - statistic(message); - } - - } catch (Throwable t) { - logger.error(t); - } - } - - private void logErrorMessage(Throwable throwable, String message) { - - if (null == throwable) { - logger.error(message); - } else { - logger.error(message, throwable); - } - } - - private void logInfoMessage(Throwable throwable, String message) { - - if (null == throwable) { - logger.info(message); - } else { - logger.info(message, throwable); - } - } - - private void logDebugMessage(Throwable throwable, String message) { - - if (null == throwable) { - logger.debug(message); - } else { - logger.debug(message, throwable); - } - } - - private void logWarnMessage(Throwable throwable, String message) { - - if (null == throwable) { - logger.warn(message); - } else { - logger.warn(message, throwable); - } - } - - public boolean isInfoEnabled() { - return logger.isInfoEnabled(); - } - - public void warn(String message) { - if (isWarnEnabled()) { - logMessage(Level.WARN, null, message); - } - } - - public void setEventProperties(String propertyName, String propertyValue) { - MDC.put(propertyName, propertyValue); - } - - /** - * log audit log - * - * @param msg audit log message - */ - @Override public void audit(String msg) { - String hostName; - String username; - try { - hostName = InetAddress.getLocalHost().getHostName(); - } catch (UnknownHostException e) { - hostName = "localhost"; - } - try { - username = UserGroupInformation.getCurrentUser().getShortUserName(); - } catch (IOException e) { - username = "unknown"; - } - String threadid = Thread.currentThread().getId() + ""; - logger.log(AuditLevel.AUDIT, - "[" + hostName + "]" + "[" + username + "]" + "[Thread-" + threadid + "]" + msg); - } - - @Override public void statistic(String message) { - logger.log(StatisticLevel.STATISTIC, message); - } - - /** - * Specifies the logging level. - */ - enum Level { - - NONE(0), - DEBUG(1), - INFO(2), - STATISTICS(3), - ERROR(4), - AUDIT(5), - WARN(6); - - /** - * Constructor. - * - * @param level - */ - Level(final int level) { - } - } -} http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/common/src/test/java/org/apache/carbondata/common/logging/LogServiceFactoryTest_UT.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/carbondata/common/logging/LogServiceFactoryTest_UT.java b/common/src/test/java/org/apache/carbondata/common/logging/LogServiceFactoryTest_UT.java index 5c8b64c..d0e1c0c 100644 --- a/common/src/test/java/org/apache/carbondata/common/logging/LogServiceFactoryTest_UT.java +++ b/common/src/test/java/org/apache/carbondata/common/logging/LogServiceFactoryTest_UT.java @@ -17,9 +17,8 @@ package org.apache.carbondata.common.logging; -import org.apache.carbondata.common.logging.impl.StandardLogService; - import junit.framework.TestCase; +import org.apache.log4j.Logger; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -33,8 +32,8 @@ public class LogServiceFactoryTest_UT extends TestCase { } @Test public void testGetLogService() { - LogService logger = LogServiceFactory.getLogService(this.getClass().getName()); - assertTrue(logger instanceof StandardLogService); + Logger logger = LogServiceFactory.getLogService(this.getClass().getName()); + assertTrue(logger instanceof Logger); } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/common/src/test/java/org/apache/carbondata/common/logging/ft/LoggingServiceTest_FT.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/carbondata/common/logging/ft/LoggingServiceTest_FT.java b/common/src/test/java/org/apache/carbondata/common/logging/ft/LoggingServiceTest_FT.java index 1f000ce..867a154 100644 --- a/common/src/test/java/org/apache/carbondata/common/logging/ft/LoggingServiceTest_FT.java +++ b/common/src/test/java/org/apache/carbondata/common/logging/ft/LoggingServiceTest_FT.java @@ -24,11 +24,14 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStreamReader; -import org.apache.carbondata.common.logging.LogService; +import org.apache.log4j.Logger; import org.apache.carbondata.common.logging.LogServiceFactory; +import org.apache.carbondata.common.logging.impl.Audit; +import org.apache.carbondata.common.logging.impl.AuditLevel; import junit.framework.TestCase; import org.apache.log4j.LogManager; +import org.apache.log4j.Logger; import org.apache.log4j.MDC; import org.junit.Assert; import org.junit.Before; @@ -36,7 +39,7 @@ import org.junit.Test; public class LoggingServiceTest_FT extends TestCase { - private static LogService logger = + private static Logger logger = LogServiceFactory.getLogService(LoggingServiceTest_FT.class.getName()); @Before public void setUp() throws Exception { @@ -56,7 +59,7 @@ public class LoggingServiceTest_FT extends TestCase { String expectedAuditLine = "[main] AUDIT [org.apache.carbondata.common.logging.ft.LoggingServiceTest_FT] 127.0.0.1 " + "testuser Function Test log- audit message created"; - logger.audit("audit message created"); + Audit.log(logger, "audit message created"); LogManager.shutdown(); http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/common/src/test/java/org/apache/carbondata/common/logging/impl/StandardLogServiceTest_UT.java ---------------------------------------------------------------------- diff --git a/common/src/test/java/org/apache/carbondata/common/logging/impl/StandardLogServiceTest_UT.java b/common/src/test/java/org/apache/carbondata/common/logging/impl/StandardLogServiceTest_UT.java deleted file mode 100644 index faa90eb..0000000 --- a/common/src/test/java/org/apache/carbondata/common/logging/impl/StandardLogServiceTest_UT.java +++ /dev/null @@ -1,140 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.carbondata.common.logging.impl; - -import junit.framework.TestCase; -import mockit.Mock; -import mockit.MockUp; -import org.apache.log4j.Category; -import org.apache.log4j.Priority; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -public class StandardLogServiceTest_UT extends TestCase { - - private StandardLogService logService = null; - - /** - * @throws Exception - */ - @Before public void setUp() throws Exception { - - new MockUp<Category>() { - @SuppressWarnings("unused") - @Mock public boolean isDebugEnabled() { - return true; - } - - @SuppressWarnings("unused") - @Mock public boolean isEnabledFor(Priority level) { - return true; - } - - @SuppressWarnings("unused") - @Mock public boolean isInfoEnabled() { - return true; - } - }; - - logService = new StandardLogService(this.getClass().getName()); - } - - /** - * @throws Exception - * @Description : tearDown - */ - @After public void tearDown() throws Exception { - } - - @Test public void testStandardLogService() { - if (logService != null && logService instanceof StandardLogService) { - Assert.assertTrue(true); - } else { - Assert.assertTrue(false); - } - } - - @Test public void testIsDebugEnabled() { - Assert.assertEquals(true, logService.isDebugEnabled()); - } - - @Test public void testIsWarnEnabled() { - Assert.assertEquals(true, logService.isWarnEnabled()); - } - - @Test public void testSecureLogEventObjectArray() { - Assert.assertTrue(true); - } - - @Test public void testAuditLogEventObjectArray() { - logService.audit("testing"); - Assert.assertTrue(true); - } - - @Test public void testDebugLogEventObjectArray() { - logService.debug("testing"); - Assert.assertTrue(true); - } - - @Test public void testErrorLogEventObjectArray() { - logService.error("testing"); - Assert.assertTrue(true); - } - - @Test public void testErrorLogEventThrowableObjectArray() { - Exception exception = new Exception("test"); - logService.error(exception); - Assert.assertTrue(true); - } - - @Test public void testErrorLogEventThrowableMessage() { - Exception exception = new Exception("test"); - logService.error(exception, "additional message"); - Assert.assertTrue(true); - } - - @Test public void testInfoLogEventObjectArray() { - logService.info("testing"); - Assert.assertTrue(true); - } - - @Test public void testIsInfoEnabled() { - Assert.assertEquals(true, logService.isInfoEnabled()); - } - - @Test public void testDeleteLogs() { - Assert.assertTrue(true); - } - - @Test public void testFlushLogs() { - Assert.assertTrue(true); - } - - @Test public void testSetEventProperties() { - logService.setEventProperties("CLIENT_IP", "127.0.0.1"); - Assert.assertTrue(true); - } - - @Test public void testAuditString() { - logService.audit("audit message"); - Assert.assertTrue(true); - } - -} http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/cache/CacheProvider.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/cache/CacheProvider.java b/core/src/main/java/org/apache/carbondata/core/cache/CacheProvider.java index 292d9eb..d809c25 100644 --- a/core/src/main/java/org/apache/carbondata/core/cache/CacheProvider.java +++ b/core/src/main/java/org/apache/carbondata/core/cache/CacheProvider.java @@ -21,7 +21,6 @@ import java.lang.reflect.Constructor; import java.util.HashMap; 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.cache.dictionary.DictionaryColumnUniqueIdentifier; @@ -31,6 +30,8 @@ import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.indexstore.BlockletDataMapIndexStore; import org.apache.carbondata.core.util.CarbonProperties; +import org.apache.log4j.Logger; + /** * Cache provider class which will create a cache based on given type */ @@ -59,7 +60,7 @@ public class CacheProvider { /** * instance for CacheProvider LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CacheProvider.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/cache/CarbonLRUCache.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/cache/CarbonLRUCache.java b/core/src/main/java/org/apache/carbondata/core/cache/CarbonLRUCache.java index 4a0c36c..87254e3 100644 --- a/core/src/main/java/org/apache/carbondata/core/cache/CarbonLRUCache.java +++ b/core/src/main/java/org/apache/carbondata/core/cache/CarbonLRUCache.java @@ -23,11 +23,12 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -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; + /** * class which manages the lru cache */ @@ -39,7 +40,7 @@ public final class CarbonLRUCache { /** * Attribute for Carbon LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonLRUCache.class.getName()); /** * Map that will contain key as table unique name and value as cache Holder http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionaryCache.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionaryCache.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionaryCache.java index 55a1c05..1607f0f 100644 --- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionaryCache.java +++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ForwardDictionaryCache.java @@ -28,7 +28,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.cache.CacheType; import org.apache.carbondata.core.cache.CarbonLRUCache; @@ -37,6 +36,8 @@ import org.apache.carbondata.core.util.CarbonUtil; import org.apache.carbondata.core.util.ObjectSizeCalculator; import org.apache.carbondata.core.util.TaskMetricsMap; +import org.apache.log4j.Logger; + /** * This class implements methods to create dictionary cache which will hold * dictionary chunks for look up of surrogate keys and values @@ -47,7 +48,7 @@ public class ForwardDictionaryCache<K extends /** * Attribute for Carbon LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(ForwardDictionaryCache.class.getName()); private static final Map<DictionaryColumnUniqueIdentifier, Object> DICTIONARY_LOCK_OBJECT = http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ManageDictionaryAndBTree.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ManageDictionaryAndBTree.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ManageDictionaryAndBTree.java index 2450f85..038b356 100644 --- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ManageDictionaryAndBTree.java +++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ManageDictionaryAndBTree.java @@ -20,7 +20,6 @@ package org.apache.carbondata.core.cache.dictionary; 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.Cache; import org.apache.carbondata.core.cache.CacheProvider; @@ -35,6 +34,8 @@ import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension; import org.apache.carbondata.core.metadata.schema.table.column.ColumnSchema; import org.apache.carbondata.core.util.path.CarbonTablePath; +import org.apache.log4j.Logger; + /** * This class is aimed at managing dictionary files for any new addition and deletion * and calling of clear cache for BTree and dictionary instances from LRU cache @@ -44,7 +45,7 @@ public class ManageDictionaryAndBTree { /** * Attribute for Carbon LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(ManageDictionaryAndBTree.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ReverseDictionaryCache.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ReverseDictionaryCache.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ReverseDictionaryCache.java index 05de1d3..deb7339 100644 --- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ReverseDictionaryCache.java +++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ReverseDictionaryCache.java @@ -27,7 +27,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.cache.CacheType; import org.apache.carbondata.core.cache.CarbonLRUCache; @@ -35,6 +34,8 @@ import org.apache.carbondata.core.reader.CarbonDictionaryColumnMetaChunk; import org.apache.carbondata.core.util.CarbonUtil; import org.apache.carbondata.core.util.ObjectSizeCalculator; +import org.apache.log4j.Logger; + /** * This class implements methods to create dictionary cache which will hold * dictionary chunks for look up of surrogate keys and values @@ -46,7 +47,7 @@ public class ReverseDictionaryCache<K extends DictionaryColumnUniqueIdentifier, /** * Attribute for Carbon LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(ReverseDictionaryCache.class.getName()); private static final long sizeOfEmptyDictChunks = http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/constants/CarbonVersionConstants.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/constants/CarbonVersionConstants.java b/core/src/main/java/org/apache/carbondata/core/constants/CarbonVersionConstants.java index 22fbaf2..2382bd8 100644 --- a/core/src/main/java/org/apache/carbondata/core/constants/CarbonVersionConstants.java +++ b/core/src/main/java/org/apache/carbondata/core/constants/CarbonVersionConstants.java @@ -20,12 +20,13 @@ package org.apache.carbondata.core.constants; import java.io.InputStream; import java.util.Properties; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; +import org.apache.log4j.Logger; + public final class CarbonVersionConstants { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonVersionConstants.class.getName()); /** * the file name of CarbonData version info @@ -63,13 +64,13 @@ public final class CarbonVersionConstants { // read CARBONDATA_VERSION_INFO_FILE into props props.load(resourceStream); } catch (Exception e) { - LOGGER.error(e, "Error loading properties from " + CARBONDATA_VERSION_INFO_FILE); + LOGGER.error("Error loading properties from " + CARBONDATA_VERSION_INFO_FILE, e); } finally { if (resourceStream != null) { try { resourceStream.close(); } catch (Exception e) { - LOGGER.error(e, "Error closing CarbonData build info resource stream"); + LOGGER.error("Error closing CarbonData build info resource stream", e); } } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/datamap/DataMapStoreManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datamap/DataMapStoreManager.java b/core/src/main/java/org/apache/carbondata/core/datamap/DataMapStoreManager.java index 22db211..75290d3 100644 --- a/core/src/main/java/org/apache/carbondata/core/datamap/DataMapStoreManager.java +++ b/core/src/main/java/org/apache/carbondata/core/datamap/DataMapStoreManager.java @@ -28,7 +28,6 @@ import org.apache.carbondata.common.annotations.InterfaceAudience; import org.apache.carbondata.common.exceptions.MetadataProcessException; import org.apache.carbondata.common.exceptions.sql.MalformedDataMapCommandException; import org.apache.carbondata.common.exceptions.sql.NoSuchDataMapException; -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.DataMapFactory; @@ -54,6 +53,7 @@ import static org.apache.carbondata.core.metadata.schema.datamap.DataMapClassPro import static org.apache.carbondata.core.metadata.schema.datamap.DataMapClassProvider.PREAGGREGATE; import org.apache.hadoop.fs.Path; +import org.apache.log4j.Logger; /** * It maintains all the DataMaps in it. @@ -87,7 +87,7 @@ public final class DataMapStoreManager { private DataMapSchemaStorageProvider provider = new DiskBasedDMSchemaStorageProvider( CarbonProperties.getInstance().getSystemFolderLocation()); - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(DataMapStoreManager.class.getName()); private DataMapStoreManager() { @@ -292,7 +292,7 @@ public final class DataMapStoreManager { dataMapCatalog.registerSchema(schema); } catch (Exception e) { // Ignore the schema - LOGGER.error(e, "Error while registering schema"); + LOGGER.error("Error while registering schema", e); } } } @@ -471,7 +471,7 @@ public final class DataMapStoreManager { try { DataMapUtil.executeDataMapJobForClearingDataMaps(carbonTable); } catch (IOException e) { - LOGGER.error(e, "clear dataMap job failed"); + LOGGER.error("clear dataMap job failed", e); // ignoring the exception } } @@ -540,7 +540,7 @@ public final class DataMapStoreManager { DataMapUtil.executeDataMapJobForClearingDataMaps(carbonTable); tableDataMap.clear(); } catch (IOException e) { - LOGGER.error(e, "clear dataMap job failed"); + LOGGER.error("clear dataMap job failed", e); // ignoring the exception } tableDataMap.deleteDatamapData(); http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/datamap/DataMapUtil.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datamap/DataMapUtil.java b/core/src/main/java/org/apache/carbondata/core/datamap/DataMapUtil.java index 60c5233..138bd62 100644 --- a/core/src/main/java/org/apache/carbondata/core/datamap/DataMapUtil.java +++ b/core/src/main/java/org/apache/carbondata/core/datamap/DataMapUtil.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.lang.reflect.Constructor; import java.util.List; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datamap.dev.expr.DataMapExprWrapper; import org.apache.carbondata.core.datastore.impl.FileFactory; @@ -33,12 +32,13 @@ import org.apache.carbondata.core.statusmanager.SegmentStatusManager; import org.apache.carbondata.core.util.ObjectSerializationUtil; import org.apache.hadoop.conf.Configuration; +import org.apache.log4j.Logger; public class DataMapUtil { private static final String DATA_MAP_DSTR = "mapreduce.input.carboninputformat.datamapdstr"; - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(DataMapUtil.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/datamap/status/DiskBasedDataMapStatusProvider.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datamap/status/DiskBasedDataMapStatusProvider.java b/core/src/main/java/org/apache/carbondata/core/datamap/status/DiskBasedDataMapStatusProvider.java index d42c98a..07fe93b 100644 --- a/core/src/main/java/org/apache/carbondata/core/datamap/status/DiskBasedDataMapStatusProvider.java +++ b/core/src/main/java/org/apache/carbondata/core/datamap/status/DiskBasedDataMapStatusProvider.java @@ -17,14 +17,20 @@ package org.apache.carbondata.core.datamap.status; -import java.io.*; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; import java.nio.charset.Charset; 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.datastore.impl.FileFactory; import org.apache.carbondata.core.fileoperations.AtomicFileOperationFactory; @@ -39,6 +45,7 @@ import org.apache.carbondata.core.util.CarbonProperties; import org.apache.carbondata.core.util.CarbonUtil; import com.google.gson.Gson; +import org.apache.log4j.Logger; /** * It saves/serializes the array of {{@link DataMapStatusDetail}} to disk in json format. @@ -47,7 +54,7 @@ import com.google.gson.Gson; */ public class DiskBasedDataMapStatusProvider implements DataMapStatusStorageProvider { - private static final LogService LOG = + private static final Logger LOG = LogServiceFactory.getLogService(DiskBasedDataMapStatusProvider.class.getName()); private static final String DATAMAP_STATUS_FILE = "datamapstatus"; @@ -72,7 +79,7 @@ public class DiskBasedDataMapStatusProvider implements DataMapStatusStorageProvi buffReader = new BufferedReader(inStream); dataMapStatusDetails = gsonObjectToRead.fromJson(buffReader, DataMapStatusDetail[].class); } catch (IOException e) { - LOG.error(e, "Failed to read datamap status"); + LOG.error("Failed to read datamap status", e); throw e; } finally { CarbonUtil.closeStreams(buffReader, inStream, dataInputStream); @@ -141,7 +148,7 @@ public class DiskBasedDataMapStatusProvider implements DataMapStatusStorageProvi } else { String errorMsg = "Upadating datamapstatus is failed due to another process taken the lock" + " for updating it"; - 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/datastore/block/SegmentPropertiesAndSchemaHolder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentPropertiesAndSchemaHolder.java b/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentPropertiesAndSchemaHolder.java index 21e22b1..cc6341b 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentPropertiesAndSchemaHolder.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentPropertiesAndSchemaHolder.java @@ -25,7 +25,6 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -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.indexstore.schema.CarbonRowSchema; @@ -36,6 +35,8 @@ import org.apache.carbondata.core.metadata.schema.table.CarbonTable; import org.apache.carbondata.core.metadata.schema.table.column.CarbonColumn; import org.apache.carbondata.core.metadata.schema.table.column.ColumnSchema; +import org.apache.log4j.Logger; + /** * Singleton class which will help in creating the segment properties */ @@ -44,7 +45,7 @@ public class SegmentPropertiesAndSchemaHolder { /** * Logger */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(SegmentPropertiesAndSchemaHolder.class.getName()); /** * SegmentPropertiesAndSchemaHolder instance http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/datastore/blocklet/BlockletEncodedColumnPage.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/blocklet/BlockletEncodedColumnPage.java b/core/src/main/java/org/apache/carbondata/core/datastore/blocklet/BlockletEncodedColumnPage.java index da4e211..00a7731 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/blocklet/BlockletEncodedColumnPage.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/blocklet/BlockletEncodedColumnPage.java @@ -24,7 +24,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastore.page.ActualDataBasedFallbackEncoder; import org.apache.carbondata.core.datastore.page.DecoderBasedFallbackEncoder; @@ -35,6 +34,8 @@ import org.apache.carbondata.core.localdictionary.generator.LocalDictionaryGener import org.apache.carbondata.core.memory.MemoryException; import org.apache.carbondata.format.LocalDictionaryChunk; +import org.apache.log4j.Logger; + /** * Maintains the list of encoded page of a column in a blocklet * and encoded dictionary values only if column is encoded using local @@ -47,7 +48,7 @@ public class BlockletEncodedColumnPage { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(BlockletEncodedColumnPage.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/datastore/compression/SnappyCompressor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/compression/SnappyCompressor.java b/core/src/main/java/org/apache/carbondata/core/datastore/compression/SnappyCompressor.java index 15f912a..c86011c 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/compression/SnappyCompressor.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/compression/SnappyCompressor.java @@ -20,15 +20,15 @@ package org.apache.carbondata.core.datastore.compression; import java.io.IOException; import java.lang.reflect.Field; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; +import org.apache.log4j.Logger; import org.xerial.snappy.Snappy; import org.xerial.snappy.SnappyNative; public class SnappyCompressor implements Compressor { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(SnappyCompressor.class.getName()); // snappy estimate max compressed length as 32 + source_len + source_len/6 @@ -61,7 +61,7 @@ public class SnappyCompressor implements Compressor { try { return Snappy.rawCompress(unCompInput, unCompInput.length); } catch (IOException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new RuntimeException(e); } } @@ -70,7 +70,7 @@ public class SnappyCompressor implements Compressor { try { return Snappy.rawCompress(unCompInput, byteSize); } catch (IOException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new RuntimeException(e); } } @@ -79,7 +79,7 @@ public class SnappyCompressor implements Compressor { try { return Snappy.uncompress(compInput); } catch (IOException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new RuntimeException(e); } } @@ -92,7 +92,7 @@ public class SnappyCompressor implements Compressor { data = new byte[uncompressedLength]; Snappy.uncompress(compInput, offset, length, data, 0); } catch (IOException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new RuntimeException(e); } return data; @@ -102,7 +102,7 @@ public class SnappyCompressor implements Compressor { try { return Snappy.compress(unCompInput); } catch (IOException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new RuntimeException(e); } } @@ -111,7 +111,7 @@ public class SnappyCompressor implements Compressor { try { return Snappy.uncompressShortArray(compInput, offset, length); } catch (IOException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new RuntimeException(e); } } @@ -120,7 +120,7 @@ public class SnappyCompressor implements Compressor { try { return Snappy.compress(unCompInput); } catch (IOException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new RuntimeException(e); } } @@ -129,7 +129,7 @@ public class SnappyCompressor implements Compressor { try { return Snappy.uncompressIntArray(compInput, offset, length); } catch (IOException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new RuntimeException(e); } } @@ -138,7 +138,7 @@ public class SnappyCompressor implements Compressor { try { return Snappy.compress(unCompInput); } catch (IOException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new RuntimeException(e); } } @@ -147,7 +147,7 @@ public class SnappyCompressor implements Compressor { try { return Snappy.uncompressLongArray(compInput, offset, length); } catch (IOException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new RuntimeException(e); } } @@ -156,7 +156,7 @@ public class SnappyCompressor implements Compressor { try { return Snappy.compress(unCompInput); } catch (IOException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new RuntimeException(e); } } @@ -165,7 +165,7 @@ public class SnappyCompressor implements Compressor { try { return Snappy.uncompressFloatArray(compInput, offset, length); } catch (IOException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new RuntimeException(e); } } @@ -174,7 +174,7 @@ public class SnappyCompressor implements Compressor { try { return Snappy.compress(unCompInput); } catch (IOException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new RuntimeException(e); } } @@ -186,7 +186,7 @@ public class SnappyCompressor implements Compressor { snappyNative.rawUncompress(compInput, offset, length, result, 0); return result; } catch (IOException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new RuntimeException(e); } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AbstractDFSCarbonFile.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AbstractDFSCarbonFile.java b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AbstractDFSCarbonFile.java index c764430..d03aaf8 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AbstractDFSCarbonFile.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AbstractDFSCarbonFile.java @@ -27,7 +27,6 @@ import java.io.OutputStream; 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.impl.FileFactory; @@ -51,12 +50,13 @@ import org.apache.hadoop.io.compress.CompressionCodecFactory; import org.apache.hadoop.io.compress.GzipCodec; import org.apache.hadoop.io.compress.Lz4Codec; import org.apache.hadoop.io.compress.SnappyCodec; +import org.apache.log4j.Logger; public abstract class AbstractDFSCarbonFile implements CarbonFile { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(AbstractDFSCarbonFile.class.getName()); protected FileStatus fileStatus; public FileSystem fs; http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AlluxioCarbonFile.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AlluxioCarbonFile.java b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AlluxioCarbonFile.java index eabfa48..03fc353 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AlluxioCarbonFile.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/AlluxioCarbonFile.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.datastore.impl.FileFactory; @@ -29,14 +28,13 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.DistributedFileSystem; - - +import org.apache.log4j.Logger; public class AlluxioCarbonFile extends AbstractDFSCarbonFile { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(AlluxioCarbonFile.class.getName()); public AlluxioCarbonFile(String filePath) { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/HDFSCarbonFile.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/HDFSCarbonFile.java b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/HDFSCarbonFile.java index ee1388f..a0cc462 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/HDFSCarbonFile.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/HDFSCarbonFile.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.hadoop.conf.Configuration; @@ -29,12 +28,13 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.DistributedFileSystem; +import org.apache.log4j.Logger; public class HDFSCarbonFile extends AbstractDFSCarbonFile { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(HDFSCarbonFile.class.getName()); public HDFSCarbonFile(String filePath) { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/LocalCarbonFile.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/LocalCarbonFile.java b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/LocalCarbonFile.java index f0794f4..e026b27 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/LocalCarbonFile.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/LocalCarbonFile.java @@ -36,7 +36,6 @@ import java.util.List; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; -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; @@ -53,11 +52,12 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.PathFilter; import org.apache.hadoop.fs.permission.FsPermission; +import org.apache.log4j.Logger; import org.xerial.snappy.SnappyInputStream; import org.xerial.snappy.SnappyOutputStream; public class LocalCarbonFile implements CarbonFile { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(LocalCarbonFile.class.getName()); private File file; @@ -118,8 +118,7 @@ public class LocalCarbonFile implements CarbonFile { try { return file.getCanonicalPath(); } catch (IOException e) { - LOGGER - .error(e, "Exception occured" + e.getMessage()); + LOGGER.error("Exception occured" + e.getMessage(), e); } return null; } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/S3CarbonFile.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/S3CarbonFile.java b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/S3CarbonFile.java index 8c80065..c23ba69 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/S3CarbonFile.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/S3CarbonFile.java @@ -20,7 +20,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.impl.FileFactory; @@ -31,10 +30,11 @@ import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.log4j.Logger; public class S3CarbonFile extends HDFSCarbonFile { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(HDFSCarbonFile.class.getName()); public S3CarbonFile(String filePath) { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/ViewFSCarbonFile.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/ViewFSCarbonFile.java b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/ViewFSCarbonFile.java index 6650b9c..b86b139 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/ViewFSCarbonFile.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/filesystem/ViewFSCarbonFile.java @@ -20,7 +20,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.datastore.impl.FileFactory; @@ -28,12 +27,13 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.viewfs.ViewFileSystem; +import org.apache.log4j.Logger; public class ViewFSCarbonFile extends AbstractDFSCarbonFile { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(ViewFSCarbonFile.class.getName()); public ViewFSCarbonFile(String filePath) { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileFactory.java b/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileFactory.java index e8f6cfb..8bd3c8e 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileFactory.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/impl/FileFactory.java @@ -25,7 +25,6 @@ import java.io.IOException; import java.lang.reflect.Method; import java.nio.channels.FileChannel; -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.FileReader; @@ -37,12 +36,13 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.FsPermission; +import org.apache.log4j.Logger; public final class FileFactory { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(FileFactory.class.getName()); private static Configuration configuration = null; http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/datastore/page/LocalDictColumnPage.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/LocalDictColumnPage.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/LocalDictColumnPage.java index ad19e27..3da154a 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/page/LocalDictColumnPage.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/LocalDictColumnPage.java @@ -20,7 +20,6 @@ package org.apache.carbondata.core.datastore.page; import java.io.IOException; import java.math.BigDecimal; -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.KeyGenException; @@ -30,6 +29,8 @@ import org.apache.carbondata.core.localdictionary.PageLevelDictionary; import org.apache.carbondata.core.localdictionary.exception.DictionaryThresholdReachedException; import org.apache.carbondata.core.localdictionary.generator.LocalDictionaryGenerator; +import org.apache.log4j.Logger; + /** * Column page implementation for Local dictionary generated columns * Its a decorator over two column page @@ -41,7 +42,7 @@ public class LocalDictColumnPage extends ColumnPage { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(LocalDictColumnPage.class.getName()); /** @@ -132,8 +133,8 @@ public class LocalDictColumnPage extends ColumnPage { encodedDataColumnPage.freeMemory(); encodedDataColumnPage = null; } catch (KeyGenException e) { - LOGGER.error(e, "Unable to generate key for: " + actualDataColumnPage - .getColumnSpec().getFieldName()); + LOGGER.error("Unable to generate key for: " + actualDataColumnPage + .getColumnSpec().getFieldName(), e); throw new RuntimeException(e); } } else { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/ColumnPageEncoder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/ColumnPageEncoder.java b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/ColumnPageEncoder.java index 44e7192..f38aef2 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/ColumnPageEncoder.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/page/encoding/ColumnPageEncoder.java @@ -24,7 +24,6 @@ import java.nio.ByteBuffer; 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.datastore.ColumnType; import org.apache.carbondata.core.datastore.TableSpec; @@ -49,12 +48,14 @@ import org.apache.carbondata.format.PresenceMeta; import static org.apache.carbondata.core.datastore.page.encoding.DefaultEncodingFactory.selectCodecByAlgorithmForFloating; import static org.apache.carbondata.core.datastore.page.encoding.DefaultEncodingFactory.selectCodecByAlgorithmForIntegral; +import org.apache.log4j.Logger; + public abstract class ColumnPageEncoder { /** * logger */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(ColumnPageEncoder.class.getName()); protected abstract byte[] encodeData(ColumnPage input) throws MemoryException, IOException; http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/dictionary/client/NonSecureDictionaryClient.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/client/NonSecureDictionaryClient.java b/core/src/main/java/org/apache/carbondata/core/dictionary/client/NonSecureDictionaryClient.java index cf25ee1..2e58255 100644 --- a/core/src/main/java/org/apache/carbondata/core/dictionary/client/NonSecureDictionaryClient.java +++ b/core/src/main/java/org/apache/carbondata/core/dictionary/client/NonSecureDictionaryClient.java @@ -18,8 +18,8 @@ package org.apache.carbondata.core.dictionary.client; import java.net.InetSocketAddress; -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.dictionary.generator.key.DictionaryMessage; import io.netty.bootstrap.Bootstrap; @@ -29,13 +29,14 @@ import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioSocketChannel; import io.netty.handler.codec.LengthFieldBasedFrameDecoder; +import org.apache.log4j.Logger; /** * Dictionary client to connect to Dictionary server and generate dictionary values */ public class NonSecureDictionaryClient implements DictionaryClient { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(NonSecureDictionaryClient.class.getName()); private NonSecureDictionaryClientHandler nonSecureDictionaryClientHandler = @@ -51,7 +52,7 @@ public class NonSecureDictionaryClient implements DictionaryClient { */ @Override public void startClient(String secretKey, String address, int port, boolean encryptSecureServer) { - LOGGER.audit("Starting client on " + address + " " + port); + Audit.log(LOGGER, "Starting client on " + address + " " + port); long start = System.currentTimeMillis(); // Create an Event with 1 thread. workerGroup = new NioEventLoopGroup(1); http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/dictionary/client/NonSecureDictionaryClientHandler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/client/NonSecureDictionaryClientHandler.java b/core/src/main/java/org/apache/carbondata/core/dictionary/client/NonSecureDictionaryClientHandler.java index 3a76d84..457441f 100644 --- a/core/src/main/java/org/apache/carbondata/core/dictionary/client/NonSecureDictionaryClientHandler.java +++ b/core/src/main/java/org/apache/carbondata/core/dictionary/client/NonSecureDictionaryClientHandler.java @@ -20,8 +20,8 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -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.dictionary.generator.key.DictionaryMessage; import io.netty.buffer.ByteBuf; @@ -29,13 +29,14 @@ import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; +import org.apache.log4j.Logger; /** * Client handler to get data. */ public class NonSecureDictionaryClientHandler extends ChannelInboundHandlerAdapter { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(NonSecureDictionaryClientHandler.class.getName()); private final BlockingQueue<DictionaryMessage> responseMsgQueue = new LinkedBlockingQueue<>(); @@ -48,7 +49,7 @@ public class NonSecureDictionaryClientHandler extends ChannelInboundHandlerAdapt public void channelActive(ChannelHandlerContext ctx) throws Exception { this.ctx = ctx; channelFutureListener = new DictionaryChannelFutureListener(ctx); - LOGGER.audit("Connected client " + ctx); + Audit.log(LOGGER, "Connected client " + ctx); super.channelActive(ctx); } @@ -68,7 +69,7 @@ public class NonSecureDictionaryClientHandler extends ChannelInboundHandlerAdapt @Override public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception { - LOGGER.error(cause, "exceptionCaught"); + LOGGER.error("exceptionCaught", cause); ctx.close(); } @@ -85,7 +86,7 @@ public class NonSecureDictionaryClientHandler extends ChannelInboundHandlerAdapt key.writeData(buffer); ctx.writeAndFlush(buffer).addListener(channelFutureListener); } catch (Exception e) { - LOGGER.error(e, "Error while send request to server "); + LOGGER.error("Error while send request to server ", e); ctx.close(); } try { @@ -118,7 +119,7 @@ public class NonSecureDictionaryClientHandler extends ChannelInboundHandlerAdapt @Override public void operationComplete(ChannelFuture future) throws Exception { if (!future.isSuccess()) { - LOGGER.error(future.cause(), "Error while sending request to Dictionary Server"); + LOGGER.error("Error while sending request to Dictionary Server", future.cause()); ctx.close(); } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/dictionary/generator/IncrementalColumnDictionaryGenerator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/IncrementalColumnDictionaryGenerator.java b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/IncrementalColumnDictionaryGenerator.java index 8a69b80..bf0f094 100644 --- a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/IncrementalColumnDictionaryGenerator.java +++ b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/IncrementalColumnDictionaryGenerator.java @@ -22,8 +22,8 @@ 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.Audit; import org.apache.carbondata.core.cache.Cache; import org.apache.carbondata.core.cache.CacheProvider; import org.apache.carbondata.core.cache.CacheType; @@ -46,6 +46,7 @@ import org.apache.carbondata.core.writer.sortindex.CarbonDictionarySortIndexWrit import org.apache.carbondata.core.writer.sortindex.CarbonDictionarySortInfo; import org.apache.carbondata.core.writer.sortindex.CarbonDictionarySortInfoPreparator; +import org.apache.log4j.Logger; /** * This generator does not maintain the whole cache of dictionary. It just maintains the cache only @@ -55,7 +56,7 @@ import org.apache.carbondata.core.writer.sortindex.CarbonDictionarySortInfoPrepa public class IncrementalColumnDictionaryGenerator implements BiDictionary<Integer, String>, DictionaryGenerator<Integer, String>, DictionaryWriter { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(IncrementalColumnDictionaryGenerator.class.getName()); private final Object lock = new Object(); @@ -147,7 +148,7 @@ public class IncrementalColumnDictionaryGenerator implements BiDictionary<Intege long sortIndexWriteTime = System.currentTimeMillis() - t3; // update Meta Data updateMetaData(dictionaryWriter); - LOGGER.audit("\n columnName: " + dimension.getColName() + + Audit.log(LOGGER, "\n columnName: " + dimension.getColName() + "\n columnId: " + dimension.getColumnId() + "\n new distinct values count: " + distinctValues.size() + "\n create dictionary cache: " + dictCacheTime + http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/dictionary/generator/TableDictionaryGenerator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/TableDictionaryGenerator.java b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/TableDictionaryGenerator.java index 3dbe5b0..33a91d8 100644 --- a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/TableDictionaryGenerator.java +++ b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/TableDictionaryGenerator.java @@ -23,7 +23,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.devapi.BiDictionary; import org.apache.carbondata.core.devapi.DictionaryGenerationException; @@ -33,13 +32,15 @@ import org.apache.carbondata.core.metadata.schema.table.CarbonTable; import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension; import org.apache.carbondata.core.util.CarbonProperties; +import org.apache.log4j.Logger; + /** * Dictionary generation for table. */ public class TableDictionaryGenerator implements DictionaryGenerator<Integer, DictionaryMessage>, DictionaryWriter { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(TableDictionaryGenerator.class.getName()); private CarbonTable carbonTable; http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/core/src/main/java/org/apache/carbondata/core/dictionary/server/NonSecureDictionaryServer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/server/NonSecureDictionaryServer.java b/core/src/main/java/org/apache/carbondata/core/dictionary/server/NonSecureDictionaryServer.java index dc2d211..5d55416 100644 --- a/core/src/main/java/org/apache/carbondata/core/dictionary/server/NonSecureDictionaryServer.java +++ b/core/src/main/java/org/apache/carbondata/core/dictionary/server/NonSecureDictionaryServer.java @@ -18,7 +18,6 @@ package org.apache.carbondata.core.dictionary.server; import java.net.InetSocketAddress; -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.dictionary.generator.key.DictionaryMessage; @@ -36,6 +35,7 @@ import io.netty.channel.nio.NioEventLoopGroup; import io.netty.channel.socket.SocketChannel; import io.netty.channel.socket.nio.NioServerSocketChannel; import io.netty.handler.codec.LengthFieldBasedFrameDecoder; +import org.apache.log4j.Logger; /** * Dictionary Server to generate dictionary keys. @@ -43,7 +43,7 @@ import io.netty.handler.codec.LengthFieldBasedFrameDecoder; public class NonSecureDictionaryServer extends AbstractDictionaryServer implements DictionaryServer { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(NonSecureDictionaryServer.class.getName()); private NonSecureDictionaryServerHandler nonSecureDictionaryServerHandler; @@ -120,7 +120,7 @@ public class NonSecureDictionaryServer extends AbstractDictionaryServer this.host = hostToBind; break; } catch (Exception e) { - LOGGER.error(e, "Dictionary Server Failed to bind to port:" + newPort); + LOGGER.error("Dictionary Server Failed to bind to port:" + newPort, e); if (i == 9) { throw new RuntimeException("Dictionary Server Could not bind to any port"); }
