Skip to content

[SPARK-19561][SQL] add int case handling for TimestampType #17200

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
JasonMWhite wants to merge 5 commits into from
Closed

[SPARK-19561][SQL] add int case handling for TimestampType #17200

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4238533
cast TimestampType.toInternal output to long
Feb 11, 2017
5b1dd67
replace int function call with long
Feb 16, 2017
a1936af
add TimestampType int handling in EvaluatePython, remove casting to l…
Mar 9, 2017
a198d49
linter
Mar 9, 2017
bee635a
add comment explaining adding Int case handling
Mar 9, 2017
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: 8 additions & 0 deletions python/pyspark/sql/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1435,6 +1435,14 @@ def test_time_with_timezone(self):
self.assertEqual(now, now1)
self.assertEqual(now, utcnow1)

# regression test for SPARK-19561
def test_datetime_at_epoch(self):
epoch = datetime.datetime.fromtimestamp(0)
df = self.spark.createDataFrame([Row(date=epoch)]).select('date', lit(epoch).alias('lit_date'))
first = df.first()
self.assertEqual(first['date'], epoch)
self.assertEqual(first['lit_date'], epoch)

def test_decimal(self):
from decimal import Decimal
schema = StructType([StructField("decimal", DecimalType(10, 5))])
Expand Down
1 change: 1 addition & 0 deletions sql/core/src/main/scala/org/apache/spark/sql/execution/python/EvaluatePython.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ object EvaluatePython {
case (c: Int, DateType) => c

case (c: Long, TimestampType) => c
case (c: Int, TimestampType) => c.toLong
Copy link
Member

@viirya viirya Mar 9, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

Can you add a comment for the reason why we recognize Int as TimestampType too here?


case (c, StringType) => UTF8String.fromString(c.toString)

Expand Down