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 4A51E200C4D for ; Wed, 5 Apr 2017 09:48:01 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 48F62160B94; Wed, 5 Apr 2017 07:48:01 +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 905C5160B91 for ; Wed, 5 Apr 2017 09:48:00 +0200 (CEST) Received: (qmail 90270 invoked by uid 500); 5 Apr 2017 07:47:59 -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 90261 invoked by uid 99); 5 Apr 2017 07:47:59 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Apr 2017 07:47:59 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 677391A076B for ; Wed, 5 Apr 2017 07:47:59 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -3.722 X-Spam-Level: X-Spam-Status: No, score=-3.722 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_NUMSUBJECT=0.5, 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] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id bCmn5Js9Havb for ; Wed, 5 Apr 2017 07:47:58 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 8C6305FCC8 for ; Wed, 5 Apr 2017 07:47:52 +0000 (UTC) Received: (qmail 90174 invoked by uid 99); 5 Apr 2017 07:47:51 -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 07:47:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 82E26DFBAB; Wed, 5 Apr 2017 07:47:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ravipesala@apache.org To: commits@carbondata.incubator.apache.org Date: Wed, 05 Apr 2017 07:47:51 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] incubator-carbondata git commit: Issue : https://issues.apache.org/jira/browse/CARBONDATA-849 archived-at: Wed, 05 Apr 2017 07:48:01 -0000 Repository: incubator-carbondata Updated Branches: refs/heads/master c62b29979 -> bd044c208 Issue : https://issues.apache.org/jira/browse/CARBONDATA-849 Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/8245e5db Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/8245e5db Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/8245e5db Branch: refs/heads/master Commit: 8245e5dbc324e1998fc64e0061018695a49bc088 Parents: c62b299 Author: ravikiran Authored: Tue Apr 4 15:13:25 2017 +0530 Committer: ravipesala Committed: Wed Apr 5 13:16:59 2017 +0530 ---------------------------------------------------------------------- .../apache/spark/sql/execution/command/carbonTableSchema.scala | 2 +- .../org/apache/spark/sql/execution/command/DDLStrategy.scala | 3 ++- .../scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8245e5db/integration/spark-common/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala ---------------------------------------------------------------------- diff --git a/integration/spark-common/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala b/integration/spark-common/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala index 3346743..6c44264 100644 --- a/integration/spark-common/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala +++ b/integration/spark-common/src/main/scala/org/apache/spark/sql/execution/command/carbonTableSchema.scala @@ -104,7 +104,7 @@ case class AlterTableModel(dbName: Option[String], segmentUpdateStatusManager: Option[SegmentUpdateStatusManager], compactionType: String, factTimeStamp: Option[Long], - alterSql: String) + var alterSql: String) case class UpdateTableModel(isUpdate: Boolean, updatedTimeStamp: Long, http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8245e5db/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/DDLStrategy.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/DDLStrategy.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/DDLStrategy.scala index fb15d6d..2916a9f 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/DDLStrategy.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/execution/command/DDLStrategy.scala @@ -72,7 +72,8 @@ class DDLStrategy(sparkSession: SparkSession) extends SparkStrategy { "Unsupported alter operation on carbon table") } } else { - throw new MalformedCarbonCommandException("Unsupported alter operation on hive table") + throw new MalformedCarbonCommandException( + "Operation not allowed : " + altertablemodel.alterSql) } case dataTypeChange@AlterTableDataTypeChange(alterTableChangeDataTypeModel) => val isCarbonTable = CarbonEnv.get.carbonMetastore http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/8245e5db/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala ---------------------------------------------------------------------- diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala index dbc3124..695f5fc 100644 --- a/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala +++ b/integration/spark2/src/main/scala/org/apache/spark/sql/parser/CarbonSpark2SqlParser.scala @@ -43,6 +43,9 @@ class CarbonSpark2SqlParser extends CarbonDDLSqlParser { case x: LoadTable => x.inputSqlString = input x + case x: AlterTableCompaction => + x.alterTableModel.alterSql = input + x case logicalPlan => logicalPlan } case failureOrError =>