Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2666B200C4D for ; Wed, 5 Apr 2017 15:39:37 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 255A5160B94; Wed, 5 Apr 2017 13:39:37 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D255C160BA9 for ; Wed, 5 Apr 2017 15:39:35 +0200 (CEST) Received: (qmail 98260 invoked by uid 500); 5 Apr 2017 13:39:35 -0000 Mailing-List: contact commits-help@carbondata.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@carbondata.incubator.apache.org Delivered-To: mailing list commits@carbondata.incubator.apache.org Received: (qmail 98071 invoked by uid 99); 5 Apr 2017 13:39:34 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Apr 2017 13:39:34 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 1250BC002D for ; Wed, 5 Apr 2017 13:39:34 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.221 X-Spam-Level: X-Spam-Status: No, score=-4.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id cbktyWA-liKO for ; Wed, 5 Apr 2017 13:39:32 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 4105B5FCD2 for ; Wed, 5 Apr 2017 13:39:32 +0000 (UTC) Received: (qmail 97958 invoked by uid 99); 5 Apr 2017 13:39:31 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Apr 2017 13:39:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C7053DF9FD; Wed, 5 Apr 2017 13:39:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jackylk@apache.org To: commits@carbondata.incubator.apache.org Date: Wed, 05 Apr 2017 13:39:42 -0000 Message-Id: <97591bc2e4cf46c3b6b3fe5d82982884@git.apache.org> In-Reply-To: <881d989231384a42b36ab1ed8b42221a@git.apache.org> References: <881d989231384a42b36ab1ed8b42221a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/13] incubator-carbondata git commit: Merge branch 'master' of https://github.com/apache/incubator-carbondata into 12-dev archived-at: Wed, 05 Apr 2017 13:39:37 -0000 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 Authored: Wed Apr 5 21:38:07 2017 +0800 Committer: jackylk 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 ----------------------------------------------------------------------