Skip to content

Commit ab2b191

Browse files
xiejiajunxiejiajun
committed
2 parents 5569788 + 016b946 commit ab2b191

File tree

110 files changed

+2409
-2157
lines changed

Some content is hidden

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

110 files changed

+2409
-2157
lines changed

‎.travis.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,16 @@ jobs:
9595
dist: xenial
9696
env: PYTHON="3" R="true" SCALA_VER="2.10" TENSORFLOW="1.13.1" PROFILE="-Pscala-2.10" BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat" MODULES="-pl $(echo .,zeppelin-interpreter,zeppelin-interpreter-shaded,${INTERPRETERS} | sed 's/!//g')" TEST_PROJECTS=""
9797

98+
# Test flink 1.10
99+
- jdk: "openjdk8"
100+
dist: xenial
101+
env: PYTHON="3" FLINK="1.10.1" PROFILE="-Pflink-1.10" BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat" MODULES="-pl flink/interpreter" TEST_PROJECTS="-Dtest=org.apache.zeppelin.flink.*"
102+
103+
# Test flink 1.11 & flink integration test
104+
- jdk: "openjdk8"
105+
dist: xenial
106+
env: BUILD_PLUGINS="true" PYTHON="3" FLINK="1.11.0" PROFILE="-Pflink-1.11 -Pintegration" BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat" MODULES="-pl flink/interpreter,zeppelin-interpreter-integration" TEST_PROJECTS="-Dtest=org.apache.zeppelin.flink.*,FlinkIntegrationTest"
107+
98108
# Run Spark integration test and unit test
99109

100110
# Run spark integration of in one zeppelin instance: Spark 3.0

‎LICENSE‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@ The text of each license is also included at licenses/LICENSE-[project]-[version
267267
(Apache 2.0) Embedded MongoDB (https://github.com/flapdoodle-oss/de.flapdoodle.embed.mongo)
268268
(Apache 2.0) Kotlin (https://github.com/JetBrains/kotlin)
269269
(Apache 2.0) s3proxy (https://github.com/gaul/s3proxy)
270+
(Apache 2.0) kubernetes-client (https://github.com/fabric8io/kubernetes-client)
270271

271272
========================================================================
272273
BSD 3-Clause licenses

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public class CassandraInterpreter extends Interpreter {
152152
public static final String DEFAULT_TCP_NO_DELAY = "true";
153153
public static final String DEFAULT_MAX_SCHEMA_AGREEMENT_WAIT_SECONDS = "12";
154154

155-
static final List NO_COMPLETION = new ArrayList<>();
155+
static final List<InterpreterCompletion> NO_COMPLETION = new ArrayList<>();
156156
public static final String DATASTAX_JAVA_DRIVER_PREFIX = "datastax-java-driver.";
157157
public static final String MILLISECONDS_STR = " milliseconds";
158158
public static final String SECONDS_STR = " seconds";

‎cassandra/src/main/resources/scalate/aggregateDetails.ssp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,46 +20,46 @@
2020
<%@ val sameNameAggregateDetails: SameNameAggregateDetails %>
2121
<%@ val withCaption: Boolean%>
2222
<div class="row">
23-
<div class="col-md-2"/>
23+
<div class="col-md-2"></div>
2424
<div class="col-md-8 col-offset-md-2">
2525
#for (aggregate <- sameNameAggregateDetails.aggregates)
2626
<div class="panel panel-default table-responsive table-bordered">
2727
<table class="table">
2828
#if(withCaption)
29-
<caption><h4 class="text-success"><i class="glyphicon glyphicon-retweet"/>&nbsp;${aggregate.name}</h4></caption>
29+
<caption><h4 class="text-success"><span class="glyphicon glyphicon-retweet"></span>&nbsp;${aggregate.name}</h4></caption>
3030
#end
3131
<tbody>
3232
<tr>
3333
<td class="col-md-6"><strong>Keyspace</strong></td>
34-
<td class="col-md-6 text-danger">${aggregate.keyspace}</td>
34+
<td class="col-md-6 text-danger" style="text-align:left">${aggregate.keyspace}</td>
3535
</tr>
3636
<tr>
3737
<td class="col-md-6"><strong>Arguments</strong></td>
38-
<td class="col-md-6">${aggregate.arguments.toList.mkString(", ")}</td>
38+
<td class="col-md-6" style="text-align:left">${aggregate.arguments.toList.mkString(", ")}</td>
3939
</tr>
4040
<tr>
4141
<td class="col-md-6"><strong>State Function</strong></td>
42-
<td class="col-md-6">${aggregate.sFunc}</td>
42+
<td class="col-md-6" style="text-align:left">${aggregate.sFunc}</td>
4343
</tr>
4444
<tr>
4545
<td class="col-md-6"><strong>State Type</strong></td>
46-
<td class="col-md-6">${aggregate.sType}</td>
46+
<td class="col-md-6" style="text-align:left">${aggregate.sType}</td>
4747
</tr>
4848
#if(aggregate.finalFunc.isDefined)
4949
<tr>
5050
<td class="col-md-6"><strong>Final Function</strong></td>
51-
<td class="col-md-6">${aggregate.finalFunc.get}</td>
51+
<td class="col-md-6" style="text-align:left">${aggregate.finalFunc.get}</td>
5252
</tr>
5353
#end
5454
#if(aggregate.initCond.isDefined)
5555
<tr>
5656
<td class="col-md-6"><strong>Initial State</strong></td>
57-
<td class="col-md-6">${aggregate.initCond.get}</td>
57+
<td class="col-md-6" style="text-align:left">${aggregate.initCond.get}</td>
5858
</tr>
5959
#end
6060
<tr>
6161
<td class="col-md-6"><strong>Return type</strong></td>
62-
<td class="col-md-6">${aggregate.returnType}</td>
62+
<td class="col-md-6" style="text-align:left">${aggregate.returnType}</td>
6363
</tr>
6464
</tbody>
6565
</table>

‎cassandra/src/main/resources/scalate/allAggregates.ssp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,34 +30,33 @@
3030
<div class="panel-heading" role="tab">
3131
<h4 class="panel-title">
3232
<a role="button" data-toggle="collapse" data-target="#${ksId}" aria-expanded="false">
33-
<span class="text-danger"><i class="glyphicon glyphicon-folder-open"/>&nbsp;&nbsp;${ksName}</span>
33+
<span class="text-danger"><span class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;${ksName}</span>
3434
</a>
3535
</h4>
3636
</div>
3737
<div id="${ksId}" class="panel-collapse collapse" role="tabpanel">
3838
<div class="panel-body">
3939
<div class="row">
40-
<div class="col-md-2"/>
40+
<div class="col-md-2"></div>
4141
<div class="col-md-8 col-offset-md-2 table-responsive table-bordered">
4242
<table class="table">
4343
<thead>
4444
<tr>
45-
<th>Aggregate</th>
46-
<th>Return Type</th>
45+
<th style="text-align:right">Aggregate</th>
46+
<th style="text-align:left">Return Type</th>
4747
</tr>
4848
</thead>
4949
<tbody>
5050
#for (aggregate <- aggregates)
5151
<tr class="text-success">
52-
<td>${aggregate.name + aggregate.arguments.mkString("(", ", ", ")")}</td>
53-
<td>${aggregate.returnType}</td>
52+
<td style="text-align:right">${aggregate.name + aggregate.arguments.mkString("(", ", ", ")")}</td>
53+
<td style="text-align:left">${aggregate.returnType}</td>
5454
</tr>
5555
#end
56-
5756
</tbody>
5857
</table>
5958
</div>
60-
<div class="col-md-2"/>
59+
<div class="col-md-2"></div>
6160
</div>
6261
</div>
6362
</div>

‎cassandra/src/main/resources/scalate/allFunctions.ssp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,34 +30,33 @@
3030
<div class="panel-heading" role="tab">
3131
<h4 class="panel-title">
3232
<a role="button" data-toggle="collapse" data-target="#${ksId}" aria-expanded="false">
33-
<span class="text-danger"><i class="glyphicon glyphicon-folder-open"/>&nbsp;&nbsp;${ksName}</span>
33+
<span class="text-danger"><span class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;${ksName}</span>
3434
</a>
3535
</h4>
3636
</div>
3737
<div id="${ksId}" class="panel-collapse collapse" role="tabpanel">
3838
<div class="panel-body">
3939
<div class="row">
40-
<div class="col-md-2"/>
40+
<div class="col-md-2"></div>
4141
<div class="col-md-8 col-offset-md-2 table-responsive table-bordered">
4242
<table class="table">
4343
<thead>
4444
<tr>
45-
<th>Function</th>
46-
<th>Return Type</th>
45+
<th style="text-align:right">Function</th>
46+
<th style="text-align:left">Return Type</th>
4747
</tr>
4848
</thead>
4949
<tbody>
5050
#for (function <- functions)
5151
<tr class="text-success">
52-
<td>${function.name + function.arguments.mkString("(",", ", ")")}</td>
53-
<td>${function.returnType}</td>
52+
<td style="text-align:right">${function.name + function.arguments.mkString("(",", ", ")")}</td>
53+
<td style="text-align:left">${function.returnType}</td>
5454
</tr>
5555
#end
56-
5756
</tbody>
5857
</table>
5958
</div>
60-
<div class="col-md-2"/>
59+
<div class="col-md-2"></div>
6160
</div>
6261
</div>
6362
</div>

‎cassandra/src/main/resources/scalate/allMaterializedViews.ssp‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,36 +28,34 @@
2828
<div class="panel-heading" role="tab">
2929
<h4 class="panel-title">
3030
<a role="button" data-toggle="collapse" data-target="#${ksId}" aria-expanded="false">
31-
<span class="text-danger"><i class="glyphicon glyphicon-folder-open"/>&nbsp;&nbsp;${ksName}</span>
31+
<span class="text-danger"><span class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;${ksName}</span>
3232
</a>
3333
</h4>
3434
</div>
3535
<div id="${ksId}" class="panel-collapse collapse" role="tabpanel">
3636
<div class="panel-body">
3737
<div class="row">
38-
<div class="col-md-2"/>
38+
<div class="col-md-2"></div>
3939
<div class="col-md-8 col-offset-md-2 table-responsive table-bordered">
4040
<table class="table">
4141
<thead>
42-
<tr><th>Materialized View</th></tr>
42+
<tr><th style="text-align:left">Materialized View</th></tr>
4343
</thead>
4444
<tbody>
4545
#for (mv <- mvs)
46-
4746
<tr class="text-primary">
48-
<td>
47+
<td style="text-align:left">
4948
${mv.name}
50-
&nbsp;<i class="glyphicon glyphicon-arrow-right"/>
51-
&nbsp;<i class="glyphicon glyphicon-th-list"/>
49+
&nbsp;<span class="glyphicon glyphicon-arrow-right"></span>
50+
&nbsp;<span class="glyphicon glyphicon-th-list"></span>
5251
&nbsp;${mv.baseTable}
5352
</td>
5453
</tr>
5554
#end
56-
5755
</tbody>
5856
</table>
5957
</div>
60-
<div class="col-md-2"/>
58+
<div class="col-md-2"></div>
6159
</div>
6260
</div>
6361
</div>

‎cassandra/src/main/resources/scalate/allTables.ssp‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,28 @@
2828
<div class="panel-heading" role="tab">
2929
<h4 class="panel-title">
3030
<a role="button" data-toggle="collapse" data-target="#${ksId}" aria-expanded="false">
31-
<span class="text-danger"><i class="glyphicon glyphicon-folder-open"/>&nbsp;&nbsp;${ksName}</span>
31+
<span class="text-danger"><span class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;${ksName}</span>
3232
</a>
3333
</h4>
3434
</div>
3535
<div id="${ksId}" class="panel-collapse collapse" role="tabpanel">
3636
<div class="panel-body">
3737
<div class="row">
38-
<div class="col-md-2"/>
38+
<div class="col-md-2"></div>
3939
<div class="col-md-8 col-offset-md-2 table-responsive table-bordered">
4040
<table class="table">
4141
<thead>
42-
<tr><th>Tables</th></tr>
42+
<tr><th style="text-align:left">Tables</th></tr>
4343
</thead>
4444
<tbody>
4545
#for (table <- tables)
46-
47-
<tr class="text-primary"><td>${table}</td></tr>
46+
<tr class="text-primary"><td style="text-align:left">${table}</td></tr>
4847
#end
4948

5049
</tbody>
5150
</table>
5251
</div>
53-
<div class="col-md-2"/>
52+
<div class="col-md-2"></div>
5453
</div>
5554
</div>
5655
</div>

‎cassandra/src/main/resources/scalate/allUDTs.ssp‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,27 @@
2828
<div class="panel-heading" role="tab">
2929
<h4 class="panel-title">
3030
<a role="button" data-toggle="collapse" data-target="#${ksId}" aria-expanded="false">
31-
<span class="text-danger"><i class="glyphicon glyphicon-folder-open"/>&nbsp;&nbsp;${ksName}</span>
31+
<span class="text-danger"><span class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;${ksName}</span>
3232
</a>
3333
</h4>
3434
</div>
3535
<div id="${ksId}" class="panel-collapse collapse" role="tabpanel">
3636
<div class="panel-body">
3737
<div class="row">
38-
<div class="col-md-2"/>
38+
<div class="col-md-2"></div>
3939
<div class="col-md-8 col-offset-md-2 table-responsive table-bordered">
4040
<table class="table">
4141
<thead>
42-
<tr><th>UDT</th></tr>
42+
<tr><th style="text-align:left">UDT</th></tr>
4343
</thead>
4444
<tbody>
4545
#for (udt <- udts)
46-
47-
<tr class="text-warning"><td>${udt}</td></tr>
46+
<tr class="text-warning"><td style="text-align:left">${udt}</td></tr>
4847
#end
49-
5048
</tbody>
5149
</table>
5250
</div>
53-
<div class="col-md-2"/>
51+
<div class="col-md-2"></div>
5452
</div>
5553
</div>
5654
</div>

‎cassandra/src/main/resources/scalate/clusterContent.ssp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,12 @@
3232
</table>
3333
<div class="row">
3434
<div class="panel-group" role="tablist" aria-multiselectable="true">
35-
3635
#for ((id, name, keyspaceHTML) <- clusterContent.keyspaces)
3736
<div class="panel panel-default">
3837
<div class="panel-heading" role="tab">
3938
<h4 class="panel-title">
4039
<a role="button" data-toggle="collapse" data-target="#${id}" aria-expanded="false">
41-
<span class="text-danger"><i class="glyphicon glyphicon-folder-open"/>&nbsp;&nbsp;${name}</span>
40+
<span class="text-danger"><span class="glyphicon glyphicon-folder-open"></span>&nbsp;&nbsp;${name}</span>
4241
</a>
4342
</h4>
4443
</div>

0 commit comments

Comments
 (0)