You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ja...@apache.org on 2017/02/24 05:38:46 UTC

[5/5] incubator-carbondata git commit: [CARBONDATA-726] Handled query and scan for V3 format. This closes #584

[CARBONDATA-726] Handled query and scan for V3 format. This closes #584


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

Branch: refs/heads/master
Commit: 3e36cdf54fe7158cda2596203c22184459097c8d
Parents: 766671c 72cb415
Author: jackylk <ja...@huawei.com>
Authored: Fri Feb 24 13:38:21 2017 +0800
Committer: jackylk <ja...@huawei.com>
Committed: Fri Feb 24 13:38:21 2017 +0800

----------------------------------------------------------------------
 .../AbstractColumnDictionaryInfo.java           |  18 +-
 .../core/cache/dictionary/Dictionary.java       |  13 ++
 .../cache/dictionary/ForwardDictionary.java     |  13 ++
 .../cache/dictionary/ReverseDictionary.java     |  13 ++
 .../core/constants/CarbonCommonConstants.java   |  12 +-
 .../carbondata/core/datastore/DataRefNode.java  |  12 +-
 .../carbondata/core/datastore/FileHolder.java   |  14 ++
 .../datastore/chunk/AbstractRawColumnChunk.java | 124 +++++++++++
 .../chunk/impl/DimensionRawColumnChunk.java     | 105 +++++++++
 .../chunk/impl/MeasureRawColumnChunk.java       | 107 +++++++++
 .../reader/DimensionColumnChunkReader.java      |  20 +-
 .../chunk/reader/MeasureColumnChunkReader.java  |  20 +-
 ...mpressedDimensionChunkFileBasedReaderV1.java |  92 +++++---
 ...mpressedDimensionChunkFileBasedReaderV2.java | 215 +++++++++----------
 ...CompressedMeasureChunkFileBasedReaderV1.java |  49 +++--
 ...CompressedMeasureChunkFileBasedReaderV2.java | 169 +++++++--------
 .../core/datastore/columnar/UnBlockIndexer.java |   7 +-
 .../core/datastore/impl/DFSFileHolderImpl.java  |   9 +
 .../core/datastore/impl/FileHolderImpl.java     |   8 +
 .../impl/btree/AbstractBTreeLeafNode.java       |  12 +-
 .../datastore/impl/btree/BTreeNonLeafNode.java  |  12 +-
 .../impl/btree/BlockletBTreeLeafNode.java       |  20 +-
 .../core/metadata/blocklet/BlockletInfo.java    |  32 ++-
 .../DictionaryBasedVectorResultCollector.java   |  54 +++--
 .../core/scan/complextypes/ArrayQueryType.java  |  16 +-
 .../scan/complextypes/ComplexQueryType.java     |  13 +-
 .../scan/complextypes/PrimitiveQueryType.java   |  12 +-
 .../core/scan/complextypes/StructQueryType.java |  10 +-
 .../executor/impl/AbstractQueryExecutor.java    |  19 +-
 .../scan/executor/infos/BlockExecutionInfo.java |  27 +++
 .../core/scan/executor/util/QueryUtil.java      |  13 +-
 .../carbondata/core/scan/filter/FilterUtil.java |   5 -
 .../core/scan/filter/GenericQueryType.java      |   6 +-
 .../filter/executer/AndFilterExecuterImpl.java  |  12 +-
 .../executer/ExcludeFilterExecuterImpl.java     |  32 ++-
 .../scan/filter/executer/FilterExecuter.java    |   9 +-
 .../executer/IncludeFilterExecuterImpl.java     |  54 ++++-
 .../filter/executer/OrFilterExecuterImpl.java   |  11 +-
 .../executer/RestructureFilterExecuterImpl.java |  52 -----
 .../executer/RowLevelFilterExecuterImpl.java    | 192 +++++++++--------
 .../RowLevelRangeGrtThanFiterExecuterImpl.java  |  69 ++++--
 ...elRangeGrtrThanEquaToFilterExecuterImpl.java |  65 ++++--
 ...velRangeLessThanEqualFilterExecuterImpl.java |  67 ++++--
 .../RowLevelRangeLessThanFiterExecuterImpl.java |  66 ++++--
 .../RowLevelRangeFilterResolverImpl.java        |  34 ++-
 .../processor/AbstractDataBlockIterator.java    | 117 ++++++++--
 .../core/scan/processor/BlocksChunkHolder.java  |  51 +++--
 .../processor/impl/DataBlockIteratorImpl.java   |   8 +-
 .../core/scan/result/AbstractScannedResult.java | 113 +++++++---
 .../result/impl/FilterQueryScannedResult.java   |  25 ++-
 .../AbstractDetailQueryResultIterator.java      |  21 +-
 .../iterator/DetailQueryResultIterator.java     |  48 +----
 .../scan/scanner/AbstractBlockletScanner.java   | 106 ++++++---
 .../core/scan/scanner/BlockletScanner.java      |  20 ++
 .../core/scan/scanner/impl/FilterScanner.java   | 172 ++++++++++-----
 .../scan/scanner/impl/NonFilterScanner.java     |   3 -
 .../carbondata/core/util/BitSetGroup.java       |  82 +++++++
 .../apache/carbondata/core/util/CarbonUtil.java |  36 ++--
 .../core/util/DataFileFooterConverter2.java     |  13 +-
 .../carbondata/core/util/DataTypeUtil.java      |  82 +++++++
 .../carbondata/core/util/DataTypeUtilTest.java  |   2 +-
 .../scanner/impl/FilterScannerTest.java         |   2 +-
 .../readsupport/SparkRowReadSupportImpl.java    |   2 +-
 .../spark/sql/CarbonDictionaryDecoder.scala     |  17 +-
 .../spark/sql/CarbonDictionaryDecoder.scala     |   9 +-
 .../sql/optimizer/CarbonLateDecodeRule.scala    |   1 +
 66 files changed, 2025 insertions(+), 839 deletions(-)
----------------------------------------------------------------------