You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by co...@apache.org on 2016/06/13 01:20:55 UTC
zeppelin git commit: ZEPPELIN-985 ] Fixed bug in the Pyspark
completion
Repository: zeppelin
Updated Branches:
refs/heads/master 5252ea7a7 -> dd70a5729
ZEPPELIN-985 ] Fixed bug in the Pyspark completion
### What is this PR for?
Currently, does not work 'pyspark completion'.
### What type of PR is it?
Bug Fix
### Todos
- [x] - change standard output for completion to interpreter outer.
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-985
### How should this be tested?
Try keyword completion for pyspark interpreter.
### Screenshots (if appropriate)
#### Before
#### After
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: CloverHearts <cl...@gmail.com>
Closes #988 from cloverhearts/hotfix/nwPyspark and squashes the following commits:
7c09a7a [CloverHearts] fixed pyspark completion.
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/dd70a572
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/dd70a572
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/dd70a572
Branch: refs/heads/master
Commit: dd70a5729b40069972c06e49f98f39ea0fdbaf5b
Parents: 5252ea7
Author: CloverHearts <cl...@gmail.com>
Authored: Fri Jun 10 18:57:16 2016 +0900
Committer: Damien CORNEAU <co...@gmail.com>
Committed: Mon Jun 13 10:20:40 2016 +0900
----------------------------------------------------------------------
spark/src/main/resources/python/zeppelin_pyspark.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/dd70a572/spark/src/main/resources/python/zeppelin_pyspark.py
----------------------------------------------------------------------
diff --git a/spark/src/main/resources/python/zeppelin_pyspark.py b/spark/src/main/resources/python/zeppelin_pyspark.py
index 83ab7b3..0ea5474 100644
--- a/spark/src/main/resources/python/zeppelin_pyspark.py
+++ b/spark/src/main/resources/python/zeppelin_pyspark.py
@@ -118,6 +118,9 @@ class SparkVersion(object):
return self.version >= self.SPARK_1_3_0
class PySparkCompletion:
+ def __init__(self, interpreterObject):
+ self.interpreterObject = interpreterObject
+
def getGlobalCompletion(self):
objectDefList = []
try:
@@ -159,9 +162,10 @@ class PySparkCompletion:
for completionItem in list(objectCompletionList):
completionList.add(completionItem)
if len(completionList) <= 0:
- print("")
+ self.interpreterObject.setStatementsFinished("", False)
else:
- print(json.dumps(list(filter(lambda x : not re.match("^__.*", x), list(completionList)))))
+ result = json.dumps(list(filter(lambda x : not re.match("^__.*", x), list(completionList))))
+ self.interpreterObject.setStatementsFinished(result, False)
output = Logger()
@@ -205,7 +209,7 @@ sc = SparkContext(jsc=jsc, gateway=gateway, conf=conf)
sqlc = SQLContext(sc, intp.getSQLContext())
sqlContext = sqlc
-completion = PySparkCompletion()
+completion = PySparkCompletion(intp)
z = PyZeppelinContext(intp.getZeppelinContext())
while True :