Skip to content

[SPARK-12558][SQL][WIP] AnalysisException when multiple functions applied in GROUP BY clause #10520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dilipbiswal wants to merge 6 commits into from
Closed

[SPARK-12558][SQL][WIP] AnalysisException when multiple functions applied in GROUP BY clause #10520

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c9f2e92
[SPARK-12558] AnalysisException when multiple functions applied in GR…
dilipbiswal Dec 30, 2015
de81c21
review comments
dilipbiswal Dec 30, 2015
7dae8e1
override equals
dilipbiswal Jan 5, 2016
24b32d5
Yin's comment
dilipbiswal Jan 10, 2016
b1e2d13
Yin's comments
dilipbiswal Jan 12, 2016
41f6f02
style fix
dilipbiswal Jan 12, 2016
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
21 changes: 21 additions & 0 deletions sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveShim.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,14 @@ import scala.reflect.ClassTag

import com.esotericsoftware.kryo.Kryo
import com.esotericsoftware.kryo.io.{Input, Output}
import com.google.common.base.Objects

import org.apache.avro.Schema
import org.apache.hadoop.conf.Configuration
import org.apache.hadoop.fs.Path
import org.apache.hadoop.hive.ql.exec.{UDF, Utilities}
import org.apache.hadoop.hive.ql.plan.{FileSinkDesc, TableDesc}
import org.apache.hadoop.hive.ql.udf.generic.GenericUDFMacro
import org.apache.hadoop.hive.serde2.ColumnProjectionUtils
import org.apache.hadoop.hive.serde2.avro.{AvroGenericRecordWritable, AvroSerdeUtils}
import org.apache.hadoop.hive.serde2.objectinspector.primitive.HiveDecimalObjectInspector
Expand Down Expand Up @@ -123,6 +126,24 @@ private[hive] object HiveShim {
// for Serialization
def this() = this(null)

override def hashCode(): Int = {
if (instance != null && instance.isInstanceOf[GenericUDFMacro]) {
Copy link
Contributor

@yhuai yhuai Jan 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, should we check the class name?

Copy link
Contributor

@yhuai yhuai Jan 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean when we check if this function wrapper is for a GenericUDFMacro, should we check the class name?

Copy link
Contributor Author

@dilipbiswal dilipbiswal Jan 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yhuai Thanks !! Could users have a class that extends GenericUDFMacro ? Wouldn't we want to handle that case as well ?

Copy link
Contributor

@yhuai yhuai Jan 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hive's macro is kind of special. I do not think users can use a class that extends GenericUDFMacro (You can take a look at hive's function registry. Macro registration is handled by registerMacro.).

Copy link
Contributor Author

@dilipbiswal dilipbiswal Jan 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yhuai Ah.. thanks a lot. I understand now that its not possible for users to extend the macro.I will make the change.

Objects.hashCode(functionClassName, instance)
} else {
functionClassName.hashCode()
}
Copy link
Contributor

@yhuai yhuai Jan 11, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems we need to correct the format?

}

override def equals(other: Any): Boolean = other match {
case a: HiveFunctionWrapper =>
if (a.instance != null && a.instance.isInstanceOf[GenericUDFMacro]) {
functionClassName == a.functionClassName && instance == a.instance
} else {
functionClassName == a.functionClassName
}
case _ => false
}

@transient
def deserializeObjectByKryo[T: ClassTag](
kryo: Kryo,
Expand Down
7 changes: 7 additions & 0 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveUDFSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,13 @@ class HiveUDFSuite extends QueryTest with TestHiveSingleton with SQLTestUtils {
sqlContext.dropTempTable("testUDF")
}

test("Hive UDF in group by") {
Seq(Tuple1(1451400761)).toDF("test_date").registerTempTable("tab1")
val count = sql("select date(cast(test_date as timestamp))" +
" from tab1 group by date(cast(test_date as timestamp))").count()
Copy link
Contributor

@yhuai yhuai Jan 13, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually it will be good to use withTempTable, which will automatically drop the temp table. Also, it will be more robust if we create a temp function based on hive's org.apache.hadoop.hive.ql.udf.generic.GenericUDFToDate. So, even if we later have a native function called date, we can still test the hive udf. We can do the test change in a follow-up pr (the pr can re-use the jira number).

Copy link
Contributor

@yhuai yhuai Jan 13, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just realize it after I merge the PR. Let's have a pr to improve the test. Thanks!

assert(count == 1)
}

test("SPARK-11522 select input_file_name from non-parquet table"){

withTempDir { tempDir =>
Expand Down