Repository: zeppelin Updated Branches: refs/heads/master 5144050f9 -> 7ada5db9e
[ZEPPELIN-2048] Can't run first paragraph when personalize mode on. ### What is this PR for? Problem of ZEPPELIN-2048 was because not set the user id when inserting new paragraph. ### What type of PR is it? Bug Fix ### What is the Jira issue? https://issues.apache.org/jira/browse/ZEPPELIN-2048 ### How should this be tested? please refer to the screenshot of jira. ### Questions: * Does the licenses files need update? no * Is there breaking changes for older versions? no * Does this needs documentation? no Author: astroshim <[email protected]> Closes #2052 from astroshim/ZEPPELIN-2048 and squashes the following commits: 77bd2ac [astroshim] add user when inserting paragraph. Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/7ada5db9 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/7ada5db9 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/7ada5db9 Branch: refs/heads/master Commit: 7ada5db9e7bfe9c50dc2f7854022bae5fbf14c53 Parents: 5144050 Author: astroshim <[email protected]> Authored: Wed Feb 22 01:11:44 2017 +0900 Committer: Lee moon soo <[email protected]> Committed: Thu Feb 23 11:20:29 2017 +0900 ---------------------------------------------------------------------- .../src/main/java/org/apache/zeppelin/notebook/Note.java | 1 + .../src/main/java/org/apache/zeppelin/notebook/Paragraph.java | 6 ++++-- .../src/test/java/org/apache/zeppelin/notebook/NoteTest.java | 7 +++++++ 3 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7ada5db9/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java index 0ee89d8..827f862 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java @@ -351,6 +351,7 @@ public class Note implements Serializable, ParagraphJobListener { synchronized (paragraphs) { paragraphs.add(index, p); } + p.addUser(p, p.getUser()); if (noteEventListener != null) { noteEventListener.onParagraphCreate(p); } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7ada5db9/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java index 92a1d26..1bf693c 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Paragraph.java @@ -142,10 +142,12 @@ public class Paragraph extends Job implements Serializable, Cloneable { p.setResult(getReturn()); p.setStatus(getStatus()); p.setId(getId()); + addUser(p, user); + return p; + } + public void addUser(Paragraph p, String user) { userParagraphMap.put(user, p); - - return p; } public String getUser() { http://git-wip-us.apache.org/repos/asf/zeppelin/blob/7ada5db9/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java ---------------------------------------------------------------------- diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java index 2267a4a..929073d 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NoteTest.java @@ -131,6 +131,13 @@ public class NoteTest { } @Test + public void insertParagraphwithUser() { + Note note = new Note(repo, interpreterFactory, interpreterSettingManager, jobListenerFactory, index, credentials, noteEventListener); + Paragraph p = note.insertParagraph(note.getParagraphs().size(), AuthenticationInfo.ANONYMOUS); + assertEquals("anonymous", p.getUser()); + } + + @Test public void clearAllParagraphOutputTest() { when(interpreterFactory.getInterpreter(anyString(), anyString(), eq("md"))).thenReturn(interpreter); when(interpreter.getScheduler()).thenReturn(scheduler);
