Repository: carbondata Updated Branches: refs/heads/master 15d38260c -> 06adb5a03
http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/loading/steps/DataWriterBatchProcessorStepImpl.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/steps/DataWriterBatchProcessorStepImpl.java b/processing/src/main/java/org/apache/carbondata/processing/loading/steps/DataWriterBatchProcessorStepImpl.java index 26ae2d7..694b345 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/steps/DataWriterBatchProcessorStepImpl.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/steps/DataWriterBatchProcessorStepImpl.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.util.Iterator; import java.util.Map; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastore.exception.CarbonDataWriterException; import org.apache.carbondata.core.datastore.row.CarbonRow; @@ -40,6 +39,8 @@ import org.apache.carbondata.processing.store.CarbonFactHandler; import org.apache.carbondata.processing.store.CarbonFactHandlerFactory; import org.apache.carbondata.processing.util.CarbonDataProcessorUtil; +import org.apache.log4j.Logger; + /** * It reads data from batch of sorted files(it could be in-memory/disk based files) * which are generated in previous sort step. And it writes data to carbondata file. @@ -47,7 +48,7 @@ import org.apache.carbondata.processing.util.CarbonDataProcessorUtil; */ public class DataWriterBatchProcessorStepImpl extends AbstractDataLoadProcessorStep { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(DataWriterBatchProcessorStepImpl.class.getName()); private Map<String, LocalDictionaryGenerator> localDictionaryGeneratorMap; @@ -112,7 +113,7 @@ public class DataWriterBatchProcessorStepImpl extends AbstractDataLoadProcessorS i++; } } catch (Exception e) { - LOGGER.error(e, "Failed for table: " + tableName + " in DataWriterBatchProcessorStepImpl"); + LOGGER.error("Failed for table: " + tableName + " in DataWriterBatchProcessorStepImpl", e); if (e.getCause() instanceof BadRecordFoundException) { throw new BadRecordFoundException(e.getCause().getMessage()); } @@ -132,7 +133,7 @@ public class DataWriterBatchProcessorStepImpl extends AbstractDataLoadProcessorS } catch (Exception e) { // if throw exception from here dataHandler will not be closed. // so just holding exception and later throwing exception - LOGGER.error(e, "Failed for table: " + tableName + " in finishing data handler"); + LOGGER.error("Failed for table: " + tableName + " in finishing data handler", e); exception = new CarbonDataWriterException( "Failed for table: " + tableName + " in finishing data handler", e); } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/loading/steps/DataWriterProcessorStepImpl.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/loading/steps/DataWriterProcessorStepImpl.java b/processing/src/main/java/org/apache/carbondata/processing/loading/steps/DataWriterProcessorStepImpl.java index cc038b9..3d704c9 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/loading/steps/DataWriterProcessorStepImpl.java +++ b/processing/src/main/java/org/apache/carbondata/processing/loading/steps/DataWriterProcessorStepImpl.java @@ -29,7 +29,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.datastore.exception.CarbonDataWriterException; import org.apache.carbondata.core.datastore.row.CarbonRow; @@ -50,13 +49,15 @@ import org.apache.carbondata.processing.store.CarbonFactHandler; import org.apache.carbondata.processing.store.CarbonFactHandlerFactory; import org.apache.carbondata.processing.util.CarbonDataProcessorUtil; +import org.apache.log4j.Logger; + /** * It reads data from sorted files which are generated in previous sort step. * And it writes data to carbondata file. It also generates mdk key while writing to carbondata file */ public class DataWriterProcessorStepImpl extends AbstractDataLoadProcessorStep { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(DataWriterProcessorStepImpl.class.getName()); private long readCounter; @@ -137,11 +138,11 @@ public class DataWriterProcessorStepImpl extends AbstractDataLoadProcessorStep { throw new CarbonDataWriterException(e); } } catch (CarbonDataWriterException e) { - LOGGER.error(e, "Failed for table: " + tableName + " in DataWriterProcessorStepImpl"); + LOGGER.error("Failed for table: " + tableName + " in DataWriterProcessorStepImpl", e); throw new CarbonDataLoadingException( "Error while initializing data handler : " + e.getMessage()); } catch (Exception e) { - LOGGER.error(e, "Failed for table: " + tableName + " in DataWriterProcessorStepImpl"); + LOGGER.error("Failed for table: " + tableName + " in DataWriterProcessorStepImpl", e); throw new CarbonDataLoadingException("There is an unexpected error: " + e.getMessage(), e); } return null; @@ -208,7 +209,7 @@ public class DataWriterProcessorStepImpl extends AbstractDataLoadProcessorStep { try { dataHandler.finish(); } catch (Exception e) { - LOGGER.error(e, "Failed for table: " + tableName + " in finishing data handler"); + LOGGER.error("Failed for table: " + tableName + " in finishing data handler", e); } LOGGER.info("Record Processed For table: " + tableName); String logMessage = @@ -230,10 +231,10 @@ public class DataWriterProcessorStepImpl extends AbstractDataLoadProcessorStep { try { dataHandler.closeHandler(); } catch (CarbonDataWriterException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new CarbonDataLoadingException(e.getMessage(), e); } catch (Exception e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new CarbonDataLoadingException("There is an unexpected error: " + e.getMessage()); } } @@ -271,7 +272,7 @@ public class DataWriterProcessorStepImpl extends AbstractDataLoadProcessorStep { LOGGER.info("closing all the DataMap writers registered to DataMap writer listener"); listener.finish(); } catch (IOException e) { - LOGGER.error(e, "error while closing the datamap writers"); + LOGGER.error("error while closing the datamap writers", e); // ignoring the exception } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonCompactionExecutor.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonCompactionExecutor.java b/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonCompactionExecutor.java index 8e68ef3..7bc7ae1 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonCompactionExecutor.java +++ b/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonCompactionExecutor.java @@ -25,7 +25,6 @@ import java.util.Map; import java.util.Set; 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.cache.dictionary.Dictionary; import org.apache.carbondata.core.constants.CarbonCommonConstants; @@ -51,6 +50,7 @@ import org.apache.carbondata.core.util.CarbonUtil; import org.apache.carbondata.core.util.DataTypeConverter; import org.apache.hadoop.conf.Configuration; +import org.apache.log4j.Logger; /** * Executor class for executing the query on the selected segments to be merged. @@ -58,7 +58,7 @@ import org.apache.hadoop.conf.Configuration; */ public class CarbonCompactionExecutor { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonCompactionExecutor.class.getName()); private final Map<String, List<DataFileFooter>> dataFileMetadataSegMapping; private final SegmentProperties destinationSegProperties; @@ -208,7 +208,7 @@ public class CarbonCompactionExecutor { } logStatistics(queryStartTime); } catch (QueryExecutionException e) { - LOGGER.error(e, "Problem while close. Ignoring the exception"); + LOGGER.error("Problem while close. Ignoring the exception", e); } clearDictionaryFromQueryModel(); } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonCompactionUtil.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonCompactionUtil.java b/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonCompactionUtil.java index 75a231e..74efdcb 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonCompactionUtil.java +++ b/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonCompactionUtil.java @@ -22,7 +22,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.datastore.block.TableBlockInfo; @@ -39,13 +38,14 @@ import org.apache.carbondata.core.util.CarbonUtil; import org.apache.carbondata.core.util.path.CarbonTablePath; import org.apache.commons.lang3.ArrayUtils; +import org.apache.log4j.Logger; /** * Utility Class for the Compaction Flow. */ public class CarbonCompactionUtil { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonCompactionUtil.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonDataMergerUtil.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonDataMergerUtil.java b/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonDataMergerUtil.java index 5b001bf..a7fc3f8 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonDataMergerUtil.java +++ b/processing/src/main/java/org/apache/carbondata/processing/merger/CarbonDataMergerUtil.java @@ -21,10 +21,20 @@ import java.io.File; import java.io.IOException; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.apache.carbondata.common.exceptions.sql.MalformedCarbonCommandException; -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; @@ -50,12 +60,13 @@ import org.apache.carbondata.processing.loading.model.CarbonLoadModel; import org.apache.carbondata.processing.util.CarbonLoaderUtil; import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; /** * utility class for load merging. */ public final class CarbonDataMergerUtil { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonDataMergerUtil.class.getName()); private CarbonDataMergerUtil() { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/merger/CompactionResultSortProcessor.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/merger/CompactionResultSortProcessor.java b/processing/src/main/java/org/apache/carbondata/processing/merger/CompactionResultSortProcessor.java index 6133016..2a70dbd 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/merger/CompactionResultSortProcessor.java +++ b/processing/src/main/java/org/apache/carbondata/processing/merger/CompactionResultSortProcessor.java @@ -20,7 +20,6 @@ import java.io.File; 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.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastore.block.SegmentProperties; @@ -48,6 +47,8 @@ import org.apache.carbondata.processing.store.CarbonFactHandler; import org.apache.carbondata.processing.store.CarbonFactHandlerFactory; import org.apache.carbondata.processing.util.CarbonDataProcessorUtil; +import org.apache.log4j.Logger; + /** * This class will process the query result and convert the data * into a format compatible for data load @@ -57,7 +58,7 @@ public class CompactionResultSortProcessor extends AbstractResultProcessor { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CompactionResultSortProcessor.class.getName()); /** * carbon load model that contains all the required information for load @@ -381,7 +382,7 @@ public class CompactionResultSortProcessor extends AbstractResultProcessor { try { dataHandler.closeHandler(); } catch (CarbonDataWriterException e) { - LOGGER.error(e, "Error in close data handler"); + LOGGER.error("Error in close data handler", e); throw new Exception("Error in close data handler", e); } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java b/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java index 2911c05..1801c1d 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java +++ b/processing/src/main/java/org/apache/carbondata/processing/merger/RowResultMergerProcessor.java @@ -22,7 +22,6 @@ import java.util.Comparator; import java.util.List; import java.util.PriorityQueue; -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; @@ -45,6 +44,8 @@ import org.apache.carbondata.processing.store.CarbonFactDataHandlerModel; import org.apache.carbondata.processing.store.CarbonFactHandler; import org.apache.carbondata.processing.util.CarbonDataProcessorUtil; +import org.apache.log4j.Logger; + /** * This is the Merger class responsible for the merging of the segments. */ @@ -61,7 +62,7 @@ public class RowResultMergerProcessor extends AbstractResultProcessor { */ private AbstractQueue<RawResultIterator> recordHolderHeap; - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(RowResultMergerProcessor.class.getName()); public RowResultMergerProcessor(String databaseName, http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/AbstractCarbonQueryExecutor.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/AbstractCarbonQueryExecutor.java b/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/AbstractCarbonQueryExecutor.java index dd5969f..c03f34e 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/AbstractCarbonQueryExecutor.java +++ b/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/AbstractCarbonQueryExecutor.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; 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.cache.dictionary.Dictionary; import org.apache.carbondata.core.datastore.block.TableBlockInfo; @@ -36,10 +35,11 @@ import org.apache.carbondata.core.scan.result.RowBatch; import org.apache.carbondata.core.util.CarbonUtil; import org.apache.hadoop.conf.Configuration; +import org.apache.log4j.Logger; public abstract class AbstractCarbonQueryExecutor { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(AbstractCarbonQueryExecutor.class.getName()); protected CarbonTable carbonTable; protected QueryModel queryModel; @@ -68,7 +68,7 @@ public abstract class AbstractCarbonQueryExecutor { try { queryExecutor.finish(); } catch (QueryExecutionException e) { - LOGGER.error(e, "Problem while finish: "); + LOGGER.error("Problem while finish: ", e); } clearDictionaryFromQueryModel(); } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/CarbonSplitExecutor.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/CarbonSplitExecutor.java b/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/CarbonSplitExecutor.java index d32757c..1b65a8b 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/CarbonSplitExecutor.java +++ b/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/CarbonSplitExecutor.java @@ -23,7 +23,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.datastore.block.TableBlockInfo; @@ -35,13 +34,14 @@ import org.apache.carbondata.core.scan.result.iterator.PartitionSpliterRawResult import org.apache.carbondata.core.util.DataTypeConverter; import org.apache.hadoop.conf.Configuration; +import org.apache.log4j.Logger; /** * Used to read carbon blocks when add/split partition */ public class CarbonSplitExecutor extends AbstractCarbonQueryExecutor { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonSplitExecutor.class.getName()); public CarbonSplitExecutor(Map<String, TaskBlockInfo> segmentMapping, CarbonTable carbonTable) { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/RowResultProcessor.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/RowResultProcessor.java b/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/RowResultProcessor.java index 00fbc7a..ac70f27 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/RowResultProcessor.java +++ b/processing/src/main/java/org/apache/carbondata/processing/partition/spliter/RowResultProcessor.java @@ -18,7 +18,6 @@ package org.apache.carbondata.processing.partition.spliter; import java.util.List; -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.datastore.exception.CarbonDataWriterException; @@ -33,6 +32,8 @@ import org.apache.carbondata.processing.store.CarbonFactDataHandlerModel; import org.apache.carbondata.processing.store.CarbonFactHandler; import org.apache.carbondata.processing.util.CarbonDataProcessorUtil; +import org.apache.log4j.Logger; + public class RowResultProcessor { private CarbonFactHandler dataHandler; @@ -40,7 +41,7 @@ public class RowResultProcessor { private CarbonColumn[] noDicAndComplexColumns; - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(RowResultProcessor.class.getName()); @@ -84,7 +85,7 @@ public class RowResultProcessor { } processStatus = true; } catch (CarbonDataWriterException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); LOGGER.error("Exception in executing RowResultProcessor" + e.getMessage()); processStatus = false; } finally { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/IntermediateFileMerger.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/IntermediateFileMerger.java b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/IntermediateFileMerger.java index 35563d0..4ebc8d9 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/IntermediateFileMerger.java +++ b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/IntermediateFileMerger.java @@ -26,7 +26,6 @@ import java.util.NoSuchElementException; import java.util.PriorityQueue; import java.util.concurrent.Callable; -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; @@ -34,11 +33,13 @@ import org.apache.carbondata.processing.loading.row.IntermediateSortTempRow; import org.apache.carbondata.processing.loading.sort.SortStepRowHandler; import org.apache.carbondata.processing.sort.exception.CarbonSortKeyAndGroupByException; +import org.apache.log4j.Logger; + public class IntermediateFileMerger implements Callable<Void> { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(IntermediateFileMerger.class.getName()); /** @@ -101,7 +102,7 @@ public class IntermediateFileMerger implements Callable<Void> { LOGGER.info("============================== Intermediate Merge of " + fileConterConst + " Sort Temp Files Cost Time: " + intermediateMergeCostTime + "(s)"); } catch (Exception e) { - LOGGER.error(e, "Problem while intermediate merging"); + LOGGER.error("Problem while intermediate merging", e); clear(); throwable = e; } finally { @@ -110,7 +111,7 @@ public class IntermediateFileMerger implements Callable<Void> { try { finish(); } catch (CarbonSortKeyAndGroupByException e) { - LOGGER.error(e, "Problem while deleting the merge file"); + LOGGER.error("Problem while deleting the merge file", e); throwable = e; } } else { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SingleThreadFinalSortFilesMerger.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SingleThreadFinalSortFilesMerger.java b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SingleThreadFinalSortFilesMerger.java index 5e9c28d..d2add29 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SingleThreadFinalSortFilesMerger.java +++ b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SingleThreadFinalSortFilesMerger.java @@ -33,7 +33,6 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; 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.exception.CarbonDataWriterException; @@ -42,11 +41,13 @@ import org.apache.carbondata.processing.loading.row.IntermediateSortTempRow; import org.apache.carbondata.processing.loading.sort.SortStepRowHandler; import org.apache.carbondata.processing.sort.exception.CarbonSortKeyAndGroupByException; +import org.apache.log4j.Logger; + public class SingleThreadFinalSortFilesMerger extends CarbonIterator<Object[]> { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(SingleThreadFinalSortFilesMerger.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortDataRows.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortDataRows.java b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortDataRows.java index 637741c..996b844 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortDataRows.java +++ b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortDataRows.java @@ -28,7 +28,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Semaphore; 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; @@ -40,11 +39,13 @@ import org.apache.carbondata.processing.loading.sort.SortStepRowHandler; import org.apache.carbondata.processing.sort.exception.CarbonSortKeyAndGroupByException; import org.apache.carbondata.processing.util.CarbonDataProcessorUtil; +import org.apache.log4j.Logger; + public class SortDataRows { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(SortDataRows.class.getName()); /** * entryCount @@ -136,7 +137,7 @@ public class SortDataRows { semaphore.acquire(); dataSorterAndWriterExecutorService.execute(new DataSorterAndWriter(recordHolderListLocal)); } catch (InterruptedException e) { - LOGGER.error(e, "exception occurred while trying to acquire a semaphore lock: "); + LOGGER.error("exception occurred while trying to acquire a semaphore lock: ", e); throw new CarbonSortKeyAndGroupByException(e); } // create the new holder Array http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortIntermediateFileMerger.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortIntermediateFileMerger.java b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortIntermediateFileMerger.java index 0e3f6bd..1f4f1e7 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortIntermediateFileMerger.java +++ b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortIntermediateFileMerger.java @@ -26,18 +26,19 @@ 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.util.CarbonThreadFactory; import org.apache.carbondata.processing.sort.exception.CarbonSortKeyAndGroupByException; +import org.apache.log4j.Logger; + /** * It does mergesort intermediate files to big file. */ public class SortIntermediateFileMerger { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(SortIntermediateFileMerger.class.getName()); /** @@ -118,7 +119,7 @@ public class SortIntermediateFileMerger { try { mergerTask.get(i).get(); } catch (InterruptedException | ExecutionException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new CarbonSortKeyAndGroupByException(e); } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortParameters.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortParameters.java b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortParameters.java index c4416d5..ecce232 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortParameters.java +++ b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortParameters.java @@ -20,7 +20,6 @@ import java.io.File; import java.io.Serializable; 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.CarbonTableIdentifier; @@ -32,10 +31,11 @@ import org.apache.carbondata.processing.loading.CarbonDataLoadConfiguration; import org.apache.carbondata.processing.util.CarbonDataProcessorUtil; import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.Logger; public class SortParameters implements Serializable { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(SortParameters.class.getName()); /** * tempFileLocation http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortTempFileChunkHolder.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortTempFileChunkHolder.java b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortTempFileChunkHolder.java index a1ef04e..ef9c3fa 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortTempFileChunkHolder.java +++ b/processing/src/main/java/org/apache/carbondata/processing/sort/sortdata/SortTempFileChunkHolder.java @@ -27,7 +27,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; -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; @@ -38,12 +37,14 @@ import org.apache.carbondata.processing.loading.row.IntermediateSortTempRow; import org.apache.carbondata.processing.loading.sort.SortStepRowHandler; import org.apache.carbondata.processing.sort.exception.CarbonSortKeyAndGroupByException; +import org.apache.log4j.Logger; + public class SortTempFileChunkHolder implements Comparable<SortTempFileChunkHolder> { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(SortTempFileChunkHolder.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java index 44fe704..67c4463 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java +++ b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java @@ -30,7 +30,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; 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.constants.CarbonV3DataFormatConstants; @@ -52,6 +51,8 @@ import org.apache.carbondata.core.util.DataTypeUtil; import org.apache.carbondata.processing.datatypes.GenericDataType; import org.apache.carbondata.processing.store.writer.CarbonFactDataWriter; +import org.apache.log4j.Logger; + /** * Fact data handler class to handle the fact data */ @@ -60,7 +61,7 @@ public class CarbonFactDataHandlerColumnar implements CarbonFactHandler { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonFactDataHandlerColumnar.class.getName()); private CarbonFactDataHandlerModel model; @@ -213,7 +214,7 @@ public class CarbonFactDataHandlerColumnar implements CarbonFactHandler { dataRows = new ArrayList<>(this.pageSize); this.entryCount = 0; } catch (InterruptedException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new CarbonDataWriterException(e.getMessage(), e); } } @@ -313,7 +314,7 @@ public class CarbonFactDataHandlerColumnar implements CarbonFactHandler { processWriteTaskSubmitList(producerExecutorServiceTaskList); processingComplete = true; } catch (InterruptedException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new CarbonDataWriterException(e.getMessage(), e); } } @@ -331,7 +332,7 @@ public class CarbonFactDataHandlerColumnar implements CarbonFactHandler { service.shutdown(); service.awaitTermination(1, TimeUnit.DAYS); } catch (InterruptedException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new CarbonDataWriterException(e.getMessage()); } } @@ -349,7 +350,7 @@ public class CarbonFactDataHandlerColumnar implements CarbonFactHandler { try { taskList.get(i).get(); } catch (InterruptedException | ExecutionException e) { - LOGGER.error(e, e.getMessage()); + LOGGER.error(e.getMessage(), e); throw new CarbonDataWriterException(e.getMessage(), e); } } @@ -587,7 +588,7 @@ public class CarbonFactDataHandlerColumnar implements CarbonFactHandler { tablePageList.put(tablePage, indexInNodeHolderArray); return null; } catch (Throwable throwable) { - LOGGER.error(throwable, "Error in producer"); + LOGGER.error("Error in producer", throwable); consumerExecutorService.shutdownNow(); resetBlockletProcessingCount(); throw new CarbonDataWriterException(throwable.getMessage(), throwable); @@ -626,7 +627,7 @@ public class CarbonFactDataHandlerColumnar implements CarbonFactHandler { if (!processingComplete || blockletProcessingCount.get() > 0) { producerExecutorService.shutdownNow(); resetBlockletProcessingCount(); - LOGGER.error(throwable, "Problem while writing the carbon data file"); + LOGGER.error("Problem while writing the carbon data file", throwable); throw new CarbonDataWriterException(throwable.getMessage()); } } finally { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerModel.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerModel.java b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerModel.java index 4b42bfc..d086b6d 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerModel.java +++ b/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerModel.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.datastore.TableSpec; @@ -53,6 +52,8 @@ import org.apache.carbondata.processing.loading.model.CarbonLoadModel; import org.apache.carbondata.processing.loading.sort.SortScopeOptions; import org.apache.carbondata.processing.util.CarbonDataProcessorUtil; +import org.apache.log4j.Logger; + // This class contains all the data required for processing and writing the carbon data // TODO: we should try to minimize this class as refactorying loading process public class CarbonFactDataHandlerModel { @@ -60,7 +61,7 @@ public class CarbonFactDataHandlerModel { /** * LOGGER */ - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonFactDataHandlerModel.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/store/TablePage.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/store/TablePage.java b/processing/src/main/java/org/apache/carbondata/processing/store/TablePage.java index 82129db..d6e4027 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/store/TablePage.java +++ b/processing/src/main/java/org/apache/carbondata/processing/store/TablePage.java @@ -27,7 +27,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.datastore.ColumnType; import org.apache.carbondata.core.datastore.TableSpec; @@ -56,13 +55,15 @@ import org.apache.carbondata.core.metadata.datatype.DataTypes; import org.apache.carbondata.core.util.DataTypeUtil; import org.apache.carbondata.processing.datatypes.GenericDataType; +import org.apache.log4j.Logger; + /** * Represent a page data for all columns, we store its data in columnar layout, so that * all processing apply to TablePage can be done in vectorized fashion. */ public class TablePage { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(TablePage.class.getName()); // For all dimension and measure columns, we store the column data directly in the page, http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/store/writer/AbstractFactDataWriter.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/store/writer/AbstractFactDataWriter.java b/processing/src/main/java/org/apache/carbondata/processing/store/writer/AbstractFactDataWriter.java index 37d33c2..64084e8 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/store/writer/AbstractFactDataWriter.java +++ b/processing/src/main/java/org/apache/carbondata/processing/store/writer/AbstractFactDataWriter.java @@ -32,7 +32,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.constants.CarbonLoadOptionConstants; @@ -55,9 +54,11 @@ import org.apache.carbondata.format.IndexHeader; import org.apache.carbondata.processing.datamap.DataMapWriterListener; import org.apache.carbondata.processing.store.CarbonFactDataHandlerModel; +import org.apache.log4j.Logger; + public abstract class AbstractFactDataWriter implements CarbonFactDataWriter { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(AbstractFactDataWriter.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/store/writer/v3/CarbonFactDataWriterImplV3.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/store/writer/v3/CarbonFactDataWriterImplV3.java b/processing/src/main/java/org/apache/carbondata/processing/store/writer/v3/CarbonFactDataWriterImplV3.java index e3cb052..d97d80c 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/store/writer/v3/CarbonFactDataWriterImplV3.java +++ b/processing/src/main/java/org/apache/carbondata/processing/store/writer/v3/CarbonFactDataWriterImplV3.java @@ -21,7 +21,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.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastore.blocklet.BlockletEncodedColumnPage; @@ -47,6 +46,8 @@ import static org.apache.carbondata.core.constants.CarbonV3DataFormatConstants.B import static org.apache.carbondata.core.constants.CarbonV3DataFormatConstants.BLOCKLET_SIZE_IN_MB_DEFAULT_VALUE; import static org.apache.carbondata.processing.loading.sort.SortScopeOptions.SortScope.NO_SORT; +import org.apache.log4j.Logger; + /** * Below class will be used to write the data in V3 format * <Column1 Data ChunkV3><Column1<Page1><Page2><Page3><Page4>> @@ -56,7 +57,7 @@ import static org.apache.carbondata.processing.loading.sort.SortScopeOptions.Sor */ public class CarbonFactDataWriterImplV3 extends AbstractFactDataWriter { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonFactDataWriterImplV3.class.getName()); /** @@ -113,7 +114,7 @@ public class CarbonFactDataWriterImplV3 extends AbstractFactDataWriter { buffer.flip(); currentOffsetInFile += fileChannel.write(buffer); } catch (IOException e) { - LOGGER.error(e, "Problem while writing the carbon file"); + LOGGER.error("Problem while writing the carbon file", e); throw new CarbonDataWriterException("Problem while writing the carbon file: ", e); } } @@ -207,7 +208,7 @@ public class CarbonFactDataWriterImplV3 extends AbstractFactDataWriter { } pageId = 0; } catch (IOException e) { - LOGGER.error(e, "Problem while writing file"); + LOGGER.error("Problem while writing file", e); throw new CarbonDataWriterException("Problem while writing file", e); } finally { // clear the data holder @@ -369,7 +370,7 @@ public class CarbonFactDataWriterImplV3 extends AbstractFactDataWriter { commitCurrentFile(true); writeIndexFile(); } catch (Exception e) { - LOGGER.error(e, "Problem while writing the index file"); + LOGGER.error("Problem while writing the index file", e); exception = new CarbonDataWriterException("Problem while writing the index file", e); } finally { try { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/util/CarbonBadRecordUtil.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonBadRecordUtil.java b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonBadRecordUtil.java index ecc6afb..d1f5500 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonBadRecordUtil.java +++ b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonBadRecordUtil.java @@ -21,7 +21,6 @@ import java.io.File; import java.io.IOException; 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.constants.CarbonLoadOptionConstants; @@ -35,12 +34,13 @@ import org.apache.carbondata.processing.loading.CarbonDataLoadConfiguration; import org.apache.carbondata.processing.loading.model.CarbonLoadModel; import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; /** * Common methods used for the bad record handling */ public class CarbonBadRecordUtil { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonDataProcessorUtil.class.getName()); /** http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java index 525f7ee..6f36ef8 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java +++ b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonDataProcessorUtil.java @@ -31,7 +31,6 @@ import java.util.Set; import org.apache.carbondata.common.CarbonIterator; import org.apache.carbondata.common.constants.LoggerAction; -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.CarbonMetadata; @@ -58,9 +57,10 @@ import org.apache.carbondata.processing.loading.sort.SortScopeOptions; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.Logger; public final class CarbonDataProcessorUtil { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonDataProcessorUtil.class.getName()); private CarbonDataProcessorUtil() { @@ -77,7 +77,7 @@ public final class CarbonDataProcessorUtil { try { CarbonUtil.deleteFoldersAndFiles(file); } catch (IOException | InterruptedException e) { - LOGGER.error(e, "Failed to delete " + loc); + LOGGER.error("Failed to delete " + loc, e); } } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java ---------------------------------------------------------------------- diff --git a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java index f6cc485..98d3576 100644 --- a/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java +++ b/processing/src/main/java/org/apache/carbondata/processing/util/CarbonLoaderUtil.java @@ -28,7 +28,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.cache.Cache; import org.apache.carbondata.core.cache.CacheProvider; @@ -60,13 +59,17 @@ import org.apache.carbondata.core.writer.CarbonIndexFileMergeWriter; import org.apache.carbondata.processing.loading.model.CarbonLoadModel; import org.apache.carbondata.processing.merger.NodeMultiBlockRelation; -import static org.apache.carbondata.core.enums.EscapeSequences.*; +import static org.apache.carbondata.core.enums.EscapeSequences.BACKSPACE; +import static org.apache.carbondata.core.enums.EscapeSequences.CARRIAGE_RETURN; +import static org.apache.carbondata.core.enums.EscapeSequences.NEW_LINE; +import static org.apache.carbondata.core.enums.EscapeSequences.TAB; import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.Logger; public final class CarbonLoaderUtil { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonLoaderUtil.class.getName()); private CarbonLoaderUtil() { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/processing/src/test/java/org/apache/carbondata/processing/util/CarbonLoaderUtilTest.java ---------------------------------------------------------------------- diff --git a/processing/src/test/java/org/apache/carbondata/processing/util/CarbonLoaderUtilTest.java b/processing/src/test/java/org/apache/carbondata/processing/util/CarbonLoaderUtilTest.java index 94f8b84..23c35da 100644 --- a/processing/src/test/java/org/apache/carbondata/processing/util/CarbonLoaderUtilTest.java +++ b/processing/src/test/java/org/apache/carbondata/processing/util/CarbonLoaderUtilTest.java @@ -20,18 +20,18 @@ 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.datastore.block.Distributable; import org.apache.carbondata.core.datastore.block.TableBlockInfo; import org.apache.carbondata.core.metadata.ColumnarFormatVersion; import org.apache.commons.lang3.StringUtils; +import org.apache.log4j.Logger; import org.junit.Assert; import org.junit.Test; public class CarbonLoaderUtilTest { - private final static LogService LOGGER + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonLoaderUtilTest.class.getName()); private List<Distributable> generateBlocks() { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/store/sdk/src/main/java/org/apache/carbondata/sdk/file/AvroCarbonWriter.java ---------------------------------------------------------------------- diff --git a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/AvroCarbonWriter.java b/store/sdk/src/main/java/org/apache/carbondata/sdk/file/AvroCarbonWriter.java index e4a65c0..9ed909a 100644 --- a/store/sdk/src/main/java/org/apache/carbondata/sdk/file/AvroCarbonWriter.java +++ b/store/sdk/src/main/java/org/apache/carbondata/sdk/file/AvroCarbonWriter.java @@ -30,7 +30,6 @@ import java.util.Random; import java.util.UUID; import org.apache.carbondata.common.annotations.InterfaceAudience; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.keygenerator.directdictionary.timestamp.DateDirectDictionaryGenerator; import org.apache.carbondata.core.metadata.datatype.DataType; @@ -60,6 +59,7 @@ import org.apache.hadoop.mapreduce.TaskAttemptID; import org.apache.hadoop.mapreduce.TaskID; import org.apache.hadoop.mapreduce.TaskType; import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl; +import org.apache.log4j.Logger; /** * Writer Implementation to write Avro Record to carbondata file. @@ -71,7 +71,7 @@ public class AvroCarbonWriter extends CarbonWriter { private TaskAttemptContext context; private ObjectArrayWritable writable; private Schema avroSchema; - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonTable.class.getName()); AvroCarbonWriter(CarbonLoadModel loadModel, Configuration hadoopConf) throws IOException { http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/store/sdk/src/main/java/org/apache/carbondata/store/LocalCarbonStore.java ---------------------------------------------------------------------- diff --git a/store/sdk/src/main/java/org/apache/carbondata/store/LocalCarbonStore.java b/store/sdk/src/main/java/org/apache/carbondata/store/LocalCarbonStore.java index dd7f333..7bfc1cb 100644 --- a/store/sdk/src/main/java/org/apache/carbondata/store/LocalCarbonStore.java +++ b/store/sdk/src/main/java/org/apache/carbondata/store/LocalCarbonStore.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Objects; import org.apache.carbondata.common.annotations.InterfaceAudience; -import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastore.row.CarbonRow; import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; @@ -42,6 +41,7 @@ import org.apache.hadoop.mapreduce.RecordReader; import org.apache.hadoop.mapreduce.TaskAttemptID; import org.apache.hadoop.mapreduce.task.JobContextImpl; import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl; +import org.apache.log4j.Logger; /** * A CarbonStore implementation that works locally, without other compute framework dependency. @@ -52,7 +52,7 @@ import org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl; @InterfaceAudience.Internal class LocalCarbonStore extends MetaCachedCarbonStore { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(LocalCarbonStore.class.getName()); @Override http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/store/sdk/src/test/java/org/apache/carbondata/sdk/file/CarbonReaderTest.java ---------------------------------------------------------------------- diff --git a/store/sdk/src/test/java/org/apache/carbondata/sdk/file/CarbonReaderTest.java b/store/sdk/src/test/java/org/apache/carbondata/sdk/file/CarbonReaderTest.java index ba8a49d..58f3f61 100644 --- a/store/sdk/src/test/java/org/apache/carbondata/sdk/file/CarbonReaderTest.java +++ b/store/sdk/src/test/java/org/apache/carbondata/sdk/file/CarbonReaderTest.java @@ -24,8 +24,9 @@ import java.util.*; import org.apache.avro.generic.GenericData; import org.apache.carbondata.common.exceptions.sql.InvalidLoadOptionException; -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.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastore.impl.FileFactory; import org.apache.carbondata.core.metadata.datatype.DataTypes; @@ -819,7 +820,7 @@ public class CarbonReaderTest extends TestCase { .addProperty(CarbonCommonConstants.CARBON_SYSTEM_FOLDER_LOCATION, path); } - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonReaderTest.class.getName()); @Test @@ -887,7 +888,7 @@ public class CarbonReaderTest extends TestCase { e.printStackTrace(); Assert.fail(e.getMessage()); } - LOGGER.audit("Bad record location:" + storeLocation); + Audit.log(LOGGER, "Bad record location:" + storeLocation); File folder = new File(path); Assert.assertTrue(folder.exists()); http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/store/search/src/main/java/org/apache/carbondata/store/worker/SearchRequestHandler.java ---------------------------------------------------------------------- diff --git a/store/search/src/main/java/org/apache/carbondata/store/worker/SearchRequestHandler.java b/store/search/src/main/java/org/apache/carbondata/store/worker/SearchRequestHandler.java index 2d3e5fe..b1e87ce 100644 --- a/store/search/src/main/java/org/apache/carbondata/store/worker/SearchRequestHandler.java +++ b/store/search/src/main/java/org/apache/carbondata/store/worker/SearchRequestHandler.java @@ -18,11 +18,15 @@ package org.apache.carbondata.store.worker; import java.io.IOException; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; import org.apache.carbondata.common.annotations.InterfaceAudience; -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.datamap.DataMapChooser; import org.apache.carbondata.core.datamap.DataMapDistributable; import org.apache.carbondata.core.datamap.Segment; @@ -53,6 +57,7 @@ import org.apache.carbondata.hadoop.CarbonRecordReader; import org.apache.carbondata.hadoop.readsupport.impl.CarbonRowReadSupport; import org.apache.hadoop.conf.Configuration; +import org.apache.log4j.Logger; import org.apache.spark.search.SearchRequest; import org.apache.spark.search.SearchResult; import org.apache.spark.search.ShutdownRequest; @@ -64,7 +69,7 @@ import org.apache.spark.search.ShutdownResponse; @InterfaceAudience.Internal public class SearchRequestHandler { - private static final LogService LOG = + private static final Logger LOG = LogServiceFactory.getLogService(SearchRequestHandler.class.getName()); public SearchResult handleSearch(SearchRequest request) { @@ -96,7 +101,7 @@ public class SearchRequestHandler { chooser = new DataMapChooser(table); return chooser.chooseFGDataMap(filterInterface); } catch (IOException e) { - LOG.audit(e.getMessage()); + Audit.log(LOG, e.getMessage()); return null; } } http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/streaming/src/main/java/org/apache/carbondata/streaming/CarbonStreamRecordWriter.java ---------------------------------------------------------------------- diff --git a/streaming/src/main/java/org/apache/carbondata/streaming/CarbonStreamRecordWriter.java b/streaming/src/main/java/org/apache/carbondata/streaming/CarbonStreamRecordWriter.java index 672f6a6..1ec0030 100644 --- a/streaming/src/main/java/org/apache/carbondata/streaming/CarbonStreamRecordWriter.java +++ b/streaming/src/main/java/org/apache/carbondata/streaming/CarbonStreamRecordWriter.java @@ -25,7 +25,6 @@ import java.util.ArrayList; 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.datastore.compression.CompressorFactory; @@ -62,12 +61,14 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.RecordWriter; import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.hadoop.mapreduce.TaskID; +import org.apache.log4j.Logger; + /** * Stream record writer */ public class CarbonStreamRecordWriter extends RecordWriter<Void, Object> { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(CarbonStreamRecordWriter.class.getName()); // basic info http://git-wip-us.apache.org/repos/asf/carbondata/blob/06adb5a0/streaming/src/main/java/org/apache/carbondata/streaming/segment/StreamSegment.java ---------------------------------------------------------------------- diff --git a/streaming/src/main/java/org/apache/carbondata/streaming/segment/StreamSegment.java b/streaming/src/main/java/org/apache/carbondata/streaming/segment/StreamSegment.java index 6ee6876..b436b18 100644 --- a/streaming/src/main/java/org/apache/carbondata/streaming/segment/StreamSegment.java +++ b/streaming/src/main/java/org/apache/carbondata/streaming/segment/StreamSegment.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.Map; 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.filesystem.CarbonFile; @@ -59,13 +58,14 @@ import org.apache.carbondata.streaming.CarbonStreamRecordWriter; import org.apache.carbondata.streaming.index.StreamFileIndex; import org.apache.hadoop.mapreduce.TaskAttemptContext; +import org.apache.log4j.Logger; /** * streaming segment manager */ public class StreamSegment { - private static final LogService LOGGER = + private static final Logger LOGGER = LogServiceFactory.getLogService(StreamSegment.class.getName()); /** @@ -301,8 +301,8 @@ public class StreamSegment { writer.getMeasureDataTypes(), blockletRowCount); } catch (Throwable ex) { if (writer != null) { - LOGGER.error(ex, "Failed to append batch data to stream segment: " + - writer.getSegmentDir()); + LOGGER.error("Failed to append batch data to stream segment: " + + writer.getSegmentDir(), ex); writer.setHasException(true); } throw ex;
