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/04/05 13:39:38 UTC
[09/13] incubator-carbondata git commit: Issue :
https://issues.apache.org/jira/browse/CARBONDATA-849
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/12-dev
Commit: 8245e5dbc324e1998fc64e0061018695a49bc088
Parents: c62b299
Author: ravikiran <ra...@gmail.com>
Authored: Tue Apr 4 15:13:25 2017 +0530
Committer: ravipesala <ra...@gmail.com>
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 =>