spark git commit: [HOTFIX] Fix compilation.

2017-04-17 Thread rxin 
Repository: spark
Updated Branches:
  refs/heads/branch-2.1 db9517c16 -> 622d7a8bf


[HOTFIX] Fix compilation.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/622d7a8b
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/622d7a8b
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/622d7a8b

Branch: refs/heads/branch-2.1
Commit: 622d7a8bf6be22e30db7ff38604ed86b44fcc87e
Parents: db9517c
Author: Reynold Xin 
Authored: Mon Apr 17 12:57:58 2017 -0700
Committer: Reynold Xin 
Committed: Mon Apr 17 12:57:58 2017 -0700

--
 .../apache/spark/sql/catalyst/expressions/regexpExpressions.scala | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/622d7a8b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/regexpExpressions.scala
--
diff --git 
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/regexpExpressions.scala
 
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/regexpExpressions.scala
index ad12177..0325d0e 100644
--- 
a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/regexpExpressions.scala
+++ 
b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/regexpExpressions.scala
@@ -92,7 +92,8 @@ trait StringRegexExpression extends ImplicitCastInputTypes {
 See also:
   Use RLIKE to match with standard regular expressions.
 """)
-case class Like(left: Expression, right: Expression) extends 
StringRegexExpression {
+case class Like(left: Expression, right: Expression)
+  extends BinaryExpression with StringRegexExpression {
 
   override def escape(v: String): String = StringUtils.escapeLikeRegex(v)
 


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

spark git commit: [HOTFIX] Fix compilation

2016-04-25 Thread rxin 
Repository: spark
Updated Branches:
  refs/heads/master 18c2c9258 -> d2614eaad


[HOTFIX] Fix compilation


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

Branch: refs/heads/master
Commit: d2614eaadb93a48fba27fe7de64aff942e345f8e
Parents: 18c2c92
Author: Reynold Xin 
Authored: Mon Apr 25 21:24:06 2016 -0700
Committer: Reynold Xin 
Committed: Mon Apr 25 21:24:06 2016 -0700

--
 .../main/scala/org/apache/spark/sql/hive/HiveContext.scala   | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/d2614eaa/sql/hivecontext-compatibility/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
--
diff --git 
a/sql/hivecontext-compatibility/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
 
b/sql/hivecontext-compatibility/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
index 65fcba8..bb76897 100644
--- 
a/sql/hivecontext-compatibility/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
+++ 
b/sql/hivecontext-compatibility/src/main/scala/org/apache/spark/sql/hive/HiveContext.scala
@@ -29,7 +29,7 @@ import org.apache.spark.sql.{SparkSession, SQLContext}
  */
 @deprecated("Use SparkSession.withHiveSupport instead", "2.0.0")
 class HiveContext private[hive](
-@transient private val sparkSession: SparkSession,
+sparkSession: SparkSession,
 isRootContext: Boolean)
   extends SQLContext(sparkSession, isRootContext) with Logging {
 
@@ -47,15 +47,15 @@ class HiveContext private[hive](
* and Hive client (both of execution and metadata) with existing 
HiveContext.
*/
   override def newSession(): HiveContext = {
-new HiveContext(sparkSession.newSession(), isRootContext = false)
+new HiveContext(super.sparkSession.newSession(), isRootContext = false)
   }
 
   protected[sql] override def sessionState: HiveSessionState = {
-sparkSession.sessionState.asInstanceOf[HiveSessionState]
+super.sparkSession.sessionState.asInstanceOf[HiveSessionState]
   }
 
   protected[sql] override def sharedState: HiveSharedState = {
-sparkSession.sharedState.asInstanceOf[HiveSharedState]
+super.sparkSession.sharedState.asInstanceOf[HiveSharedState]
   }
 
 }


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

spark git commit: [HOTFIX] Fix compilation break.

2016-04-02 Thread rxin 
Repository: spark
Updated Branches:
  refs/heads/master d7982a3a9 -> 67d753516


[HOTFIX] Fix compilation break.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/67d75351
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/67d75351
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/67d75351

Branch: refs/heads/master
Commit: 67d753516da9b6318cd4001bb7ae91703aaf098d
Parents: d7982a3
Author: Reynold Xin 
Authored: Sat Apr 2 00:00:19 2016 -0700
Committer: Reynold Xin 
Committed: Sat Apr 2 00:00:19 2016 -0700

--
 .../spark/sql/execution/streaming/HDFSMetadataLogSuite.scala | 1 +
 .../spark/sql/streaming/StreamingAggregationSuite.scala  | 8 +++-
 2 files changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/67d75351/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/HDFSMetadataLogSuite.scala
--
diff --git 
a/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/HDFSMetadataLogSuite.scala
 
b/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/HDFSMetadataLogSuite.scala
index d5db9db..1328142 100644
--- 
a/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/HDFSMetadataLogSuite.scala
+++ 
b/sql/core/src/test/scala/org/apache/spark/sql/execution/streaming/HDFSMetadataLogSuite.scala
@@ -21,6 +21,7 @@ import java.io.{File, FileNotFoundException, IOException}
 import java.net.URI
 import java.util.ConcurrentModificationException
 
+import scala.language.implicitConversions
 import scala.util.Random
 
 import org.apache.hadoop.conf.Configuration

http://git-wip-us.apache.org/repos/asf/spark/blob/67d75351/sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamingAggregationSuite.scala
--
diff --git 
a/sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamingAggregationSuite.scala
 
b/sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamingAggregationSuite.scala
index b63ce89..3af7c01 100644
--- 
a/sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamingAggregationSuite.scala
+++ 
b/sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamingAggregationSuite.scala
@@ -18,8 +18,9 @@
 package org.apache.spark.sql.streaming
 
 import org.apache.spark.SparkException
-import org.apache.spark.sql.{Encoder, StreamTest, SumOf, TypedColumn}
+import org.apache.spark.sql.StreamTest
 import org.apache.spark.sql.execution.streaming._
+import org.apache.spark.sql.expressions.scala.typed
 import org.apache.spark.sql.functions._
 import org.apache.spark.sql.test.SharedSQLContext
 
@@ -118,11 +119,8 @@ class StreamingAggregationSuite extends StreamTest with 
SharedSQLContext {
   }
 
   test("typed aggregators") {
-def sum[I, N : Numeric : Encoder](f: I => N): TypedColumn[I, N] =
-  new SumOf(f).toColumn
-
 val inputData = MemoryStream[(String, Int)]
-val aggregated = inputData.toDS().groupByKey(_._1).agg(sum(_._2))
+val aggregated = inputData.toDS().groupByKey(_._1).agg(typed.sumLong(_._2))
 
 testStream(aggregated)(
   AddData(inputData, ("a", 10), ("a", 20), ("b", 1), ("b", 2), ("c", 1)),


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

spark git commit: [HOTFIX] Fix compilation break

2016-02-21 Thread rxin 
Repository: spark
Updated Branches:
  refs/heads/master 819b0ea02 -> 9bf6a926a


[HOTFIX] Fix compilation break


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/9bf6a926
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/9bf6a926
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/9bf6a926

Branch: refs/heads/master
Commit: 9bf6a926a1071fa59f76ab12b23df8de618f1cae
Parents: 819b0ea
Author: Reynold Xin 
Authored: Sun Feb 21 19:37:35 2016 -0800
Committer: Reynold Xin 
Committed: Sun Feb 21 19:37:35 2016 -0800

--
 .../scala/org/apache/spark/sql/catalyst/CatalystQlSuite.scala   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/9bf6a926/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/CatalystQlSuite.scala
--
diff --git 
a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/CatalystQlSuite.scala
 
b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/CatalystQlSuite.scala
index 1d1c0cb..812aa5a 100644
--- 
a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/CatalystQlSuite.scala
+++ 
b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/CatalystQlSuite.scala
@@ -22,7 +22,6 @@ import org.apache.spark.sql.catalyst.analysis._
 import org.apache.spark.sql.catalyst.expressions._
 import org.apache.spark.sql.catalyst.plans.PlanTest
 import org.apache.spark.sql.catalyst.plans.logical._
-import org.apache.spark.sql.types.BooleanType
 import org.apache.spark.unsafe.types.CalendarInterval
 
 class CatalystQlSuite extends PlanTest {
@@ -213,7 +212,7 @@ class CatalystQlSuite extends PlanTest {
 
 val expected = Project(
   UnresolvedAlias(UnresolvedAttribute("u_1.id"), None) :: Nil,
-  Subquery("u_1",
+  SubqueryAlias("u_1",
 Union(
   Union(
 Project(
@@ -247,7 +246,7 @@ class CatalystQlSuite extends PlanTest {
 
 val expected2 = Project(
   UnresolvedAlias(UnresolvedAttribute("u_1.id"), None) :: Nil,
-  Subquery("u_1",
+  SubqueryAlias("u_1",
 Union(
   Union(
 Union(


-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org