carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jack...@apache.org
Subject [1/2] incubator-carbondata git commit: Fixed compilation issue in Spark1.6
Date Mon, 09 Jan 2017 01:58:09 GMT
Repository: incubator-carbondata
Updated Branches:
  refs/heads/master 96ef7f4c4 -> f7f40c09f


Fixed compilation issue in Spark1.6


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

Branch: refs/heads/master
Commit: e2f7bbac6e4019676ae09ab8d46876752d42dde1
Parents: 96ef7f4
Author: ravipesala <ravi.pesala@gmail.com>
Authored: Sun Jan 8 16:40:00 2017 +0530
Committer: jackylk <jacky.likun@huawei.com>
Committed: Mon Jan 9 09:57:23 2017 +0800

----------------------------------------------------------------------
 .../spark/sql/catalyst/CarbonTableIdentifierImplicit.scala    | 7 +++++++
 .../scala/org/apache/spark/sql/hive/CarbonAnalysisRules.scala | 1 +
 .../org/apache/spark/sql/optimizer/CarbonOptimizer.scala      | 1 +
 3 files changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/e2f7bbac/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonTableIdentifierImplicit.scala
----------------------------------------------------------------------
diff --git a/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonTableIdentifierImplicit.scala
b/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonTableIdentifierImplicit.scala
index 55441cf..cb754d8 100644
--- a/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonTableIdentifierImplicit.scala
+++ b/integration/spark-common/src/main/scala/org/apache/spark/sql/catalyst/CarbonTableIdentifierImplicit.scala
@@ -37,4 +37,11 @@ object CarbonTableIdentifierImplicit {
       case _ => Seq(tableIdentifier.table)
     }
   }
+
+  implicit def toOptionalSequence(alias: Option[String]): Option[Seq[String]] = {
+    alias match {
+      case Some(alias) => Some(Seq(alias))
+      case _ => None
+    }
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/e2f7bbac/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonAnalysisRules.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonAnalysisRules.scala
b/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonAnalysisRules.scala
index 07ed1d4..f22e958 100644
--- a/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonAnalysisRules.scala
+++ b/integration/spark/src/main/scala/org/apache/spark/sql/hive/CarbonAnalysisRules.scala
@@ -18,6 +18,7 @@ package org.apache.spark.sql.hive
 
 import org.apache.spark.sql._
 import org.apache.spark.sql.catalyst.CarbonTableIdentifierImplicit
+import org.apache.spark.sql.catalyst.CarbonTableIdentifierImplicit._
 import org.apache.spark.sql.catalyst.analysis.{UnresolvedAlias, UnresolvedFunction, UnresolvedRelation,
UnresolvedStar}
 import org.apache.spark.sql.catalyst.expressions.Alias
 import org.apache.spark.sql.catalyst.plans.Inner

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/e2f7bbac/integration/spark/src/main/scala/org/apache/spark/sql/optimizer/CarbonOptimizer.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/optimizer/CarbonOptimizer.scala
b/integration/spark/src/main/scala/org/apache/spark/sql/optimizer/CarbonOptimizer.scala
index fea79a5..c893035 100644
--- a/integration/spark/src/main/scala/org/apache/spark/sql/optimizer/CarbonOptimizer.scala
+++ b/integration/spark/src/main/scala/org/apache/spark/sql/optimizer/CarbonOptimizer.scala
@@ -23,6 +23,7 @@ import scala.collection.JavaConverters._
 import scala.collection.mutable.ArrayBuffer
 
 import org.apache.spark.sql._
+import org.apache.spark.sql.catalyst.CarbonTableIdentifierImplicit._
 import org.apache.spark.sql.catalyst.expressions._
 import org.apache.spark.sql.catalyst.expressions.aggregate._
 import org.apache.spark.sql.catalyst.optimizer.Optimizer


Mime
View raw message