aboutsummaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorReynold Xin <rxin@databricks.com>2015-02-16 19:00:30 -0800
committerReynold Xin <rxin@databricks.com>2015-02-16 19:00:30 -0800
commit0e180bfc3c7f18780d4fc4f42681609832418e43 (patch)
treee87dc86f26072db58ec4e71030c782d197e65e46 /python
parent58a82a7882d7a8a7e4064278c4bf28607d9a42ba (diff)
downloadspark-0e180bfc3c7f18780d4fc4f42681609832418e43.tar.gz
spark-0e180bfc3c7f18780d4fc4f42681609832418e43.tar.bz2
spark-0e180bfc3c7f18780d4fc4f42681609832418e43.zip
[SQL] Various DataFrame doc changes.
Added a bunch of tags. Also changed parquetFile to take varargs rather than a string followed by varargs. Author: Reynold Xin <rxin@databricks.com> Closes #4636 from rxin/df-doc and squashes the following commits: 651f80c [Reynold Xin] Fixed parquetFile in PySpark. 8dc3024 [Reynold Xin] [SQL] Various DataFrame doc changes.
Diffstat (limited to 'python')
-rw-r--r--python/pyspark/sql/context.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/python/pyspark/sql/context.py b/python/pyspark/sql/context.py
index 7683c1b4df..dd2cd5ee76 100644
--- a/python/pyspark/sql/context.py
+++ b/python/pyspark/sql/context.py
@@ -431,11 +431,10 @@ class SQLContext(object):
True
"""
gateway = self._sc._gateway
- jpath = paths[0]
- jpaths = gateway.new_array(gateway.jvm.java.lang.String, len(paths) - 1)
- for i in range(1, len(paths)):
+ jpaths = gateway.new_array(gateway.jvm.java.lang.String, len(paths))
+ for i in range(0, len(paths)):
jpaths[i] = paths[i]
- jdf = self._ssql_ctx.parquetFile(jpath, jpaths)
+ jdf = self._ssql_ctx.parquetFile(jpaths)
return DataFrame(jdf, self)
def jsonFile(self, path, schema=None, samplingRatio=1.0):