You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@zeppelin.apache.org by rajarajan-g <gi...@git.apache.org> on 2016/09/27 14:30:45 UTC
[GitHub] zeppelin pull request #1464: [Zeppelin 796] [WIP] Duplicated notebook names ...
GitHub user rajarajan-g opened a pull request:
https://github.com/apache/zeppelin/pull/1464
[Zeppelin 796] [WIP] Duplicated notebook names should not be allowed
### What is this PR for?
When a notebook is created/cloned/imported the title/name of the new notebook should not be duplicate of the existing notebook's title/name
### What type of PR is it?
Improvement
### Todos
* [ ] - Task
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-796
### How should this be tested?
1. Create a notebook with name 'Note', Notebook should allow user to create a note
2. When a user try to create/clone/import a notebook with name 'Note', Notebook should not
allow user to create note.
### Screenshots (if appropriate)
Screenshot of error message displayed during create/clone notebook
![create](https://cloud.githubusercontent.com/assets/11922701/18878102/05b401ea-84ed-11e6-92c4-539cae37c4f9.png)
Screenshot of error message displayed during import notebook
![import](https://cloud.githubusercontent.com/assets/11922701/18878072/f69716a2-84ec-11e6-965a-3fbb29dd63d7.png)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/rajarajan-g/zeppelin ZEPPELIN-796
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/zeppelin/pull/1464.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1464
----
commit 681c600cd96dbab8ffe9fb44e93524bfbaacf109
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-27T05:43:03Z
Code changes for ZEPPELIN-796
commit bfe7091902bb3e3c16fcf4b50322b7b2b6f9a2e0
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-27T05:52:12Z
Removed unnecessary statements
commit 9071d2ae093f8fdfc1803e9a86f2234ee9eb78bf
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-27T06:15:38Z
code formatted
commit 055637f56deede4a4fa19c5bf31ff13880c827fe
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-27T06:53:56Z
removed unnecessary statement
commit a4dc418f6a89eaeca53775a7bf86a0868e440fb2
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-27T07:26:54Z
fix for changes
commit 3991eceb93192536855d4550241951e23d5b57c3
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-27T14:02:41Z
code fix for Test
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] zeppelin issue #1464: [Zeppelin 796] [WIP] Duplicated notebook names should ...
Posted by rajarajan-g <gi...@git.apache.org>.
Github user rajarajan-g commented on the issue:
https://github.com/apache/zeppelin/pull/1464
@khalidhuseynov : Lets say if i create a note with name 'Note'. If zeppelin allows me to create a new note with name 'Note', then after sometime when i search for one of this note, I am going to get confused here.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] zeppelin pull request #1464: [Zeppelin 796] Duplicated notebook names should...
Posted by rajarajan-g <gi...@git.apache.org>.
Github user rajarajan-g closed the pull request at:
https://github.com/apache/zeppelin/pull/1464
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] zeppelin issue #1464: [Zeppelin 796] [WIP] Duplicated notebook names should ...
Posted by corneadoug <gi...@git.apache.org>.
Github user corneadoug commented on the issue:
https://github.com/apache/zeppelin/pull/1464
@rajarajan-g How do you handle if another user with same notebook name decides to gives you read ability on his notebook?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] zeppelin issue #1464: [Zeppelin 796] [WIP] Duplicated notebook names should ...
Posted by rajarajan-g <gi...@git.apache.org>.
Github user rajarajan-g commented on the issue:
https://github.com/apache/zeppelin/pull/1464
@corneadoug : If a user creates a note with same name, it would do no good to that user itself as it confuses him.
For resolving the scenario, we can pick one of the below ways
1. we should have one unique notebook name across the server.(Not quite a solution)
2. we can follow unique notebook name per user in server.
In case if a note is shared by the creator with other users, an extra information should be available to user like below in home page of notebook
**NoteName** _**(created by user1)**_
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] zeppelin issue #1464: [Zeppelin 796] [WIP] Duplicated notebook names should ...
Posted by khalidhuseynov <gi...@git.apache.org>.
Github user khalidhuseynov commented on the issue:
https://github.com/apache/zeppelin/pull/1464
@rajarajan-g why do you think it's a problem having same note title/name with existing one. could you give more context?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] zeppelin issue #1464: [Zeppelin 796] [WIP] Duplicated notebook names should ...
Posted by rajarajan-g <gi...@git.apache.org>.
Github user rajarajan-g commented on the issue:
https://github.com/apache/zeppelin/pull/1464
Going to reopen the pull request to trigger CI build
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] zeppelin issue #1464: [Zeppelin 796] [WIP] Duplicated notebook names should ...
Posted by jongyoul <gi...@git.apache.org>.
Github user jongyoul commented on the issue:
https://github.com/apache/zeppelin/pull/1464
I think this PR contains wrong changes like JDBC*. Is it correct?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] zeppelin issue #1464: [Zeppelin 796] [WIP] Duplicated notebook names should ...
Posted by rajarajan-g <gi...@git.apache.org>.
Github user rajarajan-g commented on the issue:
https://github.com/apache/zeppelin/pull/1464
@corneadoug : Nice catch. I didn't check that scenario. Will let you once, i figure out a way.
Let me check the current implementation too.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] zeppelin issue #1464: [Zeppelin 796] Duplicated notebook names should not be...
Posted by rajarajan-g <gi...@git.apache.org>.
Github user rajarajan-g commented on the issue:
https://github.com/apache/zeppelin/pull/1464
Hi All,
An unknown commit got merged into this PR. I just had this issue while rebasing. I am going to open new PR for the same.So, Closing this PR . Please continue the discussion in the new PR https://github.com/apache/zeppelin/pull/1536
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] zeppelin issue #1464: [Zeppelin 796] [WIP] Duplicated notebook names should ...
Posted by rajarajan-g <gi...@git.apache.org>.
Github user rajarajan-g commented on the issue:
https://github.com/apache/zeppelin/pull/1464
CI build is green & success. Please review
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] zeppelin pull request #1464: [Zeppelin 796] [WIP] Duplicated notebook names ...
Posted by rajarajan-g <gi...@git.apache.org>.
GitHub user rajarajan-g reopened a pull request:
https://github.com/apache/zeppelin/pull/1464
[Zeppelin 796] [WIP] Duplicated notebook names should not be allowed
### What is this PR for?
When a notebook is created/cloned/imported the title/name of the new notebook should not be duplicate of the existing notebook's title/name
### What type of PR is it?
Improvement
### Todos
* [ ] - Task
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-796
### How should this be tested?
1. Create a notebook with name 'Note', Notebook should allow user to create a note
2. When a user try to create/clone/import a notebook with name 'Note', Notebook should not
allow user to create note.
### Screenshots (if appropriate)
Screenshot of error message displayed during create/clone notebook
![create](https://cloud.githubusercontent.com/assets/11922701/18878102/05b401ea-84ed-11e6-92c4-539cae37c4f9.png)
Screenshot of error message displayed during import notebook
![import](https://cloud.githubusercontent.com/assets/11922701/18878072/f69716a2-84ec-11e6-965a-3fbb29dd63d7.png)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/rajarajan-g/zeppelin ZEPPELIN-796
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/zeppelin/pull/1464.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1464
----
commit 2dec9d0b895df16c49e73b0bda5abef6457cc7bc
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-27T05:43:03Z
Code changes for ZEPPELIN-796
commit ab04be9e0c2b6d211052a6c22c52b11a9942c866
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-27T05:52:12Z
Removed unnecessary statements
commit 8ec520a509e3e3f1af255b6b1969aae91ad91217
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-27T06:15:38Z
code formatted
commit 010f3e39f2162f489a34b3e34a36bdaf97425cd0
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-27T06:53:56Z
removed unnecessary statement
commit e89090c521e7bf4a3f86eb9b42823726cd715aa1
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-27T07:26:54Z
fix for changes
commit 2adbf7589cef4a318709b8e7ff76acd21187d9de
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-27T14:02:41Z
code fix for Test
commit c42711fc6701acbca08d9c9423a098e74c1744fc
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-28T08:47:03Z
custom exception
commit b24491bafa78693457687dd5da460d5e387e9ddb
Author: astroshim <hs...@nflabs.com>
Date: 2016-09-23T07:31:19Z
[ZEPPELIN-1405] ConnectionPool for JDBCInterpreter.
### What is this PR for?
This PR is for refactoring code for JDBCInterpreter.
There is no putting 'Connection' to 'propertyKeyUnusedConnectionListMap' anywhere in the original code.
### What type of PR is it?
Improvement
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-1405
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: astroshim <hs...@nflabs.com>
Closes #1396 from astroshim/ZEPPELIN-1405 and squashes the following commits:
b07e162 [astroshim] add checking connection is null
f6998c2 [astroshim] Merge branch 'master' into ZEPPELIN-1405
1862ae6 [astroshim] Merge branch 'master' into ZEPPELIN-1405
efc2bfc [astroshim] rebase
21217a7 [astroshim] fix indentation.
4d4f85c [astroshim] refactoring code of close()
9f1e368 [astroshim] replace ConnectionPool
4dabbcc [astroshim] wip) changing to use dbcp
12dd7cb [astroshim] remove propertyKeyUnusedConnectionListMap map
commit e1e54b5d2435c9078d2e9122385c5a5f5e6059c7
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-28T15:12:01Z
fixes for junit tests
commit 1307a650451226df1937109116408bad0595eb97
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-27T05:43:03Z
Code changes for ZEPPELIN-796
commit 8911fe24509e197c6b6e4dcc65975cff047a7cef
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-27T05:52:12Z
Removed unnecessary statements
commit 20c14eef15d09aa98c17beeb4c59db829204fcf7
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-27T06:15:38Z
code formatted
commit cc01966bd08945741154625b68027e58c47ca5fd
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-27T06:53:56Z
removed unnecessary statement
commit 512832f994f7802968f47e2150dc0a570e024e0e
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-27T07:26:54Z
fix for changes
commit 66925981e9014ec2b6c05b196289e9989f0e3403
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-27T14:02:41Z
code fix for Test
commit aba85802689bb6bab889f753bbedfb312d0c4ab1
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-28T08:47:03Z
custom exception
commit 1a3b4c97074e8e2174182a1e236a39138f10a915
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-28T15:12:01Z
fixes for junit tests
commit 31ab43dc2acfb2edbe5255b8f8faec30c6f353f2
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-29T05:41:15Z
check style fix
commit f2b68e9b036462c7184ab3595c6eb73961db73ae
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-29T05:52:01Z
fixes for checkstyle errors
commit 241be0f75f447fe3023385479636727388ddd9c4
Author: rajarajan-g <ra...@imaginea.com>
Date: 2016-09-29T07:17:40Z
bug fix for Junit test
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] zeppelin issue #1464: [Zeppelin 796] [WIP] Duplicated notebook names should ...
Posted by corneadoug <gi...@git.apache.org>.
Github user corneadoug commented on the issue:
https://github.com/apache/zeppelin/pull/1464
Well the problem here is that there is really nothing you can do, you are not going to change your Notebook name, or somebody else notebook name because both name are the same
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] zeppelin issue #1464: [Zeppelin 796] [WIP] Duplicated notebook names should ...
Posted by rajarajan-g <gi...@git.apache.org>.
Github user rajarajan-g commented on the issue:
https://github.com/apache/zeppelin/pull/1464
@jongyoul : Thanks for noticing that. I didn't make those changes. Those changes seems to come from another commit. Need to check that
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] zeppelin pull request #1464: [Zeppelin 796] [WIP] Duplicated notebook names ...
Posted by rajarajan-g <gi...@git.apache.org>.
Github user rajarajan-g closed the pull request at:
https://github.com/apache/zeppelin/pull/1464
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] zeppelin issue #1464: [Zeppelin 796] [WIP] Duplicated notebook names should ...
Posted by rajarajan-g <gi...@git.apache.org>.
Github user rajarajan-g commented on the issue:
https://github.com/apache/zeppelin/pull/1464
@jongyoul : Hey i was quite busy for sometime.
I was trying to resolve the commit issues that you have pointed out.
but while during rebase i am getting below error
```
git rebase master
First, rewinding head to replay your work on top of it...
Applying: Code changes for ZEPPELIN-796
Using index info to reconstruct a base tree...
M zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
M zeppelin-web/src/components/noteName-create/notename.controller.js
M zeppelin-web/src/components/noteName-import/note-import-dialog.html
M zeppelin-web/src/components/noteName-import/notenameImport.controller.js
M zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js
<stdin>:18: trailing whitespace.
* @throws DuplicateNameException
<stdin>:40: trailing whitespace.
* @throws DuplicateNameException
<stdin>:98: trailing whitespace.
* @throws DuplicateNameException
<stdin>:175: trailing whitespace.
<stdin>:187: trailing whitespace.
conn.send(serializeMessage(new Message(OP.ERROR_DIALOG).put("info",
warning: squelched 21 whitespace errors
warning: 26 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js
CONFLICT (content): Merge conflict in zeppelin-web/src/components/websocketEvents/websocketEvents.factory.js
Auto-merging zeppelin-web/src/components/noteName-import/notenameImport.controller.js
CONFLICT (content): Merge conflict in zeppelin-web/src/components/noteName-import/notenameImport.controller.js
Auto-merging zeppelin-web/src/components/noteName-import/note-import-dialog.html
Auto-merging zeppelin-web/src/components/noteName-create/notename.controller.js
CONFLICT (content): Merge conflict in zeppelin-web/src/components/noteName-create/notename.controller.js
Auto-merging zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
Failed to merge in the changes.
Patch failed at 0001 Code changes for ZEPPELIN-796
The copy of the patch that failed is found in:
/home/rajarajang/Workspace/stsWorksapce/zeppelin/.git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
```
Even though after i resolve the conflicts, again it shows conflict again and not able to remove that unnecessary commit that you pointed out. Please help me out on resolving that issue
Please let me know if anyone has faced this issue and also please let me if there is a way to resolve this issue.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---