Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions sql/core/src/main/scala/org/apache/spark/sql/functions.scala
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import scala.util.Try
import org.apache.spark.annotation.Experimental
import org.apache.spark.sql.catalyst.{SqlParser, ScalaReflection}
import org.apache.spark.sql.catalyst.analysis.{UnresolvedFunction, Star}
import org.apache.spark.sql.catalyst.encoders.{ExpressionEncoder, Encoder}
import org.apache.spark.sql.catalyst.encoders.ExpressionEncoder
import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.expressions.aggregate._
import org.apache.spark.sql.catalyst.plans.logical.BroadcastHint
Expand Down Expand Up @@ -83,9 +83,6 @@ object functions extends LegacyFunctions {
Column(func.toAggregateExpression(isDistinct))
}

private implicit def newLongEncoder: Encoder[Long] = ExpressionEncoder[Long](flat = true)


/**
* Returns a [[Column]] based on the given column name.
*
Expand Down Expand Up @@ -269,7 +266,8 @@ object functions extends LegacyFunctions {
* @group agg_funcs
* @since 1.3.0
*/
def count(columnName: String): TypedColumn[Any, Long] = count(Column(columnName)).as[Long]
def count(columnName: String): TypedColumn[Any, Long] =
count(Column(columnName)).as(ExpressionEncoder[Long](flat = true))

/**
* Aggregate function: returns the number of distinct items in a group.
Expand Down