You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2018/11/07 01:18:42 UTC
zeppelin git commit: ZEPPELIN-3846. Code Completion is broken
Repository: zeppelin
Updated Branches:
refs/heads/master 9f04c8fcb -> 31ceca797
ZEPPELIN-3846. Code Completion is broken
### What is this PR for?
Code completion is broken due to the shaded jar in zeppelin-interpreter-api, this PR fix this issue and also add unit test for it.
### What type of PR is it?
[Bug Fix]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://jira.apache.org/jira/browse/ZEPPELIN-3846
### How should this be tested?
* CI pass
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Jeff Zhang <zj...@apache.org>
Closes #3220 from zjffdu/ZEPPELIN-3846 and squashes the following commits:
5cc385eea [Jeff Zhang] ZEPPELIN-3846. Code Completion is broken
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/31ceca79
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/31ceca79
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/31ceca79
Branch: refs/heads/master
Commit: 31ceca797df26815593407db2ffc3b9d2d80ecd5
Parents: 9f04c8f
Author: Jeff Zhang <zj...@apache.org>
Authored: Fri Nov 2 14:02:47 2018 +0800
Committer: Jeff Zhang <zj...@apache.org>
Committed: Wed Nov 7 09:15:51 2018 +0800
----------------------------------------------------------------------
zeppelin-interpreter-api/pom.xml | 18 ++----------------
.../zeppelin/rest/ZeppelinSparkClusterTest.java | 6 +++++-
2 files changed, 7 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/31ceca79/zeppelin-interpreter-api/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-interpreter-api/pom.xml b/zeppelin-interpreter-api/pom.xml
index 70170be..e4b800c 100644
--- a/zeppelin-interpreter-api/pom.xml
+++ b/zeppelin-interpreter-api/pom.xml
@@ -125,22 +125,8 @@
</excludes>
</relocation>
<relocation>
- <pattern>com</pattern>
- <shadedPattern>${shaded.dependency.prefix}.com</shadedPattern>
- <excludes>
- <exclude>**/pom.xml</exclude>
- <!-- Not the com/ packages that are a part of particular jdk implementations -->
- <exclude>com/sun/tools/*</exclude>
- <exclude>com/sun/javadoc/*</exclude>
- <exclude>com/sun/security/*</exclude>
- <exclude>com/sun/jndi/*</exclude>
- <exclude>com/sun/management/*</exclude>
- <exclude>com/sun/tools/**/*</exclude>
- <exclude>com/sun/javadoc/**/*</exclude>
- <exclude>com/sun/security/**/*</exclude>
- <exclude>com/sun/jndi/**/*</exclude>
- <exclude>com/sun/management/**/*</exclude>
- </excludes>
+ <pattern>com.google</pattern>
+ <shadedPattern>${shaded.dependency.prefix}.com.google</shadedPattern>
</relocation>
<relocation>
<pattern>io</pattern>
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/31ceca79/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java
----------------------------------------------------------------------
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java
index faa639f..7494df2 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.apache.commons.io.FileUtils;
+import org.apache.zeppelin.interpreter.thrift.InterpreterCompletion;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -64,7 +65,7 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
//ci timeout.
//TODO(zjffdu) remove this after we upgrade it to junit 4.13 (ZEPPELIN-3341)
private static Set<String> verifiedSparkVersions = new HashSet<>();
-
+
private String sparkVersion;
private AuthenticationInfo anonymous = new AuthenticationInfo("anonymous");
@@ -170,6 +171,9 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
assertEquals(Status.FINISHED, p.getStatus());
assertEquals("2", p.getReturn().message().get(0).getData());
+ // test code completion
+ List<InterpreterCompletion> completions = note.completion(p.getId(), "sc.", 2);
+ assertTrue(completions.size() > 0);
ZeppelinServer.notebook.removeNote(note.getId(), anonymous);
}