You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by fe...@apache.org on 2016/04/16 01:54:28 UTC
incubator-zeppelin git commit: [ZEPPELIN-741] Re-use existing
paragraphId on note import
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master 528878112 -> ee86763c6
[ZEPPELIN-741] Re-use existing paragraphId on note import
### What is this PR for?
Upon note.json import, do not generate a new paragraphId but re-use the existing one.
This is important because the `z.angularBind()/z.angularUnbind()/z.runParagraph()` functions are pointing to static paragraphId
### What type of PR is it?
[Improvement]
### Todos
* [ ] - Code Review
* [ ] - Test
### What is the Jira issue?
**[ZEPPELIN-741]**
### How should this be tested?
1. Create a paragraph with the following content:
```
%md
## The paragraph id is **PUT_HERE_CURRENT_PARAGRAPH_ID**
## The new paragraph id is **${New_Paragraph_Id}**
```
2. Retrieve the current paragraph id and replace the text **PUT_HERE_CURRENT_PARAGRAPH_ID** then re-execute the paragraph
3. Export the paragraph as JSON
4. Delete it
5. Re-import it
6. Retrieve the paragraph id again and put it in the input text form and then execute the paragraph
7. Normally both paragraph ids should be the same
8. Now clone the current note
9. In the new note, retrieve the paragraph id again and put it in the input text form and then execute the paragraph
10. Normally both paragraph ids now are different
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? --> **No**
* Is there breaking changes for older versions? --> **No**
* Does this needs documentation? --> **Yes**
[ZEPPELIN-741]: https://issues.apache.org/jira/browse/ZEPPELIN-741
Author: DuyHai DOAN <do...@gmail.com>
Closes #832 from doanduyhai/ZEPPELIN-741 and squashes the following commits:
e162559 [DuyHai DOAN] [ZEPPELIN-741] Re-use existing paragraphId on note import
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/ee86763c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/ee86763c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/ee86763c
Branch: refs/heads/master
Commit: ee86763c60f13966ab82343795ac7f6b03dc52a1
Parents: 5288781
Author: DuyHai DOAN <do...@gmail.com>
Authored: Tue Apr 12 17:40:36 2016 +0200
Committer: Felix Cheung <fe...@apache.org>
Committed: Fri Apr 15 16:54:25 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/zeppelin/scheduler/Job.java | 5 +++++
.../main/java/org/apache/zeppelin/notebook/Note.java | 4 +++-
.../java/org/apache/zeppelin/notebook/Paragraph.java | 13 +++++++++++++
.../org/apache/zeppelin/notebook/NotebookTest.java | 4 +++-
4 files changed, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/ee86763c/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java
----------------------------------------------------------------------
diff --git a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java
index d9b93f2..00df966 100644
--- a/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java
+++ b/zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java
@@ -103,11 +103,16 @@ public abstract class Job {
this(jobName, listener, JobProgressPoller.DEFAULT_INTERVAL_MSEC);
}
+ public Job(String jobId, String jobName, JobListener listener) {
+ this(jobId, jobName, listener, JobProgressPoller.DEFAULT_INTERVAL_MSEC);
+ }
+
public Job(String jobId, String jobName, JobListener listener, long progressUpdateIntervalMs) {
this.jobName = jobName;
this.listener = listener;
this.progressUpdateIntervalMs = progressUpdateIntervalMs;
+ dateCreated = new Date();
id = jobId;
setStatus(Status.READY);
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/ee86763c/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 6a09735..5ef1171 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
@@ -167,7 +167,9 @@ public class Note implements Serializable, JobListener {
* @param srcParagraph
*/
public void addCloneParagraph(Paragraph srcParagraph) {
- Paragraph newParagraph = new Paragraph(this, this, replLoader);
+
+ // Keep paragraph original ID
+ final Paragraph newParagraph = new Paragraph(srcParagraph.getId(), this, this, replLoader);
Map<String, Object> config = new HashMap<>(srcParagraph.getConfig());
Map<String, Object> param = new HashMap<>(srcParagraph.settings.getParams());
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/ee86763c/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 5778d0d..ae0c410 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
@@ -62,6 +62,19 @@ public class Paragraph extends Job implements Serializable, Cloneable {
settings = new GUI();
}
+ public Paragraph(String paragraphId, Note note, JobListener listener,
+ NoteInterpreterLoader replLoader) {
+ super(paragraphId, generateId(), listener);
+ this.note = note;
+ this.replLoader = replLoader;
+ title = null;
+ text = null;
+ authenticationInfo = null;
+ dateUpdated = null;
+ settings = new GUI();
+ config = new HashMap<String, Object>();
+ }
+
public Paragraph(Note note, JobListener listener, NoteInterpreterLoader replLoader) {
super(generateId(), listener);
this.note = note;
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/ee86763c/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
----------------------------------------------------------------------
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
index 3c89c35..a353328 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java
@@ -322,7 +322,9 @@ public class NotebookTest implements JobListenerFactory{
Note cloneNote = notebook.cloneNote(note.getId(), "clone note");
Paragraph cp = cloneNote.paragraphs.get(0);
assertEquals(cp.getStatus(), Status.READY);
- assertNotEquals(cp.getId(), p.getId());
+
+ // Keep same ParagraphID
+ assertEquals(cp.getId(), p.getId());
assertEquals(cp.text, p.text);
assertEquals(cp.getResult().message(), p.getResult().message());
}