Apply new InterpreterCompletion class under zeppelin-zengine/

This commit is contained in:
AhyoungRyu 2016-06-09 09:38:03 -07:00
parent dbecc5125c
commit c283043a05
5 changed files with 13 additions and 6 deletions

View file

@ -30,6 +30,7 @@ import org.apache.zeppelin.display.AngularObjectRegistry;
import org.apache.zeppelin.display.Input;
import org.apache.zeppelin.interpreter.*;
import org.apache.zeppelin.interpreter.remote.RemoteAngularObjectRegistry;
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
import org.apache.zeppelin.notebook.repo.NotebookRepo;
import org.apache.zeppelin.notebook.utility.IdHashes;
import org.apache.zeppelin.resource.ResourcePoolUtils;
@ -400,11 +401,13 @@ public class Note implements Serializable, JobListener {
}
}
public List<String> completion(String paragraphId, String buffer, int cursor) {
public List<InterpreterCompletion> completion(String paragraphId, String buffer, int cursor) {
Paragraph p = getParagraph(paragraphId);
p.setNoteReplLoader(replLoader);
p.setListener(jobListenerFactory.getParagraphJobListener(this));
return p.completion(buffer, cursor);
List completion = p.completion(buffer, cursor);
return completion;
}
public List<Paragraph> getParagraphs() {

View file

@ -19,6 +19,7 @@ package org.apache.zeppelin.notebook;
import org.apache.zeppelin.display.AngularObject;
import org.apache.zeppelin.display.AngularObjectRegistry;
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
import org.apache.zeppelin.user.AuthenticationInfo;
import org.apache.zeppelin.user.Credentials;
import org.apache.zeppelin.user.UserCredentials;
@ -196,7 +197,7 @@ public class Paragraph extends Job implements Serializable, Cloneable {
return getRepl(getRequiredReplName());
}
public List<String> completion(String buffer, int cursor) {
public List<InterpreterCompletion> completion(String buffer, int cursor) {
String replName = getRequiredReplName(buffer);
if (replName != null) {
cursor -= replName.length() + 1;

View file

@ -25,6 +25,7 @@ import java.util.Properties;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
import org.apache.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.scheduler.SchedulerFactory;
@ -81,7 +82,7 @@ public class MockInterpreter1 extends Interpreter{
}
@Override
public List<String> completion(String buf, int cursor) {
public List<InterpreterCompletion> completion(String buf, int cursor) {
return null;
}
}

View file

@ -25,6 +25,7 @@ import java.util.Properties;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
import org.apache.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.scheduler.SchedulerFactory;
@ -68,7 +69,7 @@ public class MockInterpreter11 extends Interpreter{
}
@Override
public List<String> completion(String buf, int cursor) {
public List<InterpreterCompletion> completion(String buf, int cursor) {
return null;
}
}

View file

@ -25,6 +25,7 @@ import java.util.Properties;
import org.apache.zeppelin.interpreter.Interpreter;
import org.apache.zeppelin.interpreter.InterpreterContext;
import org.apache.zeppelin.interpreter.InterpreterResult;
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
import org.apache.zeppelin.scheduler.Scheduler;
import org.apache.zeppelin.scheduler.SchedulerFactory;
@ -80,7 +81,7 @@ public class MockInterpreter2 extends Interpreter{
}
@Override
public List<String> completion(String buf, int cursor) {
public List<InterpreterCompletion> completion(String buf, int cursor) {
return null;
}
}