You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ra...@apache.org on 2017/05/15 05:06:32 UTC
[19/19] carbondata git commit: Merging 12-dev branch into master
branch. This closes #914
Merging 12-dev branch into master branch. This closes #914
Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/46521add
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/46521add
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/46521add
Branch: refs/heads/master
Commit: 46521add0668ab2b8c7816690c5ceca092500dce
Parents: fb2441a fa08ab4
Author: ravipesala <ra...@gmail.com>
Authored: Mon May 15 10:34:56 2017 +0530
Committer: ravipesala <ra...@gmail.com>
Committed: Mon May 15 10:34:56 2017 +0530
----------------------------------------------------------------------
.../dictionary/DictionaryCacheLoaderImpl.java | 3 +-
.../dictionary/DoubleArrayTrieDictionary.java | 5 +-
.../dictionary/ReverseDictionaryCache.java | 3 +-
.../core/compression/BigIntCompressor.java | 9 +-
.../core/compression/DoubleCompressor.java | 43 +-
.../core/compression/ValueCompressor.java | 3 +-
.../core/constants/CarbonCommonConstants.java | 13 +-
.../core/datastore/block/SegmentProperties.java | 42 +
.../block/TableBlockUniqueIdentifier.java | 3 +-
.../chunk/store/MeasureChunkStoreFactory.java | 26 +-
...feVariableLengthDimensionDataChunkStore.java | 32 +-
.../BlockIndexerStorageForNoInvertedIndex.java | 2 +-
...ndexerStorageForNoInvertedIndexForShort.java | 3 +-
.../compression/MeasureMetaDataModel.java | 8 +-
.../compression/ReaderCompressModel.java | 8 +-
.../compression/ValueCompressionHolder.java | 26 +-
.../compression/WriterCompressModel.java | 41 +-
.../compression/decimal/CompressByteArray.java | 4 +-
.../decimal/CompressionMaxMinByte.java | 6 +-
.../decimal/CompressionMaxMinDefault.java | 6 +-
.../decimal/CompressionMaxMinInt.java | 6 +-
.../decimal/CompressionMaxMinLong.java | 6 +-
.../decimal/CompressionMaxMinShort.java | 6 +-
.../nondecimal/CompressionNonDecimalByte.java | 6 +-
.../CompressionNonDecimalDefault.java | 6 +-
.../nondecimal/CompressionNonDecimalInt.java | 6 +-
.../nondecimal/CompressionNonDecimalLong.java | 6 +-
.../CompressionNonDecimalMaxMinByte.java | 6 +-
.../CompressionNonDecimalMaxMinDefault.java | 6 +-
.../CompressionNonDecimalMaxMinInt.java | 6 +-
.../CompressionNonDecimalMaxMinLong.java | 6 +-
.../CompressionNonDecimalMaxMinShort.java | 6 +-
.../nondecimal/CompressionNonDecimalShort.java | 6 +-
.../compression/none/CompressionNoneByte.java | 6 +-
.../none/CompressionNoneDefault.java | 6 +-
.../compression/none/CompressionNoneInt.java | 6 +-
.../compression/none/CompressionNoneLong.java | 6 +-
.../compression/none/CompressionNoneShort.java | 6 +-
.../dataholder/CarbonWriteDataHolder.java | 156 +--
.../core/datastore/impl/FileFactory.java | 10 +-
.../impl/btree/BTreeDataRefNodeFinder.java | 24 +-
.../HeavyCompressedDoubleArrayDataStore.java | 57 --
.../core/datastore/page/ColumnPage.java | 42 +
.../core/datastore/page/ComplexColumnPage.java | 77 ++
.../datastore/page/FixLengthColumnPage.java | 155 +++
.../datastore/page/VarLengthColumnPage.java | 42 +
.../datastore/page/compression/Compression.java | 23 +
.../datastore/page/encoding/ColumnCodec.java | 35 +
.../datastore/page/encoding/DummyCodec.java | 37 +
.../page/statistics/PageStatistics.java | 124 +++
.../page/statistics/StatisticsCollector.java | 66 ++
.../DateDirectDictionaryGenerator.java | 3 +-
.../core/keygenerator/mdkey/Bits.java | 9 +-
.../keygenerator/mdkey/NumberCompressor.java | 7 +-
.../core/metadata/ValueEncoderMeta.java | 18 +-
.../ThriftWrapperSchemaConverterImpl.java | 97 ++
.../core/metadata/datatype/DataType.java | 6 +-
.../core/metadata/schema/PartitionInfo.java | 91 ++
.../schema/partition/AbstractPartition.java | 42 +
.../schema/partition/HashPartition.java | 34 +
.../schema/partition/ListPartition.java | 36 +
.../schema/partition/PartitionType.java | 27 +
.../schema/partition/RangePartition.java | 40 +
.../core/metadata/schema/table/CarbonTable.java | 47 +
.../core/metadata/schema/table/TableSchema.java | 14 +
.../schema/table/column/ColumnSchema.java | 10 +
.../core/mutate/CarbonUpdateUtil.java | 14 +-
.../CarbonDictionaryMetadataReaderImpl.java | 12 +-
.../core/reader/CarbonIndexFileReader.java | 6 +-
.../impl/DictionaryBasedResultCollector.java | 12 +-
...structureBasedDictionaryResultCollector.java | 4 +-
.../core/scan/expression/ColumnExpression.java | 4 +-
.../core/scan/expression/LiteralExpression.java | 6 +-
.../scan/filter/FilterExpressionProcessor.java | 4 +-
.../carbondata/core/scan/filter/FilterUtil.java | 98 +-
.../executer/RowLevelFilterExecuterImpl.java | 9 +-
...velRangeLessThanEqualFilterExecuterImpl.java | 2 +-
.../RowLevelRangeLessThanFiterExecuterImpl.java | 2 +-
.../executer/ValueBasedFilterExecuterImpl.java | 6 +-
.../RowLevelRangeFilterResolverImpl.java | 5 +-
.../visitor/NoDictionaryTypeVisitor.java | 3 +-
.../visitor/RangeNoDictionaryTypeVisitor.java | 3 +-
.../core/scan/partition/HashPartitioner.java | 41 +
.../core/scan/partition/ListPartitioner.java | 65 ++
.../core/scan/partition/PartitionUtil.java | 109 +++
.../core/scan/partition/Partitioner.java | 27 +
.../core/scan/partition/RangePartitioner.java | 137 +++
.../AbstractDetailQueryResultIterator.java | 4 +-
.../iterator/DetailQueryResultIterator.java | 3 +-
.../scan/result/vector/CarbonColumnVector.java | 7 +
.../core/stats/PartitionStatistic.java | 59 ++
.../SegmentUpdateStatusManager.java | 5 +-
.../util/AbstractDataFileFooterConverter.java | 7 +
.../apache/carbondata/core/util/ByteUtil.java | 346 ++++++-
.../core/util/CarbonMetadataUtil.java | 44 +-
.../carbondata/core/util/CarbonProperties.java | 1 -
.../apache/carbondata/core/util/CarbonUtil.java | 35 +-
.../carbondata/core/util/CompressionFinder.java | 10 +-
.../carbondata/core/util/DataTypeUtil.java | 73 +-
.../apache/carbondata/core/util/NodeHolder.java | 31 +-
.../core/util/ValueCompressionUtil.java | 190 ++--
.../core/util/path/CarbonStorePath.java | 3 +-
.../core/util/path/CarbonTablePath.java | 6 +-
.../dictionary/AbstractDictionaryCacheTest.java | 6 +-
.../dictionary/ReverseDictionaryCacheTest.java | 4 +-
.../block/SegmentPropertiesTestUtil.java | 3 +-
.../filesystem/AlluxioCarbonFileTest.java | 6 +-
.../filesystem/HDFSCarbonFileTest.java | 9 +-
.../filesystem/LocalCarbonFileTest.java | 3 +-
.../filesystem/ViewFsCarbonFileTest.java | 6 +-
.../impl/btree/BTreeBlockFinderTest.java | 10 +-
.../ThriftWrapperSchemaConverterImplTest.java | 3 +-
.../core/scan/executor/util/QueryUtilTest.java | 9 +-
.../core/scan/filter/FilterUtilTest.java | 7 +-
.../core/util/CarbonMetadataUtilTest.java | 11 +-
.../core/util/RangeFilterProcessorTest.java | 21 +-
.../core/util/ValueCompressionUtilTest.java | 114 +--
.../core/writer/CarbonFooterWriterTest.java | 2 +-
.../src/main/resources/partition_data.csv | 25 +
.../examples/CarbonPartitionExample.scala | 131 +++
.../examples/CarbonSessionExample.scala | 1 +
format/src/main/thrift/carbondata.thrift | 8 +-
format/src/main/thrift/schema.thrift | 18 +
.../carbondata/hadoop/CarbonInputFormat.java | 4 +-
.../carbondata/hadoop/CarbonInputSplit.java | 6 +-
.../internal/index/impl/InMemoryBTreeIndex.java | 4 +-
.../impl/DictionaryDecodeReadSupport.java | 3 +
.../hadoop/util/BlockLevelTraverser.java | 4 +-
.../hadoop/test/util/StoreCreator.java | 5 +
.../testsuite/emptyrow/TestEmptyRows.scala | 2 +-
.../testsuite/dataload/TestLoadDataFrame.scala | 79 +-
.../dataload/TestLoadDataWithNoMeasure.scala | 8 +-
.../ColumnGroupDataTypesTestCase.scala | 6 +
.../partition/TestDDLForPartitionTable.scala | 127 +++
.../TestDataLoadingForPartitionTable.scala | 289 ++++++
.../testsuite/sortcolumns/TestSortColumns.scala | 274 ++++++
.../carbondata/spark/PartitionFactory.scala | 65 ++
.../spark/rdd/NewCarbonDataLoadRDD.scala | 79 ++
.../carbondata/spark/util/CommonUtil.scala | 37 +-
.../spark/sql/catalyst/CarbonDDLSqlParser.scala | 225 +++--
.../execution/command/carbonTableSchema.scala | 80 +-
.../spark/CarbonDataFrameWriter.scala | 8 +-
.../spark/rdd/CarbonDataRDDFactory.scala | 117 ++-
.../org/apache/spark/sql/CarbonSqlParser.scala | 38 +-
.../apache/spark/sql/TestCarbonSqlParser.scala | 56 +-
.../readsupport/SparkRowReadSupportImpl.java | 13 +-
.../vectorreader/ColumnarVectorWrapper.java | 13 +
.../spark/rdd/CarbonDataRDDFactory.scala | 126 ++-
.../spark/sql/CarbonDataFrameWriter.scala | 29 +-
.../org/apache/spark/sql/TableCreator.scala | 148 +--
.../spark/sql/parser/CarbonSparkSqlParser.scala | 39 +-
.../processing/merger/CarbonCompactionUtil.java | 3 +-
.../processing/merger/CarbonDataMergerUtil.java | 29 +-
.../merger/CompactionResultSortProcessor.java | 30 +-
.../merger/RowResultMergerProcessor.java | 14 +-
.../processing/model/CarbonLoadModel.java | 6 +-
.../newflow/CarbonDataLoadConfiguration.java | 24 +
.../newflow/DataLoadProcessBuilder.java | 36 +-
.../impl/NonDictionaryFieldConverterImpl.java | 21 +-
.../DictionaryServerClientDictionary.java | 3 +-
.../sort/impl/ParallelReadMergeSorterImpl.java | 5 +-
...arallelReadMergeSorterWithBucketingImpl.java | 7 +-
.../sort/unsafe/UnsafeCarbonRowPage.java | 142 +--
.../newflow/sort/unsafe/UnsafeSortDataRows.java | 27 +-
.../unsafe/comparator/UnsafeRowComparator.java | 10 +-
.../UnsafeRowComparatorForNormalDIms.java | 8 +-
.../holder/UnsafeFinalMergePageHolder.java | 4 +-
.../unsafe/holder/UnsafeInmemoryHolder.java | 5 +-
.../holder/UnsafeSortTempFileChunkHolder.java | 34 +-
.../merger/UnsafeIntermediateFileMerger.java | 38 +-
.../UnsafeSingleThreadFinalSortFilesMerger.java | 4 +-
.../CarbonRowDataWriterProcessorStepImpl.java | 319 +++++++
.../steps/DataConverterProcessorStepImpl.java | 3 +-
...ConverterProcessorWithBucketingStepImpl.java | 3 +-
.../newflow/steps/SortProcessorStepImpl.java | 3 +-
.../sortdata/IntermediateFileMerger.java | 38 +-
.../sortdata/NewRowComparator.java | 12 +-
.../sortdata/NewRowComparatorForNormalDims.java | 10 +-
.../sortandgroupby/sortdata/RowComparator.java | 10 +-
.../sortdata/RowComparatorForNormalDims.java | 10 +-
.../sortandgroupby/sortdata/SortDataRows.java | 42 +-
.../sortandgroupby/sortdata/SortParameters.java | 68 +-
.../sortdata/SortTempFileChunkHolder.java | 43 +-
.../store/CarbonDataFileAttributes.java | 10 +-
.../store/CarbonFactDataHandlerColumnar.java | 948 +++++++++----------
.../store/CarbonFactDataHandlerModel.java | 50 +-
.../store/SingleThreadFinalSortFilesMerger.java | 13 +-
.../store/colgroup/ColGroupBlockStorage.java | 29 +-
.../store/writer/AbstractFactDataWriter.java | 4 +-
.../writer/v3/CarbonFactDataWriterImplV3.java | 4 +-
.../util/CarbonDataProcessorUtil.java | 53 +-
.../processing/util/NonDictionaryUtil.java | 3 +-
.../store/colgroup/ColGroupMinMaxTest.java | 2 +
193 files changed, 5617 insertions(+), 1907 deletions(-)
----------------------------------------------------------------------