Skip to content

[SPARK-5722][SQL] fix for infer long type in python similar to Java long #4521

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
dondrake wants to merge 9 commits into from
Closed

[SPARK-5722][SQL] fix for infer long type in python similar to Java long #4521

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f53b94c
fix for SPARK-5722 infer long type in python similar to Java long
dondrake Feb 11, 2015
c07e6f2
added comment for SPARK-5722
dondrake Feb 11, 2015
16d63f4
added a saveAsParquetFile() as part of test for SPARK-5722
dondrake Feb 11, 2015
09be060
added saveAsParquetFile() for SPARK-5722
dondrake Feb 11, 2015
a694093
Merge branch 'branch-1.2' of https://github.com/dondrake/spark into b…
dondrake Feb 11, 2015
41f363a
after dialog on PR, just infer all int's to long's.
dondrake Feb 12, 2015
0d2bcd2
PEP 8 fix
dondrake Feb 12, 2015
97cf704
ensure LongType's are converted to Long
dondrake Feb 17, 2015
69ce6d0
LongType's are now converted
dondrake Feb 17, 2015
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
4 changes: 4 additions & 0 deletions python/pyspark/sql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,10 @@ def _infer_type(obj):

dataType = _type_mappings.get(type(obj))
if dataType is not None:
# Conform to Java int/long sizes SPARK-5722
if dataType == IntegerType:
Copy link
Contributor

@davies davies Feb 11, 2015

Choose a reason for hiding this comment

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

Add a comment here.

if obj > 2**31 - 1 or obj < -2**31:
dataType = LongType
return dataType()

if isinstance(obj, dict):
Expand Down
16 changes: 15 additions & 1 deletion python/pyspark/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
CloudPickleSerializer, CompressedSerializer
from pyspark.shuffle import Aggregator, InMemoryMerger, ExternalMerger, ExternalSorter
from pyspark.sql import SQLContext, IntegerType, Row, ArrayType, StructType, StructField, \
UserDefinedType, DoubleType
UserDefinedType, DoubleType, LongType, _infer_type
from pyspark import shuffle

_have_scipy = False
Expand Down Expand Up @@ -923,6 +923,20 @@ def test_infer_schema(self):
result = self.sqlCtx.sql("SELECT l[0].a from test2 where d['key'].d = '2'")
self.assertEqual(1, result.first()[0])

def test_infer_long_type(self):
longrow = [Row(f1='a', f2=100000000000000)]
lrdd = self.sc.parallelize(longrow)
slrdd = self.sqlCtx.inferSchema(lrdd)
self.assertEqual(slrdd.schema().fields[1].dataType, LongType())

self.assertEqual(_infer_type(1), IntegerType())
self.assertEqual(_infer_type(2**10), IntegerType())
self.assertEqual(_infer_type(2**20), IntegerType())
self.assertEqual(_infer_type(2**31 - 1), IntegerType())
self.assertEqual(_infer_type(2**31), LongType())
self.assertEqual(_infer_type(2**61), LongType())
self.assertEqual(_infer_type(2**71), LongType())

def test_convert_row_to_dict(self):
row = Row(l=[Row(a=1, b='s')], d={"key": Row(c=1.0, d="2")})
self.assertEqual(1, row.asDict()['l'][0].a)
Expand Down