Skip to content

ZEPPELIN-501 Notebook search #534

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bzz wants to merge 63 commits into from
Closed

ZEPPELIN-501 Notebook search #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
c5928f9
Search: form added to navbar in frontend
bzz Nov 19, 2015
7880237
Search: backend REST API scetch /notebooks/search?q=... added
bzz Nov 19, 2015
3900b60
Search: disabling UI on disconnect
bzz Nov 19, 2015
bc2458a
Get rid of compiler warnings
bzz Nov 20, 2015
163a465
Search: add search/result-list and switch to
bzz Nov 20, 2015
c2c2a52
Search: backend indexing using Lucene added to zengine
bzz Nov 23, 2015
db246fa
Search: highlighting added using fragments
bzz Nov 24, 2015
11127f0
style search widget for notebook search
Nov 24, 2015
9ca8628
Search: merge first 3 fragments + full paragraph in search result
bzz Nov 26, 2015
865925c
highlight syntax and search terms in search results
Nov 26, 2015
227c6b4
update search results view: add panels for results
Nov 26, 2015
aa5ddb3
center search results on screen
Nov 26, 2015
6ccd6f1
Search: nuke compiler warnings in NotebookRestApi
bzz Dec 11, 2015
7aad5cf
Search: make checkstyle happy
bzz Dec 11, 2015
e363ed4
Search: make jshint happy
bzz Dec 11, 2015
5c1e3e4
Refatoring - removing old annotations
bzz Dec 11, 2015
98f4e59
Search: refactoring, rename fragment -> snippet
bzz Dec 11, 2015
63a4e05
Search: adding search API docs
bzz Dec 11, 2015
08fe806
Search: adding tests
bzz Dec 11, 2015
b2b93c4
Search: refatoring, move SearchService from NotebookRepoSync -> Notebook
bzz Dec 11, 2015
09d44d2
Search: re-index note on every change
bzz Dec 11, 2015
1e1357c
redirect to notebook and scroll to paragraph from search view
Dec 14, 2015
71ec51f
clear search field on navigation to home view (/)
Dec 15, 2015
82c7dd7
ZEPPELIN-501: reverting accidental changes
bzz Dec 15, 2015
b853aa6
ZEPPELIN-501: fixing typos in docs
bzz Dec 16, 2015
e80c3e5
ZEPPELIN-501: Indexing notebook names
bzz Dec 16, 2015
7d06686
fix search-related bug in notebook controller
Dec 16, 2015
00f0315
handle notebooks is search results
Dec 16, 2015
fcbff3d
add missing apache license info to a source file
Dec 16, 2015
5a18bc8
ZEPPELIN-501: restore NotebookRepoSync.sync() visibility + compiler w…
bzz Dec 16, 2015
c00b516
ZEPPELIN-501: update LICENCE file with new deps
bzz Dec 16, 2015
29da337
Merge pull request #7 from felizbear/search-fix
Dec 16, 2015
6180c86
ZEPPELIN-501: mute logs, invalid notes do not fail all indexing
bzz Dec 16, 2015
1952847
ZEPPELIN-501: minor test update
bzz Dec 16, 2015
cd2173e
ZEPPELIN-501: tixing fypo in docs, again :see_no_evil:
bzz Dec 16, 2015
ded9c3b
ZEPPELIN-501: adding missing license headers
bzz Dec 16, 2015
c7ae983
Merge branch 'master' into notebook-search
bzz Dec 17, 2015
36b2467
ZEPPELIN-501: add default val for Note.name
bzz Dec 17, 2015
b0b2c54
ZEPPELIN-501: refactoring, renames + verbose logging ON
bzz Dec 17, 2015
0efc00e
Merge branch 'master' into notebook-search
bzz Dec 17, 2015
009b290
ZEPPELIN-501: muting logs back
bzz Dec 17, 2015
b13d5fb
Merge branch 'master' into notebook-search
bzz Dec 18, 2015
825b266
ZEPPELIN-501: refactoring + handling index Create\Delete
bzz Dec 18, 2015
8c0f29a
ZEPPELIN-501: fixing NPE in tests \w mocks
bzz Dec 18, 2015
6da1dc9
Merge branch 'master' into notebook-search
bzz Dec 18, 2015
0ce8a92
ZEPPELIN-501: add missing logger
bzz Dec 18, 2015
eb7878a
Merge branch 'master' into notebook-search
bzz Dec 21, 2015
44235eb
ZEPPELIN-501: refactoring, cleaning compiler warnings in Note.java
bzz Dec 22, 2015
2b2f8dc
Merge branch 'master' into notebook-search
bzz Dec 22, 2015
6a3906f
Merge branch 'master' into notebook-search
bzz Dec 22, 2015
40cf9e8
ZEPPELIN-501: refactoring, cleaning compiler warnings in Notebook.java
bzz Dec 22, 2015
3f20904
ZEPPELIN-501: refactoring, compiler warning in Paragraph.java
bzz Dec 22, 2015
e915a69
ZEPPELIN-501: update notebooks on save + tests
bzz Dec 22, 2015
5f47890
ZEPPELIN-501: fix bug (merge artefact) that failed CI befor
bzz Dec 22, 2015
da69c07
ZEPPELIN-501: validate notes before update index
bzz Dec 22, 2015
f30e6c8
Merge branch 'master' into notebook-search
bzz Dec 22, 2015
d2b44ac
ZEPPELIN-501: stop printing whole note in logs
bzz Dec 23, 2015
cf44b1f
ZEPPELIN-501: fix NPE on double-delete
bzz Dec 23, 2015
73a28bb
ZEPPELIN-501: fix NPE on Note creation by NotebookRepo, \wo DI constr…
bzz Dec 23, 2015
78f69a3
ZEPPELIN-501: update index on paragraph delete
bzz Dec 23, 2015
c77d53b
ZEPPELIN-501: fix + test for bug in index key structure
bzz Dec 23, 2015
e3af25c
ZEPPELIN-501: muting more search logs info->debug
bzz Dec 23, 2015
c7f1d35
ZEPPELIN-501: refactoring, extract SearchService interface + Lucen-ba…
bzz Dec 23, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions docs/rest-api/rest-notebook.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,4 +556,33 @@ limitations under the License.
<td><pre>{"status":"OK","body":"* * * * * ?"}</pre></td>
</tr>
</table>

<table class="table-configuration">
<col width="200">
<tr>
<th>Full-text search through the paragraphs in all notebooks</th>
<th></th>
</tr>
<tr>
<td>Description</td>
<td>```GET``` request will return list of matching paragraphs
</td>
</tr>
<tr>
<td>URL</td>
<td>```http://[zeppelin-server]:[zeppelin-port]/api/notebook/search?q=[query]```</td>
</tr>
<tr>
<td>Success code</td>
<td>200</td>
</tr>
<tr>
<td>Fail code</td>
<td> 500 </td>
</tr>
<tr>
<td>Sample JSON response </td>
<td><pre>{"status":"OK", body: [{"id":"<noteId>/paragraph/<paragraphId>", "name":"Notebook Name", "snippet":"", "text":""}]}</pre></td>
</tr>
</table>

3 changes: 2 additions & 1 deletion zeppelin-distribution/src/bin_license/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ The following components are provided under Apache License.
(Apache 2.0) Apache Tajo (http://tajo.apache.org/)
(Apache 2.0) Apache Flink (http://flink.apache.org/)
(Apache 2.0) Apache Thrift (http://thrift.apache.org/)
(Apache 2.0) Apache Lucene (https://lucene.apache.org/)
(Apache 2.0) Apache Zookeeper (org.apache.zookeeper:zookeeper:jar:3.4.5 - http://zookeeper.apache.org/)
(Apache 2.0) Chill (com.twitter:chill-java:jar:0.5.0 - https://github.com/twitter/chill/)
(Apache 2.0) Codehaus Plexus (org.codehaus.plexus:plexus:jar:1.5.6 - https://codehaus-plexus.github.io/)
Expand Down Expand Up @@ -129,10 +130,10 @@ The following components are provided under the MIT License.
(The MIT License) Objenesis (org.objenesis:objenesis:2.1 - https://github.com/easymock/objenesis) - Copyright (c) 2006-2015 the original author and authors
(The MIT License) JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.5 - http://www.slf4j.org)
(The MIT License) JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:1.7.5 - http://www.slf4j.org)
(The MIT License) angular-resource (angular-resource - https://github.com/angular/angular.js/tree/master/src/ngResource)
(The MIT License) minimal-json (com.eclipsesource.minimal-json:minimal-json:0.9.4 - https://github.com/ralfstx/minimal-json)



========================================================================
BSD-style licenses
========================================================================
Expand Down
1 change: 0 additions & 1 deletion zeppelin-interpreter/src/main/java/org/apache/zeppelin/scheduler/Job.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
* and saving/loading jobs from disk.
* Changing/adding/deleting non transitive field name need consideration of that.
*
* @author Leemoonsoo
*/
public abstract class Job {
/**
Expand Down
34 changes: 17 additions & 17 deletions zeppelin-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,22 @@
<version>2.2.1</version>
</dependency>

<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId>
<version>1.13</version>
</dependency>

<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0-m10</version>
</dependency>

<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
Copy link
Member

@felixcheung felixcheung Dec 15, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this specify a version for the artifact?

Copy link
Member Author

@bzz bzz Dec 16, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, need to check if we do not specify it already somewhere.
Although it looks like a bit out of scope of this PR (this change is merely a re-order)

</dependency>

<dependency>
<groupId>org.seleniumhq.selenium</groupId>
Expand Down Expand Up @@ -240,23 +256,6 @@
<scope>test</scope>
</dependency>

<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId>
<version>1.13</version>
</dependency>

<dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>2.0-m10</version>
</dependency>

<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
</dependency>

<dependency>
<groupId>org.scalatest</groupId>
<artifactId>scalatest_2.10</artifactId>
Expand All @@ -268,6 +267,7 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.0</version>
<scope>test</scope>
</dependency>
</dependencies>

Expand Down
Loading