You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by ma...@apache.org on 2017/01/17 17:59:03 UTC
[1/3] incubator-toree git commit: Add Flush Method to Logger so it
can be compliant to stream interface
Repository: incubator-toree
Updated Branches:
refs/heads/master e06da57a8 -> 70b804bd7
Add Flush Method to Logger so it can be compliant to stream interface
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/e1dc4e54
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/e1dc4e54
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/e1dc4e54
Branch: refs/heads/master
Commit: e1dc4e5414599ea2d298540a4805d0f87a83d5eb
Parents: 9b577f1
Author: David Taieb <da...@us.ibm.com>
Authored: Wed Jan 4 08:36:49 2017 -0500
Committer: David Taieb <da...@us.ibm.com>
Committed: Wed Jan 4 08:36:49 2017 -0500
----------------------------------------------------------------------
pyspark-interpreter/src/main/resources/PySpark/pyspark_runner.py | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/e1dc4e54/pyspark-interpreter/src/main/resources/PySpark/pyspark_runner.py
----------------------------------------------------------------------
diff --git a/pyspark-interpreter/src/main/resources/PySpark/pyspark_runner.py b/pyspark-interpreter/src/main/resources/PySpark/pyspark_runner.py
index e3864f8..fcb1a06 100644
--- a/pyspark-interpreter/src/main/resources/PySpark/pyspark_runner.py
+++ b/pyspark-interpreter/src/main/resources/PySpark/pyspark_runner.py
@@ -93,6 +93,9 @@ class Logger(object):
def reset(self):
self.out = ""
+
+ def flush(self):
+ pass
output = Logger()
sys.stdout = output
[2/3] incubator-toree git commit: Make sure there is always a cell to
write to for the python interpreter
Posted by ma...@apache.org.
Make sure there is always a cell to write to for the python interpreter
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/447f0e24
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/447f0e24
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/447f0e24
Branch: refs/heads/master
Commit: 447f0e24a4037ed9bc8a0838d60bdb1bd7678562
Parents: e1dc4e5
Author: David Taieb <da...@us.ibm.com>
Authored: Wed Jan 4 18:17:36 2017 -0500
Committer: David Taieb <da...@us.ibm.com>
Committed: Wed Jan 4 18:17:36 2017 -0500
----------------------------------------------------------------------
.../src/main/resources/PySpark/pyspark_runner.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/447f0e24/pyspark-interpreter/src/main/resources/PySpark/pyspark_runner.py
----------------------------------------------------------------------
diff --git a/pyspark-interpreter/src/main/resources/PySpark/pyspark_runner.py b/pyspark-interpreter/src/main/resources/PySpark/pyspark_runner.py
index fcb1a06..04d1666 100644
--- a/pyspark-interpreter/src/main/resources/PySpark/pyspark_runner.py
+++ b/pyspark-interpreter/src/main/resources/PySpark/pyspark_runner.py
@@ -151,12 +151,14 @@ kernel = Kernel(bridge.kernel())
while True:
try:
- code_info = state.nextCode()
+ next_code_info = state.nextCode()
# If code is not available, try again later
- if code_info is None:
+ if next_code_info is None:
sleep(1)
continue
+
+ code_info = next_code_info
code_lines = code_info.code().split("\n")
final_code = None
[3/3] incubator-toree git commit: Merging PR #82 for TOREE-356 and
TOREE-357
Posted by ma...@apache.org.
Merging PR #82 for TOREE-356 and TOREE-357
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/70b804bd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/70b804bd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/70b804bd
Branch: refs/heads/master
Commit: 70b804bd75d2e5f8fcc2f1151e6badfabfaf9dcd
Parents: e06da57 447f0e2
Author: Marius van Niekerk <ma...@gmail.com>
Authored: Tue Jan 17 12:58:46 2017 -0500
Committer: Marius van Niekerk <ma...@gmail.com>
Committed: Tue Jan 17 12:58:46 2017 -0500
----------------------------------------------------------------------
.../src/main/resources/PySpark/pyspark_runner.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------