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/03/07 05:45:13 UTC
zeppelin git commit: ZEPPELIN-3304. Move sap module before
zeppelin-distribution
Repository: zeppelin
Updated Branches:
refs/heads/master db3774640 -> a3952ea95
ZEPPELIN-3304. Move sap module before zeppelin-distribution
### What is this PR for?
1. Move sap module before zeppelin-distribution, otherwise sap module will be built after zeppelin-distribution
2. Fix code style issue of sap module
3. Update travis to include sap module
### What type of PR is it?
[Bug Fix]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-3304
### 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 #2845 from zjffdu/ZEPPELIN-3304 and squashes the following commits:
533a1b0 [Jeff Zhang] ZEPPELIN-3304. Move sap module before zeppelin-distribution
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/a3952ea9
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/a3952ea9
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/a3952ea9
Branch: refs/heads/master
Commit: a3952ea95c72543ca767d2c9dd2f4c6cab63fe1b
Parents: db37746
Author: Jeff Zhang <zj...@apache.org>
Authored: Wed Mar 7 11:54:51 2018 +0800
Committer: Jeff Zhang <zj...@apache.org>
Committed: Wed Mar 7 13:45:07 2018 +0800
----------------------------------------------------------------------
.travis.yml | 2 +-
pom.xml | 2 +-
.../main/java/org/apache/zeppelin/sap/universe/UniverseUtil.java | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a3952ea9/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index bcef80a..dcd6cea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,7 +37,7 @@ addons:
env:
global:
# Interpreters does not required by zeppelin-server integration tests
- - INTERPRETERS='!hbase,!pig,!jdbc,!file,!flink,!ignite,!kylin,!lens,!cassandra,!elasticsearch,!bigquery,!alluxio,!scio,!livy,!groovy'
+ - INTERPRETERS='!hbase,!pig,!jdbc,!file,!flink,!ignite,!kylin,!lens,!cassandra,!elasticsearch,!bigquery,!alluxio,!scio,!livy,!groovy,!sap'
matrix:
include:
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a3952ea9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dc6d64b..d6087a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -77,11 +77,11 @@
<module>alluxio</module>
<module>scio</module>
<module>neo4j</module>
+ <module>sap</module>
<module>zeppelin-web</module>
<module>zeppelin-server</module>
<module>zeppelin-jupyter</module>
<module>zeppelin-distribution</module>
- <module>sap</module>
</modules>
<properties>
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a3952ea9/sap/src/main/java/org/apache/zeppelin/sap/universe/UniverseUtil.java
----------------------------------------------------------------------
diff --git a/sap/src/main/java/org/apache/zeppelin/sap/universe/UniverseUtil.java b/sap/src/main/java/org/apache/zeppelin/sap/universe/UniverseUtil.java
index dc9099d..31fbf51 100644
--- a/sap/src/main/java/org/apache/zeppelin/sap/universe/UniverseUtil.java
+++ b/sap/src/main/java/org/apache/zeppelin/sap/universe/UniverseUtil.java
@@ -188,7 +188,8 @@ public class UniverseUtil {
}
if (buf.toString().toLowerCase().endsWith("where") || i == array.length - 1) {
selectPart = false;
- select.append(parseResultObj(resultObj.toString().replaceAll("(?i)wher$", ""), nodeInfos));
+ select.append(parseResultObj(resultObj.toString().replaceAll("(?i)wher$", ""),
+ nodeInfos));
select.append(RESULT_END_TEMPLATE);
continue;
}