carbondata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ravipes...@apache.org
Subject [24/50] [abbrv] incubator-carbondata git commit: Supporting Spark 1.6.3 Version in CarbonData
Date Fri, 20 Jan 2017 17:39:32 GMT
Supporting Spark 1.6.3 Version in CarbonData

# Conflicts:
#	docs/Building-CarbonData-And-IDE-Configuartion.md


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

Branch: refs/heads/branch-1.0
Commit: 75a94c03ec68eae0f19306fa596a31eeba4e9c5a
Parents: ee95624
Author: nareshpr <prnaresh.naresh@gmail.com>
Authored: Thu Jan 19 19:15:21 2017 +0530
Committer: ravipesala <ravi.pesala@gmail.com>
Committed: Fri Jan 20 12:51:05 2017 +0530

----------------------------------------------------------------------
 build/README.md                                                | 1 +
 .../main/scala/org/apache/spark/sql/CodeGenerateFactory.scala  | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/75a94c03/build/README.md
----------------------------------------------------------------------
diff --git a/build/README.md b/build/README.md
index a150a90..0115f5d 100644
--- a/build/README.md
+++ b/build/README.md
@@ -48,6 +48,7 @@ mvn -DskipTests -Pspark-1.5 -Dspark.version=1.5.2 clean package
  
 mvn -DskipTests -Pspark-1.6 -Dspark.version=1.6.1 clean package
 mvn -DskipTests -Pspark-1.6 -Dspark.version=1.6.2 clean package
+mvn -DskipTests -Pspark-1.6 -Dspark.version=1.6.3 clean package
 
 mvn -DskipTests -Pspark-2.1 -Dspark.version=2.1.0 clean package
 ```

http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/75a94c03/integration/spark/src/main/scala/org/apache/spark/sql/CodeGenerateFactory.scala
----------------------------------------------------------------------
diff --git a/integration/spark/src/main/scala/org/apache/spark/sql/CodeGenerateFactory.scala
b/integration/spark/src/main/scala/org/apache/spark/sql/CodeGenerateFactory.scala
index 7ab2bf7..065dfed 100644
--- a/integration/spark/src/main/scala/org/apache/spark/sql/CodeGenerateFactory.scala
+++ b/integration/spark/src/main/scala/org/apache/spark/sql/CodeGenerateFactory.scala
@@ -25,8 +25,8 @@ import org.apache.spark.util.{ScalaCompilerUtil, Utils}
 
 private[sql] class CodeGenerateFactory(version: String) {
 
-  val optimizerFactory = if (version.equals("1.6.2")) {
-    ScalaCompilerUtil.compiledCode(CodeTemplates.spark1_6_2_OptimizerString)
+  val optimizerFactory = if (version.equals("1.6.2") || version.equals("1.6.3")) {
+    ScalaCompilerUtil.compiledCode(CodeTemplates.spark1_6_OptimizerString)
       .asInstanceOf[AbstractCarbonOptimizerFactory]
   } else if (version.startsWith("1.6") || version.startsWith("1.5")) {
     ScalaCompilerUtil.compiledCode(CodeTemplates.defaultOptimizerString)
@@ -90,7 +90,7 @@ object CodeGenerateFactory {
 
 object CodeTemplates {
 
-  val spark1_6_2_OptimizerString =
+  val spark1_6_OptimizerString =
     s"""
        import org.apache.spark.sql._;
        import org.apache.spark.sql.optimizer._;


Mime
View raw message