carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ravipes...@apache.org
Subject [9/9] incubator-carbondata git commit: [CARBONDATA-568] clean up code for carbon-core module This closes #472
Date Wed, 04 Jan 2017 13:35:03 GMT
[CARBONDATA-568] clean up code for carbon-core module This closes #472


Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/2ad623dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/2ad623dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/2ad623dc

Branch: refs/heads/master
Commit: 2ad623dcb4567286b436534f225235fec33aabab
Parents: 82072ee eaadc88
Author: ravipesala <ravi.pesala@gmail.com>
Authored: Wed Jan 4 19:04:28 2017 +0530
Committer: ravipesala <ravi.pesala@gmail.com>
Committed: Wed Jan 4 19:04:28 2017 +0530

----------------------------------------------------------------------
 .../org/apache/carbondata/core/cache/Cache.java |  11 +-
 .../AbstractColumnDictionaryInfo.java           |   3 +-
 .../dictionary/AbstractDictionaryCache.java     | 105 +++--
 .../dictionary/DictionaryBuilderException.java  |  63 +++
 .../dictionary/DoubleArrayTrieDictionary.java   | 384 -------------------
 .../dictionary/ForwardDictionaryCache.java      |  18 +-
 .../dictionary/ReverseDictionaryCache.java      |  18 +-
 .../core/carbon/CarbonDataLoadSchema.java       |  25 +-
 .../datastore/AbstractBlockIndexStoreCache.java |  14 +-
 .../core/carbon/datastore/BlockIndexStore.java  |  20 +-
 .../core/carbon/datastore/DataRefNode.java      |  16 +-
 .../carbon/datastore/DataRefNodeFinder.java     |   2 -
 .../carbon/datastore/SegmentTaskIndexStore.java |  36 +-
 .../carbon/datastore/block/AbstractIndex.java   |   7 -
 .../core/carbon/datastore/block/BlockIndex.java |   1 -
 .../datastore/block/SegmentProperties.java      |   5 +-
 .../datastore/block/SegmentTaskIndex.java       |   1 -
 .../carbon/datastore/block/TableTaskInfo.java   |   3 +-
 .../chunk/DimensionColumnDataChunk.java         |   3 -
 .../reader/DimensionColumnChunkReader.java      |   8 +-
 .../chunk/reader/MeasureColumnChunkReader.java  |   7 +-
 .../reader/dimension/AbstractChunkReader.java   |   1 -
 ...mpressedDimensionChunkFileBasedReaderV1.java |   5 +-
 ...mpressedDimensionChunkFileBasedReaderV2.java |   7 +-
 .../measure/AbstractMeasureChunkReader.java     |   3 -
 ...CompressedMeasureChunkFileBasedReaderV1.java |   7 +-
 ...CompressedMeasureChunkFileBasedReaderV2.java |  14 +-
 .../exception/IndexBuilderException.java        |   4 +-
 .../impl/btree/AbstractBTreeBuilder.java        |   3 +-
 .../impl/btree/AbstractBTreeLeafNode.java       |  13 +-
 .../impl/btree/BTreeDataRefNodeFinder.java      |   4 -
 .../datastore/impl/btree/BTreeNonLeafNode.java  |   5 -
 .../impl/btree/BlockBTreeLeafNode.java          |   1 -
 .../impl/btree/BlockletBTreeLeafNode.java       |  11 +-
 .../compressor/ChunkCompressorMeta.java         |  56 ---
 .../blocklet/compressor/CompressionCodec.java   |  31 --
 .../metadata/blocklet/datachunk/DataChunk.java  | 105 +----
 .../metadata/blocklet/sort/SortState.java       |  38 --
 .../ThriftWrapperSchemaConverterImpl.java       |   2 -
 .../core/carbon/metadata/encoder/Encoding.java  |   2 +-
 .../metadata/schema/table/CarbonTable.java      |   4 -
 .../carbon/metadata/schema/table/TableInfo.java |  28 --
 .../metadata/schema/table/TableSchema.java      |  30 --
 .../schema/table/column/CarbonMeasure.java      |  19 -
 .../schema/table/column/ColumnSchema.java       |  21 -
 .../core/carbon/path/CarbonTablePath.java       |   1 -
 .../QueryStatisticsRecorderDummy.java           |   2 +-
 .../core/compression/DoubleCompressor.java      |   6 +-
 .../core/constants/CarbonCommonConstants.java   |  26 --
 .../core/datastorage/store/FileHolder.java      |  15 +-
 .../core/datastorage/store/NodeKeyStore.java    |  64 ----
 .../datastorage/store/NodeMeasureDataStore.java |   6 -
 .../store/columnar/ColumnarKeyStore.java        |  47 ---
 .../columnar/ColumnarKeyStoreDataHolder.java    |  45 +--
 .../store/columnar/ColumnarKeyStoreInfo.java    | 262 -------------
 .../columnar/ColumnarKeyStoreMetadata.java      | 107 +-----
 .../store/compression/WriterCompressModel.java  |   3 +-
 .../decimal/UnCompressByteArray.java            |   2 +-
 .../decimal/UnCompressMaxMinFloat.java          |   2 +-
 .../compression/none/UnCompressNoneDefault.java |   3 -
 .../compression/none/UnCompressNoneLong.java    |   6 +-
 .../store/impl/DFSFileHolderImpl.java           | 111 ++----
 .../datastorage/store/impl/FileFactory.java     |  68 ----
 .../datastorage/store/impl/FileHolderImpl.java  |  67 ++--
 .../store/impl/MemoryMappedFileHolderImpl.java  | 118 ------
 ...ractHeavyCompressedDoubleArrayDataStore.java |   8 +-
 ...yCompressedDoubleArrayDataInMemoryStore.java |  34 --
 .../dictionary/generator/DictionaryWriter.java  |   3 +-
 .../IncrementalColumnDictionaryGenerator.java   |   6 +-
 .../generator/ServerDictionaryGenerator.java    |   2 +-
 .../generator/TableDictionaryGenerator.java     |   9 +-
 .../dictionary/server/DictionaryServer.java     |   2 +-
 .../core/keygenerator/KeyGenerator.java         |   3 -
 .../keygenerator/columnar/ColumnarSplitter.java |  18 -
 .../MultiDimKeyVarLengthEquiSplitGenerator.java |  26 +-
 ...tiDimKeyVarLengthVariableSplitGenerator.java |  14 +-
 .../TimeStampGranularityConstants.java          |   4 +-
 .../TimeStampGranularityTypeValue.java          |   2 +-
 .../mdkey/AbstractKeyGenerator.java             |   2 +-
 .../mdkey/MultiDimKeyVarLengthGenerator.java    |  10 -
 .../core/memory/HeapMemoryAllocator.java        |   2 -
 .../carbondata/core/metadata/BlockletInfo.java  | 202 ----------
 .../core/metadata/BlockletInfoColumnar.java     |  49 ---
 .../core/reader/CarbonDictionaryReaderImpl.java |   8 +-
 .../core/reader/CarbonFooterReader.java         |   5 +-
 .../carbondata/core/reader/ThriftReader.java    |   2 +-
 .../CarbonDictionarySortIndexReader.java        |   4 +-
 .../core/service/ColumnUniqueIdService.java     |   2 +-
 .../core/service/DictionaryService.java         |  10 +-
 .../carbondata/core/unsafe/CarbonUnsafe.java    |   2 +-
 .../util/AbstractDataFileFooterConverter.java   |  61 +--
 .../carbondata/core/util/CarbonMergerUtil.java  |   4 +-
 .../core/util/CarbonMetadataUtil.java           |   2 +-
 .../carbondata/core/util/CarbonProperties.java  |  16 -
 .../core/util/CarbonTimeStatisticsFactory.java  |   8 +-
 .../apache/carbondata/core/util/CarbonUtil.java | 174 +++------
 .../core/util/CarbonUtilException.java          |  80 ----
 .../carbondata/core/util/CompressionFinder.java |   2 +-
 .../carbondata/core/util/DataTypeUtil.java      |   2 +-
 .../core/util/ValueCompressionUtil.java         |  10 +-
 .../core/writer/CarbonFooterWriter.java         |   2 -
 .../core/writer/CarbonIndexFileWriter.java      |   1 -
 .../core/writer/HierarchyValueWriterForCSV.java |   4 +-
 .../CarbonDictionarySortIndexWriter.java        |   7 +-
 .../CarbonDictionarySortIndexWriterImpl.java    |   5 +-
 .../CarbonDictionarySortInfoPreparator.java     |   4 +-
 .../sortindex/CarbonDictionarySortModel.java    |  12 +-
 .../impl/DictionaryBasedResultCollector.java    |   5 -
 .../DictionaryBasedVectorResultCollector.java   |   5 -
 .../collector/impl/RawBasedResultCollector.java |   5 -
 .../scan/complextypes/ArrayQueryType.java       |  54 +--
 .../scan/complextypes/ComplexQueryType.java     |  12 +-
 .../scan/complextypes/PrimitiveQueryType.java   |  42 +-
 .../scan/complextypes/StructQueryType.java      |  60 +--
 .../carbondata/scan/executor/QueryExecutor.java |   6 +-
 .../exception/QueryExecutionException.java      |   2 -
 .../executor/impl/AbstractQueryExecutor.java    |  47 +--
 .../scan/executor/impl/DetailQueryExecutor.java |   3 +-
 .../executor/impl/QueryExecutorProperties.java  |  24 --
 .../impl/VectorDetailQueryExecutor.java         |   6 +-
 .../scan/executor/infos/AggregatorInfo.java     |  44 ---
 .../scan/executor/infos/BlockExecutionInfo.java | 160 --------
 .../scan/executor/infos/KeyStructureInfo.java   |  19 -
 .../scan/executor/infos/SortInfo.java           | 125 ------
 .../scan/executor/util/QueryUtil.java           | 170 +-------
 .../scan/expression/BinaryExpression.java       |  16 -
 .../carbondata/scan/expression/Expression.java  |   1 -
 .../conditional/ConditionalExpression.java      |   6 -
 .../exception/FilterIllegalMemberException.java |   4 -
 .../exception/FilterUnsupportedException.java   |   4 -
 .../logical/BinaryLogicalExpression.java        |  18 -
 .../scan/filter/FilterExpressionProcessor.java  |  22 +-
 .../carbondata/scan/filter/FilterProcessor.java |   9 +-
 .../carbondata/scan/filter/FilterUtil.java      | 174 +++------
 .../scan/filter/GenericQueryType.java           |  22 +-
 .../filter/executer/AndFilterExecuterImpl.java  |   3 +-
 .../ExcludeColGroupFilterExecuterImpl.java      |   2 -
 .../executer/ExcludeFilterExecuterImpl.java     |   3 +-
 .../scan/filter/executer/FilterExecuter.java    |   4 +-
 .../IncludeColGroupFilterExecuterImpl.java      |   2 -
 .../executer/IncludeFilterExecuterImpl.java     |   8 +-
 .../filter/executer/OrFilterExecuterImpl.java   |   3 +-
 .../executer/RowLevelFilterExecuterImpl.java    |  86 ++---
 .../RowLevelRangeGrtThanFiterExecuterImpl.java  |   7 +-
 ...elRangeGrtrThanEquaToFilterExecuterImpl.java |   3 +-
 ...velRangeLessThanEqualFilterExecuterImpl.java |   3 +-
 .../RowLevelRangeLessThanFiterExecuterImpl.java |   3 +-
 .../RowLevelRangeTypeExecuterFacory.java        |   9 +-
 .../filter/resolver/AndFilterResolverImpl.java  |  56 ---
 .../resolver/ConditionalFilterResolverImpl.java |  39 +-
 .../filter/resolver/FilterResolverIntf.java     |  18 +-
 .../resolver/LogicalFilterResolverImpl.java     |   9 +-
 .../resolver/RestructureFilterResolverImpl.java | 208 ----------
 .../resolver/RowLevelFilterResolverImpl.java    |   7 +-
 .../RowLevelRangeFilterResolverImpl.java        |  51 +--
 .../DimColumnResolvedFilterInfo.java            |  59 +--
 .../MeasureColumnResolvedFilterInfo.java        |  37 +-
 .../visitable/ResolvedFilterInfoVisitable.java  |  38 --
 .../visitor/CustomTypeDictionaryVisitor.java    |  13 +-
 .../visitor/DictionaryColumnVisitor.java        |  33 +-
 .../visitor/NoDictionaryTypeVisitor.java        |   7 +-
 .../visitor/ResolvedFilterInfoVisitorIntf.java  |   4 +-
 .../carbondata/scan/model/CarbonQueryPlan.java  |  83 ----
 .../carbondata/scan/model/QueryColumn.java      |  41 --
 .../carbondata/scan/model/QueryModel.java       | 184 +--------
 .../carbondata/scan/model/SortOrderType.java    |  57 ---
 .../processor/AbstractDataBlockIterator.java    |  21 +-
 .../apache/carbondata/scan/result/Result.java   |  70 ----
 .../AbstractDetailQueryResultIterator.java      |   1 -
 .../iterator/DetailQueryResultIterator.java     |  10 +-
 .../scan/result/iterator/RawResultIterator.java |   2 +-
 .../scan/result/vector/CarbonColumnVector.java  |  24 +-
 .../vector/MeasureDataVectorProcessor.java      |   2 +-
 .../scan/scanner/AbstractBlockletScanner.java   |   8 +-
 .../scan/scanner/BlockletScanner.java           |   7 +-
 .../scan/scanner/impl/FilterScanner.java        |  29 +-
 .../dictionary/ReverseDictionaryCacheTest.java  |   5 +-
 .../store/impl/DFSFileHolderImplUnitTest.java   |  40 +-
 .../store/impl/FileHolderImplUnitTest.java      |  17 +-
 .../MemoryMappedFileHolderImplUnitTest.java     | 137 -------
 .../datastore/SegmentTaskIndexStoreTest.java    |   4 +-
 .../datastore/block/SegmentPropertiesTest.java  |   2 -
 .../block/SegmentPropertiesTestUtil.java        |   2 -
 ...ressedDimensionChunkFileBasedReaderTest.java |   5 +-
 ...mpressedMeasureChunkFileBasedReaderTest.java |   5 +-
 .../carbon/metadata/CarbonMetadataTest.java     |   1 -
 .../ThriftWrapperSchemaConverterImplTest.java   |   1 -
 .../metadata/schema/table/CarbonTableTest.java  |   1 -
 .../table/CarbonTableWithComplexTypesTest.java  |   1 -
 .../ColumnarKeyStoreDataHolderUnitTest.java     |   2 +-
 .../carbondata/core/util/CarbonUtilTest.java    |  56 +--
 .../core/writer/CarbonFooterWriterTest.java     |   4 +-
 .../CarbonDictionarySortInfoPreparatorTest.java |   9 +-
 .../impl/RawBasedResultCollectorTest.java       |   1 -
 .../carbondata/scan/filter/FilterUtilTest.java  |  65 +---
 .../scanner/impl/FilterScannerTest.java         |  12 +-
 .../carbondata/hadoop/CacheAccessClient.java    |  12 +-
 .../carbondata/hadoop/CarbonInputFormat.java    |  41 +-
 .../internal/index/impl/InMemoryBTreeIndex.java |  35 +-
 .../hadoop/readsupport/CarbonReadSupport.java   |   8 +-
 .../AbstractDictionaryDecodedReadSupport.java   |  17 +-
 .../hadoop/util/CarbonInputFormatUtil.java      |   1 -
 .../hadoop/test/util/StoreCreator.java          |   4 +-
 .../carbondata/spark/load/CarbonLoaderUtil.java |  14 +-
 .../spark/merger/CarbonCompactionExecutor.java  |  18 +-
 .../spark/merger/CarbonCompactionUtil.java      |  12 +-
 .../carbondata/spark/rdd/CarbonMergerRDD.scala  |   5 +-
 .../execution/command/carbonTableSchema.scala   |   1 -
 .../readsupport/SparkRowReadSupportImpl.java    |   3 +-
 .../scala/org/apache/spark/sql/CarbonScan.scala |  10 -
 .../spark/sql/SparkUnknownExpression.scala      |  17 +-
 .../readsupport/SparkRowReadSupportImpl.java    |   4 +-
 .../scala/org/apache/spark/sql/CarbonScan.scala |   3 -
 .../processing/csvload/DataGraphExecuter.java   | 128 ++-----
 .../processing/csvload/GraphExecutionUtil.java  |   2 +-
 .../processing/datatypes/PrimitiveDataType.java |   9 +-
 .../processing/mdkeygen/MDKeyGenStep.java       |   5 +-
 .../newflow/AbstractDataLoadProcessorStep.java  |   5 +-
 .../newflow/converter/RowConverter.java         |   4 +-
 .../impl/DictionaryFieldConverterImpl.java      |  29 +-
 .../converter/impl/FieldEncoderFactory.java     |   4 +-
 .../converter/impl/RowConverterImpl.java        |  15 +-
 .../impl/UnsafeParallelReadMergeSorterImpl.java |   2 +-
 .../newflow/sort/unsafe/UnsafeSortDataRows.java |  20 +-
 .../merger/UnsafeIntermediateFileMerger.java    |   3 +-
 .../steps/DataConverterProcessorStepImpl.java   |   4 +-
 ...ConverterProcessorWithBucketingStepImpl.java |   4 +-
 .../steps/DataWriterProcessorStepImpl.java      |   3 +-
 .../newflow/steps/SortProcessorStepImpl.java    |   3 +-
 .../sortdata/IntermediateFileMerger.java        |   3 +-
 .../FileStoreSurrogateKeyGenForCSV.java         |  55 +--
 .../util/CarbonDataProcessorUtil.java           |  40 +-
 .../carbon/datastore/BlockIndexStoreTest.java   |  12 +-
 .../carbondata/test/util/StoreCreator.java      |   4 +-
 234 files changed, 946 insertions(+), 5250 deletions(-)
----------------------------------------------------------------------



Mime
View raw message