Repository: spark Updated Branches: refs/heads/master 5d9c37c23 -> 887e1b72d
[SPARK-6574] [PySpark] fix sql example Fix the import in sql example. Author: Davies Liu <dav...@databricks.com> Closes #5230 from davies/fix_sql_example and squashes the following commits: 7ecc5f4 [Davies Liu] fix sql example Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/887e1b72 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/887e1b72 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/887e1b72 Branch: refs/heads/master Commit: 887e1b72dfa5965f8ab1aad212fb33bb365b0e1b Parents: 5d9c37c Author: Davies Liu <dav...@databricks.com> Authored: Fri Mar 27 11:42:26 2015 -0700 Committer: Michael Armbrust <mich...@databricks.com> Committed: Fri Mar 27 11:42:26 2015 -0700 ---------------------------------------------------------------------- examples/src/main/python/sql.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/887e1b72/examples/src/main/python/sql.py ---------------------------------------------------------------------- diff --git a/examples/src/main/python/sql.py b/examples/src/main/python/sql.py index 47202fd..d89361f 100644 --- a/examples/src/main/python/sql.py +++ b/examples/src/main/python/sql.py @@ -19,7 +19,7 @@ import os from pyspark import SparkContext from pyspark.sql import SQLContext -from pyspark.sql import Row, StructField, StructType, StringType, IntegerType +from pyspark.sql.types import Row, StructField, StructType, StringType, IntegerType if __name__ == "__main__": --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
