diff options
author | Reynold Xin <rxin@databricks.com> | 2015-02-19 12:09:44 -0800 |
---|---|---|
committer | Michael Armbrust <michael@databricks.com> | 2015-02-19 12:15:18 -0800 |
commit | 55d91d92bcdd56c479138cbdd9d2354bb8db52a7 (patch) | |
tree | ac64514307c4b6e5c6cf7a16244e591f6b4abb0b /dev/merge_spark_pr.py | |
parent | fe00eb66e8a65e23e81d401da32c5d5de8180394 (diff) | |
download | spark-55d91d92bcdd56c479138cbdd9d2354bb8db52a7.tar.gz spark-55d91d92bcdd56c479138cbdd9d2354bb8db52a7.tar.bz2 spark-55d91d92bcdd56c479138cbdd9d2354bb8db52a7.zip |
[SPARK-5904][SQL] DataFrame API fixes.
1. Column is no longer a DataFrame to simplify class hierarchy.
2. Don't use varargs on abstract methods (see Scala compiler bug SI-9013).
Author: Reynold Xin <rxin@databricks.com>
Closes #4686 from rxin/SPARK-5904 and squashes the following commits:
fd9b199 [Reynold Xin] Fixed Python tests.
df25cef [Reynold Xin] Non final.
5221530 [Reynold Xin] [SPARK-5904][SQL] DataFrame API fixes.
Conflicts:
sql/core/src/main/scala/org/apache/spark/sql/DataFrameImpl.scala
Diffstat (limited to 'dev/merge_spark_pr.py')
0 files changed, 0 insertions, 0 deletions