Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id E9FD0200BFC for ; Sat, 14 Jan 2017 08:57:49 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id E705C160B56; Sat, 14 Jan 2017 07:57:49 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9EDEB160B52 for ; Sat, 14 Jan 2017 08:57:47 +0100 (CET) Received: (qmail 22643 invoked by uid 500); 14 Jan 2017 07:57:46 -0000 Mailing-List: contact commits-help@carbondata.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@carbondata.incubator.apache.org Delivered-To: mailing list commits@carbondata.incubator.apache.org Received: (qmail 22598 invoked by uid 99); 14 Jan 2017 07:57:46 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Jan 2017 07:57:46 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id F088CC0A83 for ; Sat, 14 Jan 2017 07:57:45 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -6.218 X-Spam-Level: X-Spam-Status: No, score=-6.218 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-2.999, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id nQD2ZoPjkGfR for ; Sat, 14 Jan 2017 07:57:41 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 4C3D861F00 for ; Sat, 14 Jan 2017 07:57:13 +0000 (UTC) Received: (qmail 21109 invoked by uid 99); 14 Jan 2017 07:57:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Jan 2017 07:57:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5A03ADFCF2; Sat, 14 Jan 2017 07:57:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jackylk@apache.org To: commits@carbondata.incubator.apache.org Date: Sat, 14 Jan 2017 07:57:52 -0000 Message-Id: <3f7c0c4f42e744ae97533c456fe2d05e@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [43/57] [abbrv] incubator-carbondata git commit: move load archived-at: Sat, 14 Jan 2017 07:57:50 -0000 move load Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/ae17158a Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/ae17158a Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/ae17158a Branch: refs/heads/movecorepackage Commit: ae17158a4cf9390ddd57855e36ed2d99a74cc6ec Parents: d0d25c9 Author: jackylk Authored: Fri Jan 13 15:32:59 2017 +0800 Committer: jackylk Committed: Fri Jan 13 15:32:59 2017 +0800 ---------------------------------------------------------------------- .../carbondata/core/cache/CacheProvider.java | 2 +- .../dictionary/AbstractDictionaryCache.java | 4 +- .../cache/dictionary/ColumnDictionaryInfo.java | 2 +- .../dictionary/DictionaryCacheLoaderImpl.java | 4 +- .../decimal/CompressionMaxMinInt.java | 4 +- .../decimal/CompressionMaxMinLong.java | 4 +- .../decimal/CompressionMaxMinShort.java | 4 +- .../nondecimal/CompressionNonDecimalByte.java | 2 +- .../CompressionNonDecimalDefault.java | 4 +- .../nondecimal/CompressionNonDecimalInt.java | 4 +- .../nondecimal/CompressionNonDecimalLong.java | 4 +- .../CompressionNonDecimalMaxMinDefault.java | 4 +- .../CompressionNonDecimalMaxMinLong.java | 4 +- .../CompressionNonDecimalMaxMinShort.java | 4 +- .../compression/none/CompressionNoneByte.java | 4 +- .../none/CompressionNoneDefault.java | 4 +- .../compression/none/CompressionNoneInt.java | 4 +- .../compression/none/CompressionNoneLong.java | 4 +- .../impl/CompressedDataMeasureDataWrapper.java | 2 +- ...ractHeavyCompressedDoubleArrayDataStore.java | 2 +- .../core/datastore/BlockIndexStore.java | 8 +- .../carbondata/core/datastore/DataRefNode.java | 4 +- .../core/datastore/SegmentTaskIndexStore.java | 2 +- .../datastore/TableSegmentUniqueIdentifier.java | 4 +- .../core/datastore/block/BlockInfo.java | 2 +- .../core/datastore/block/SegmentProperties.java | 13 +- .../core/datastore/block/TableBlockInfo.java | 4 +- .../block/TableBlockUniqueIdentifier.java | 2 +- .../datastore/chunk/MeasureColumnDataChunk.java | 2 +- .../impl/FixedLengthDimensionDataChunk.java | 5 +- .../impl/VariableLengthDimensionDataChunk.java | 5 +- .../chunk/reader/CarbonDataReaderFactory.java | 12 +- .../reader/DimensionColumnChunkReader.java | 2 +- .../chunk/reader/MeasureColumnChunkReader.java | 2 +- .../reader/dimension/AbstractChunkReader.java | 2 +- ...mpressedDimensionChunkFileBasedReaderV1.java | 6 +- ...mpressedDimensionChunkFileBasedReaderV2.java | 4 +- ...CompressedMeasureChunkFileBasedReaderV1.java | 8 +- ...CompressedMeasureChunkFileBasedReaderV2.java | 8 +- .../chunk/store/DimensionChunkStoreFactory.java | 12 +- .../chunk/store/MeasureChunkStoreFactory.java | 2 +- .../UnsafeAbstractDimensionDataChunkStore.java | 2 +- .../impl/btree/AbstractBTreeBuilder.java | 2 +- .../impl/btree/AbstractBTreeLeafNode.java | 4 +- .../datastore/impl/btree/BTreeNonLeafNode.java | 6 +- .../datastore/impl/btree/BlockBTreeBuilder.java | 2 +- .../impl/btree/BlockletBTreeBuilder.java | 2 +- .../impl/btree/BlockletBTreeLeafNode.java | 2 +- .../dictionary/client/DictionaryClient.java | 4 +- .../client/DictionaryClientHandler.java | 6 +- .../IncrementalColumnDictionaryGenerator.java | 16 +- .../generator/ServerDictionaryGenerator.java | 6 +- .../generator/TableDictionaryGenerator.java | 6 +- .../server/DictionaryServerHandler.java | 6 +- .../DirectDictionaryKeyGeneratorFactory.java | 8 +- .../DateDirectDictionaryGenerator.java | 2 +- .../TimeStampDirectDictionaryGenerator.java | 14 +- .../carbondata/core/load/BlockDetails.java | 87 ----- .../core/load/LoadMetadataDetails.java | 344 ------------------- .../core/memory/HeapMemoryAllocator.java | 2 +- .../core/metadata/blocklet/DataFileFooter.java | 2 +- .../core/metadata/schema/table/CarbonTable.java | 10 +- .../core/metadata/schema/table/TableSchema.java | 2 +- .../carbondata/core/path/CarbonTablePath.java | 5 +- .../reader/CarbonDeleteDeltaFileReaderImpl.java | 10 +- .../reader/CarbonDeleteFilesDataReader.java | 6 +- .../CarbonDictionaryMetadataReaderImpl.java | 4 +- .../core/reader/CarbonDictionaryReaderImpl.java | 2 +- .../CarbonDictionarySortIndexReaderImpl.java | 4 +- .../impl/AbstractScannedResultCollector.java | 2 +- .../impl/DictionaryBasedResultCollector.java | 10 +- .../DictionaryBasedVectorResultCollector.java | 2 +- .../collector/impl/RawBasedResultCollector.java | 2 +- .../scan/complextypes/PrimitiveQueryType.java | 2 +- .../executor/impl/AbstractQueryExecutor.java | 16 +- .../executor/impl/QueryExecutorProperties.java | 2 +- .../scan/executor/infos/BlockExecutionInfo.java | 2 +- .../core/scan/executor/util/QueryUtil.java | 12 +- .../scan/executor/util/RestructureUtil.java | 2 +- .../core/scan/expression/ExpressionResult.java | 4 +- .../scan/filter/FilterExpressionProcessor.java | 4 +- .../core/scan/filter/FilterProcessor.java | 2 +- .../carbondata/core/scan/filter/FilterUtil.java | 16 +- .../ExcludeColGroupFilterExecuterImpl.java | 2 +- .../executer/ExcludeFilterExecuterImpl.java | 2 +- .../IncludeColGroupFilterExecuterImpl.java | 2 +- .../executer/IncludeFilterExecuterImpl.java | 4 +- .../executer/RowLevelFilterExecuterImpl.java | 12 +- .../RowLevelRangeGrtThanFiterExecuterImpl.java | 6 +- ...elRangeGrtrThanEquaToFilterExecuterImpl.java | 6 +- ...velRangeLessThanEqualFilterExecuterImpl.java | 8 +- .../RowLevelRangeLessThanFiterExecuterImpl.java | 8 +- .../resolver/ConditionalFilterResolverImpl.java | 5 +- .../filter/resolver/FilterResolverIntf.java | 2 +- .../resolver/LogicalFilterResolverImpl.java | 2 +- .../resolver/RowLevelFilterResolverImpl.java | 2 +- .../RowLevelRangeFilterResolverImpl.java | 8 +- .../visitor/CustomTypeDictionaryVisitor.java | 2 +- .../carbondata/core/scan/model/QueryModel.java | 10 +- .../processor/AbstractDataBlockIterator.java | 4 +- .../core/scan/processor/BlocksChunkHolder.java | 2 +- .../processor/impl/DataBlockIteratorImpl.java | 2 +- .../core/scan/result/AbstractScannedResult.java | 4 +- .../AbstractDetailQueryResultIterator.java | 16 +- .../scan/scanner/AbstractBlockletScanner.java | 10 +- .../core/scan/scanner/impl/FilterScanner.java | 18 +- .../scan/scanner/impl/NonFilterScanner.java | 2 +- .../core/service/CarbonCommonFactory.java | 3 - .../DriverQueryStatisticsRecorderImpl.java | 4 +- .../core/update/CarbonUpdateUtil.java | 89 +---- .../data/BlockletDeleteDeltaCacheLoader.java | 2 +- .../core/updatestatus/LoadMetadataDetails.java | 344 +++++++++++++++++++ .../core/updatestatus/SegmentStatusManager.java | 22 +- .../SegmentUpdateStatusManager.java | 24 +- .../updatestatus/locks/CarbonLockFactory.java | 2 +- .../core/updatestatus/locks/HdfsFileLock.java | 2 +- .../core/updatestatus/locks/LocalFileLock.java | 2 +- .../updatestatus/locks/ZooKeeperLocking.java | 2 +- .../util/AbstractDataFileFooterConverter.java | 10 +- .../core/util/CarbonMetadataUtil.java | 6 +- .../carbondata/core/util/CarbonProperties.java | 2 +- .../core/util/CarbonTimeStatisticsFactory.java | 2 +- .../apache/carbondata/core/util/CarbonUtil.java | 20 +- .../core/util/DataFileFooterConverter.java | 6 +- .../core/util/DataFileFooterConverter2.java | 2 +- .../carbondata/core/util/DataTypeUtil.java | 2 +- .../core/writer/CarbonDictionaryWriterImpl.java | 8 +- .../CarbonDictionarySortIndexWriterImpl.java | 8 +- .../CarbonDictionarySortInfoPreparator.java | 2 +- .../sortindex/CarbonDictionarySortModel.java | 2 +- .../core/load/LoadMetadataDetailsUnitTest.java | 119 ------- .../LoadMetadataDetailsUnitTest.java | 121 +++++++ .../hadoop/test/util/StoreCreator.java | 4 +- .../dataretention/DataRetentionTestCase.scala | 3 +- .../carbondata/spark/load/CarbonLoaderUtil.java | 2 +- .../spark/load/DeleteLoadFolders.java | 2 +- .../spark/merger/CarbonDataMergerUtil.java | 2 +- .../carbondata/spark/util/CarbonQueryUtil.java | 2 +- .../carbondata/spark/util/LoadMetadataUtil.java | 2 +- .../org/apache/carbondata/spark/KeyVal.scala | 2 +- .../spark/rdd/CarbonDataLoadRDD.scala | 6 +- .../spark/rdd/CarbonDeleteLoadByDateRDD.scala | 2 +- .../spark/rdd/DataManagementFunc.scala | 3 +- .../spark/rdd/NewCarbonDataLoadRDD.scala | 4 +- .../execution/command/carbonTableSchema.scala | 3 +- .../scala/org/apache/spark/util/SparkUtil.scala | 2 +- .../spark/rdd/CarbonDataRDDFactory.scala | 4 +- .../spark/rdd/CarbonDataRDDFactory.scala | 4 +- .../processing/csvreaderstep/BlockDetails.java | 87 +++++ .../processing/csvreaderstep/CsvInput.java | 1 - .../csvreaderstep/UnivocityCsvParserVo.java | 2 - .../graphgenerator/GraphGenerator.java | 2 +- .../processing/model/CarbonLoadModel.java | 2 +- .../carbondata/test/util/StoreCreator.java | 4 +- 154 files changed, 950 insertions(+), 963 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/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 9ab8ac7..216e483 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 @@ -28,11 +28,11 @@ import org.apache.carbondata.core.cache.dictionary.Dictionary; import org.apache.carbondata.core.cache.dictionary.DictionaryColumnUniqueIdentifier; import org.apache.carbondata.core.cache.dictionary.ForwardDictionaryCache; import org.apache.carbondata.core.cache.dictionary.ReverseDictionaryCache; +import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastore.BlockIndexStore; import org.apache.carbondata.core.datastore.SegmentTaskIndexStore; import org.apache.carbondata.core.datastore.block.AbstractIndex; import org.apache.carbondata.core.datastore.block.TableBlockUniqueIdentifier; -import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.util.CarbonProperties; /** http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/AbstractDictionaryCache.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/AbstractDictionaryCache.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/AbstractDictionaryCache.java index b1bf459..5fd06b4 100644 --- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/AbstractDictionaryCache.java +++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/AbstractDictionaryCache.java @@ -22,16 +22,16 @@ package org.apache.carbondata.core.cache.dictionary; import java.io.IOException; import java.util.List; -import org.apache.carbondata.core.service.CarbonCommonFactory; import org.apache.carbondata.core.cache.Cache; import org.apache.carbondata.core.cache.CacheType; import org.apache.carbondata.core.cache.CarbonLRUCache; -import org.apache.carbondata.core.path.CarbonTablePath; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastorage.filesystem.CarbonFile; import org.apache.carbondata.core.datastorage.impl.FileFactory; +import org.apache.carbondata.core.path.CarbonTablePath; import org.apache.carbondata.core.reader.CarbonDictionaryColumnMetaChunk; import org.apache.carbondata.core.reader.CarbonDictionaryMetadataReader; +import org.apache.carbondata.core.service.CarbonCommonFactory; import org.apache.carbondata.core.service.DictionaryService; import org.apache.carbondata.core.service.PathService; import org.apache.carbondata.core.util.CarbonProperties; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryInfo.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryInfo.java index b08870a..18e88a8 100644 --- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryInfo.java +++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/ColumnDictionaryInfo.java @@ -26,8 +26,8 @@ import java.util.Date; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import org.apache.carbondata.core.metadata.DataType; import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.metadata.DataType; import org.apache.carbondata.core.util.ByteUtil; import org.apache.carbondata.core.util.CarbonProperties; import org.apache.carbondata.core.util.CarbonUtil; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryCacheLoaderImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryCacheLoaderImpl.java b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryCacheLoaderImpl.java index c60b911..6e2d899 100644 --- a/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryCacheLoaderImpl.java +++ b/core/src/main/java/org/apache/carbondata/core/cache/dictionary/DictionaryCacheLoaderImpl.java @@ -24,12 +24,12 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.carbondata.core.service.CarbonCommonFactory; +import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.metadata.CarbonTableIdentifier; import org.apache.carbondata.core.metadata.ColumnIdentifier; -import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.reader.CarbonDictionaryReader; import org.apache.carbondata.core.reader.sortindex.CarbonDictionarySortIndexReader; +import org.apache.carbondata.core.service.CarbonCommonFactory; import org.apache.carbondata.core.service.DictionaryService; import org.apache.carbondata.core.util.CarbonUtil; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/decimal/CompressionMaxMinInt.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/decimal/CompressionMaxMinInt.java b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/decimal/CompressionMaxMinInt.java index 9387155..fcafb0f 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/decimal/CompressionMaxMinInt.java +++ b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/decimal/CompressionMaxMinInt.java @@ -25,10 +25,10 @@ import java.nio.ByteBuffer; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastorage.compression.Compressor; -import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; -import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.datastorage.compression.CompressorFactory; import org.apache.carbondata.core.datastorage.compression.ValueCompressionHolder; +import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; +import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.util.ValueCompressionUtil; import org.apache.carbondata.core.util.ValueCompressionUtil.DataType; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/decimal/CompressionMaxMinLong.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/decimal/CompressionMaxMinLong.java b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/decimal/CompressionMaxMinLong.java index d732e18..3be00e4 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/decimal/CompressionMaxMinLong.java +++ b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/decimal/CompressionMaxMinLong.java @@ -25,10 +25,10 @@ import java.nio.ByteBuffer; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastorage.compression.Compressor; -import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; -import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.datastorage.compression.CompressorFactory; import org.apache.carbondata.core.datastorage.compression.ValueCompressionHolder; +import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; +import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.util.ValueCompressionUtil; import org.apache.carbondata.core.util.ValueCompressionUtil.DataType; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/decimal/CompressionMaxMinShort.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/decimal/CompressionMaxMinShort.java b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/decimal/CompressionMaxMinShort.java index 3f93978..546f903 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/decimal/CompressionMaxMinShort.java +++ b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/decimal/CompressionMaxMinShort.java @@ -25,10 +25,10 @@ import java.nio.ByteBuffer; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastorage.compression.Compressor; -import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; -import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.datastorage.compression.CompressorFactory; import org.apache.carbondata.core.datastorage.compression.ValueCompressionHolder; +import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; +import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.util.ValueCompressionUtil; import org.apache.carbondata.core.util.ValueCompressionUtil.DataType; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalByte.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalByte.java b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalByte.java index 1767298..7aec7fc 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalByte.java +++ b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalByte.java @@ -25,9 +25,9 @@ import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastorage.compression.Compressor; import org.apache.carbondata.core.datastorage.compression.CompressorFactory; +import org.apache.carbondata.core.datastorage.compression.ValueCompressionHolder; import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; -import org.apache.carbondata.core.datastorage.compression.ValueCompressionHolder; import org.apache.carbondata.core.util.ValueCompressionUtil.DataType; public class CompressionNonDecimalByte extends ValueCompressionHolder { http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalDefault.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalDefault.java b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalDefault.java index ac0ec78..7a3ec18 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalDefault.java +++ b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalDefault.java @@ -25,10 +25,10 @@ import java.nio.ByteBuffer; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastorage.compression.Compressor; -import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; -import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.datastorage.compression.CompressorFactory; import org.apache.carbondata.core.datastorage.compression.ValueCompressionHolder; +import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; +import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.util.ValueCompressionUtil; import org.apache.carbondata.core.util.ValueCompressionUtil.DataType; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalInt.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalInt.java b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalInt.java index 1e5689d..2968702 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalInt.java +++ b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalInt.java @@ -25,10 +25,10 @@ import java.nio.ByteBuffer; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastorage.compression.Compressor; -import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; -import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.datastorage.compression.CompressorFactory; import org.apache.carbondata.core.datastorage.compression.ValueCompressionHolder; +import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; +import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.util.ValueCompressionUtil; import org.apache.carbondata.core.util.ValueCompressionUtil.DataType; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalLong.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalLong.java b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalLong.java index d84b8f2..0083736 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalLong.java +++ b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalLong.java @@ -25,10 +25,10 @@ import java.nio.ByteBuffer; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastorage.compression.Compressor; -import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; -import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.datastorage.compression.CompressorFactory; import org.apache.carbondata.core.datastorage.compression.ValueCompressionHolder; +import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; +import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.util.ValueCompressionUtil; import org.apache.carbondata.core.util.ValueCompressionUtil.DataType; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalMaxMinDefault.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalMaxMinDefault.java b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalMaxMinDefault.java index e298c37..e8c386f 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalMaxMinDefault.java +++ b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalMaxMinDefault.java @@ -25,10 +25,10 @@ import java.nio.ByteBuffer; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastorage.compression.Compressor; -import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; -import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.datastorage.compression.CompressorFactory; import org.apache.carbondata.core.datastorage.compression.ValueCompressionHolder; +import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; +import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.util.ValueCompressionUtil; import org.apache.carbondata.core.util.ValueCompressionUtil.DataType; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalMaxMinLong.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalMaxMinLong.java b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalMaxMinLong.java index 8524c20..ddffc2b 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalMaxMinLong.java +++ b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalMaxMinLong.java @@ -24,11 +24,11 @@ import java.nio.ByteBuffer; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; -import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; -import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.datastorage.compression.Compressor; import org.apache.carbondata.core.datastorage.compression.CompressorFactory; import org.apache.carbondata.core.datastorage.compression.ValueCompressionHolder; +import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; +import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.util.ValueCompressionUtil; import org.apache.carbondata.core.util.ValueCompressionUtil.DataType; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalMaxMinShort.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalMaxMinShort.java b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalMaxMinShort.java index dac557c..1306b1f 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalMaxMinShort.java +++ b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/nondecimal/CompressionNonDecimalMaxMinShort.java @@ -25,10 +25,10 @@ import java.nio.ByteBuffer; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastorage.compression.Compressor; -import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; -import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.datastorage.compression.CompressorFactory; import org.apache.carbondata.core.datastorage.compression.ValueCompressionHolder; +import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; +import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.util.ValueCompressionUtil; import org.apache.carbondata.core.util.ValueCompressionUtil.DataType; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/none/CompressionNoneByte.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/none/CompressionNoneByte.java b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/none/CompressionNoneByte.java index 308ec8b..32d3e63 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/none/CompressionNoneByte.java +++ b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/none/CompressionNoneByte.java @@ -24,10 +24,10 @@ import java.math.BigDecimal; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastorage.compression.Compressor; -import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; -import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.datastorage.compression.CompressorFactory; import org.apache.carbondata.core.datastorage.compression.ValueCompressionHolder; +import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; +import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.util.ValueCompressionUtil.DataType; public class CompressionNoneByte extends ValueCompressionHolder { http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/none/CompressionNoneDefault.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/none/CompressionNoneDefault.java b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/none/CompressionNoneDefault.java index 65fa3e5..dad6bdb 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/none/CompressionNoneDefault.java +++ b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/none/CompressionNoneDefault.java @@ -25,10 +25,10 @@ import java.nio.ByteBuffer; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastorage.compression.Compressor; -import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; -import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.datastorage.compression.CompressorFactory; import org.apache.carbondata.core.datastorage.compression.ValueCompressionHolder; +import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; +import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.util.ValueCompressionUtil; import org.apache.carbondata.core.util.ValueCompressionUtil.DataType; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/none/CompressionNoneInt.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/none/CompressionNoneInt.java b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/none/CompressionNoneInt.java index 29a60cf..13ecd8c 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/none/CompressionNoneInt.java +++ b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/none/CompressionNoneInt.java @@ -25,10 +25,10 @@ import java.nio.ByteBuffer; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastorage.compression.Compressor; -import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; -import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.datastorage.compression.CompressorFactory; import org.apache.carbondata.core.datastorage.compression.ValueCompressionHolder; +import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; +import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.util.ValueCompressionUtil; import org.apache.carbondata.core.util.ValueCompressionUtil.DataType; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/none/CompressionNoneLong.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/none/CompressionNoneLong.java b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/none/CompressionNoneLong.java index 834467d..c22464d 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastorage/compression/none/CompressionNoneLong.java +++ b/core/src/main/java/org/apache/carbondata/core/datastorage/compression/none/CompressionNoneLong.java @@ -25,10 +25,10 @@ import java.nio.ByteBuffer; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.datastorage.compression.Compressor; -import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; -import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.datastorage.compression.CompressorFactory; import org.apache.carbondata.core.datastorage.compression.ValueCompressionHolder; +import org.apache.carbondata.core.datastore.chunk.store.MeasureChunkStoreFactory; +import org.apache.carbondata.core.datastore.chunk.store.MeasureDataChunkStore; import org.apache.carbondata.core.util.ValueCompressionUtil; import org.apache.carbondata.core.util.ValueCompressionUtil.DataType; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastorage/impl/CompressedDataMeasureDataWrapper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastorage/impl/CompressedDataMeasureDataWrapper.java b/core/src/main/java/org/apache/carbondata/core/datastorage/impl/CompressedDataMeasureDataWrapper.java index 6512d25..997543b 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastorage/impl/CompressedDataMeasureDataWrapper.java +++ b/core/src/main/java/org/apache/carbondata/core/datastorage/impl/CompressedDataMeasureDataWrapper.java @@ -19,8 +19,8 @@ package org.apache.carbondata.core.datastorage.impl; -import org.apache.carbondata.core.datastorage.dataholder.CarbonReadDataHolder; import org.apache.carbondata.core.datastorage.MeasureDataWrapper; +import org.apache.carbondata.core.datastorage.dataholder.CarbonReadDataHolder; public class CompressedDataMeasureDataWrapper implements MeasureDataWrapper { http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastorage/impl/data/compressed/AbstractHeavyCompressedDoubleArrayDataStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastorage/impl/data/compressed/AbstractHeavyCompressedDoubleArrayDataStore.java b/core/src/main/java/org/apache/carbondata/core/datastorage/impl/data/compressed/AbstractHeavyCompressedDoubleArrayDataStore.java index 8573187..e47cf42 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastorage/impl/data/compressed/AbstractHeavyCompressedDoubleArrayDataStore.java +++ b/core/src/main/java/org/apache/carbondata/core/datastorage/impl/data/compressed/AbstractHeavyCompressedDoubleArrayDataStore.java @@ -23,8 +23,8 @@ 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.datastorage.NodeMeasureDataStore; -import org.apache.carbondata.core.datastorage.compression.WriterCompressModel; import org.apache.carbondata.core.datastorage.compression.ValueCompressionHolder; +import org.apache.carbondata.core.datastorage.compression.WriterCompressModel; import org.apache.carbondata.core.datastorage.dataholder.CarbonWriteDataHolder; import org.apache.carbondata.core.util.ValueCompressionUtil; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/BlockIndexStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/BlockIndexStore.java b/core/src/main/java/org/apache/carbondata/core/datastore/BlockIndexStore.java index 8fe4601..88d8737 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/BlockIndexStore.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/BlockIndexStore.java @@ -35,8 +35,7 @@ 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.CarbonLRUCache; -import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; -import org.apache.carbondata.core.metadata.CarbonTableIdentifier; +import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastore.block.AbstractIndex; import org.apache.carbondata.core.datastore.block.BlockIndex; import org.apache.carbondata.core.datastore.block.BlockInfo; @@ -44,11 +43,12 @@ import org.apache.carbondata.core.datastore.block.SegmentTaskIndexWrapper; import org.apache.carbondata.core.datastore.block.TableBlockInfo; import org.apache.carbondata.core.datastore.block.TableBlockUniqueIdentifier; import org.apache.carbondata.core.datastore.exception.IndexBuilderException; -import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; +import org.apache.carbondata.core.metadata.CarbonTableIdentifier; +import org.apache.carbondata.core.scan.model.QueryModel; import org.apache.carbondata.core.update.CarbonUpdateUtil; import org.apache.carbondata.core.update.data.UpdateVO; import org.apache.carbondata.core.util.CarbonProperties; -import org.apache.carbondata.core.scan.model.QueryModel; /** http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/DataRefNode.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/DataRefNode.java b/core/src/main/java/org/apache/carbondata/core/datastore/DataRefNode.java index 219ee73..9d4287a 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/DataRefNode.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/DataRefNode.java @@ -20,10 +20,10 @@ package org.apache.carbondata.core.datastore; import java.io.IOException; -import org.apache.carbondata.core.update.data.BlockletLevelDeleteDeltaDataCache; +import org.apache.carbondata.core.datastorage.FileHolder; import org.apache.carbondata.core.datastore.chunk.DimensionColumnDataChunk; import org.apache.carbondata.core.datastore.chunk.MeasureColumnDataChunk; -import org.apache.carbondata.core.datastorage.FileHolder; +import org.apache.carbondata.core.update.data.BlockletLevelDeleteDeltaDataCache; /** * Interface data block reference http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/SegmentTaskIndexStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/SegmentTaskIndexStore.java b/core/src/main/java/org/apache/carbondata/core/datastore/SegmentTaskIndexStore.java index 8feae0c..21be5e8 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/SegmentTaskIndexStore.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/SegmentTaskIndexStore.java @@ -32,12 +32,12 @@ import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.cache.Cache; import org.apache.carbondata.core.cache.CarbonLRUCache; -import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.datastore.block.AbstractIndex; import org.apache.carbondata.core.datastore.block.SegmentTaskIndex; import org.apache.carbondata.core.datastore.block.SegmentTaskIndexWrapper; import org.apache.carbondata.core.datastore.block.TableBlockInfo; import org.apache.carbondata.core.datastore.exception.IndexBuilderException; +import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.metadata.blocklet.DataFileFooter; import org.apache.carbondata.core.path.CarbonTablePath; import org.apache.carbondata.core.path.CarbonTablePath.DataFileUtil; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/TableSegmentUniqueIdentifier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/TableSegmentUniqueIdentifier.java b/core/src/main/java/org/apache/carbondata/core/datastore/TableSegmentUniqueIdentifier.java index 71b7c3f..30407b4 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/TableSegmentUniqueIdentifier.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/TableSegmentUniqueIdentifier.java @@ -22,10 +22,10 @@ package org.apache.carbondata.core.datastore; import java.util.List; import java.util.Map; +import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.datastore.block.TableBlockInfo; import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.metadata.CarbonTableIdentifier; -import org.apache.carbondata.core.datastore.block.TableBlockInfo; -import org.apache.carbondata.core.constants.CarbonCommonConstants; /** * Class holds the absoluteTableIdentifier and segmentId to uniquely identify a segment http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/block/BlockInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/block/BlockInfo.java b/core/src/main/java/org/apache/carbondata/core/datastore/block/BlockInfo.java index 37382f3..dcb0a3e 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/block/BlockInfo.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/block/BlockInfo.java @@ -18,8 +18,8 @@ */ package org.apache.carbondata.core.datastore.block; -import org.apache.carbondata.core.path.CarbonTablePath; import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.path.CarbonTablePath; /** * Below class will be used to store table block info http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentProperties.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentProperties.java b/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentProperties.java index e84c8ba..dde8e76 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentProperties.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/block/SegmentProperties.java @@ -28,17 +28,18 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.apache.carbondata.core.metadata.DataType; -import org.apache.carbondata.core.metadata.Encoding; -import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension; -import org.apache.carbondata.core.metadata.schema.table.column.CarbonMeasure; -import org.apache.carbondata.core.metadata.schema.table.column.ColumnSchema; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastorage.columnar.ColumnGroupModel; import org.apache.carbondata.core.keygenerator.KeyGenerator; import org.apache.carbondata.core.keygenerator.columnar.ColumnarSplitter; -import org.apache.carbondata.core.keygenerator.columnar.impl.MultiDimKeyVarLengthVariableSplitGenerator; +import org.apache.carbondata.core.keygenerator.columnar.impl + .MultiDimKeyVarLengthVariableSplitGenerator; import org.apache.carbondata.core.keygenerator.mdkey.MultiDimKeyVarLengthGenerator; +import org.apache.carbondata.core.metadata.DataType; +import org.apache.carbondata.core.metadata.Encoding; +import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension; +import org.apache.carbondata.core.metadata.schema.table.column.CarbonMeasure; +import org.apache.carbondata.core.metadata.schema.table.column.ColumnSchema; import org.apache.carbondata.core.util.CarbonUtil; import org.apache.commons.lang3.ArrayUtils; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockInfo.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockInfo.java b/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockInfo.java index 4f20ceb..c7ce3db 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockInfo.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockInfo.java @@ -22,11 +22,11 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; +import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.datastorage.impl.FileFactory; import org.apache.carbondata.core.metadata.ColumnarFormatVersion; import org.apache.carbondata.core.path.CarbonTablePath; import org.apache.carbondata.core.path.CarbonTablePath.DataFileUtil; -import org.apache.carbondata.core.constants.CarbonCommonConstants; -import org.apache.carbondata.core.datastorage.impl.FileFactory; /** * class will be used to pass the block detail detail will be passed form driver http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockUniqueIdentifier.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockUniqueIdentifier.java b/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockUniqueIdentifier.java index f2fbba7..4a05ff8 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockUniqueIdentifier.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/block/TableBlockUniqueIdentifier.java @@ -1,8 +1,8 @@ package org.apache.carbondata.core.datastore.block; +import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.metadata.AbsoluteTableIdentifier; import org.apache.carbondata.core.metadata.CarbonTableIdentifier; -import org.apache.carbondata.core.constants.CarbonCommonConstants; /** * Class : Holds the info to uniquely identify a blocks http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/MeasureColumnDataChunk.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/MeasureColumnDataChunk.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/MeasureColumnDataChunk.java index d2ee1a7..ce09305 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/MeasureColumnDataChunk.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/MeasureColumnDataChunk.java @@ -18,8 +18,8 @@ */ package org.apache.carbondata.core.datastore.chunk; -import org.apache.carbondata.core.metadata.blocklet.datachunk.PresenceMeta; import org.apache.carbondata.core.datastorage.dataholder.CarbonReadDataHolder; +import org.apache.carbondata.core.metadata.blocklet.datachunk.PresenceMeta; /** * Holder for measure column chunk http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/FixedLengthDimensionDataChunk.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/FixedLengthDimensionDataChunk.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/FixedLengthDimensionDataChunk.java index 9eee078..6edc977 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/FixedLengthDimensionDataChunk.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/FixedLengthDimensionDataChunk.java @@ -18,9 +18,10 @@ */ package org.apache.carbondata.core.datastore.chunk.impl; -import org.apache.carbondata.core.datastore.chunk.store.DimensionChunkStoreFactory; -import org.apache.carbondata.core.datastore.chunk.store.DimensionChunkStoreFactory.DimensionStoreType; import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.datastore.chunk.store.DimensionChunkStoreFactory; +import org.apache.carbondata.core.datastore.chunk.store.DimensionChunkStoreFactory + .DimensionStoreType; import org.apache.carbondata.core.scan.executor.infos.KeyStructureInfo; import org.apache.carbondata.core.scan.result.vector.CarbonColumnVector; import org.apache.carbondata.core.scan.result.vector.ColumnVectorInfo; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/VariableLengthDimensionDataChunk.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/VariableLengthDimensionDataChunk.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/VariableLengthDimensionDataChunk.java index 7c16f54..549d6d8 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/VariableLengthDimensionDataChunk.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/impl/VariableLengthDimensionDataChunk.java @@ -20,9 +20,10 @@ package org.apache.carbondata.core.datastore.chunk.impl; import java.util.Arrays; -import org.apache.carbondata.core.datastore.chunk.store.DimensionChunkStoreFactory; -import org.apache.carbondata.core.datastore.chunk.store.DimensionChunkStoreFactory.DimensionStoreType; import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.datastore.chunk.store.DimensionChunkStoreFactory; +import org.apache.carbondata.core.datastore.chunk.store.DimensionChunkStoreFactory + .DimensionStoreType; import org.apache.carbondata.core.scan.executor.infos.KeyStructureInfo; import org.apache.carbondata.core.scan.result.vector.CarbonColumnVector; import org.apache.carbondata.core.scan.result.vector.ColumnVectorInfo; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/CarbonDataReaderFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/CarbonDataReaderFactory.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/CarbonDataReaderFactory.java index 5ac5702..c83f2d7 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/CarbonDataReaderFactory.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/CarbonDataReaderFactory.java @@ -18,11 +18,15 @@ */ package org.apache.carbondata.core.datastore.chunk.reader; +import org.apache.carbondata.core.datastore.chunk.reader.dimension + .v1.CompressedDimensionChunkFileBasedReaderV1; +import org.apache.carbondata.core.datastore.chunk.reader.dimension + .v2.CompressedDimensionChunkFileBasedReaderV2; +import org.apache.carbondata.core.datastore.chunk.reader.measure + .v1.CompressedMeasureChunkFileBasedReaderV1; +import org.apache.carbondata.core.datastore.chunk.reader.measure + .v2.CompressedMeasureChunkFileBasedReaderV2; import org.apache.carbondata.core.metadata.ColumnarFormatVersion; -import org.apache.carbondata.core.datastore.chunk.reader.dimension.v1.CompressedDimensionChunkFileBasedReaderV1; -import org.apache.carbondata.core.datastore.chunk.reader.dimension.v2.CompressedDimensionChunkFileBasedReaderV2; -import org.apache.carbondata.core.datastore.chunk.reader.measure.v1.CompressedMeasureChunkFileBasedReaderV1; -import org.apache.carbondata.core.datastore.chunk.reader.measure.v2.CompressedMeasureChunkFileBasedReaderV2; import org.apache.carbondata.core.metadata.blocklet.BlockletInfo; /** http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/DimensionColumnChunkReader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/DimensionColumnChunkReader.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/DimensionColumnChunkReader.java index aeb7ff9..92dcb60 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/DimensionColumnChunkReader.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/DimensionColumnChunkReader.java @@ -20,8 +20,8 @@ package org.apache.carbondata.core.datastore.chunk.reader; import java.io.IOException; -import org.apache.carbondata.core.datastore.chunk.DimensionColumnDataChunk; import org.apache.carbondata.core.datastorage.FileHolder; +import org.apache.carbondata.core.datastore.chunk.DimensionColumnDataChunk; /** * Interface for reading the data chunk http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/MeasureColumnChunkReader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/MeasureColumnChunkReader.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/MeasureColumnChunkReader.java index ec86612..94004d9 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/MeasureColumnChunkReader.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/MeasureColumnChunkReader.java @@ -20,8 +20,8 @@ package org.apache.carbondata.core.datastore.chunk.reader; import java.io.IOException; -import org.apache.carbondata.core.datastore.chunk.MeasureColumnDataChunk; import org.apache.carbondata.core.datastorage.FileHolder; +import org.apache.carbondata.core.datastore.chunk.MeasureColumnDataChunk; /** * Reader interface for reading the measure blocks from file http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/AbstractChunkReader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/AbstractChunkReader.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/AbstractChunkReader.java index 4e45bc3..4cc24d9 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/AbstractChunkReader.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/AbstractChunkReader.java @@ -18,10 +18,10 @@ */ package org.apache.carbondata.core.datastore.chunk.reader.dimension; -import org.apache.carbondata.core.datastore.chunk.reader.DimensionColumnChunkReader; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastorage.compression.Compressor; import org.apache.carbondata.core.datastorage.compression.CompressorFactory; +import org.apache.carbondata.core.datastore.chunk.reader.DimensionColumnChunkReader; import org.apache.carbondata.core.keygenerator.mdkey.NumberCompressor; import org.apache.carbondata.core.util.CarbonProperties; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v1/CompressedDimensionChunkFileBasedReaderV1.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v1/CompressedDimensionChunkFileBasedReaderV1.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v1/CompressedDimensionChunkFileBasedReaderV1.java index 01df68b..dd487d9 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v1/CompressedDimensionChunkFileBasedReaderV1.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v1/CompressedDimensionChunkFileBasedReaderV1.java @@ -21,16 +21,16 @@ package org.apache.carbondata.core.datastore.chunk.reader.dimension.v1; import java.io.IOException; import java.util.List; +import org.apache.carbondata.core.datastorage.FileHolder; +import org.apache.carbondata.core.datastorage.columnar.UnBlockIndexer; import org.apache.carbondata.core.datastore.chunk.DimensionColumnDataChunk; import org.apache.carbondata.core.datastore.chunk.impl.ColumnGroupDimensionDataChunk; import org.apache.carbondata.core.datastore.chunk.impl.FixedLengthDimensionDataChunk; import org.apache.carbondata.core.datastore.chunk.impl.VariableLengthDimensionDataChunk; import org.apache.carbondata.core.datastore.chunk.reader.dimension.AbstractChunkReader; +import org.apache.carbondata.core.metadata.Encoding; import org.apache.carbondata.core.metadata.blocklet.BlockletInfo; import org.apache.carbondata.core.metadata.blocklet.datachunk.DataChunk; -import org.apache.carbondata.core.metadata.Encoding; -import org.apache.carbondata.core.datastorage.FileHolder; -import org.apache.carbondata.core.datastorage.columnar.UnBlockIndexer; import org.apache.carbondata.core.util.CarbonUtil; /** http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v2/CompressedDimensionChunkFileBasedReaderV2.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v2/CompressedDimensionChunkFileBasedReaderV2.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v2/CompressedDimensionChunkFileBasedReaderV2.java index 48b5aeb..3bddf4e 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v2/CompressedDimensionChunkFileBasedReaderV2.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/dimension/v2/CompressedDimensionChunkFileBasedReaderV2.java @@ -21,14 +21,14 @@ package org.apache.carbondata.core.datastore.chunk.reader.dimension.v2; import java.io.IOException; import java.util.List; +import org.apache.carbondata.core.datastorage.FileHolder; +import org.apache.carbondata.core.datastorage.columnar.UnBlockIndexer; import org.apache.carbondata.core.datastore.chunk.DimensionColumnDataChunk; import org.apache.carbondata.core.datastore.chunk.impl.ColumnGroupDimensionDataChunk; import org.apache.carbondata.core.datastore.chunk.impl.FixedLengthDimensionDataChunk; import org.apache.carbondata.core.datastore.chunk.impl.VariableLengthDimensionDataChunk; import org.apache.carbondata.core.datastore.chunk.reader.dimension.AbstractChunkReader; import org.apache.carbondata.core.metadata.blocklet.BlockletInfo; -import org.apache.carbondata.core.datastorage.FileHolder; -import org.apache.carbondata.core.datastorage.columnar.UnBlockIndexer; import org.apache.carbondata.core.util.CarbonUtil; import org.apache.carbondata.format.DataChunk2; import org.apache.carbondata.format.Encoding; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v1/CompressedMeasureChunkFileBasedReaderV1.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v1/CompressedMeasureChunkFileBasedReaderV1.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v1/CompressedMeasureChunkFileBasedReaderV1.java index 562ea8c..48cb244 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v1/CompressedMeasureChunkFileBasedReaderV1.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v1/CompressedMeasureChunkFileBasedReaderV1.java @@ -21,15 +21,15 @@ package org.apache.carbondata.core.datastore.chunk.reader.measure.v1; import java.io.IOException; import java.util.List; -import org.apache.carbondata.core.datastore.chunk.MeasureColumnDataChunk; -import org.apache.carbondata.core.datastore.chunk.reader.measure.AbstractMeasureChunkReader; -import org.apache.carbondata.core.metadata.blocklet.BlockletInfo; -import org.apache.carbondata.core.metadata.blocklet.datachunk.DataChunk; import org.apache.carbondata.core.datastorage.FileHolder; import org.apache.carbondata.core.datastorage.compression.ReaderCompressModel; import org.apache.carbondata.core.datastorage.compression.ValueCompressionHolder; import org.apache.carbondata.core.datastorage.dataholder.CarbonReadDataHolder; +import org.apache.carbondata.core.datastore.chunk.MeasureColumnDataChunk; +import org.apache.carbondata.core.datastore.chunk.reader.measure.AbstractMeasureChunkReader; import org.apache.carbondata.core.metadata.ValueEncoderMeta; +import org.apache.carbondata.core.metadata.blocklet.BlockletInfo; +import org.apache.carbondata.core.metadata.blocklet.datachunk.DataChunk; import org.apache.carbondata.core.util.ValueCompressionUtil; /** http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v2/CompressedMeasureChunkFileBasedReaderV2.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v2/CompressedMeasureChunkFileBasedReaderV2.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v2/CompressedMeasureChunkFileBasedReaderV2.java index 90fa6f3..3325299 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v2/CompressedMeasureChunkFileBasedReaderV2.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/reader/measure/v2/CompressedMeasureChunkFileBasedReaderV2.java @@ -23,16 +23,16 @@ import java.util.ArrayList; import java.util.BitSet; import java.util.List; -import org.apache.carbondata.core.datastore.chunk.MeasureColumnDataChunk; -import org.apache.carbondata.core.datastore.chunk.reader.measure.AbstractMeasureChunkReader; -import org.apache.carbondata.core.metadata.blocklet.BlockletInfo; -import org.apache.carbondata.core.metadata.blocklet.datachunk.PresenceMeta; import org.apache.carbondata.core.datastorage.FileHolder; import org.apache.carbondata.core.datastorage.compression.CompressorFactory; import org.apache.carbondata.core.datastorage.compression.ValueCompressionHolder; import org.apache.carbondata.core.datastorage.compression.WriterCompressModel; import org.apache.carbondata.core.datastorage.dataholder.CarbonReadDataHolder; +import org.apache.carbondata.core.datastore.chunk.MeasureColumnDataChunk; +import org.apache.carbondata.core.datastore.chunk.reader.measure.AbstractMeasureChunkReader; import org.apache.carbondata.core.metadata.ValueEncoderMeta; +import org.apache.carbondata.core.metadata.blocklet.BlockletInfo; +import org.apache.carbondata.core.metadata.blocklet.datachunk.PresenceMeta; import org.apache.carbondata.core.util.CarbonUtil; import org.apache.carbondata.format.DataChunk2; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/DimensionChunkStoreFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/DimensionChunkStoreFactory.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/DimensionChunkStoreFactory.java index f667e65..df054c5 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/DimensionChunkStoreFactory.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/DimensionChunkStoreFactory.java @@ -16,11 +16,15 @@ */ package org.apache.carbondata.core.datastore.chunk.store; -import org.apache.carbondata.core.datastore.chunk.store.impl.safe.SafeFixedLengthDimensionDataChunkStore; -import org.apache.carbondata.core.datastore.chunk.store.impl.safe.SafeVariableLengthDimensionDataChunkStore; -import org.apache.carbondata.core.datastore.chunk.store.impl.unsafe.UnsafeFixedLengthDimensionDataChunkStore; -import org.apache.carbondata.core.datastore.chunk.store.impl.unsafe.UnsafeVariableLengthDimesionDataChunkStore; import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.datastore.chunk.store.impl.safe + .SafeFixedLengthDimensionDataChunkStore; +import org.apache.carbondata.core.datastore.chunk.store.impl.safe + .SafeVariableLengthDimensionDataChunkStore; +import org.apache.carbondata.core.datastore.chunk.store.impl.unsafe + .UnsafeFixedLengthDimensionDataChunkStore; +import org.apache.carbondata.core.datastore.chunk.store.impl.unsafe + .UnsafeVariableLengthDimesionDataChunkStore; import org.apache.carbondata.core.util.CarbonProperties; /** http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/MeasureChunkStoreFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/MeasureChunkStoreFactory.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/MeasureChunkStoreFactory.java index 8a87e49..a95ae11 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/MeasureChunkStoreFactory.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/MeasureChunkStoreFactory.java @@ -16,6 +16,7 @@ */ package org.apache.carbondata.core.datastore.chunk.store; +import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastore.chunk.store.impl.safe.SafeByteMeasureChunkStore; import org.apache.carbondata.core.datastore.chunk.store.impl.safe.SafeDoubleMeasureChunkStore; import org.apache.carbondata.core.datastore.chunk.store.impl.safe.SafeIntMeasureChunkStore; @@ -26,7 +27,6 @@ import org.apache.carbondata.core.datastore.chunk.store.impl.unsafe.UnsafeDouble import org.apache.carbondata.core.datastore.chunk.store.impl.unsafe.UnsafeIntMeasureChunkStore; import org.apache.carbondata.core.datastore.chunk.store.impl.unsafe.UnsafeLongMeasureChunkStore; import org.apache.carbondata.core.datastore.chunk.store.impl.unsafe.UnsafeShortMeasureChunkStore; -import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.util.CarbonProperties; import org.apache.carbondata.core.util.ValueCompressionUtil.DataType; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeAbstractDimensionDataChunkStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeAbstractDimensionDataChunkStore.java b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeAbstractDimensionDataChunkStore.java index 718170c..4c5c05c 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeAbstractDimensionDataChunkStore.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/chunk/store/impl/unsafe/UnsafeAbstractDimensionDataChunkStore.java @@ -18,8 +18,8 @@ */ package org.apache.carbondata.core.datastore.chunk.store.impl.unsafe; -import org.apache.carbondata.core.datastore.chunk.store.DimensionDataChunkStore; import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.datastore.chunk.store.DimensionDataChunkStore; import org.apache.carbondata.core.memory.MemoryAllocatorFactory; import org.apache.carbondata.core.memory.MemoryBlock; import org.apache.carbondata.core.unsafe.CarbonUnsafe; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/AbstractBTreeBuilder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/AbstractBTreeBuilder.java b/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/AbstractBTreeBuilder.java index 2ea58b5..6b64410 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/AbstractBTreeBuilder.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/AbstractBTreeBuilder.java @@ -22,9 +22,9 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; +import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.datastore.BtreeBuilder; import org.apache.carbondata.core.datastore.IndexKey; -import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.util.CarbonProperties; /** http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/AbstractBTreeLeafNode.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/AbstractBTreeLeafNode.java b/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/AbstractBTreeLeafNode.java index 14df51f..4907dd9 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/AbstractBTreeLeafNode.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/AbstractBTreeLeafNode.java @@ -20,12 +20,12 @@ package org.apache.carbondata.core.datastore.impl.btree; import java.io.IOException; -import org.apache.carbondata.core.update.data.BlockletLevelDeleteDeltaDataCache; +import org.apache.carbondata.core.datastorage.FileHolder; import org.apache.carbondata.core.datastore.DataRefNode; import org.apache.carbondata.core.datastore.IndexKey; import org.apache.carbondata.core.datastore.chunk.DimensionColumnDataChunk; import org.apache.carbondata.core.datastore.chunk.MeasureColumnDataChunk; -import org.apache.carbondata.core.datastorage.FileHolder; +import org.apache.carbondata.core.update.data.BlockletLevelDeleteDeltaDataCache; /** * Non leaf node abstract class http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BTreeNonLeafNode.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BTreeNonLeafNode.java b/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BTreeNonLeafNode.java index c2ffae9..3176b9b 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BTreeNonLeafNode.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BTreeNonLeafNode.java @@ -21,13 +21,13 @@ package org.apache.carbondata.core.datastore.impl.btree; import java.util.ArrayList; import java.util.List; -import org.apache.carbondata.core.update.data.BlockletLevelDeleteDeltaDataCache; +import org.apache.carbondata.core.constants.CarbonCommonConstants; +import org.apache.carbondata.core.datastorage.FileHolder; import org.apache.carbondata.core.datastore.DataRefNode; import org.apache.carbondata.core.datastore.IndexKey; import org.apache.carbondata.core.datastore.chunk.DimensionColumnDataChunk; import org.apache.carbondata.core.datastore.chunk.MeasureColumnDataChunk; -import org.apache.carbondata.core.constants.CarbonCommonConstants; -import org.apache.carbondata.core.datastorage.FileHolder; +import org.apache.carbondata.core.update.data.BlockletLevelDeleteDeltaDataCache; /** * No leaf node of a b+tree class which will keep the matadata(start key) of the http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BlockBTreeBuilder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BlockBTreeBuilder.java b/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BlockBTreeBuilder.java index 0d20002..60fb89f 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BlockBTreeBuilder.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BlockBTreeBuilder.java @@ -41,9 +41,9 @@ 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.BTreeBuilderInfo; import org.apache.carbondata.core.datastore.IndexKey; -import org.apache.carbondata.core.constants.CarbonCommonConstants; /** * Below class will be used to build the btree BTree will be built for all the http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BlockletBTreeBuilder.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BlockletBTreeBuilder.java b/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BlockletBTreeBuilder.java index 4d11014..6a37706 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BlockletBTreeBuilder.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BlockletBTreeBuilder.java @@ -23,9 +23,9 @@ 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.BTreeBuilderInfo; import org.apache.carbondata.core.datastore.IndexKey; -import org.apache.carbondata.core.constants.CarbonCommonConstants; /** * Btree based builder which will build the leaf node in a b+ tree format http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BlockletBTreeLeafNode.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BlockletBTreeLeafNode.java b/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BlockletBTreeLeafNode.java index f3d2bef..4951c95 100644 --- a/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BlockletBTreeLeafNode.java +++ b/core/src/main/java/org/apache/carbondata/core/datastore/impl/btree/BlockletBTreeLeafNode.java @@ -20,6 +20,7 @@ package org.apache.carbondata.core.datastore.impl.btree; import java.io.IOException; +import org.apache.carbondata.core.datastorage.FileHolder; import org.apache.carbondata.core.datastore.BTreeBuilderInfo; import org.apache.carbondata.core.datastore.chunk.DimensionColumnDataChunk; import org.apache.carbondata.core.datastore.chunk.MeasureColumnDataChunk; @@ -27,7 +28,6 @@ import org.apache.carbondata.core.datastore.chunk.reader.CarbonDataReaderFactory import org.apache.carbondata.core.datastore.chunk.reader.DimensionColumnChunkReader; import org.apache.carbondata.core.datastore.chunk.reader.MeasureColumnChunkReader; import org.apache.carbondata.core.metadata.blocklet.index.BlockletMinMaxIndex; -import org.apache.carbondata.core.datastorage.FileHolder; /** * Leaf node class of a Blocklet btree http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/dictionary/client/DictionaryClient.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/client/DictionaryClient.java b/core/src/main/java/org/apache/carbondata/core/dictionary/client/DictionaryClient.java index 92bc56a..802def5 100644 --- a/core/src/main/java/org/apache/carbondata/core/dictionary/client/DictionaryClient.java +++ b/core/src/main/java/org/apache/carbondata/core/dictionary/client/DictionaryClient.java @@ -27,7 +27,9 @@ import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.dictionary.generator.key.DictionaryKey; import org.jboss.netty.bootstrap.ClientBootstrap; -import org.jboss.netty.channel.*; +import org.jboss.netty.channel.ChannelPipeline; +import org.jboss.netty.channel.ChannelPipelineFactory; +import org.jboss.netty.channel.Channels; import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory; import org.jboss.netty.handler.codec.serialization.ClassResolvers; import org.jboss.netty.handler.codec.serialization.ObjectDecoder; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/dictionary/client/DictionaryClientHandler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/client/DictionaryClientHandler.java b/core/src/main/java/org/apache/carbondata/core/dictionary/client/DictionaryClientHandler.java index d5ca781..5dba202 100644 --- a/core/src/main/java/org/apache/carbondata/core/dictionary/client/DictionaryClientHandler.java +++ b/core/src/main/java/org/apache/carbondata/core/dictionary/client/DictionaryClientHandler.java @@ -28,7 +28,11 @@ import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.dictionary.generator.key.DictionaryKey; import org.apache.carbondata.core.dictionary.generator.key.KryoRegister; -import org.jboss.netty.channel.*; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.jboss.netty.channel.ChannelStateEvent; +import org.jboss.netty.channel.ExceptionEvent; +import org.jboss.netty.channel.MessageEvent; +import org.jboss.netty.channel.SimpleChannelHandler; /** * Client handler to get data. http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/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 b95f2c9..3902746 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 @@ -19,10 +19,11 @@ package org.apache.carbondata.core.dictionary.generator; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.carbondata.core.service.CarbonCommonFactory; import org.apache.carbondata.common.logging.LogService; import org.apache.carbondata.common.logging.LogServiceFactory; import org.apache.carbondata.core.cache.Cache; @@ -30,15 +31,16 @@ import org.apache.carbondata.core.cache.CacheProvider; import org.apache.carbondata.core.cache.CacheType; import org.apache.carbondata.core.cache.dictionary.Dictionary; import org.apache.carbondata.core.cache.dictionary.DictionaryColumnUniqueIdentifier; -import org.apache.carbondata.core.metadata.CarbonTableIdentifier; -import org.apache.carbondata.core.metadata.ColumnIdentifier; -import org.apache.carbondata.core.metadata.CarbonMetadata; -import org.apache.carbondata.core.metadata.schema.table.CarbonTable; -import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension; import org.apache.carbondata.core.constants.CarbonCommonConstants; import org.apache.carbondata.core.devapi.BiDictionary; import org.apache.carbondata.core.devapi.DictionaryGenerationException; import org.apache.carbondata.core.devapi.DictionaryGenerator; +import org.apache.carbondata.core.metadata.CarbonMetadata; +import org.apache.carbondata.core.metadata.CarbonTableIdentifier; +import org.apache.carbondata.core.metadata.ColumnIdentifier; +import org.apache.carbondata.core.metadata.schema.table.CarbonTable; +import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension; +import org.apache.carbondata.core.service.CarbonCommonFactory; import org.apache.carbondata.core.service.DictionaryService; import org.apache.carbondata.core.util.CarbonUtil; import org.apache.carbondata.core.util.DataTypeUtil; http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ae17158a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/ServerDictionaryGenerator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/ServerDictionaryGenerator.java b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/ServerDictionaryGenerator.java index b522560..0da6f94 100644 --- a/core/src/main/java/org/apache/carbondata/core/dictionary/generator/ServerDictionaryGenerator.java +++ b/core/src/main/java/org/apache/carbondata/core/dictionary/generator/ServerDictionaryGenerator.java @@ -21,12 +21,12 @@ package org.apache.carbondata.core.dictionary.generator; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.carbondata.core.metadata.CarbonMetadata; -import org.apache.carbondata.core.metadata.schema.table.CarbonTable; -import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension; import org.apache.carbondata.core.devapi.DictionaryGenerationException; import org.apache.carbondata.core.devapi.DictionaryGenerator; import org.apache.carbondata.core.dictionary.generator.key.DictionaryKey; +import org.apache.carbondata.core.metadata.CarbonMetadata; +import org.apache.carbondata.core.metadata.schema.table.CarbonTable; +import org.apache.carbondata.core.metadata.schema.table.column.CarbonDimension; /** * This is the dictionary generator for all tables. It generates dictionary