Skip to content

[SPARK-30808][SQL] Enable Java 8 time API in Thrift server #27552

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
MaxGekk wants to merge 19 commits into from
Closed

[SPARK-30808][SQL] Enable Java 8 time API in Thrift server #27552

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
916838a
Enable Java 8 time API in thrift server
MaxGekk Feb 12, 2020
d98cdbc
Convert Instant/LocalDate to Timestamp/Date for correct formatting
MaxGekk Feb 13, 2020
580dd09
Big fix
MaxGekk Feb 13, 2020
deaef58
Set DATETIME_JAVA8API_ENABLED in HiveResult
MaxGekk Feb 16, 2020
804e709
Merge remote-tracking branch 'remotes/origin/master' into hive-thrift…
MaxGekk Feb 16, 2020
80f4c89
Fix StackOverflowError
MaxGekk Feb 16, 2020
d3131a5
Dataset[T] -> Dataset[_]
MaxGekk Feb 17, 2020
e68e622
Use Dataset.ofRows
MaxGekk Feb 17, 2020
e491f96
Use withActive
MaxGekk Feb 17, 2020
95597a7
Fix typo
MaxGekk Feb 17, 2020
2086bbf
Remove unused import
MaxGekk Feb 17, 2020
69f63b2
Use df.queryExecution in SparkSQLDriver
MaxGekk Feb 17, 2020
cdb322d
Embed dataset to HiveComparisonTest
MaxGekk Feb 17, 2020
5ac5e77
Add a comment
MaxGekk Feb 17, 2020
ce77628
Add a comment to SparkExecuteStatementOperation
MaxGekk Feb 17, 2020
f9112b7
Minor change
MaxGekk Feb 17, 2020
2129f30
Revert "Embed dataset to HiveComparisonTest"
MaxGekk Feb 17, 2020
902f9d8
Replace ds.queryExecution.logical by ds.logicalPlan
MaxGekk Feb 17, 2020
880b1de
Bug fix
MaxGekk Feb 17, 2020
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: 7 additions & 1 deletion ...rc/main/scala/org/apache/spark/sql/hive/thriftserver/SparkExecuteStatementOperation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package org.apache.spark.sql.hive.thriftserver

import java.security.PrivilegedExceptionAction
import java.sql.{Date, Timestamp}
import java.time.{Instant, LocalDate}
import java.util.{Arrays, Map => JMap, UUID}
import java.util.concurrent.RejectedExecutionException

Expand Down Expand Up @@ -178,7 +179,12 @@ private[hive] class SparkExecuteStatementOperation(
}
curCol += 1
}
resultRowSet.addRow(row.toArray.asInstanceOf[Array[Object]])
val resultRow = row.map {
Comment thread
cloud-fan marked this conversation as resolved.
case i: Instant => Timestamp.from(i).toString
case ld: LocalDate => Date.valueOf(ld)
case other => other
}.toArray.asInstanceOf[Array[Object]]
resultRowSet.addRow(resultRow)
curRow += 1
resultOffset += 1
}
Expand Down
3 changes: 3 additions & 0 deletions ...hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkSQLEnv.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import org.apache.spark.{SparkConf, SparkContext}
import org.apache.spark.internal.Logging
import org.apache.spark.sql.{SparkSession, SQLContext}
import org.apache.spark.sql.hive.{HiveExternalCatalog, HiveUtils}
import org.apache.spark.sql.internal.SQLConf
Comment thread
MaxGekk marked this conversation as resolved.
Outdated
import org.apache.spark.util.Utils

/** A singleton object for the master program. The slaves should not access this. */
Expand All @@ -45,6 +46,8 @@ private[hive] object SparkSQLEnv extends Logging {

sparkConf
.setAppName(maybeAppName.getOrElse(s"SparkSQL::${Utils.localHostName()}"))
.set(SQLConf.DATETIME_JAVA8API_ENABLED, true)


val sparkSession = SparkSession.builder.config(sparkConf).enableHiveSupport().getOrCreate()
sparkContext = sparkSession.sparkContext
Expand Down