Skip to content

Commit 9ee539b

Browse files
cloverheartscloverhearts
committed
Merge branch 'master' into dev/jobmanager/step/02-basic-front
2 parents 5d64018 + 7b00dff commit 9ee539b

File tree

63 files changed

+879
-160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+879
-160
lines changed

‎alluxio/src/main/java/org/apache/zeppelin/alluxio/AlluxioInterpreter.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.apache.zeppelin.interpreter.InterpreterPropertyBuilder;
2929
import org.apache.zeppelin.interpreter.InterpreterResult;
3030
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
31+
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
3132
import org.slf4j.Logger;
3233
import org.slf4j.LoggerFactory;
3334

@@ -174,13 +175,13 @@ public int getProgress(InterpreterContext context) {
174175
}
175176

176177
@Override
177-
public List<String> completion(String buf, int cursor) {
178+
public List<InterpreterCompletion> completion(String buf, int cursor) {
178179
String[] words = splitAndRemoveEmpty(splitAndRemoveEmpty(buf, "\n"), " ");
179180
String lastWord = "";
180181
if (words.length > 0) {
181182
lastWord = words[ words.length - 1 ];
182183
}
183-
ArrayList<String> voices = new ArrayList<String>();
184+
ArrayList voices = new ArrayList<>();
184185
for (String command : keywords) {
185186
if (command.startsWith(lastWord)) {
186187
voices.add(command);

‎alluxio/src/test/java/org/apache/zeppelin/alluxio/AlluxioInterpreterTest.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import alluxio.client.file.URIStatus;
3232
import org.apache.zeppelin.interpreter.InterpreterResult;
3333
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
34+
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
3435
import org.junit.*;
3536

3637
import alluxio.Constants;
@@ -76,19 +77,19 @@ public final void before() throws Exception {
7677

7778
@Test
7879
public void testCompletion() {
79-
List<String> expectedResultOne = Arrays.asList("cat", "chgrp",
80+
List expectedResultOne = Arrays.asList("cat", "chgrp",
8081
"chmod", "chown", "copyFromLocal", "copyToLocal", "count",
8182
"createLineage");
82-
List<String> expectedResultTwo = Arrays.asList("copyFromLocal",
83+
List expectedResultTwo = Arrays.asList("copyFromLocal",
8384
"copyToLocal", "count");
84-
List<String> expectedResultThree = Arrays.asList("copyFromLocal", "copyToLocal");
85-
List<String> expectedResultNone = new ArrayList<String>();
86-
87-
List<String> resultOne = alluxioInterpreter.completion("c", 0);
88-
List<String> resultTwo = alluxioInterpreter.completion("co", 0);
89-
List<String> resultThree = alluxioInterpreter.completion("copy", 0);
90-
List<String> resultNotMatch = alluxioInterpreter.completion("notMatch", 0);
91-
List<String> resultAll = alluxioInterpreter.completion("", 0);
85+
List expectedResultThree = Arrays.asList("copyFromLocal", "copyToLocal");
86+
List expectedResultNone = new ArrayList<String>();
87+
88+
List<InterpreterCompletion> resultOne = alluxioInterpreter.completion("c", 0);
89+
List<InterpreterCompletion> resultTwo = alluxioInterpreter.completion("co", 0);
90+
List<InterpreterCompletion> resultThree = alluxioInterpreter.completion("copy", 0);
91+
List<InterpreterCompletion> resultNotMatch = alluxioInterpreter.completion("notMatch", 0);
92+
List<InterpreterCompletion> resultAll = alluxioInterpreter.completion("", 0);
9293

9394
Assert.assertEquals(expectedResultOne, resultOne);
9495
Assert.assertEquals(expectedResultTwo, resultTwo);

‎angular/src/main/java/org/apache/zeppelin/angular/AngularInterpreter.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.apache.zeppelin.interpreter.InterpreterResult;
2727
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
2828
import org.apache.zeppelin.interpreter.InterpreterResult.Type;
29+
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
2930
import org.apache.zeppelin.scheduler.Scheduler;
3031
import org.apache.zeppelin.scheduler.SchedulerFactory;
3132

@@ -69,8 +70,8 @@ public int getProgress(InterpreterContext context) {
6970
}
7071

7172
@Override
72-
public List<String> completion(String buf, int cursor) {
73-
return new LinkedList<String>();
73+
public List<InterpreterCompletion> completion(String buf, int cursor) {
74+
return new LinkedList<>();
7475
}
7576

7677
@Override

‎cassandra/src/main/java/org/apache/zeppelin/cassandra/CassandraInterpreter.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.zeppelin.interpreter.InterpreterContext;
2424
import org.apache.zeppelin.interpreter.InterpreterPropertyBuilder;
2525
import org.apache.zeppelin.interpreter.InterpreterResult;
26+
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
2627
import org.apache.zeppelin.scheduler.Scheduler;
2728
import org.apache.zeppelin.scheduler.SchedulerFactory;
2829
import org.slf4j.Logger;
@@ -139,7 +140,7 @@ public class CassandraInterpreter extends Interpreter {
139140
public static final String LOGGING_DOWNGRADING_RETRY = "LOGGING_DOWNGRADING";
140141
public static final String LOGGING_FALLTHROUGH_RETRY = "LOGGING_FALLTHROUGH";
141142

142-
public static final List<String> NO_COMPLETION = new ArrayList<>();
143+
public static final List NO_COMPLETION = new ArrayList<>();
143144

144145
InterpreterLogic helper;
145146
Cluster cluster;
@@ -320,7 +321,7 @@ public int getProgress(InterpreterContext context) {
320321
}
321322

322323
@Override
323-
public List<String> completion(String buf, int cursor) {
324+
public List<InterpreterCompletion> completion(String buf, int cursor) {
324325
return NO_COMPLETION;
325326
}
326327

‎elasticsearch/src/main/java/org/apache/zeppelin/elasticsearch/ElasticsearchInterpreter.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.apache.zeppelin.interpreter.InterpreterContext;
3838
import org.apache.zeppelin.interpreter.InterpreterPropertyBuilder;
3939
import org.apache.zeppelin.interpreter.InterpreterResult;
40+
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
4041
import org.elasticsearch.action.delete.DeleteResponse;
4142
import org.elasticsearch.action.get.GetResponse;
4243
import org.elasticsearch.action.index.IndexResponse;
@@ -244,8 +245,8 @@ public int getProgress(InterpreterContext interpreterContext) {
244245
}
245246

246247
@Override
247-
public List<String> completion(String s, int i) {
248-
final List<String> suggestions = new ArrayList<>();
248+
public List<InterpreterCompletion> completion(String s, int i) {
249+
final List suggestions = new ArrayList<>();
249250

250251
if (StringUtils.isEmpty(s)) {
251252
suggestions.addAll(COMMANDS);

‎file/src/main/java/org/apache/zeppelin/file/FileInterpreter.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.zeppelin.interpreter.InterpreterResult;
2424
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
2525
import org.apache.zeppelin.interpreter.InterpreterResult.Type;
26+
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
2627
import org.apache.zeppelin.scheduler.Scheduler;
2728
import org.apache.zeppelin.scheduler.SchedulerFactory;
2829
import org.slf4j.Logger;
@@ -165,7 +166,7 @@ public Scheduler getScheduler() {
165166
}
166167

167168
@Override
168-
public List<String> completion(String buf, int cursor) {
169+
public List<InterpreterCompletion> completion(String buf, int cursor) {
169170
return null;
170171
}
171172
}

‎file/src/main/java/org/apache/zeppelin/file/HDFSFileInterpreter.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.apache.zeppelin.interpreter.Interpreter;
2727
import org.apache.zeppelin.interpreter.InterpreterException;
2828
import org.apache.zeppelin.interpreter.InterpreterPropertyBuilder;
29+
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
2930

3031
/**
3132
* HDFS implementation of File interpreter for Zeppelin.
@@ -259,9 +260,9 @@ public boolean isDirectory(String path) {
259260

260261

261262
@Override
262-
public List<String> completion(String buf, int cursor) {
263+
public List<InterpreterCompletion> completion(String buf, int cursor) {
263264
logger.info("Completion request at position\t" + cursor + " in string " + buf);
264-
final List<String> suggestions = new ArrayList<>();
265+
final List suggestions = new ArrayList<>();
265266
if (StringUtils.isEmpty(buf)) {
266267
suggestions.add("ls");
267268
suggestions.add("cd");

‎flink/src/main/java/org/apache/zeppelin/flink/FlinkInterpreter.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.apache.zeppelin.interpreter.InterpreterResult;
3939
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
4040
import org.apache.zeppelin.interpreter.InterpreterUtils;
41+
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
4142
import org.slf4j.Logger;
4243
import org.slf4j.LoggerFactory;
4344

@@ -331,8 +332,8 @@ public int getProgress(InterpreterContext context) {
331332
}
332333

333334
@Override
334-
public List<String> completion(String buf, int cursor) {
335-
return new LinkedList<String>();
335+
public List<InterpreterCompletion> completion(String buf, int cursor) {
336+
return new LinkedList<>();
336337
}
337338

338339
private void startFlinkMiniCluster() {

‎geode/src/main/java/org/apache/zeppelin/geode/GeodeOqlInterpreter.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.apache.zeppelin.interpreter.InterpreterPropertyBuilder;
2525
import org.apache.zeppelin.interpreter.InterpreterResult;
2626
import org.apache.zeppelin.interpreter.InterpreterResult.Code;
27+
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
2728
import org.apache.zeppelin.scheduler.Scheduler;
2829
import org.apache.zeppelin.scheduler.SchedulerFactory;
2930
import org.slf4j.Logger;
@@ -300,7 +301,7 @@ public Scheduler getScheduler() {
300301
}
301302

302303
@Override
303-
public List<String> completion(String buf, int cursor) {
304+
public List<InterpreterCompletion> completion(String buf, int cursor) {
304305
return null;
305306
}
306307

‎hbase/src/main/java/org/apache/zeppelin/hbase/HbaseInterpreter.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package org.apache.zeppelin.hbase;
1616

1717
import org.apache.zeppelin.interpreter.*;
18+
import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
1819
import org.apache.zeppelin.scheduler.Scheduler;
1920
import org.apache.zeppelin.scheduler.SchedulerFactory;
2021
import org.jruby.embed.LocalContextScope;
@@ -152,7 +153,7 @@ public Scheduler getScheduler() {
152153
}
153154

154155
@Override
155-
public List<String> completion(String buf, int cursor) {
156+
public List<InterpreterCompletion> completion(String buf, int cursor) {
156157
return null;
157158
}
158159

0 commit comments

Comments
 (0)