Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Search: make checkstyle happy

Browse source
This commit is contained in:
Alexander Bezzubov 2015-12-11 15:13:20 +09:00
parent 6ccd6f11d4
commit 7aad5cf867
3 changed files with 57 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
zeppelin-server/src/main/java/org/apache/zeppelin/rest/NotebookRestApi.java
View file

@ -387,16 +387,16 @@ public class NotebookRestApi {
return new JsonResponse<>(Status.OK, note.getConfig().get("cron")).build();
}
/**
* Search for a Notes
*/
@GET
@Path("search")
public Response search(@QueryParam("q") String query) {
LOG.info("Searching notebooks for {}", query);
List<Map<String, String>> notebooksFound = notebookIndex.search(query);
LOG.info("Notbooks {} found", notebooksFound.size());
return new JsonResponse<>(Status.OK, notebooksFound).build();
}
/**
* Search for a Notes
*/
@GET
@Path("search")
public Response search(@QueryParam("q") String query) {
LOG.info("Searching notebooks for {}", query);
List<Map<String, String>> notebooksFound = notebookIndex.search(query);
LOG.info("Notbooks {} found", notebooksFound.size());
return new JsonResponse<>(Status.OK, notebooksFound).build();
}
}

27
zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/repo/NotebookRepoSync.java
View file

@ -48,12 +48,12 @@ public class NotebookRepoSync implements NotebookRepo {
private List<NotebookRepo> repos = new ArrayList<NotebookRepo>();
/**
* @param notebookIndex
* @param noteIndex
* @param (conf)
* @throws - Exception
*/
public NotebookRepoSync(ZeppelinConfiguration conf, SearchService notebookIndex) throws Exception {
this.notebookIndex = notebookIndex;
public NotebookRepoSync(ZeppelinConfiguration conf, SearchService noteIndex) throws Exception {
this.notebookIndex = noteIndex;
config = conf;
String allStorageClassNames = conf.getString(ConfVars.ZEPPELIN_NOTEBOOK_STORAGE).trim();
@ -142,26 +142,23 @@ public class NotebookRepoSync implements NotebookRepo {
*/
public void sync(int sourceRepoIndex, int destRepoIndex) throws IOException {
LOG.info("Sync started");
NotebookRepo sourceRepo = getRepo(sourceRepoIndex);
NotebookRepo destRepo = getRepo(destRepoIndex);
List <NoteInfo> sourceNotes = sourceRepo.list();
List <NoteInfo> destNotes = destRepo.list();
NotebookRepo srcRepo = getRepo(sourceRepoIndex);
NotebookRepo dstRepo = getRepo(destRepoIndex);
List <NoteInfo> srcNotes = srcRepo.list();
List <NoteInfo> dstNotes = dstRepo.list();
//TODO(bzz): find a better place
if (notebookIndex != null) {
List<Note> notebooks = new ArrayList<>();
for (NoteInfo i: sourceNotes) {
notebooks.add(sourceRepo.get(i.getId()));
for (NoteInfo i: srcNotes) {
notebooks.add(srcRepo.get(i.getId()));
}
LOG.info("Index started");
notebookIndex.index(notebooks);
LOG.info("Index ended");
}
Map<String, List<String>> noteIDs = notesCheckDiff(sourceNotes,
sourceRepo,
destNotes,
destRepo);
Map<String, List<String>> noteIDs = notesCheckDiff(srcNotes, srcRepo, dstNotes, dstRepo);
List<String> pushNoteIDs = noteIDs.get(pushKey);
List<String> pullNoteIDs = noteIDs.get(pullKey);
if (!pushNoteIDs.isEmpty()) {
@ -169,7 +166,7 @@ public class NotebookRepoSync implements NotebookRepo {
for (String id : pushNoteIDs) {
LOG.info("ID : " + id);
}
pushNotes(pushNoteIDs, sourceRepo, destRepo);
pushNotes(pushNoteIDs, srcRepo, dstRepo);
} else {
LOG.info("Nothing to push");
}
@ -179,7 +176,7 @@ public class NotebookRepoSync implements NotebookRepo {
for (String id : pullNoteIDs) {
LOG.info("ID : " + id);
}
pushNotes(pullNoteIDs, destRepo, sourceRepo);
pushNotes(pullNoteIDs, dstRepo, srcRepo);
} else {
LOG.info("Nothing to pull");
}

54
zeppelin-zengine/src/main/java/org/apache/zeppelin/search/SearchService.java
View file

@ -49,6 +49,12 @@ public class SearchService {
static final String SEARCH_FIELD = "contents";
static final String ID_FIELD = "id";
/**
* Full-text search in all the notebooks
*
* @param queryStr a query
* @return A list of matching paragraphs (id, text, snippet w/ highlight)
*/
public List<Map<String, String>> search(String queryStr) {
List<Map<String, String>> result = Collections.emptyList();
try (IndexReader indexReader = DirectoryReader.open(ramDirectory)) {
@ -72,7 +78,8 @@ public class SearchService {
return result;
}
private List<Map<String, String>> doSearch(IndexSearcher searcher, Query query, Analyzer analyzer, Highlighter highlighter) {
private List<Map<String, String>> doSearch(IndexSearcher searcher, Query query,
Analyzer analyzer, Highlighter highlighter) {
List<Map<String, String>> matchingParagraphs = Lists.newArrayList();
ScoreDoc[] hits;
try {
@ -91,9 +98,10 @@ public class SearchService {
}
String text = doc.get(SEARCH_FIELD);
TokenStream tokenStream = TokenSources.getTokenStream(searcher.getIndexReader(), id, SEARCH_FIELD, analyzer);
TokenStream tokenStream = TokenSources.getTokenStream(searcher.getIndexReader(), id,
SEARCH_FIELD, analyzer);
TextFragment[] frag = highlighter.getBestTextFragments(tokenStream, text, true, 3);
//TODO(bzz): remove this as too verbose
// TODO(bzz): remove this as too verbose
LOG.info(" {} fragments found for query '{}' in '{}'", frag.length, query, text);
for (int j = 0; j < frag.length; j++) {
if ((frag[j] != null) && (frag[j].getScore() > 0)) {
@ -102,13 +110,15 @@ public class SearchService {
}
String fragment = (frag != null && frag.length > 0) ? frag[0].toString() : "";
matchingParagraphs.add(ImmutableMap.of("id", path, "name", title, "fragment", fragment, "text", text));
matchingParagraphs.add(ImmutableMap.of("id", path,
"name", title, "fragment", fragment, "text", text));
} else {
LOG.info("{}. No {} for this document", i + 1, ID_FIELD);
}
}
} catch (IOException | InvalidTokenOffsetsException e) {
LOG.error("Exception on searching for {}", query, e);;
LOG.error("Exception on searching for {}", query, e);
;
}
return matchingParagraphs;
}
@ -134,13 +144,17 @@ public class SearchService {
/**
* Indexes the given list of notebooks
*
* @param writer Writer to the index where the given file/dir info will be stored
* @param path The file to index, or the directory to recurse into to find files to index
* @throws IOException If there is a low-level I/O error
* @param writer
* Writer to the index where the given file/dir info will be stored
* @param path
* The file to index, or the directory to recurse into to find files
* to index
* @throws IOException
* If there is a low-level I/O error
*/
void indexDocs(final IndexWriter writer, List<Note> docs) throws IOException {
for (Note note: docs) {
for (Paragraph doc: note.getParagraphs()) {
for (Note note : docs) {
for (Paragraph doc : note.getParagraphs()) {
if (doc.getText() == null) {
LOG.info("Skipping empty paragraph");
continue;
@ -152,20 +166,20 @@ public class SearchService {
/** Indexes a single paragraph = document */
void indexDoc(IndexWriter writer, Note note, Paragraph p) throws IOException {
Document doc = new Document();
Document doc = new Document();
//<note-id>/paragraph/<paragraph-id>
String id = String.format("%s/paragraph/%s", note.getId(), p.getId());
Field pathField = new StringField(ID_FIELD, id, Field.Store.YES);
doc.add(pathField);
// <note-id>/paragraph/<paragraph-id>
String id = String.format("%s/paragraph/%s", note.getId(), p.getId());
Field pathField = new StringField(ID_FIELD, id, Field.Store.YES);
doc.add(pathField);
doc.add(new StringField("title", note.getName(), Field.Store.YES));
doc.add(new StringField("title", note.getName(), Field.Store.YES));
Date date = p.getDateStarted() != null ? p.getDateStarted() : p.getDateCreated();
doc.add(new LongField("modified", date.getTime(), Field.Store.NO));
doc.add(new TextField(SEARCH_FIELD, p.getText(), Field.Store.YES));
Date date = p.getDateStarted() != null ? p.getDateStarted() : p.getDateCreated();
doc.add(new LongField("modified", date.getTime(), Field.Store.NO));
doc.add(new TextField(SEARCH_FIELD, p.getText(), Field.Store.YES));
writer.addDocument(doc);
writer.addDocument(doc);
}
}