Skip to content

[ZEPPELIN-559] Cassandra interpreter v2#600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
doanduyhai wants to merge 9 commits into from
Closed

[ZEPPELIN-559] Cassandra interpreter v2 #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
058161d
Upgrade Java driver version to 3.0.0-rc1
doanduyhai Jan 5, 2016
6b46076
Add Support for UDF, UDA and Materialized Views
doanduyhai Jan 5, 2016
6ea9e55
Update help menu and changelog
doanduyhai Jan 5, 2016
7a5ac39
Update RegExp for UDF creation to fix multiple statements match
doanduyhai Jan 6, 2016
6509da5
Fix failing tests
doanduyhai Jan 5, 2016
138804c
Fix CSS style for UDF & MV in menu display
doanduyhai Jan 9, 2016
41b8667
Tune regular expression for FUNCTION creation pattern
doanduyhai Jan 9, 2016
a2d831b
Refactor after code review
doanduyhai Jan 10, 2016
36e3bdb
Fix random test failure
doanduyhai Jan 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions cassandra/pom.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,18 +35,19 @@
<url>http://zeppelin.incubator.apache.org</url>

<properties>
<cassandra.driver.version>2.1.7.1</cassandra.driver.version>
<cassandra.driver.version>3.0.0-rc1</cassandra.driver.version>
<snappy.version>1.0.5.4</snappy.version>
<lz4.version>1.2.0</lz4.version>
<scala.version>2.11.7</scala.version>
<scala.binary.version>2.11</scala.binary.version>
<commons-lang.version>3.4</commons-lang.version>
<lz4.version>1.3.0</lz4.version>
<scala.version>2.10.4</scala.version>
<scala.binary.version>2.10</scala.binary.version>
<commons-lang.version>3.3.2</commons-lang.version>
<scalate.version>1.7.1</scalate.version>
<cassandra.guava.version>16.0.1</cassandra.guava.version>

<!--TEST-->
<scalatest.version>2.2.4</scalatest.version>
<junit.version>4.12</junit.version>
<achilles.version>3.2.2</achilles.version>
<achilles.version>3.2.4-Zeppelin</achilles.version>
<assertj.version>1.7.0</assertj.version>
<mockito.version>1.9.5</mockito.version>
</properties>
Expand All@@ -65,6 +66,12 @@
<version>${cassandra.driver.version}</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${cassandra.guava.version}</version>
</dependency>

<!-- Compression libraries for the cassandra-driver protocol. -->
<!-- Include both compression options to make to simplify deployment. -->

Expand DownExpand Up@@ -130,7 +137,7 @@

<dependency>
<groupId>info.archinnov</groupId>
<artifactId>achilles-junit</artifactId>
<artifactId>achilles-embedded</artifactId>
<version>${achilles.version}</version>
<scope>test</scope>
<exclusions>
Expand All@@ -145,13 +152,6 @@
</exclusions>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>16.0</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand All@@ -167,7 +167,6 @@
</dependency>
</dependencies>


<build>
<plugins>
<!-- Plugin to compile Scala code -->
Expand DownExpand Up@@ -293,7 +292,6 @@
</execution>
</executions>
</plugin>

</plugins>
</build>
</project>
81 changes: 81 additions & 0 deletions cassandra/src/main/resources/scalate/aggregateDetails.ssp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
<%--
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
--%>
#import(org.apache.zeppelin.cassandra.MetaDataHierarchy._)
<%@ val sameNameAggregateDetails: SameNameAggregateDetails %>
<%@ val withCaption: Boolean%>
<div class="row">
<div class="col-md-2"/>
<div class="col-md-8 col-offset-md-2">
#for (aggregate <- sameNameAggregateDetails.aggregates)
<div class="panel panel-default table-responsive table-bordered">
<table class="table">
#if(withCaption)
<caption><h4 class="text-success"><i class="glyphicon glyphicon-retweet"/>&nbsp;${aggregate.name}</h4></caption>
#end
<tbody>
<tr>
<td class="col-md-6"><strong>Keyspace</strong></td>
<td class="col-md-6 text-danger">${aggregate.keyspace}</td>
</tr>
<tr>
<td class="col-md-6"><strong>Arguments</strong></td>
<td class="col-md-6">${aggregate.arguments.toList.mkString(", ")}</td>
</tr>
<tr>
<td class="col-md-6"><strong>State Function</strong></td>
<td class="col-md-6">${aggregate.sFunc}</td>
</tr>
<tr>
<td class="col-md-6"><strong>State Type</strong></td>
<td class="col-md-6">${aggregate.sType}</td>
</tr>
#if(aggregate.finalFunc.isDefined)
<tr>
<td class="col-md-6"><strong>Final Function</strong></td>
<td class="col-md-6">${aggregate.finalFunc.get}</td>
</tr>
#end
#if(aggregate.initCond.isDefined)
<tr>
<td class="col-md-6"><strong>Initial State</strong></td>
<td class="col-md-6">${aggregate.initCond.get}</td>
</tr>
#end
<tr>
<td class="col-md-6"><strong>Return type</strong></td>
<td class="col-md-6">${aggregate.returnType}</td>
</tr>
</tbody>
</table>
<div class="panel-footer">
<a data-toggle="collapse" data-target="#${aggregate.uniqueId}_asCQL">
<strong>As CQL statement</strong>
<span class="caret"></span>
</a>
<br/><br/>
<div class="text-success collapse" id="${aggregate.uniqueId}_asCQL">
<pre class="well">${aggregate.asCQL}</pre>
</div>
</div>
</div>
<hr/>
#end
</div>
<div class="col-md-2"></div>
</div>
68 changes: 68 additions & 0 deletions cassandra/src/main/resources/scalate/allAggregates.ssp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
<%--
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
--%>

#import(org.apache.zeppelin.cassandra.MetaDataHierarchy._)
#import(java.util.UUID)
<%@ val allAggregates: Map[(UUID, String), List[AggregateSummary]] %>

<div class="container">

<div class="row">
<div class="panel-group" role="tablist" aria-multiselectable="true">
#for (((ksId,ksName), aggregates) <- allAggregates)
<div class="panel panel-default">
<div class="panel-heading" role="tab">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" data-target="#${ksId}" aria-expanded="false">
<span class="text-danger"><i class="glyphicon glyphicon-folder-open"/>&nbsp;&nbsp;${ksName}</span>
</a>
</h4>
</div>
<div id="${ksId}" class="panel-collapse collapse" role="tabpanel">
<div class="panel-body">
<div class="row">
<div class="col-md-2"/>
<div class="col-md-8 col-offset-md-2 table-responsive table-bordered">
<table class="table">
<thead>
<tr>
<th>Aggregate</th>
<th>Return Type</th>
</tr>
</thead>
<tbody>
#for (aggregate <- aggregates)
<tr class="text-success">
<td>${aggregate.name + aggregate.arguments.mkString("(", ", ", ")")}</td>
<td>${aggregate.returnType}</td>
</tr>
#end

</tbody>
</table>
</div>
<div class="col-md-2"/>
</div>
</div>
</div>
</div>
#end
</div>
</div>
</div>
68 changes: 68 additions & 0 deletions cassandra/src/main/resources/scalate/allFunctions.ssp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
<%--
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
--%>

#import(org.apache.zeppelin.cassandra.MetaDataHierarchy._)
#import(java.util.UUID)
<%@ val allFunctions: Map[(UUID, String), List[FunctionSummary]] %>

<div class="container">

<div class="row">
<div class="panel-group" role="tablist" aria-multiselectable="true">
#for (((ksId,ksName), functions) <- allFunctions)
<div class="panel panel-default">
<div class="panel-heading" role="tab">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" data-target="#${ksId}" aria-expanded="false">
<span class="text-danger"><i class="glyphicon glyphicon-folder-open"/>&nbsp;&nbsp;${ksName}</span>
</a>
</h4>
</div>
<div id="${ksId}" class="panel-collapse collapse" role="tabpanel">
<div class="panel-body">
<div class="row">
<div class="col-md-2"/>
<div class="col-md-8 col-offset-md-2 table-responsive table-bordered">
<table class="table">
<thead>
<tr>
<th>Function</th>
<th>Return Type</th>
</tr>
</thead>
<tbody>
#for (function <- functions)
<tr class="text-success">
<td>${function.name + function.arguments.mkString("(",", ", ")")}</td>
<td>${function.returnType}</td>
</tr>
#end

</tbody>
</table>
</div>
<div class="col-md-2"/>
</div>
</div>
</div>
</div>
#end
</div>
</div>
</div>
68 changes: 68 additions & 0 deletions cassandra/src/main/resources/scalate/allMaterializedViews.ssp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
<%--
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
--%>
#import(org.apache.zeppelin.cassandra.MetaDataHierarchy._)
#import(java.util.UUID)
<%@ val allMVs: Map[(UUID,String),List[MaterializedViewSummary]] %>
<div class="container">

<div class="row">
<div class="panel-group" role="tablist" aria-multiselectable="true">
#for (((ksId,ksName), mvs) <- allMVs)
<div class="panel panel-default">
<div class="panel-heading" role="tab">
<h4 class="panel-title">
<a role="button" data-toggle="collapse" data-target="#${ksId}" aria-expanded="false">
<span class="text-danger"><i class="glyphicon glyphicon-folder-open"/>&nbsp;&nbsp;${ksName}</span>
</a>
</h4>
</div>
<div id="${ksId}" class="panel-collapse collapse" role="tabpanel">
<div class="panel-body">
<div class="row">
<div class="col-md-2"/>
<div class="col-md-8 col-offset-md-2 table-responsive table-bordered">
<table class="table">
<thead>
<tr><th>Materialized View</th></tr>
</thead>
<tbody>
#for (mv <- mvs)

<tr class="text-primary">
<td>
${mv.name}
&nbsp;<i class="glyphicon glyphicon-arrow-right"/>
&nbsp;<i class="glyphicon glyphicon-th-list"/>
&nbsp;${mv.baseTable}
</td>
</tr>
#end

</tbody>
</table>
</div>
<div class="col-md-2"/>
</div>
</div>
</div>
</div>
#end
</div>
</div>
</div>
Loading