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 2016/12/01 01:48:17 UTC
[1/2] incubator-carbondata git commit: fix compile error
Repository: incubator-carbondata
Updated Branches:
refs/heads/master 286eccb5e -> 9ad98f432
fix compile error
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/609c5d10
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/609c5d10
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/609c5d10
Branch: refs/heads/master
Commit: 609c5d10cfa952561bebbf7bcbf937907bb551a3
Parents: 286eccb
Author: jackylk <ja...@huawei.com>
Authored: Thu Dec 1 09:36:55 2016 +0800
Committer: jackylk <ja...@huawei.com>
Committed: Thu Dec 1 09:36:55 2016 +0800
----------------------------------------------------------------------
.../main/scala/org/apache/spark/sql/optimizer/CarbonOptimizer.scala | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-carbondata/blob/609c5d10/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 87b00c1..499be5c 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
@@ -24,6 +24,7 @@ import scala.collection.mutable.ArrayBuffer
import org.apache.spark.sql._
import org.apache.spark.sql.catalyst.expressions._
+import org.apache.spark.sql.catalyst.expressions.aggregate._
import org.apache.spark.sql.catalyst.optimizer.Optimizer
import org.apache.spark.sql.catalyst.plans.logical._
import org.apache.spark.sql.catalyst.rules.Rule
[2/2] incubator-carbondata git commit: Fix compile error for spark1.6
integration This closes #375
Posted by ja...@apache.org.
Fix compile error for spark1.6 integration This closes #375
Project: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/commit/9ad98f43
Tree: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/tree/9ad98f43
Diff: http://git-wip-us.apache.org/repos/asf/incubator-carbondata/diff/9ad98f43
Branch: refs/heads/master
Commit: 9ad98f4320c0601f0d6b78dd40109852af52100a
Parents: 286eccb 609c5d1
Author: jackylk <ja...@huawei.com>
Authored: Thu Dec 1 09:47:54 2016 +0800
Committer: jackylk <ja...@huawei.com>
Committed: Thu Dec 1 09:47:54 2016 +0800
----------------------------------------------------------------------
.../main/scala/org/apache/spark/sql/optimizer/CarbonOptimizer.scala | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------