diff options
| author | Reynold Xin <rxin@databricks.com> | 2015-02-16 19:00:30 -0800 |
|---|---|---|
| committer | Reynold Xin <rxin@databricks.com> | 2015-02-16 19:00:47 -0800 |
| commit | e355b54de8ef38af0900c78c8901d5a1abe58aaa (patch) | |
| tree | 17ec1458b980e5e183b649d35d6998e3b5942c31 /python | |
| parent | 385a339a2e685e2a985587cf459cd329912946e9 (diff) | |
| download | spark-e355b54de8ef38af0900c78c8901d5a1abe58aaa.tar.gz spark-e355b54de8ef38af0900c78c8901d5a1abe58aaa.tar.bz2 spark-e355b54de8ef38af0900c78c8901d5a1abe58aaa.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.
(cherry picked from commit 0e180bfc3c7f18780d4fc4f42681609832418e43)
Signed-off-by: Reynold Xin <rxin@databricks.com>
Diffstat (limited to 'python')
| -rw-r--r-- | python/pyspark/sql/context.py | 7 |
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): |