move core package change update package name
fix style fix compile Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/ce09aaaf Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/ce09aaaf Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/ce09aaaf Branch: refs/heads/master Commit: ce09aaaf76c313b21f535eca9b53e99fb88668fa Parents: 1d5b5fc Author: jackylk <jacky.li...@huawei.com> Authored: Mon Jan 16 21:18:23 2017 +0800 Committer: chenliang613 <chenliang...@huawei.com> Committed: Mon Jan 16 22:41:59 2017 +0800 ---------------------------------------------------------------------- .../common/ext/ColumnUniqueIdGenerator.java | 41 - .../common/ext/DictionaryFactory.java | 119 -- .../carbondata/common/ext/PathFactory.java | 46 - .../common/factory/CarbonCommonFactory.java | 54 - .../BlockletLevelDeleteDeltaDataCache.java | 46 - .../iudprocessor/iuddata/BlockMappingVO.java | 54 - .../iuddata/BlockletDeleteDeltaCacheLoader.java | 80 - .../iuddata/DeleteDeltaCacheLoaderIntf.java | 27 - .../iudprocessor/iuddata/RowCountDetailsVO.java | 68 - .../carbondata/core/cache/CacheProvider.java | 8 +- .../apache/carbondata/core/cache/CacheType.java | 8 +- .../dictionary/AbstractDictionaryCache.java | 8 +- .../cache/dictionary/ColumnDictionaryInfo.java | 2 +- .../cache/dictionary/DictionaryCacheLoader.java | 2 +- .../dictionary/DictionaryCacheLoaderImpl.java | 6 +- .../DictionaryColumnUniqueIdentifier.java | 6 +- .../dictionary/DoubleArrayTrieDictionary.java | 5 +- .../BlockletLevelDeleteDeltaDataCache.java | 46 + .../core/carbon/AbsoluteTableIdentifier.java | 141 -- .../core/carbon/CarbonDataLoadSchema.java | 184 -- .../core/carbon/CarbonTableIdentifier.java | 139 -- .../core/carbon/ColumnIdentifier.java | 114 -- .../core/carbon/ColumnarFormatVersion.java | 52 - .../datastore/AbstractBlockIndexStoreCache.java | 115 -- .../core/carbon/datastore/BTreeBuilderInfo.java | 61 - .../core/carbon/datastore/BlockIndexStore.java | 381 ---- .../core/carbon/datastore/BtreeBuilder.java | 38 - .../core/carbon/datastore/DataRefNode.java | 128 -- .../carbon/datastore/DataRefNodeFinder.java | 43 - .../core/carbon/datastore/IndexKey.java | 62 - .../carbon/datastore/SegmentTaskIndexStore.java | 401 ---- .../datastore/TableSegmentUniqueIdentifier.java | 144 -- .../carbon/datastore/block/AbstractIndex.java | 129 -- .../core/carbon/datastore/block/BlockIndex.java | 52 - .../core/carbon/datastore/block/BlockInfo.java | 134 -- .../carbon/datastore/block/BlockletInfos.java | 112 -- .../carbon/datastore/block/Distributable.java | 27 - .../datastore/block/SegmentProperties.java | 754 ------- .../datastore/block/SegmentTaskIndex.java | 57 - .../block/SegmentTaskIndexWrapper.java | 148 -- .../carbon/datastore/block/TableBlockInfo.java | 311 --- .../block/TableBlockUniqueIdentifier.java | 72 - .../carbon/datastore/block/TableTaskInfo.java | 115 -- .../carbon/datastore/block/TaskBlockInfo.java | 68 - .../chunk/DimensionColumnDataChunk.java | 111 -- .../datastore/chunk/MeasureColumnDataChunk.java | 74 - .../chunk/impl/AbstractDimensionDataChunk.java | 90 - .../impl/ColumnGroupDimensionDataChunk.java | 186 -- .../impl/FixedLengthDimensionDataChunk.java | 161 -- .../impl/VariableLengthDimensionDataChunk.java | 153 -- .../chunk/reader/CarbonDataReaderFactory.java | 94 - .../reader/DimensionColumnChunkReader.java | 52 - .../chunk/reader/MeasureColumnChunkReader.java | 50 - .../reader/dimension/AbstractChunkReader.java | 100 - ...mpressedDimensionChunkFileBasedReaderV1.java | 145 -- ...mpressedDimensionChunkFileBasedReaderV2.java | 288 --- .../measure/AbstractMeasureChunkReader.java | 41 - ...CompressedMeasureChunkFileBasedReaderV1.java | 108 - ...CompressedMeasureChunkFileBasedReaderV2.java | 236 --- .../chunk/store/DimensionChunkStoreFactory.java | 88 - .../chunk/store/DimensionDataChunkStore.java | 95 - .../chunk/store/MeasureChunkStoreFactory.java | 97 - .../chunk/store/MeasureDataChunkStore.java | 86 - .../SafeAbsractDimensionDataChunkStore.java | 126 -- .../safe/SafeAbstractMeasureDataChunkStore.java | 114 -- .../impl/safe/SafeByteMeasureChunkStore.java | 55 - .../impl/safe/SafeDoubleMeasureChunkStore.java | 54 - .../SafeFixedLengthDimensionDataChunkStore.java | 114 -- .../impl/safe/SafeIntMeasureChunkStore.java | 54 - .../impl/safe/SafeLongMeasureChunkStore.java | 55 - .../impl/safe/SafeShortMeasureChunkStore.java | 56 - ...feVariableLengthDimensionDataChunkStore.java | 139 -- .../UnsafeAbstractDimensionDataChunkStore.java | 173 -- .../UnsafeAbstractMeasureDataChunkStore.java | 128 -- .../unsafe/UnsafeByteMeasureChunkStore.java | 58 - .../unsafe/UnsafeDoubleMeasureChunkStore.java | 60 - ...nsafeFixedLengthDimensionDataChunkStore.java | 147 -- .../impl/unsafe/UnsafeIntMeasureChunkStore.java | 60 - .../unsafe/UnsafeLongMeasureChunkStore.java | 59 - .../unsafe/UnsafeShortMeasureChunkStore.java | 59 - ...afeVariableLengthDimesionDataChunkStore.java | 212 -- .../exception/IndexBuilderException.java | 96 - .../impl/btree/AbstractBTreeBuilder.java | 164 -- .../impl/btree/AbstractBTreeLeafNode.java | 244 --- .../impl/btree/BTreeDataRefNodeFinder.java | 265 --- .../carbon/datastore/impl/btree/BTreeNode.java | 71 - .../datastore/impl/btree/BTreeNonLeafNode.java | 249 --- .../datastore/impl/btree/BlockBTreeBuilder.java | 118 -- .../impl/btree/BlockBTreeLeafNode.java | 64 - .../impl/btree/BlockletBTreeBuilder.java | 104 - .../impl/btree/BlockletBTreeLeafNode.java | 129 -- .../core/carbon/metadata/CarbonMetadata.java | 165 -- .../carbon/metadata/blocklet/BlockletInfo.java | 154 -- .../metadata/blocklet/DataFileFooter.java | 171 -- .../carbon/metadata/blocklet/SegmentInfo.java | 72 - .../compressor/ChunkCompressorMeta.java | 36 - .../metadata/blocklet/datachunk/DataChunk.java | 228 --- .../blocklet/datachunk/PresenceMeta.java | 66 - .../blocklet/index/BlockletBTreeIndex.java | 76 - .../metadata/blocklet/index/BlockletIndex.java | 77 - .../blocklet/index/BlockletMinMaxIndex.java | 83 - .../metadata/converter/SchemaConverter.java | 105 - .../ThriftWrapperSchemaConverterImpl.java | 424 ---- .../core/carbon/metadata/datatype/DataType.java | 58 - .../core/carbon/metadata/encoder/Encoding.java | 32 - .../carbon/metadata/index/BlockIndexInfo.java | 92 - .../carbon/metadata/schema/BucketingInfo.java | 49 - .../carbon/metadata/schema/SchemaEvolution.java | 52 - .../metadata/schema/SchemaEvolutionEntry.java | 93 - .../metadata/schema/table/CarbonTable.java | 585 ------ .../carbon/metadata/schema/table/TableInfo.java | 211 -- .../metadata/schema/table/TableSchema.java | 189 -- .../schema/table/column/CarbonColumn.java | 190 -- .../schema/table/column/CarbonDimension.java | 159 -- .../table/column/CarbonImplicitDimension.java | 179 -- .../schema/table/column/CarbonMeasure.java | 97 - .../schema/table/column/ColumnSchema.java | 405 ---- .../carbon/path/CarbonSharedDictionaryPath.java | 73 - .../core/carbon/path/CarbonStorePath.java | 79 - .../core/carbon/path/CarbonTablePath.java | 663 ------- .../DriverQueryStatisticsRecorderDummy.java | 65 - .../DriverQueryStatisticsRecorderImpl.java | 268 --- .../carbon/querystatistics/QueryStatistic.java | 114 -- .../QueryStatisticsConstants.java | 60 - .../querystatistics/QueryStatisticsModel.java | 45 - .../QueryStatisticsRecorder.java | 36 - .../QueryStatisticsRecorderDummy.java | 68 - .../QueryStatisticsRecorderImpl.java | 176 -- .../core/compression/BigDecimalCompressor.java | 2 +- .../core/compression/BigIntCompressor.java | 2 +- .../core/compression/DoubleCompressor.java | 2 +- .../core/compression/ValueCompressor.java | 2 +- .../core/datastorage/store/FileHolder.java | 88 - .../datastorage/store/MeasureDataWrapper.java | 30 - .../datastorage/store/NodeMeasureDataStore.java | 34 - .../columnar/BlockIndexerStorageForInt.java | 226 --- .../BlockIndexerStorageForNoInvertedIndex.java | 159 -- .../store/columnar/ColumnGroupModel.java | 116 -- .../store/columnar/ColumnWithIntIndex.java | 82 - .../columnar/ColumnWithIntIndexForHighCard.java | 49 - .../columnar/ColumnarKeyStoreDataHolder.java | 54 - .../columnar/ColumnarKeyStoreMetadata.java | 53 - .../store/columnar/IndexStorage.java | 44 - .../store/columnar/UnBlockIndexer.java | 78 - .../store/compression/Compressor.java | 60 - .../store/compression/CompressorFactory.java | 52 - .../store/compression/MeasureMetaDataModel.java | 128 -- .../store/compression/ReaderCompressModel.java | 61 - .../store/compression/SnappyCompressor.java | 222 --- .../compression/ValueCompressionHolder.java | 115 -- .../store/compression/WriterCompressModel.java | 220 --- .../decimal/CompressionMaxMinByte.java | 115 -- .../decimal/CompressionMaxMinDefault.java | 117 -- .../decimal/CompressionMaxMinInt.java | 113 -- .../decimal/CompressionMaxMinLong.java | 113 -- .../decimal/CompressionMaxMinShort.java | 115 -- .../nondecimal/CompressionNonDecimalByte.java | 99 - .../CompressionNonDecimalDefault.java | 101 - .../nondecimal/CompressionNonDecimalInt.java | 100 - .../nondecimal/CompressionNonDecimalLong.java | 101 - .../CompressionNonDecimalMaxMinByte.java | 105 - .../CompressionNonDecimalMaxMinDefault.java | 107 - .../CompressionNonDecimalMaxMinInt.java | 105 - .../CompressionNonDecimalMaxMinLong.java | 106 - .../CompressionNonDecimalMaxMinShort.java | 104 - .../nondecimal/CompressionNonDecimalShort.java | 100 - .../compression/none/CompressionNoneByte.java | 104 - .../none/CompressionNoneDefault.java | 102 - .../compression/none/CompressionNoneInt.java | 102 - .../compression/none/CompressionNoneLong.java | 99 - .../compression/none/CompressionNoneShort.java | 104 - .../compression/type/CompressionBigDecimal.java | 146 -- .../store/dataholder/CarbonReadDataHolder.java | 50 - .../store/dataholder/CarbonWriteDataHolder.java | 280 --- .../store/filesystem/AbstractDFSCarbonFile.java | 217 -- .../store/filesystem/AlluxioCarbonFile.java | 130 -- .../store/filesystem/CarbonFile.java | 66 - .../store/filesystem/CarbonFileFilter.java | 24 - .../store/filesystem/HDFSCarbonFile.java | 128 -- .../store/filesystem/LocalCarbonFile.java | 229 --- .../store/filesystem/ViewFSCarbonFile.java | 126 -- .../impl/CompressedDataMeasureDataWrapper.java | 37 - .../store/impl/DFSFileHolderImpl.java | 134 -- .../datastorage/store/impl/FileFactory.java | 485 ----- .../datastorage/store/impl/FileHolderImpl.java | 198 -- ...ractHeavyCompressedDoubleArrayDataStore.java | 90 - ...yCompressedDoubleArrayDataInMemoryStore.java | 30 - .../core/datastorage/util/StoreFactory.java | 35 - .../datastore/AbstractBlockIndexStoreCache.java | 115 ++ .../core/datastore/BTreeBuilderInfo.java | 61 + .../core/datastore/BlockIndexStore.java | 380 ++++ .../carbondata/core/datastore/BtreeBuilder.java | 38 + .../carbondata/core/datastore/DataRefNode.java | 127 ++ .../core/datastore/DataRefNodeFinder.java | 43 + .../carbondata/core/datastore/FileHolder.java | 88 + .../carbondata/core/datastore/IndexKey.java | 62 + .../core/datastore/MeasureDataWrapper.java | 30 + .../core/datastore/NodeMeasureDataStore.java | 34 + .../core/datastore/SegmentTaskIndexStore.java | 401 ++++ .../datastore/TableSegmentUniqueIdentifier.java | 144 ++ .../core/datastore/block/AbstractIndex.java | 129 ++ .../core/datastore/block/BlockIndex.java | 52 + .../core/datastore/block/BlockInfo.java | 134 ++ .../core/datastore/block/BlockletInfos.java | 112 ++ .../core/datastore/block/Distributable.java | 27 + .../core/datastore/block/SegmentProperties.java | 754 +++++++ .../core/datastore/block/SegmentTaskIndex.java | 57 + .../block/SegmentTaskIndexWrapper.java | 148 ++ .../core/datastore/block/TableBlockInfo.java | 311 +++ .../block/TableBlockUniqueIdentifier.java | 72 + .../core/datastore/block/TableTaskInfo.java | 115 ++ .../core/datastore/block/TaskBlockInfo.java | 68 + .../chunk/DimensionColumnDataChunk.java | 111 ++ .../datastore/chunk/MeasureColumnDataChunk.java | 74 + .../chunk/impl/AbstractDimensionDataChunk.java | 90 + .../impl/ColumnGroupDimensionDataChunk.java | 186 ++ .../impl/FixedLengthDimensionDataChunk.java | 161 ++ .../impl/VariableLengthDimensionDataChunk.java | 153 ++ .../chunk/reader/CarbonDataReaderFactory.java | 94 + .../reader/DimensionColumnChunkReader.java | 52 + .../chunk/reader/MeasureColumnChunkReader.java | 50 + .../reader/dimension/AbstractChunkReader.java | 100 + ...mpressedDimensionChunkFileBasedReaderV1.java | 145 ++ ...mpressedDimensionChunkFileBasedReaderV2.java | 288 +++ .../measure/AbstractMeasureChunkReader.java | 41 + ...CompressedMeasureChunkFileBasedReaderV1.java | 108 + ...CompressedMeasureChunkFileBasedReaderV2.java | 236 +++ .../chunk/store/DimensionChunkStoreFactory.java | 88 + .../chunk/store/DimensionDataChunkStore.java | 95 + .../chunk/store/MeasureChunkStoreFactory.java | 97 + .../chunk/store/MeasureDataChunkStore.java | 86 + .../SafeAbsractDimensionDataChunkStore.java | 126 ++ .../safe/SafeAbstractMeasureDataChunkStore.java | 114 ++ .../impl/safe/SafeByteMeasureChunkStore.java | 55 + .../impl/safe/SafeDoubleMeasureChunkStore.java | 54 + .../SafeFixedLengthDimensionDataChunkStore.java | 114 ++ .../impl/safe/SafeIntMeasureChunkStore.java | 54 + .../impl/safe/SafeLongMeasureChunkStore.java | 55 + .../impl/safe/SafeShortMeasureChunkStore.java | 56 + ...feVariableLengthDimensionDataChunkStore.java | 139 ++ .../UnsafeAbstractDimensionDataChunkStore.java | 173 ++ .../UnsafeAbstractMeasureDataChunkStore.java | 128 ++ .../unsafe/UnsafeByteMeasureChunkStore.java | 58 + .../unsafe/UnsafeDoubleMeasureChunkStore.java | 60 + ...nsafeFixedLengthDimensionDataChunkStore.java | 147 ++ .../impl/unsafe/UnsafeIntMeasureChunkStore.java | 60 + .../unsafe/UnsafeLongMeasureChunkStore.java | 59 + .../unsafe/UnsafeShortMeasureChunkStore.java | 59 + ...afeVariableLengthDimesionDataChunkStore.java | 212 ++ .../columnar/BlockIndexerStorageForInt.java | 226 +++ .../BlockIndexerStorageForNoInvertedIndex.java | 159 ++ .../datastore/columnar/ColumnGroupModel.java | 116 ++ .../datastore/columnar/ColumnWithIntIndex.java | 82 + .../columnar/ColumnWithIntIndexForHighCard.java | 49 + .../columnar/ColumnarKeyStoreDataHolder.java | 54 + .../columnar/ColumnarKeyStoreMetadata.java | 53 + .../core/datastore/columnar/IndexStorage.java | 44 + .../core/datastore/columnar/UnBlockIndexer.java | 78 + .../core/datastore/compression/Compressor.java | 60 + .../compression/CompressorFactory.java | 52 + .../compression/MeasureMetaDataModel.java | 128 ++ .../compression/ReaderCompressModel.java | 61 + .../datastore/compression/SnappyCompressor.java | 222 +++ .../compression/ValueCompressionHolder.java | 115 ++ .../compression/WriterCompressModel.java | 220 +++ .../decimal/CompressionMaxMinByte.java | 115 ++ .../decimal/CompressionMaxMinDefault.java | 117 ++ .../decimal/CompressionMaxMinInt.java | 113 ++ .../decimal/CompressionMaxMinLong.java | 113 ++ .../decimal/CompressionMaxMinShort.java | 115 ++ .../nondecimal/CompressionNonDecimalByte.java | 99 + .../CompressionNonDecimalDefault.java | 101 + .../nondecimal/CompressionNonDecimalInt.java | 100 + .../nondecimal/CompressionNonDecimalLong.java | 101 + .../CompressionNonDecimalMaxMinByte.java | 105 + .../CompressionNonDecimalMaxMinDefault.java | 107 + .../CompressionNonDecimalMaxMinInt.java | 105 + .../CompressionNonDecimalMaxMinLong.java | 106 + .../CompressionNonDecimalMaxMinShort.java | 104 + .../nondecimal/CompressionNonDecimalShort.java | 100 + .../compression/none/CompressionNoneByte.java | 104 + .../none/CompressionNoneDefault.java | 102 + .../compression/none/CompressionNoneInt.java | 102 + .../compression/none/CompressionNoneLong.java | 99 + .../compression/none/CompressionNoneShort.java | 104 + .../compression/type/CompressionBigDecimal.java | 146 ++ .../dataholder/CarbonReadDataHolder.java | 50 + .../dataholder/CarbonWriteDataHolder.java | 280 +++ .../exception/IndexBuilderException.java | 96 + .../filesystem/AbstractDFSCarbonFile.java | 217 ++ .../datastore/filesystem/AlluxioCarbonFile.java | 130 ++ .../core/datastore/filesystem/CarbonFile.java | 66 + .../datastore/filesystem/CarbonFileFilter.java | 24 + .../datastore/filesystem/HDFSCarbonFile.java | 128 ++ .../datastore/filesystem/LocalCarbonFile.java | 229 +++ .../datastore/filesystem/ViewFSCarbonFile.java | 126 ++ .../impl/CompressedDataMeasureDataWrapper.java | 37 + .../core/datastore/impl/DFSFileHolderImpl.java | 134 ++ .../core/datastore/impl/FileFactory.java | 485 +++++ .../core/datastore/impl/FileHolderImpl.java | 198 ++ .../impl/btree/AbstractBTreeBuilder.java | 164 ++ .../impl/btree/AbstractBTreeLeafNode.java | 244 +++ .../impl/btree/BTreeDataRefNodeFinder.java | 265 +++ .../core/datastore/impl/btree/BTreeNode.java | 71 + .../datastore/impl/btree/BTreeNonLeafNode.java | 249 +++ .../datastore/impl/btree/BlockBTreeBuilder.java | 118 ++ .../impl/btree/BlockBTreeLeafNode.java | 64 + .../impl/btree/BlockletBTreeBuilder.java | 104 + .../impl/btree/BlockletBTreeLeafNode.java | 129 ++ ...ractHeavyCompressedDoubleArrayDataStore.java | 90 + ...yCompressedDoubleArrayDataInMemoryStore.java | 30 + .../dictionary/client/DictionaryClient.java | 4 +- .../client/DictionaryClientHandler.java | 6 +- .../IncrementalColumnDictionaryGenerator.java | 16 +- .../generator/ServerDictionaryGenerator.java | 6 +- .../generator/TableDictionaryGenerator.java | 6 +- .../server/DictionaryServerHandler.java | 6 +- .../fileoperations/AtomicFileOperations.java | 33 + .../AtomicFileOperationsImpl.java | 87 + .../core/fileoperations/FileWriteOperation.java | 25 + .../DirectDictionaryGenerator.java | 2 +- .../DirectDictionaryKeyGeneratorFactory.java | 2 +- .../DateDirectDictionaryGenerator.java | 2 +- .../TimeStampDirectDictionaryGenerator.java | 14 +- .../carbondata/core/load/BlockDetails.java | 87 - .../core/load/LoadMetadataDetails.java | 344 ---- .../core/locks/AbstractCarbonLock.java | 77 + .../core/locks/CarbonLockFactory.java | 94 + .../carbondata/core/locks/CarbonLockUtil.java | 64 + .../carbondata/core/locks/HdfsFileLock.java | 129 ++ .../carbondata/core/locks/ICarbonLock.java | 40 + .../carbondata/core/locks/LocalFileLock.java | 164 ++ .../apache/carbondata/core/locks/LockUsage.java | 36 + .../carbondata/core/locks/ZooKeeperLocking.java | 195 ++ .../carbondata/core/locks/ZookeeperInit.java | 82 + .../carbondata/core/memory/CarbonUnsafe.java | 60 + .../core/memory/HeapMemoryAllocator.java | 2 - .../core/memory/UnsafeMemoryAllocator.java | 2 - .../core/metadata/AbsoluteTableIdentifier.java | 141 ++ .../core/metadata/BlockletInfoColumnar.java | 2 +- .../core/metadata/CarbonMetadata.java | 165 ++ .../core/metadata/CarbonTableIdentifier.java | 139 ++ .../core/metadata/ColumnIdentifier.java | 114 ++ .../core/metadata/ColumnarFormatVersion.java | 52 + .../core/metadata/blocklet/BlockletInfo.java | 154 ++ .../core/metadata/blocklet/DataFileFooter.java | 171 ++ .../core/metadata/blocklet/SegmentInfo.java | 72 + .../compressor/ChunkCompressorMeta.java | 36 + .../metadata/blocklet/datachunk/DataChunk.java | 228 +++ .../blocklet/datachunk/PresenceMeta.java | 66 + .../blocklet/index/BlockletBTreeIndex.java | 76 + .../metadata/blocklet/index/BlockletIndex.java | 77 + .../blocklet/index/BlockletMinMaxIndex.java | 83 + .../metadata/converter/SchemaConverter.java | 105 + .../ThriftWrapperSchemaConverterImpl.java | 424 ++++ .../core/metadata/datatype/DataType.java | 58 + .../core/metadata/encoder/Encoding.java | 32 + .../core/metadata/index/BlockIndexInfo.java | 92 + .../core/metadata/schema/BucketingInfo.java | 49 + .../core/metadata/schema/SchemaEvolution.java | 52 + .../metadata/schema/SchemaEvolutionEntry.java | 93 + .../core/metadata/schema/table/CarbonTable.java | 585 ++++++ .../core/metadata/schema/table/TableInfo.java | 211 ++ .../core/metadata/schema/table/TableSchema.java | 189 ++ .../schema/table/column/CarbonColumn.java | 190 ++ .../schema/table/column/CarbonDimension.java | 159 ++ .../table/column/CarbonImplicitDimension.java | 179 ++ .../schema/table/column/CarbonMeasure.java | 97 + .../schema/table/column/ColumnSchema.java | 405 ++++ .../core/mutate/CarbonUpdateUtil.java | 803 ++++++++ .../core/mutate/DeleteDeltaBlockDetails.java | 96 + .../core/mutate/DeleteDeltaBlockletDetails.java | 85 + .../core/mutate/SegmentUpdateDetails.java | 172 ++ .../carbondata/core/mutate/TupleIdEnum.java | 41 + .../apache/carbondata/core/mutate/UpdateVO.java | 108 + .../core/mutate/data/BlockMappingVO.java | 54 + .../data/BlockletDeleteDeltaCacheLoader.java | 80 + .../mutate/data/DeleteDeltaCacheLoaderIntf.java | 27 + .../core/mutate/data/RowCountDetailsVO.java | 68 + .../carbondata/core/partition/Partitioner.java | 26 - .../partition/impl/HashPartitionerImpl.java | 105 - .../reader/CarbonDeleteDeltaFileReader.java | 2 +- .../reader/CarbonDeleteDeltaFileReaderImpl.java | 14 +- .../reader/CarbonDeleteFilesDataReader.java | 12 +- .../CarbonDictionaryMetadataReaderImpl.java | 8 +- .../core/reader/CarbonDictionaryReaderImpl.java | 8 +- .../carbondata/core/reader/ThriftReader.java | 2 +- .../CarbonDictionarySortIndexReaderImpl.java | 10 +- .../scan/collector/ScannedResultCollector.java | 45 + .../impl/AbstractScannedResultCollector.java | 159 ++ .../impl/DictionaryBasedResultCollector.java | 172 ++ .../DictionaryBasedVectorResultCollector.java | 136 ++ .../collector/impl/RawBasedResultCollector.java | 74 + .../core/scan/complextypes/ArrayQueryType.java | 110 ++ .../scan/complextypes/ComplexQueryType.java | 64 + .../scan/complextypes/PrimitiveQueryType.java | 145 ++ .../core/scan/complextypes/StructQueryType.java | 130 ++ .../core/scan/executor/QueryExecutor.java | 51 + .../scan/executor/QueryExecutorFactory.java | 38 + .../exception/QueryExecutionException.java | 94 + .../executor/impl/AbstractQueryExecutor.java | 493 +++++ .../scan/executor/impl/DetailQueryExecutor.java | 50 + .../executor/impl/QueryExecutorProperties.java | 73 + .../impl/VectorDetailQueryExecutor.java | 47 + .../scan/executor/infos/AggregatorInfo.java | 105 + .../scan/executor/infos/BlockExecutionInfo.java | 604 ++++++ .../scan/executor/infos/KeyStructureInfo.java | 100 + .../core/scan/executor/util/QueryUtil.java | 882 +++++++++ .../scan/executor/util/RestructureUtil.java | 140 ++ .../core/scan/expression/BinaryExpression.java | 43 + .../core/scan/expression/ColumnExpression.java | 114 ++ .../core/scan/expression/Expression.java | 49 + .../core/scan/expression/ExpressionResult.java | 545 ++++++ .../core/scan/expression/LeafExpression.java | 24 + .../core/scan/expression/LiteralExpression.java | 69 + .../core/scan/expression/UnknownExpression.java | 28 + .../BinaryConditionalExpression.java | 37 + .../conditional/ConditionalExpression.java | 37 + .../conditional/EqualToExpression.java | 109 ++ .../GreaterThanEqualToExpression.java | 91 + .../conditional/GreaterThanExpression.java | 94 + .../expression/conditional/InExpression.java | 99 + .../conditional/LessThanEqualToExpression.java | 93 + .../conditional/LessThanExpression.java | 96 + .../expression/conditional/ListExpression.java | 62 + .../conditional/NotEqualsExpression.java | 105 + .../expression/conditional/NotInExpression.java | 98 + .../exception/FilterIllegalMemberException.java | 94 + .../exception/FilterUnsupportedException.java | 88 + .../scan/expression/logical/AndExpression.java | 63 + .../logical/BinaryLogicalExpression.java | 109 ++ .../expression/logical/FalseExpression.java | 70 + .../scan/expression/logical/OrExpression.java | 62 + .../core/scan/filter/DimColumnFilterInfo.java | 80 + .../scan/filter/FilterExpressionProcessor.java | 338 ++++ .../core/scan/filter/FilterProcessor.java | 57 + .../carbondata/core/scan/filter/FilterUtil.java | 1353 +++++++++++++ .../core/scan/filter/GenericQueryType.java | 53 + .../filter/executer/AndFilterExecuterImpl.java | 63 + .../executer/DimColumnExecuterFilterInfo.java | 32 + .../ExcludeColGroupFilterExecuterImpl.java | 135 ++ .../executer/ExcludeFilterExecuterImpl.java | 153 ++ .../scan/filter/executer/FilterExecuter.java | 47 + .../IncludeColGroupFilterExecuterImpl.java | 207 ++ .../executer/IncludeFilterExecuterImpl.java | 178 ++ .../filter/executer/OrFilterExecuterImpl.java | 53 + .../executer/RestructureFilterExecuterImpl.java | 54 + .../executer/RowLevelFilterExecuterImpl.java | 368 ++++ .../RowLevelRangeGrtThanFiterExecuterImpl.java | 212 ++ ...elRangeGrtrThanEquaToFilterExecuterImpl.java | 199 ++ ...velRangeLessThanEqualFilterExecuterImpl.java | 248 +++ .../RowLevelRangeLessThanFiterExecuterImpl.java | 255 +++ .../RowLevelRangeTypeExecuterFacory.java | 92 + .../core/scan/filter/intf/ExpressionType.java | 45 + .../scan/filter/intf/FilterExecuterType.java | 28 + .../core/scan/filter/intf/RowImpl.java | 44 + .../core/scan/filter/intf/RowIntf.java | 31 + .../resolver/ConditionalFilterResolverImpl.java | 232 +++ .../filter/resolver/FilterResolverIntf.java | 100 + .../resolver/LogicalFilterResolverImpl.java | 115 ++ .../resolver/RowLevelFilterResolverImpl.java | 136 ++ .../RowLevelRangeFilterResolverImpl.java | 266 +++ .../metadata/FilterResolverMetadata.java | 62 + .../DimColumnResolvedFilterInfo.java | 143 ++ .../MeasureColumnResolvedFilterInfo.java | 70 + .../visitor/CustomTypeDictionaryVisitor.java | 101 + .../visitor/DictionaryColumnVisitor.java | 67 + .../visitor/FilterInfoTypeVisitorFactory.java | 45 + .../visitor/NoDictionaryTypeVisitor.java | 64 + .../visitor/ResolvedFilterInfoVisitorIntf.java | 42 + .../core/scan/model/CarbonQueryPlan.java | 156 ++ .../carbondata/core/scan/model/QueryColumn.java | 68 + .../core/scan/model/QueryDimension.java | 58 + .../core/scan/model/QueryMeasure.java | 61 + .../carbondata/core/scan/model/QueryModel.java | 365 ++++ .../processor/AbstractDataBlockIterator.java | 144 ++ .../core/scan/processor/BlockletIterator.java | 88 + .../core/scan/processor/BlocksChunkHolder.java | 125 ++ .../processor/impl/DataBlockIteratorImpl.java | 75 + .../core/scan/result/AbstractScannedResult.java | 569 ++++++ .../core/scan/result/BatchResult.java | 105 + .../result/impl/FilterQueryScannedResult.java | 182 ++ .../impl/NonFilterQueryScannedResult.java | 146 ++ .../AbstractDetailQueryResultIterator.java | 200 ++ .../scan/result/iterator/ChunkRowIterator.java | 79 + .../iterator/DetailQueryResultIterator.java | 85 + .../scan/result/iterator/RawResultIterator.java | 169 ++ .../result/iterator/VectorChunkRowIterator.java | 93 + .../VectorDetailQueryResultIterator.java | 52 + .../scan/result/vector/CarbonColumnVector.java | 47 + .../scan/result/vector/CarbonColumnarBatch.java | 62 + .../scan/result/vector/ColumnVectorInfo.java | 41 + .../vector/MeasureDataVectorProcessor.java | 268 +++ .../vector/impl/CarbonColumnVectorImpl.java | 154 ++ .../scan/scanner/AbstractBlockletScanner.java | 93 + .../core/scan/scanner/BlockletScanner.java | 42 + .../core/scan/scanner/impl/FilterScanner.java | 202 ++ .../scan/scanner/impl/NonFilterScanner.java | 40 + .../core/scan/wrappers/ByteArrayWrapper.java | 221 +++ .../core/service/CarbonCommonFactory.java | 51 + .../core/service/ColumnUniqueIdService.java | 2 +- .../core/service/DictionaryService.java | 4 +- .../carbondata/core/service/PathService.java | 4 +- .../service/impl/ColumnUniqueIdGenerator.java | 41 + .../core/service/impl/DictionaryFactory.java | 119 ++ .../core/service/impl/PathFactory.java | 46 + .../DriverQueryStatisticsRecorderDummy.java | 65 + .../DriverQueryStatisticsRecorderImpl.java | 268 +++ .../carbondata/core/stats/QueryStatistic.java | 114 ++ .../core/stats/QueryStatisticsConstants.java | 60 + .../core/stats/QueryStatisticsModel.java | 45 + .../core/stats/QueryStatisticsRecorder.java | 36 + .../stats/QueryStatisticsRecorderDummy.java | 68 + .../core/stats/QueryStatisticsRecorderImpl.java | 176 ++ .../core/statusmanager/LoadMetadataDetails.java | 344 ++++ .../statusmanager/SegmentStatusManager.java | 642 ++++++ .../SegmentUpdateStatusManager.java | 990 ++++++++++ .../carbondata/core/unsafe/CarbonUnsafe.java | 60 - .../core/update/CarbonUpdateUtil.java | 797 -------- .../core/update/DeleteDeltaBlockDetails.java | 96 - .../core/update/DeleteDeltaBlockletDetails.java | 85 - .../core/update/SegmentUpdateDetails.java | 172 -- .../carbondata/core/update/TupleIdEnum.java | 41 - .../apache/carbondata/core/update/UpdateVO.java | 108 - .../core/updatestatus/SegmentStatusManager.java | 636 ------ .../SegmentUpdateStatusManager.java | 984 ---------- .../util/AbstractDataFileFooterConverter.java | 26 +- .../core/util/CarbonMetadataUtil.java | 12 +- .../carbondata/core/util/CarbonProperties.java | 2 +- .../core/util/CarbonTimeStatisticsFactory.java | 10 +- .../apache/carbondata/core/util/CarbonUtil.java | 52 +- .../core/util/DataFileFooterConverter.java | 18 +- .../core/util/DataFileFooterConverter2.java | 12 +- .../util/DataFileFooterConverterFactory.java | 2 +- .../carbondata/core/util/DataTypeUtil.java | 6 +- .../core/util/ValueCompressionUtil.java | 16 +- .../util/path/CarbonSharedDictionaryPath.java | 73 + .../core/util/path/CarbonStorePath.java | 79 + .../core/util/path/CarbonTablePath.java | 663 +++++++ .../core/writer/CarbonDeleteDeltaWriter.java | 2 +- .../writer/CarbonDeleteDeltaWriterImpl.java | 4 +- .../core/writer/CarbonDictionaryWriterImpl.java | 12 +- .../carbondata/core/writer/ThriftWriter.java | 2 +- .../CarbonDictionarySortIndexWriterImpl.java | 12 +- .../CarbonDictionarySortInfoPreparator.java | 2 +- .../sortindex/CarbonDictionarySortModel.java | 2 +- .../fileoperations/AtomicFileOperations.java | 33 - .../AtomicFileOperationsImpl.java | 87 - .../fileoperations/FileWriteOperation.java | 25 - .../carbondata/locks/AbstractCarbonLock.java | 77 - .../carbondata/locks/CarbonLockFactory.java | 94 - .../apache/carbondata/locks/CarbonLockUtil.java | 64 - .../apache/carbondata/locks/HdfsFileLock.java | 129 -- .../apache/carbondata/locks/ICarbonLock.java | 40 - .../apache/carbondata/locks/LocalFileLock.java | 164 -- .../org/apache/carbondata/locks/LockUsage.java | 36 - .../carbondata/locks/ZooKeeperLocking.java | 195 -- .../apache/carbondata/locks/ZookeeperInit.java | 82 - .../scan/collector/ScannedResultCollector.java | 45 - .../impl/AbstractScannedResultCollector.java | 159 -- .../impl/DictionaryBasedResultCollector.java | 172 -- .../DictionaryBasedVectorResultCollector.java | 136 -- .../collector/impl/RawBasedResultCollector.java | 74 - .../scan/complextypes/ArrayQueryType.java | 110 -- .../scan/complextypes/ComplexQueryType.java | 64 - .../scan/complextypes/PrimitiveQueryType.java | 139 -- .../scan/complextypes/StructQueryType.java | 130 -- .../carbondata/scan/executor/QueryExecutor.java | 51 - .../scan/executor/QueryExecutorFactory.java | 38 - .../exception/QueryExecutionException.java | 94 - .../executor/impl/AbstractQueryExecutor.java | 493 ----- .../scan/executor/impl/DetailQueryExecutor.java | 50 - .../executor/impl/QueryExecutorProperties.java | 73 - .../impl/VectorDetailQueryExecutor.java | 47 - .../scan/executor/infos/AggregatorInfo.java | 105 - .../scan/executor/infos/BlockExecutionInfo.java | 604 ------ .../scan/executor/infos/KeyStructureInfo.java | 100 - .../scan/executor/util/QueryUtil.java | 882 --------- .../scan/executor/util/RestructureUtil.java | 140 -- .../scan/expression/BinaryExpression.java | 43 - .../scan/expression/ColumnExpression.java | 114 -- .../carbondata/scan/expression/Expression.java | 49 - .../scan/expression/ExpressionResult.java | 545 ------ .../scan/expression/LeafExpression.java | 24 - .../scan/expression/LiteralExpression.java | 69 - .../scan/expression/UnknownExpression.java | 28 - .../BinaryConditionalExpression.java | 37 - .../conditional/ConditionalExpression.java | 37 - .../conditional/EqualToExpression.java | 109 -- .../GreaterThanEqualToExpression.java | 91 - .../conditional/GreaterThanExpression.java | 94 - .../expression/conditional/InExpression.java | 99 - .../conditional/LessThanEqualToExpression.java | 93 - .../conditional/LessThanExpression.java | 96 - .../expression/conditional/ListExpression.java | 62 - .../conditional/NotEqualsExpression.java | 105 - .../expression/conditional/NotInExpression.java | 98 - .../exception/FilterIllegalMemberException.java | 94 - .../exception/FilterUnsupportedException.java | 88 - .../scan/expression/logical/AndExpression.java | 63 - .../logical/BinaryLogicalExpression.java | 109 -- .../expression/logical/FalseExpression.java | 70 - .../scan/expression/logical/OrExpression.java | 62 - .../scan/filter/DimColumnFilterInfo.java | 80 - .../scan/filter/FilterExpressionProcessor.java | 338 ---- .../carbondata/scan/filter/FilterProcessor.java | 57 - .../carbondata/scan/filter/FilterUtil.java | 1353 ------------- .../scan/filter/GenericQueryType.java | 53 - .../filter/executer/AndFilterExecuterImpl.java | 63 - .../executer/DimColumnExecuterFilterInfo.java | 32 - .../ExcludeColGroupFilterExecuterImpl.java | 135 -- .../executer/ExcludeFilterExecuterImpl.java | 153 -- .../scan/filter/executer/FilterExecuter.java | 47 - .../IncludeColGroupFilterExecuterImpl.java | 207 -- .../executer/IncludeFilterExecuterImpl.java | 178 -- .../filter/executer/OrFilterExecuterImpl.java | 53 - .../executer/RestructureFilterExecuterImpl.java | 54 - .../executer/RowLevelFilterExecuterImpl.java | 368 ---- .../RowLevelRangeGrtThanFiterExecuterImpl.java | 212 -- ...elRangeGrtrThanEquaToFilterExecuterImpl.java | 199 -- ...velRangeLessThanEqualFilterExecuterImpl.java | 248 --- .../RowLevelRangeLessThanFiterExecuterImpl.java | 255 --- .../RowLevelRangeTypeExecuterFacory.java | 92 - .../scan/filter/intf/ExpressionType.java | 45 - .../scan/filter/intf/FilterExecuterType.java | 28 - .../carbondata/scan/filter/intf/RowImpl.java | 44 - .../carbondata/scan/filter/intf/RowIntf.java | 31 - .../resolver/ConditionalFilterResolverImpl.java | 232 --- .../filter/resolver/FilterResolverIntf.java | 100 - .../resolver/LogicalFilterResolverImpl.java | 115 -- .../resolver/RowLevelFilterResolverImpl.java | 136 -- .../RowLevelRangeFilterResolverImpl.java | 266 --- .../metadata/FilterResolverMetadata.java | 62 - .../DimColumnResolvedFilterInfo.java | 143 -- .../MeasureColumnResolvedFilterInfo.java | 70 - .../visitor/CustomTypeDictionaryVisitor.java | 101 - .../visitor/DictionaryColumnVisitor.java | 67 - .../visitor/FilterInfoTypeVisitorFactory.java | 45 - .../visitor/NoDictionaryTypeVisitor.java | 64 - .../visitor/ResolvedFilterInfoVisitorIntf.java | 42 - .../carbondata/scan/model/CarbonQueryPlan.java | 156 -- .../carbondata/scan/model/QueryColumn.java | 68 - .../carbondata/scan/model/QueryDimension.java | 58 - .../carbondata/scan/model/QueryMeasure.java | 61 - .../carbondata/scan/model/QueryModel.java | 365 ---- .../processor/AbstractDataBlockIterator.java | 144 -- .../scan/processor/BlockletIterator.java | 88 - .../scan/processor/BlocksChunkHolder.java | 125 -- .../processor/impl/DataBlockIteratorImpl.java | 75 - .../scan/result/AbstractScannedResult.java | 569 ------ .../carbondata/scan/result/BatchResult.java | 105 - .../result/impl/FilterQueryScannedResult.java | 182 -- .../impl/NonFilterQueryScannedResult.java | 146 -- .../AbstractDetailQueryResultIterator.java | 200 -- .../scan/result/iterator/ChunkRowIterator.java | 79 - .../iterator/DetailQueryResultIterator.java | 85 - .../scan/result/iterator/RawResultIterator.java | 169 -- .../result/iterator/VectorChunkRowIterator.java | 93 - .../VectorDetailQueryResultIterator.java | 52 - .../scan/result/vector/CarbonColumnVector.java | 47 - .../scan/result/vector/CarbonColumnarBatch.java | 62 - .../scan/result/vector/ColumnVectorInfo.java | 41 - .../vector/MeasureDataVectorProcessor.java | 268 --- .../vector/impl/CarbonColumnVectorImpl.java | 154 -- .../scan/scanner/AbstractBlockletScanner.java | 93 - .../scan/scanner/BlockletScanner.java | 42 - .../scan/scanner/impl/FilterScanner.java | 202 -- .../scan/scanner/impl/NonFilterScanner.java | 40 - .../scan/wrappers/ByteArrayWrapper.java | 221 --- .../dictionary/AbstractDictionaryCacheTest.java | 14 +- .../dictionary/ColumnDictionaryInfoTest.java | 2 +- .../DictionaryCacheLoaderImplTest.java | 6 +- .../DictionaryColumnUniqueIdentifierTest.java | 6 +- .../dictionary/ForwardDictionaryCacheTest.java | 4 +- .../cache/dictionary/ForwardDictionaryTest.java | 2 +- .../dictionary/ReverseDictionaryCacheTest.java | 6 +- .../carbon/AbsoluteTableIdentifierTest.java | 3 + .../core/carbon/CarbonTableIdentifierTest.java | 2 + .../core/carbon/ColumnIdentifierTest.java | 3 +- .../impl/CompressedDataMeasureWrapperTest.java | 4 +- .../store/impl/DFSFileHolderImplUnitTest.java | 2 +- .../store/impl/FileFactoryImplUnitTest.java | 2 +- .../store/impl/FileHolderImplUnitTest.java | 2 +- .../datastore/SegmentTaskIndexStoreTest.java | 143 -- .../carbon/datastore/block/BlockIndexTest.java | 79 - .../carbon/datastore/block/BlockInfoTest.java | 90 - .../datastore/block/SegmentPropertiesTest.java | 350 ---- .../block/SegmentPropertiesTestUtil.java | 232 --- .../datastore/block/SegmentTaskIndexTest.java | 78 - .../datastore/block/TableBlockInfoTest.java | 176 -- .../datastore/block/TableTaskInfoTest.java | 80 - .../impl/ColumnGroupDimensionDataChunkTest.java | 118 -- .../impl/FixedLengthDimensionDataChunkTest.java | 71 - ...ressedDimensionChunkFileBasedReaderTest.java | 134 -- ...mpressedMeasureChunkFileBasedReaderTest.java | 107 - .../impl/btree/BTreeBlockFinderTest.java | 367 ---- .../carbon/metadata/CarbonMetadataTest.java | 266 --- .../ThriftWrapperSchemaConverterImplTest.java | 1846 ------------------ .../metadata/schema/table/CarbonTableTest.java | 118 -- .../table/CarbonTableWithComplexTypesTest.java | 158 -- .../metadata/schema/table/TableInfoTest.java | 52 - .../metadata/schema/table/TableSchemaTest.java | 51 - .../DriverQueryStatisticsRecorderImplTest.java | 120 -- .../QueryStasticsRecorderImplTest.java | 110 -- .../ColumnarKeyStoreDataHolderUnitTest.java | 93 - .../store/filesystem/AlluxioCarbonFileTest.java | 295 --- .../store/filesystem/HDFSCarbonFileTest.java | 402 ---- .../store/filesystem/LocalCarbonFileTest.java | 472 ----- .../store/filesystem/ViewFsCarbonFileTest.java | 314 --- .../datastore/SegmentTaskIndexStoreTest.java | 143 ++ .../core/datastore/block/BlockIndexTest.java | 79 + .../core/datastore/block/BlockInfoTest.java | 90 + .../datastore/block/SegmentPropertiesTest.java | 350 ++++ .../block/SegmentPropertiesTestUtil.java | 232 +++ .../datastore/block/SegmentTaskIndexTest.java | 77 + .../datastore/block/TableBlockInfoTest.java | 176 ++ .../core/datastore/block/TableTaskInfoTest.java | 80 + .../impl/ColumnGroupDimensionDataChunkTest.java | 118 ++ .../impl/FixedLengthDimensionDataChunkTest.java | 71 + ...ressedDimensionChunkFileBasedReaderTest.java | 134 ++ ...mpressedMeasureChunkFileBasedReaderTest.java | 109 ++ .../ColumnarKeyStoreDataHolderUnitTest.java | 93 + .../filesystem/AlluxioCarbonFileTest.java | 292 +++ .../filesystem/HDFSCarbonFileTest.java | 400 ++++ .../filesystem/LocalCarbonFileTest.java | 470 +++++ .../filesystem/ViewFsCarbonFileTest.java | 311 +++ .../impl/btree/BTreeBlockFinderTest.java | 367 ++++ ...ctDictionaryKeyGeneratorFactoryUnitTest.java | 3 +- .../core/load/LoadMetadataDetailsUnitTest.java | 2 + .../core/metadata/CarbonMetadataTest.java | 266 +++ .../ThriftWrapperSchemaConverterImplTest.java | 1846 ++++++++++++++++++ .../metadata/schema/table/CarbonTableTest.java | 118 ++ .../table/CarbonTableWithComplexTypesTest.java | 158 ++ .../metadata/schema/table/TableInfoTest.java | 52 + .../metadata/schema/table/TableSchemaTest.java | 51 + .../CarbonFormatDirectoryStructureTest.java | 73 - .../path/CarbonFormatSharedDictionaryTest.java | 48 - .../reader/CarbonDictionaryReaderImplTest.java | 12 +- ...CarbonDictionarySortIndexReaderImplTest.java | 8 +- .../DictionaryBasedResultCollectorTest.java | 154 ++ .../impl/RawBasedResultCollectorTest.java | 132 ++ .../scan/complextypes/ArrayQueryTypeTest.java | 57 + .../complextypes/PrimitiveQueryTypeTest.java | 156 ++ .../scan/complextypes/StructQueryTypeTest.java | 74 + .../core/scan/executor/util/QueryUtilTest.java | 241 +++ .../scan/executor/util/RestructureUtilTest.java | 115 ++ .../scan/expression/ColumnExpressionTest.java | 71 + .../scan/expression/ExpressionResultTest.java | 498 +++++ .../scan/expression/LiteralExpressionTest.java | 59 + .../conditional/EqualToExpressionUnitTest.java | 315 +++ .../GreaterThanEqualToExpressionUnitTest.java | 293 +++ .../GreaterThanExpressionUnitTest.java | 364 ++++ .../conditional/InExpressionUnitTest.java | 276 +++ .../LessThanEqualToExpressionUnitTest.java | 368 ++++ .../conditional/LessThanExpressionUnitTest.java | 364 ++++ .../conditional/ListExpressionUnitTest.java | 64 + .../NotEqualsExpressionUnitTest.java | 406 ++++ .../conditional/NotInExpressionUnitTest.java | 275 +++ .../expression/logical/AndExpressionTest.java | 81 + .../expression/logical/FalseExpressionTest.java | 48 + .../expression/logical/OrExpressionTest.java | 79 + .../core/scan/filter/FilterUtilTest.java | 392 ++++ .../core/scan/result/BatchResultTest.java | 95 + .../impl/FilterQueryScannedResultTest.java | 210 ++ .../impl/NonFilterQueryScannedResultTest.java | 209 ++ .../scan/wrappers/ByteArrayWrapperTest.java | 107 + .../DriverQueryStatisticsRecorderImplTest.java | 120 ++ .../stats/QueryStasticsRecorderImplTest.java | 110 ++ .../core/util/CarbonMetadataUtilTest.java | 28 +- .../carbondata/core/util/CarbonUtilTest.java | 30 +- .../core/util/DataFileFooterConverterTest.java | 23 +- .../carbondata/core/util/DataTypeUtilTest.java | 16 +- .../core/util/ValueCompressionUtilTest.java | 12 +- .../CarbonFormatDirectoryStructureTest.java | 72 + .../path/CarbonFormatSharedDictionaryTest.java | 46 + .../writer/CarbonDictionaryWriterImplTest.java | 12 +- .../core/writer/CarbonFooterWriterTest.java | 20 +- ...CarbonDictionarySortIndexWriterImplTest.java | 4 +- .../CarbonDictionarySortInfoPreparatorTest.java | 2 +- .../CarbonDictionarySortModelTest.java | 2 +- .../DictionaryBasedResultCollectorTest.java | 154 -- .../impl/RawBasedResultCollectorTest.java | 158 -- .../scan/complextypes/ArrayQueryTypeTest.java | 57 - .../complextypes/PrimitiveQueryTypeTest.java | 156 -- .../scan/complextypes/StructQueryTypeTest.java | 74 - .../scan/executor/util/QueryUtilTest.java | 241 --- .../scan/executor/util/RestructureUtilTest.java | 116 -- .../scan/expression/ColumnExpressionTest.java | 71 - .../scan/expression/ExpressionResultTest.java | 498 ----- .../scan/expression/LiteralExpressionTest.java | 59 - .../conditional/EqualToExpressionUnitTest.java | 315 --- .../GreaterThanEqualToExpressionUnitTest.java | 294 --- .../GreaterThanExpressionUnitTest.java | 364 ---- .../conditional/InExpressionUnitTest.java | 276 --- .../LessThanEqualToExpressionUnitTest.java | 368 ---- .../conditional/LessThanExpressionUnitTest.java | 364 ---- .../conditional/ListExpressionUnitTest.java | 64 - .../NotEqualsExpressionUnitTest.java | 406 ---- .../conditional/NotInExpressionUnitTest.java | 275 --- .../expression/logical/AndExpressionTest.java | 81 - .../expression/logical/FalseExpressionTest.java | 48 - .../expression/logical/OrExpressionTest.java | 79 - .../carbondata/scan/filter/FilterUtilTest.java | 395 ---- .../carbondata/scan/result/BatchResultTest.java | 95 - .../impl/FilterQueryScannedResultTest.java | 210 -- .../impl/NonFilterQueryScannedResultTest.java | 209 -- .../scan/wrappers/ByteArrayWrapperTest.java | 107 - .../scanner/impl/FilterScannerTest.java | 40 - dev/findbugs-exclude.xml | 6 +- .../carbondata/examples/AlluxioExample.scala | 2 +- .../examples/GenerateDictionaryExample.scala | 6 +- .../carbondata/examples/HadoopFileExample.scala | 3 - .../examples/util/AllDictionaryUtil.scala | 2 +- .../apache/carbondata/hadoop/CacheClient.java | 4 +- .../carbondata/hadoop/CarbonInputFormat.java | 64 +- .../carbondata/hadoop/CarbonInputSplit.java | 12 +- .../hadoop/CarbonMultiBlockSplit.java | 2 +- .../carbondata/hadoop/CarbonPathFilter.java | 2 +- .../carbondata/hadoop/CarbonRecordReader.java | 12 +- .../hadoop/api/CarbonTableInputFormat.java | 4 +- .../carbondata/hadoop/internal/index/Index.java | 2 +- .../internal/index/impl/InMemoryBTreeIndex.java | 38 +- .../hadoop/internal/segment/Segment.java | 2 +- .../internal/segment/impl/IndexedSegment.java | 2 +- .../hadoop/readsupport/CarbonReadSupport.java | 4 +- .../AbstractDictionaryDecodedReadSupport.java | 8 +- .../impl/ArrayWritableReadSupport.java | 4 +- .../readsupport/impl/RawDataReadSupport.java | 4 +- .../hadoop/util/BlockLevelTraverser.java | 23 +- .../hadoop/util/CarbonInputFormatUtil.java | 22 +- .../carbondata/hadoop/util/SchemaReader.java | 18 +- .../hadoop/ft/CarbonInputFormat_FT.java | 12 +- .../hadoop/ft/CarbonInputMapperTest.java | 12 +- .../test/util/ObjectSerializationUtilTest.java | 10 +- .../hadoop/test/util/StoreCreator.java | 53 +- .../spark/load/CarbonLoaderUtilTest.java | 4 +- .../validation/FileFooterValidator.java | 8 +- .../complexType/TestCreateTableWithDouble.scala | 8 +- .../dataload/TestLoadDataGeneral.scala | 8 +- .../blockprune/BlockPruneQueryTestCase.scala | 2 +- .../DataCompactionBoundaryConditionsTest.scala | 2 +- .../DataCompactionCardinalityBoundryTest.scala | 6 +- .../datacompaction/DataCompactionLockTest.scala | 8 +- .../MajorCompactionIgnoreInMinorTest.scala | 10 +- .../MajorCompactionStopsAfterCompaction.scala | 4 +- .../dataretention/DataRetentionTestCase.scala | 9 +- .../SubqueryWithFilterAndSortTestCase.scala | 4 +- .../ValueCompressionDataTypeTestCase.scala | 4 +- .../carbondata/spark/load/CarbonLoaderUtil.java | 60 +- .../spark/load/DeleteLoadFolders.java | 16 +- .../spark/merger/CarbonCompactionExecutor.java | 30 +- .../spark/merger/CarbonCompactionUtil.java | 14 +- .../spark/merger/CarbonDataMergerUtil.java | 44 +- .../merger/CarbonDataMergerUtilResult.java | 2 +- .../spark/merger/NodeBlockRelation.java | 2 +- .../spark/merger/NodeMultiBlockRelation.java | 2 +- .../spark/merger/RowResultMerger.java | 33 +- .../carbondata/spark/merger/TableMeta.java | 4 +- .../spark/merger/TupleConversionAdapter.java | 4 +- .../api/impl/QueryPartitionHelper.java | 2 +- .../carbondata/spark/util/CarbonQueryUtil.java | 4 +- .../carbondata/spark/util/LoadMetadataUtil.java | 8 +- .../org/apache/carbondata/api/CarbonStore.scala | 5 +- .../spark/CarbonColumnValidator.scala | 2 +- .../apache/carbondata/spark/CarbonFilters.scala | 12 +- .../carbondata/spark/CarbonSparkFactory.scala | 4 +- .../spark/DictionaryDetailHelper.scala | 10 +- .../org/apache/carbondata/spark/KeyVal.scala | 4 +- .../spark/rdd/CarbonDataLoadRDD.scala | 4 +- .../spark/rdd/CarbonDeleteLoadByDateRDD.scala | 2 +- .../spark/rdd/CarbonGlobalDictionaryRDD.scala | 13 +- .../spark/rdd/CarbonIUDMergerRDD.scala | 4 +- .../carbondata/spark/rdd/CarbonMergerRDD.scala | 37 +- .../carbondata/spark/rdd/CarbonScanRDD.scala | 16 +- .../apache/carbondata/spark/rdd/Compactor.scala | 4 +- .../spark/rdd/DataManagementFunc.scala | 14 +- .../spark/rdd/NewCarbonDataLoadRDD.scala | 3 +- .../carbondata/spark/rdd/UpdateDataLoad.scala | 8 +- .../spark/tasks/DictionaryWriterTask.scala | 2 +- .../spark/tasks/SortIndexWriterTask.scala | 2 +- .../carbondata/spark/util/CarbonScalaUtil.scala | 4 +- .../carbondata/spark/util/CommonUtil.scala | 2 +- .../spark/util/DataTypeConverterUtil.scala | 2 +- .../spark/util/GlobalDictionaryUtil.scala | 19 +- .../spark/sql/catalyst/CarbonDDLSqlParser.scala | 2 +- .../execution/command/carbonTableSchema.scala | 15 +- .../spark/sql/hive/DistributionUtil.scala | 2 +- .../scala/org/apache/spark/util/FileUtils.scala | 4 +- .../scala/org/apache/spark/util/SparkUtil.scala | 2 +- .../readsupport/SparkRowReadSupportImpl.java | 8 +- .../spark/CarbonDataFrameWriter.scala | 2 +- .../spark/rdd/CarbonDataRDDFactory.scala | 26 +- .../carbondata/spark/util/CarbonSparkUtil.scala | 4 +- .../carbondata/spark/util/QueryPlanUtil.scala | 2 +- .../apache/spark/sql/CarbonBoundReference.scala | 2 +- .../org/apache/spark/sql/CarbonContext.scala | 2 +- .../sql/CarbonDatasourceHadoopRelation.scala | 6 +- .../spark/sql/CarbonDatasourceRelation.scala | 13 +- .../spark/sql/CarbonDictionaryDecoder.scala | 10 +- .../scala/org/apache/spark/sql/CarbonScan.scala | 2 +- .../org/apache/spark/sql/CarbonSparkUtil.scala | 4 +- .../spark/sql/SparkUnknownExpression.scala | 8 +- .../sql/execution/command/IUDCommands.scala | 23 +- .../execution/command/carbonTableSchema.scala | 30 +- .../apache/spark/sql/hive/CarbonMetastore.scala | 31 +- .../spark/sql/optimizer/CarbonOptimizer.scala | 27 +- .../CompactionSystemLockFeatureTest.scala | 8 +- .../DataCompactionMinorThresholdTest.scala | 4 +- .../DataCompactionNoDictionaryTest.scala | 4 +- .../datacompaction/DataCompactionTest.scala | 4 +- .../spark/util/AllDictionaryTestCase.scala | 3 +- .../AutoHighCardinalityIdentifyTestCase.scala | 10 +- .../spark/util/DictionaryTestCaseUtil.scala | 2 +- .../util/ExternalColumnDictionaryTestCase.scala | 3 +- ...GlobalDictionaryUtilConcurrentTestCase.scala | 7 +- .../util/GlobalDictionaryUtilTestCase.scala | 3 +- .../readsupport/SparkRowReadSupportImpl.java | 6 +- .../vectorreader/ColumnarVectorWrapper.java | 2 +- .../VectorizedCarbonRecordReader.java | 24 +- .../spark/CarbonColumnValidator.scala | 2 +- .../apache/carbondata/spark/CarbonFilters.scala | 12 +- .../carbondata/spark/CarbonSparkFactory.scala | 5 +- .../spark/DictionaryDetailHelper.scala | 10 +- .../spark/rdd/CarbonDataRDDFactory.scala | 28 +- .../carbondata/spark/util/CarbonSparkUtil.scala | 4 +- .../carbondata/spark/util/QueryPlanUtil.scala | 3 +- .../spark/sql/CarbonDataFrameWriter.scala | 2 +- .../sql/CarbonDatasourceHadoopRelation.scala | 12 +- .../spark/sql/CarbonDictionaryDecoder.scala | 8 +- .../scala/org/apache/spark/sql/CarbonScan.scala | 4 +- .../spark/sql/SparkUnknownExpression.scala | 10 +- .../org/apache/spark/sql/TableCreator.scala | 4 +- .../execution/CarbonLateDecodeStrategy.scala | 6 +- .../execution/command/carbonTableSchema.scala | 29 +- .../apache/spark/sql/hive/CarbonMetastore.scala | 41 +- .../sql/optimizer/CarbonLateDecodeRule.scala | 2 +- .../bucketing/TableBucketingTestCase.scala | 4 +- .../processing/csvload/DataGraphExecuter.java | 10 +- .../processing/csvload/GraphExecutionUtil.java | 12 +- .../processing/csvreaderstep/BlockDetails.java | 87 + .../processing/csvreaderstep/CsvInput.java | 1 - .../csvreaderstep/UnivocityCsvParser.java | 4 +- .../csvreaderstep/UnivocityCsvParserVo.java | 2 - .../processing/datatypes/PrimitiveDataType.java | 6 +- .../graphgenerator/GraphGenerator.java | 14 +- .../processing/mdkeygen/MDKeyGenStep.java | 19 +- .../processing/model/CarbonDataLoadSchema.java | 184 ++ .../processing/model/CarbonLoadModel.java | 9 +- .../newflow/CarbonDataLoadConfiguration.java | 4 +- .../processing/newflow/DataField.java | 4 +- .../processing/newflow/DataLoadExecutor.java | 2 +- .../newflow/DataLoadProcessBuilder.java | 12 +- .../impl/DictionaryFieldConverterImpl.java | 4 +- .../DirectDictionaryFieldConverterImpl.java | 2 +- .../converter/impl/FieldEncoderFactory.java | 8 +- .../impl/MeasureFieldConverterImpl.java | 4 +- .../impl/NonDictionaryFieldConverterImpl.java | 4 +- .../newflow/parser/CarbonParserFactory.java | 4 +- .../newflow/partition/Partitioner.java | 26 + .../partition/impl/HashPartitionerImpl.java | 105 + ...arallelReadMergeSorterWithBucketingImpl.java | 2 +- .../sort/unsafe/UnsafeCarbonRowPage.java | 2 +- .../unsafe/comparator/UnsafeRowComparator.java | 2 +- .../UnsafeRowComparatorForNormalDIms.java | 2 +- .../steps/DataConverterProcessorStepImpl.java | 2 +- ...ConverterProcessorWithBucketingStepImpl.java | 10 +- .../steps/DataWriterProcessorStepImpl.java | 4 +- .../schema/metadata/ColumnSchemaDetails.java | 2 +- .../sortdata/CompressedTempSortFileWriter.java | 2 +- .../sortandgroupby/sortdata/SortParameters.java | 2 +- .../store/CarbonDataWriterFactory.java | 2 +- .../store/CarbonFactDataHandlerColumnar.java | 23 +- .../store/CarbonFactDataHandlerModel.java | 14 +- .../processing/store/StoreFactory.java | 35 + .../store/colgroup/ColGroupBlockStorage.java | 2 +- .../store/colgroup/ColGroupMinMax.java | 2 +- .../store/writer/AbstractFactDataWriter.java | 32 +- .../store/writer/CarbonDataWriterVo.java | 4 +- .../store/writer/CarbonFactDataWriter.java | 4 +- .../processing/store/writer/NodeHolder.java | 2 +- .../writer/v1/CarbonFactDataWriterImplV1.java | 4 +- .../writer/v2/CarbonFactDataWriterImplV2.java | 2 +- .../csvbased/BadRecordsLogger.java | 4 +- .../CarbonCSVBasedDimSurrogateKeyGen.java | 2 +- .../csvbased/CarbonCSVBasedSeqGenMeta.java | 2 +- .../csvbased/CarbonCSVBasedSeqGenStep.java | 11 +- .../FileStoreSurrogateKeyGenForCSV.java | 8 +- .../util/CarbonDataProcessorUtil.java | 24 +- .../processing/util/CarbonSchemaParser.java | 14 +- .../carbon/datastore/BlockIndexStoreTest.java | 14 +- .../carbondata/lcm/locks/LocalFileLockTest.java | 6 +- .../lcm/locks/ZooKeeperLockingTest.java | 8 +- .../store/colgroup/ColGroupMinMaxTest.java | 8 +- .../carbondata/test/util/StoreCreator.java | 52 +- 994 files changed, 55489 insertions(+), 55576 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ce09aaaf/core/src/main/java/org/apache/carbondata/common/ext/ColumnUniqueIdGenerator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/common/ext/ColumnUniqueIdGenerator.java b/core/src/main/java/org/apache/carbondata/common/ext/ColumnUniqueIdGenerator.java deleted file mode 100644 index 577a5ed..0000000 --- a/core/src/main/java/org/apache/carbondata/common/ext/ColumnUniqueIdGenerator.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.carbondata.common.ext; - -import java.util.UUID; - -import org.apache.carbondata.core.carbon.metadata.schema.table.column.ColumnSchema; -import org.apache.carbondata.core.service.ColumnUniqueIdService; - -/** - * It returns unique id given column - */ -public class ColumnUniqueIdGenerator implements ColumnUniqueIdService { - - private static ColumnUniqueIdService columnUniqueIdService = new ColumnUniqueIdGenerator(); - - @Override public String generateUniqueId(String databaseName, ColumnSchema columnSchema) { - return UUID.randomUUID().toString(); - } - - public static ColumnUniqueIdService getInstance() { - return columnUniqueIdService; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ce09aaaf/core/src/main/java/org/apache/carbondata/common/ext/DictionaryFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/common/ext/DictionaryFactory.java b/core/src/main/java/org/apache/carbondata/common/ext/DictionaryFactory.java deleted file mode 100644 index 3cf1ad5..0000000 --- a/core/src/main/java/org/apache/carbondata/common/ext/DictionaryFactory.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.carbondata.common.ext; - -import org.apache.carbondata.core.carbon.CarbonTableIdentifier; -import org.apache.carbondata.core.carbon.ColumnIdentifier; -import org.apache.carbondata.core.reader.CarbonDictionaryMetadataReader; -import org.apache.carbondata.core.reader.CarbonDictionaryMetadataReaderImpl; -import org.apache.carbondata.core.reader.CarbonDictionaryReader; -import org.apache.carbondata.core.reader.CarbonDictionaryReaderImpl; -import org.apache.carbondata.core.reader.sortindex.CarbonDictionarySortIndexReader; -import org.apache.carbondata.core.reader.sortindex.CarbonDictionarySortIndexReaderImpl; -import org.apache.carbondata.core.service.DictionaryService; -import org.apache.carbondata.core.writer.CarbonDictionaryWriter; -import org.apache.carbondata.core.writer.CarbonDictionaryWriterImpl; -import org.apache.carbondata.core.writer.sortindex.CarbonDictionarySortIndexWriter; -import org.apache.carbondata.core.writer.sortindex.CarbonDictionarySortIndexWriterImpl; - -/** - * service to get dictionary reader and writer - */ -public class DictionaryFactory implements DictionaryService { - - private static DictionaryService dictService = new DictionaryFactory(); - - /** - * get dictionary writer - * - * @param carbonTableIdentifier - * @param columnIdentifier - * @param carbonStorePath - * @return - */ - @Override public CarbonDictionaryWriter getDictionaryWriter( - CarbonTableIdentifier carbonTableIdentifier, ColumnIdentifier columnIdentifier, - String carbonStorePath) { - return new CarbonDictionaryWriterImpl(carbonStorePath, carbonTableIdentifier, columnIdentifier); - } - - /** - * get dictionary sort index writer - * - * @param carbonTableIdentifier - * @param columnIdentifier - * @param carbonStorePath - * @return - */ - @Override public CarbonDictionarySortIndexWriter getDictionarySortIndexWriter( - CarbonTableIdentifier carbonTableIdentifier, ColumnIdentifier columnIdentifier, - String carbonStorePath) { - return new CarbonDictionarySortIndexWriterImpl(carbonTableIdentifier, columnIdentifier, - carbonStorePath); - } - - /** - * get dictionary metadata reader - * - * @param carbonTableIdentifier - * @param columnIdentifier - * @param carbonStorePath - * @return - */ - @Override public CarbonDictionaryMetadataReader getDictionaryMetadataReader( - CarbonTableIdentifier carbonTableIdentifier, ColumnIdentifier columnIdentifier, - String carbonStorePath) { - return new CarbonDictionaryMetadataReaderImpl(carbonStorePath, carbonTableIdentifier, - columnIdentifier); - } - - /** - * get dictionary reader - * - * @param carbonTableIdentifier - * @param columnIdentifier - * @param carbonStorePath - * @return - */ - @Override public CarbonDictionaryReader getDictionaryReader( - CarbonTableIdentifier carbonTableIdentifier, ColumnIdentifier columnIdentifier, - String carbonStorePath) { - return new CarbonDictionaryReaderImpl(carbonStorePath, carbonTableIdentifier, columnIdentifier); - } - - /** - * get dictionary sort index reader - * - * @param carbonTableIdentifier - * @param columnIdentifier - * @param carbonStorePath - * @return - */ - @Override public CarbonDictionarySortIndexReader getDictionarySortIndexReader( - CarbonTableIdentifier carbonTableIdentifier, ColumnIdentifier columnIdentifier, - String carbonStorePath) { - return new CarbonDictionarySortIndexReaderImpl(carbonTableIdentifier, columnIdentifier, - carbonStorePath); - } - - public static DictionaryService getInstance() { - return dictService; - } - -} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ce09aaaf/core/src/main/java/org/apache/carbondata/common/ext/PathFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/common/ext/PathFactory.java b/core/src/main/java/org/apache/carbondata/common/ext/PathFactory.java deleted file mode 100644 index cbf5613..0000000 --- a/core/src/main/java/org/apache/carbondata/common/ext/PathFactory.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.carbondata.common.ext; - -import org.apache.carbondata.core.carbon.CarbonTableIdentifier; -import org.apache.carbondata.core.carbon.path.CarbonStorePath; -import org.apache.carbondata.core.carbon.path.CarbonTablePath; -import org.apache.carbondata.core.service.PathService; - -/** - * Create helper to get path details - */ -public class PathFactory implements PathService { - - private static PathService pathService = new PathFactory(); - - /** - * @param storeLocation - * @param tableIdentifier - * @return store path related to tables - */ - @Override public CarbonTablePath getCarbonTablePath( - String storeLocation, CarbonTableIdentifier tableIdentifier) { - return CarbonStorePath.getCarbonTablePath(storeLocation, tableIdentifier); - } - - public static PathService getInstance() { - return pathService; - } -} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ce09aaaf/core/src/main/java/org/apache/carbondata/common/factory/CarbonCommonFactory.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/common/factory/CarbonCommonFactory.java b/core/src/main/java/org/apache/carbondata/common/factory/CarbonCommonFactory.java deleted file mode 100644 index 09b4465..0000000 --- a/core/src/main/java/org/apache/carbondata/common/factory/CarbonCommonFactory.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.carbondata.common.factory; - -import org.apache.carbondata.common.ext.ColumnUniqueIdGenerator; -import org.apache.carbondata.common.ext.DictionaryFactory; -import org.apache.carbondata.common.ext.PathFactory; -import org.apache.carbondata.core.service.ColumnUniqueIdService; -import org.apache.carbondata.core.service.DictionaryService; -import org.apache.carbondata.core.service.PathService; - -/** - * Interface to get services - */ -public class CarbonCommonFactory { - - /** - * @return dictionary service - */ - public static DictionaryService getDictionaryService() { - return DictionaryFactory.getInstance(); - } - - /** - * @return path service - */ - public static PathService getPathService() { - return PathFactory.getInstance(); - } - - /** - * @return unique id generator - */ - public static ColumnUniqueIdService getColumnUniqueIdGenerator() { - return ColumnUniqueIdGenerator.getInstance(); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ce09aaaf/core/src/main/java/org/apache/carbondata/common/iudprocessor/cache/BlockletLevelDeleteDeltaDataCache.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/common/iudprocessor/cache/BlockletLevelDeleteDeltaDataCache.java b/core/src/main/java/org/apache/carbondata/common/iudprocessor/cache/BlockletLevelDeleteDeltaDataCache.java deleted file mode 100644 index acc00f0..0000000 --- a/core/src/main/java/org/apache/carbondata/common/iudprocessor/cache/BlockletLevelDeleteDeltaDataCache.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.carbondata.common.iudprocessor.cache; - -import org.roaringbitmap.RoaringBitmap; - -/** - * This class maintains delete delta data cache of each blocklet along with the block timestamp - */ -public class BlockletLevelDeleteDeltaDataCache { - private RoaringBitmap deleteDelataDataCache; - private String timeStamp; - - public BlockletLevelDeleteDeltaDataCache(int[] deleteDeltaFileData, String timeStamp) { - deleteDelataDataCache = RoaringBitmap.bitmapOf(deleteDeltaFileData); - this.timeStamp=timeStamp; - } - - public boolean contains(int key) { - return deleteDelataDataCache.contains(key); - } - - public int getSize() { - return deleteDelataDataCache.getCardinality(); - } - - public String getCacheTimeStamp() { - return timeStamp; - } -} - http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ce09aaaf/core/src/main/java/org/apache/carbondata/common/iudprocessor/iuddata/BlockMappingVO.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/common/iudprocessor/iuddata/BlockMappingVO.java b/core/src/main/java/org/apache/carbondata/common/iudprocessor/iuddata/BlockMappingVO.java deleted file mode 100644 index ab43b6b..0000000 --- a/core/src/main/java/org/apache/carbondata/common/iudprocessor/iuddata/BlockMappingVO.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.carbondata.common.iudprocessor.iuddata; - -import java.util.Map; - -/** - * VO class to store the details of segment and block count , block and its row count. - */ -public class BlockMappingVO { - - private Map<String, Long> blockRowCountMapping ; - - private Map<String, Long> segmentNumberOfBlockMapping ; - - private Map<String, RowCountDetailsVO> completeBlockRowDetailVO; - - public void setCompleteBlockRowDetailVO(Map<String, RowCountDetailsVO> completeBlockRowDetailVO) { - this.completeBlockRowDetailVO = completeBlockRowDetailVO; - } - - public Map<String, RowCountDetailsVO> getCompleteBlockRowDetailVO() { - return completeBlockRowDetailVO; - } - - public Map<String, Long> getBlockRowCountMapping() { - return blockRowCountMapping; - } - - public Map<String, Long> getSegmentNumberOfBlockMapping() { - return segmentNumberOfBlockMapping; - } - - public BlockMappingVO(Map<String, Long> blockRowCountMapping, - Map<String, Long> segmentNumberOfBlockMapping) { - this.blockRowCountMapping = blockRowCountMapping; - this.segmentNumberOfBlockMapping = segmentNumberOfBlockMapping; - } -} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ce09aaaf/core/src/main/java/org/apache/carbondata/common/iudprocessor/iuddata/BlockletDeleteDeltaCacheLoader.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/common/iudprocessor/iuddata/BlockletDeleteDeltaCacheLoader.java b/core/src/main/java/org/apache/carbondata/common/iudprocessor/iuddata/BlockletDeleteDeltaCacheLoader.java deleted file mode 100644 index 5b380c2..0000000 --- a/core/src/main/java/org/apache/carbondata/common/iudprocessor/iuddata/BlockletDeleteDeltaCacheLoader.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.carbondata.common.iudprocessor.iuddata; - -import org.apache.carbondata.common.iudprocessor.cache.BlockletLevelDeleteDeltaDataCache; -import org.apache.carbondata.common.logging.LogService; -import org.apache.carbondata.common.logging.LogServiceFactory; -import org.apache.carbondata.core.carbon.AbsoluteTableIdentifier; -import org.apache.carbondata.core.carbon.datastore.DataRefNode; -import org.apache.carbondata.core.updatestatus.SegmentUpdateStatusManager; - -/** - * This class is responsible for loading delete delta file cache based on - * blocklet id of a particular block - */ -public class BlockletDeleteDeltaCacheLoader implements DeleteDeltaCacheLoaderIntf { - private String blockletID; - private DataRefNode blockletNode; - private AbsoluteTableIdentifier absoluteIdentifier; - private static final LogService LOGGER = - LogServiceFactory.getLogService(BlockletDeleteDeltaCacheLoader.class.getName()); - - public BlockletDeleteDeltaCacheLoader(String blockletID, - DataRefNode blockletNode, AbsoluteTableIdentifier absoluteIdentifier) { - this.blockletID = blockletID; - this.blockletNode = blockletNode; - this.absoluteIdentifier= absoluteIdentifier; - } - - /** - * This method will load the delete delta cache based on blocklet id of particular block with - * the help of SegmentUpdateStatusManager. - */ - public void loadDeleteDeltaFileDataToCache() { - SegmentUpdateStatusManager segmentUpdateStatusManager = - new SegmentUpdateStatusManager(absoluteIdentifier); - int[] deleteDeltaFileData = null; - BlockletLevelDeleteDeltaDataCache deleteDeltaDataCache = null; - if (null == blockletNode.getDeleteDeltaDataCache()) { - try { - deleteDeltaFileData = segmentUpdateStatusManager.getDeleteDeltaDataFromAllFiles(blockletID); - deleteDeltaDataCache = new BlockletLevelDeleteDeltaDataCache(deleteDeltaFileData, - segmentUpdateStatusManager.getTimestampForRefreshCache(blockletID, null)); - } catch (Exception e) { - LOGGER.debug("Unable to retrieve delete delta files"); - } - } else { - deleteDeltaDataCache = blockletNode.getDeleteDeltaDataCache(); - // if already cache is present then validate the cache using timestamp - String cacheTimeStamp = segmentUpdateStatusManager - .getTimestampForRefreshCache(blockletID, deleteDeltaDataCache.getCacheTimeStamp()); - if (null != cacheTimeStamp) { - try { - deleteDeltaFileData = - segmentUpdateStatusManager.getDeleteDeltaDataFromAllFiles(blockletID); - deleteDeltaDataCache = new BlockletLevelDeleteDeltaDataCache(deleteDeltaFileData, - segmentUpdateStatusManager.getTimestampForRefreshCache(blockletID, cacheTimeStamp)); - } catch (Exception e) { - LOGGER.debug("Unable to retrieve delete delta files"); - } - } - } - blockletNode.setDeleteDeltaDataCache(deleteDeltaDataCache); - } -} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ce09aaaf/core/src/main/java/org/apache/carbondata/common/iudprocessor/iuddata/DeleteDeltaCacheLoaderIntf.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/common/iudprocessor/iuddata/DeleteDeltaCacheLoaderIntf.java b/core/src/main/java/org/apache/carbondata/common/iudprocessor/iuddata/DeleteDeltaCacheLoaderIntf.java deleted file mode 100644 index 2455910..0000000 --- a/core/src/main/java/org/apache/carbondata/common/iudprocessor/iuddata/DeleteDeltaCacheLoaderIntf.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.carbondata.common.iudprocessor.iuddata; - -/** - * This interface holds all methods required to load delete delta file data to cache - */ -public interface DeleteDeltaCacheLoaderIntf { - - void loadDeleteDeltaFileDataToCache(); - -} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ce09aaaf/core/src/main/java/org/apache/carbondata/common/iudprocessor/iuddata/RowCountDetailsVO.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/common/iudprocessor/iuddata/RowCountDetailsVO.java b/core/src/main/java/org/apache/carbondata/common/iudprocessor/iuddata/RowCountDetailsVO.java deleted file mode 100644 index 7b5cc31..0000000 --- a/core/src/main/java/org/apache/carbondata/common/iudprocessor/iuddata/RowCountDetailsVO.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.carbondata.common.iudprocessor.iuddata; - -import java.io.Serializable; - -/** - * VO class Details for block. - */ -public class RowCountDetailsVO implements Serializable { - - private static final long serialVersionUID = 1206104914918491749L; - - private long totalNumberOfRows; - - private long deletedRowsInBlock; - - public RowCountDetailsVO(long totalNumberOfRows, long deletedRowsInBlock) { - this.totalNumberOfRows = totalNumberOfRows; - this.deletedRowsInBlock = deletedRowsInBlock; - } - - public long getTotalNumberOfRows() { - return totalNumberOfRows; - } - - public long getDeletedRowsInBlock() { - return deletedRowsInBlock; - } - - @Override public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj == null || getClass() != obj.getClass()) { - return false; - } - - RowCountDetailsVO that = (RowCountDetailsVO) obj; - - if (totalNumberOfRows != that.totalNumberOfRows) { - return false; - } - return deletedRowsInBlock == that.deletedRowsInBlock; - - } - - @Override public int hashCode() { - int result = (int) (totalNumberOfRows ^ (totalNumberOfRows >>> 32)); - result = 31 * result + (int) (deletedRowsInBlock ^ (deletedRowsInBlock >>> 32)); - return result; - } -} http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ce09aaaf/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 412f094..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.carbon.datastore.BlockIndexStore; -import org.apache.carbondata.core.carbon.datastore.SegmentTaskIndexStore; -import org.apache.carbondata.core.carbon.datastore.block.AbstractIndex; -import org.apache.carbondata.core.carbon.datastore.block.TableBlockUniqueIdentifier; 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.util.CarbonProperties; /** http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ce09aaaf/core/src/main/java/org/apache/carbondata/core/cache/CacheType.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/carbondata/core/cache/CacheType.java b/core/src/main/java/org/apache/carbondata/core/cache/CacheType.java index 5cc0282..b55654e 100644 --- a/core/src/main/java/org/apache/carbondata/core/cache/CacheType.java +++ b/core/src/main/java/org/apache/carbondata/core/cache/CacheType.java @@ -21,10 +21,10 @@ package org.apache.carbondata.core.cache; import org.apache.carbondata.core.cache.dictionary.Dictionary; import org.apache.carbondata.core.cache.dictionary.DictionaryColumnUniqueIdentifier; -import org.apache.carbondata.core.carbon.datastore.TableSegmentUniqueIdentifier; -import org.apache.carbondata.core.carbon.datastore.block.AbstractIndex; -import org.apache.carbondata.core.carbon.datastore.block.SegmentTaskIndexWrapper; -import org.apache.carbondata.core.carbon.datastore.block.TableBlockUniqueIdentifier; +import org.apache.carbondata.core.datastore.TableSegmentUniqueIdentifier; +import org.apache.carbondata.core.datastore.block.AbstractIndex; +import org.apache.carbondata.core.datastore.block.SegmentTaskIndexWrapper; +import org.apache.carbondata.core.datastore.block.TableBlockUniqueIdentifier; /** * class which defines different cache types. cache type can be dictionary cache for http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/ce09aaaf/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 b554d34..96f16b6 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,19 +22,19 @@ package org.apache.carbondata.core.cache.dictionary; import java.io.IOException; import java.util.List; -import org.apache.carbondata.common.factory.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.carbon.path.CarbonTablePath; import org.apache.carbondata.core.constants.CarbonCommonConstants; -import org.apache.carbondata.core.datastorage.store.filesystem.CarbonFile; -import org.apache.carbondata.core.datastorage.store.impl.FileFactory; +import org.apache.carbondata.core.datastore.filesystem.CarbonFile; +import org.apache.carbondata.core.datastore.impl.FileFactory; 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; +import org.apache.carbondata.core.util.path.CarbonTablePath; /** * Abstract class which implements methods common to reverse and forward dictionary cache
