Skip to content

Commit a3952ea

Browse files
committed
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 <[email protected]> Closes apache#2845 from zjffdu/ZEPPELIN-3304 and squashes the following commits: 533a1b0 [Jeff Zhang] ZEPPELIN-3304. Move sap module before zeppelin-distribution
1 parent db37746 commit a3952ea

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ addons:
3737
env:
3838
global:
3939
# Interpreters does not required by zeppelin-server integration tests
40-
- INTERPRETERS='!hbase,!pig,!jdbc,!file,!flink,!ignite,!kylin,!lens,!cassandra,!elasticsearch,!bigquery,!alluxio,!scio,!livy,!groovy'
40+
- INTERPRETERS='!hbase,!pig,!jdbc,!file,!flink,!ignite,!kylin,!lens,!cassandra,!elasticsearch,!bigquery,!alluxio,!scio,!livy,!groovy,!sap'
4141

4242
matrix:
4343
include:

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@
7777
<module>alluxio</module>
7878
<module>scio</module>
7979
<module>neo4j</module>
80+
<module>sap</module>
8081
<module>zeppelin-web</module>
8182
<module>zeppelin-server</module>
8283
<module>zeppelin-jupyter</module>
8384
<module>zeppelin-distribution</module>
84-
<module>sap</module>
8585
</modules>
8686

8787
<properties>

sap/src/main/java/org/apache/zeppelin/sap/universe/UniverseUtil.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,8 @@ && isFilter(String.format("%s]", whereBuf.toString()), text.substring(i + 1))))
188188
}
189189
if (buf.toString().toLowerCase().endsWith("where") || i == array.length - 1) {
190190
selectPart = false;
191-
select.append(parseResultObj(resultObj.toString().replaceAll("(?i)wher$", ""), nodeInfos));
191+
select.append(parseResultObj(resultObj.toString().replaceAll("(?i)wher$", ""),
192+
nodeInfos));
192193
select.append(RESULT_END_TEMPLATE);
193194
continue;
194195
}

0 commit comments

Comments
 (0)