carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jack...@apache.org
Subject [13/13] incubator-carbondata git commit: Merge branch 'master' of https://github.com/apache/incubator-carbondata into 12-dev
Date Wed, 05 Apr 2017 13:39:42 GMT
Merge branch 'master' of https://github.com/apache/incubator-carbondata into 12-dev


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

Branch: refs/heads/12-dev
Commit: 3f19978c01f1c043a1a675125697f8f523f65fa2
Parents: 5763f8c 950a6d0
Author: jackylk <jacky.likun@huawei.com>
Authored: Wed Apr 5 21:38:07 2017 +0800
Committer: jackylk <jacky.likun@huawei.com>
Committed: Wed Apr 5 21:38:07 2017 +0800

----------------------------------------------------------------------
 .../core/constants/CarbonCommonConstants.java   |   2 +-
 .../core/datastore/NodeMeasureDataStore.java    |  32 --
 ...ractHeavyCompressedDoubleArrayDataStore.java |  89 -----
 ...yCompressedDoubleArrayDataInMemoryStore.java |  28 --
 .../HeavyCompressedDoubleArrayDataStore.java    |  57 ++++
 .../impl/AbstractScannedResultCollector.java    |   3 +-
 .../core/util/CarbonMetadataUtil.java           |   2 +-
 .../apache/carbondata/core/util/CarbonUtil.java |   2 +-
 .../carbondata/core/util/DataTypeUtil.java      |   5 +-
 .../examples/AllDictionaryExample.scala         |   1 +
 format/src/main/thrift/carbondata.thrift        | 190 +++++------
 format/src/main/thrift/carbondata_index.thrift  |  40 ++-
 format/src/main/thrift/dictionary.thrift        |  30 +-
 .../src/main/thrift/dictionary_metadata.thrift  |  30 +-
 format/src/main/thrift/schema.thrift            | 100 +++---
 format/src/main/thrift/sort_index.thrift        |  32 +-
 .../spark/sql/catalyst/CarbonDDLSqlParser.scala |   9 +-
 .../execution/command/carbonTableSchema.scala   |   2 +-
 .../sql/execution/command/DDLStrategy.scala     |   3 +-
 .../sql/parser/CarbonSpark2SqlParser.scala      |   3 +
 .../AlterTableValidationTestCase.scala          |   8 +
 .../sort/unsafe/UnsafeCarbonRowPage.java        |   6 +-
 .../holder/UnsafeSortTempFileChunkHolder.java   |   2 +-
 .../merger/UnsafeIntermediateFileMerger.java    |   2 +-
 .../sortdata/IntermediateFileMerger.java        |   2 +-
 .../sortandgroupby/sortdata/SortDataRows.java   |   2 +-
 .../sortdata/SortTempFileChunkHolder.java       |   2 +-
 .../store/CarbonFactDataHandlerColumnar.java    | 328 +++++++++++--------
 .../processing/store/StoreFactory.java          |  33 --
 .../store/writer/CarbonFactDataWriter.java      |   4 +-
 .../writer/v1/CarbonFactDataWriterImplV1.java   |  13 +-
 .../writer/v3/CarbonFactDataWriterImplV3.java   |  14 +-
 32 files changed, 518 insertions(+), 558 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3f19978c/core/src/main/java/org/apache/carbondata/core/constants/CarbonCommonConstants.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3f19978c/core/src/main/java/org/apache/carbondata/core/util/DataTypeUtil.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3f19978c/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonDDLSqlParser.scala
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3f19978c/integration/spark-common/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3f19978c/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/UnsafeCarbonRowPage.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3f19978c/processing/src/main/java/org/apache/carbondata/processing/newflow/sort/unsafe/holder/UnsafeSortTempFileChunkHolder.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3f19978c/processing/src/main/java/org/apache/carbondata/processing/sortandgroupby/sortdata/IntermediateFileMerger.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3f19978c/processing/src/main/java/org/apache/carbondata/processing/sortandgroupby/sortdata/SortDataRows.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3f19978c/processing/src/main/java/org/apache/carbondata/processing/sortandgroupby/sortdata/SortTempFileChunkHolder.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/3f19978c/processing/src/main/java/org/apache/carbondata/processing/store/CarbonFactDataHandlerColumnar.java
----------------------------------------------------------------------


Mime
View raw message