diff --git a/cassandra/pom.xml b/cassandra/pom.xml index 57b501a7a69..1b825b4f0da 100644 --- a/cassandra/pom.xml +++ b/cassandra/pom.xml @@ -35,18 +35,19 @@ http://zeppelin.incubator.apache.org - 2.1.7.1 + 3.0.0-rc1 1.0.5.4 - 1.2.0 - 2.11.7 - 2.11 - 3.4 + 1.3.0 + 2.10.4 + 2.10 + 3.3.2 1.7.1 + 16.0.1 2.2.4 4.12 - 3.2.2 + 3.2.4-Zeppelin 1.7.0 1.9.5 @@ -65,6 +66,12 @@ ${cassandra.driver.version} + + com.google.guava + guava + ${cassandra.guava.version} + + @@ -130,7 +137,7 @@ info.archinnov - achilles-junit + achilles-embedded ${achilles.version} test @@ -145,13 +152,6 @@ - - com.google.guava - guava - 16.0 - test - - org.mockito mockito-core @@ -167,7 +167,6 @@ - @@ -293,7 +292,6 @@ - diff --git a/cassandra/src/main/resources/scalate/aggregateDetails.ssp b/cassandra/src/main/resources/scalate/aggregateDetails.ssp new file mode 100644 index 00000000000..02800a2bd62 --- /dev/null +++ b/cassandra/src/main/resources/scalate/aggregateDetails.ssp @@ -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%> +
+
+
+ #for (aggregate <- sameNameAggregateDetails.aggregates) +
+ + #if(withCaption) + + #end + + + + + + + + + + + + + + + + + + #if(aggregate.finalFunc.isDefined) + + + + + #end + #if(aggregate.initCond.isDefined) + + + + + #end + + + + + +

 ${aggregate.name}

Keyspace${aggregate.keyspace}
Arguments${aggregate.arguments.toList.mkString(", ")}
State Function${aggregate.sFunc}
State Type${aggregate.sType}
Final Function${aggregate.finalFunc.get}
Initial State${aggregate.initCond.get}
Return type${aggregate.returnType}
+ +
+
+ #end +
+
+
\ No newline at end of file diff --git a/cassandra/src/main/resources/scalate/allAggregates.ssp b/cassandra/src/main/resources/scalate/allAggregates.ssp new file mode 100644 index 00000000000..f093c507d97 --- /dev/null +++ b/cassandra/src/main/resources/scalate/allAggregates.ssp @@ -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]] %> + +
+ +
+
+ #for (((ksId,ksName), aggregates) <- allAggregates) +
+ +
+
+
+
+
+ + + + + + + + + #for (aggregate <- aggregates) + + + + + #end + + +
AggregateReturn Type
${aggregate.name + aggregate.arguments.mkString("(", ", ", ")")}${aggregate.returnType}
+
+
+
+
+
+
+ #end +
+
+
\ No newline at end of file diff --git a/cassandra/src/main/resources/scalate/allFunctions.ssp b/cassandra/src/main/resources/scalate/allFunctions.ssp new file mode 100644 index 00000000000..fc756a42aa6 --- /dev/null +++ b/cassandra/src/main/resources/scalate/allFunctions.ssp @@ -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]] %> + +
+ +
+
+ #for (((ksId,ksName), functions) <- allFunctions) +
+ +
+
+
+
+
+ + + + + + + + + #for (function <- functions) + + + + + #end + + +
FunctionReturn Type
${function.name + function.arguments.mkString("(",", ", ")")}${function.returnType}
+
+
+
+
+
+
+ #end +
+
+
\ No newline at end of file diff --git a/cassandra/src/main/resources/scalate/allMaterializedViews.ssp b/cassandra/src/main/resources/scalate/allMaterializedViews.ssp new file mode 100644 index 00000000000..8ffee573a6c --- /dev/null +++ b/cassandra/src/main/resources/scalate/allMaterializedViews.ssp @@ -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]] %> +
+ +
+
+ #for (((ksId,ksName), mvs) <- allMVs) +
+ +
+
+
+
+
+ + + + + + #for (mv <- mvs) + + + + + #end + + +
Materialized View
+ ${mv.name} +   +   +  ${mv.baseTable} +
+
+
+
+
+
+
+ #end +
+
+
\ No newline at end of file diff --git a/cassandra/src/main/resources/scalate/allTables.ssp b/cassandra/src/main/resources/scalate/allTables.ssp index b363bee6b89..810881ba8ce 100644 --- a/cassandra/src/main/resources/scalate/allTables.ssp +++ b/cassandra/src/main/resources/scalate/allTables.ssp @@ -24,7 +24,6 @@
#for (((ksId,ksName), tables) <- allTables) -
\ No newline at end of file diff --git a/cassandra/src/main/resources/scalate/allUDTs.ssp b/cassandra/src/main/resources/scalate/allUDTs.ssp new file mode 100644 index 00000000000..559ef41af5a --- /dev/null +++ b/cassandra/src/main/resources/scalate/allUDTs.ssp @@ -0,0 +1,61 @@ +<%-- +/* +* 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 allUDTs: Map[(UUID,String),List[String]] %> +
+ +
+
+ #for (((ksId,ksName), udts) <- allUDTs) +
+ +
+
+
+
+
+ + + + + + #for (udt <- udts) + + + #end + + +
UDT
${udt}
+
+
+
+
+
+
+ #end +
+
+
\ No newline at end of file diff --git a/cassandra/src/main/resources/scalate/dropDownMenuForKeyspace.ssp b/cassandra/src/main/resources/scalate/dropDownMenuForKeyspace.ssp index 74f6fbc8970..6c2aad1d86b 100644 --- a/cassandra/src/main/resources/scalate/dropDownMenuForKeyspace.ssp +++ b/cassandra/src/main/resources/scalate/dropDownMenuForKeyspace.ssp @@ -35,8 +35,19 @@ #end #end - #if(ksContent.udts.nonEmpty) + #if(ksContent.views.nonEmpty) + + + #for((id,name,_) <- ksContent.views) +
  • + +  ${name} + +
  • + #end + #end + #if(ksContent.udts.nonEmpty) #for((id,name,_) <- ksContent.udts) @@ -47,6 +58,30 @@ #end #end + + #if(ksContent.functions.nonEmpty) + + + #for((id,name,_) <- ksContent.functions) +
  • + +  ${name} + +
  • + #end + #end + + #if(ksContent.aggregates.nonEmpty) + + + #for((id,name,_) <- ksContent.aggregates) +
  • + +  ${name} + +
  • + #end + #end \ No newline at end of file diff --git a/cassandra/src/main/resources/scalate/functionDetails.ssp b/cassandra/src/main/resources/scalate/functionDetails.ssp new file mode 100644 index 00000000000..7d61400f7a5 --- /dev/null +++ b/cassandra/src/main/resources/scalate/functionDetails.ssp @@ -0,0 +1,77 @@ +<%-- +/* +* 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 sameNameFunctionDetails: SameNameFunctionDetails %> +<%@ val withCaption: Boolean%> +
    +
    +
    + #for (function <- sameNameFunctionDetails.functions) +
    + + #if(withCaption) + + #end + + + + + + + + + + + + #if(function.calledOnNullInput) + + #else + + #end + + + + + + + + + + + + + + +

     ${function.name}

    Keyspace${function.keyspace}
    Arguments${function.arguments.toList.mkString(", ")}
    Null InputCALLED ON NULL INPUTRETURN NULL ON NULL INPUT
    Return type${function.returnType}
    Language${function.language}
    Body${escape(function.body)}
    + +
    +
    + #end +
    +
    +
    \ No newline at end of file diff --git a/cassandra/src/main/resources/scalate/helpMenu.ssp b/cassandra/src/main/resources/scalate/helpMenu.ssp index 1c793ecbbc3..26ff1171abd 100644 --- a/cassandra/src/main/resources/scalate/helpMenu.ssp +++ b/cassandra/src/main/resources/scalate/helpMenu.ssp @@ -27,7 +27,9 @@ <%@ val preparedStatementsId: UUID = UUIDs.random() %> <%@ val dynamicFormsId: UUID = UUIDs.random() %> <%@ val configurationId: UUID = UUIDs.random() %> -<%@ val miscId: UUID = UUIDs.random() %> +<%@ val sharedStatesId: UUID = UUIDs.random() %> +<%@ val changelogId: UUID = UUIDs.random() %> +<%@ val contactsId: UUID = UUIDs.random() %>

    @@ -70,10 +72,20 @@
  • - -   Misc + +   Shared States
  • +
  • + +   Change Log + +
  • +
  • + +   Contacts & Bugs + +
  • @@ -91,12 +103,12 @@
    #end + #if (ksContent.views.nonEmpty) + + + + + +

    Materialized Views
    +
    +
    + #for((id,name,viewHTML) <- ksContent.views) + +
    + +
    +
    + ${unescape(viewHTML)} +
    +
    +
    + #end +
    +
    + #end + #if (ksContent.udts.nonEmpty) @@ -88,4 +118,64 @@ #end + #if (ksContent.functions.nonEmpty) + +
    + + + +

    Functions
    +
    +
    + #for((id,name,functionHTML) <- ksContent.functions) + +
    + +
    +
    + ${unescape(functionHTML)} +
    +
    +
    + #end +
    +
    + #end + + #if (ksContent.aggregates.nonEmpty) + + + + + +

    Aggregates
    +
    +
    + #for((id,name,aggregateHTML) <- ksContent.aggregates) + +
    + +
    +
    + ${unescape(aggregateHTML)} +
    +
    +
    + #end +
    +
    + #end +
    \ No newline at end of file diff --git a/cassandra/src/main/resources/scalate/keyspaceDetails.ssp b/cassandra/src/main/resources/scalate/keyspaceDetails.ssp index beaf182cd89..c0b9f8f413e 100644 --- a/cassandra/src/main/resources/scalate/keyspaceDetails.ssp +++ b/cassandra/src/main/resources/scalate/keyspaceDetails.ssp @@ -46,7 +46,7 @@ + #if(tableDetails.indices.size > 0) +
    +
    + + + + + + + + + + #for (index <- tableDetails.indices) + + + + + #end + +

     ${tableDetails.tableName}'s indices

    +
    NameTarget
    ${index.name}${index.target}
    + +
    + #end
    \ No newline at end of file diff --git a/cassandra/src/main/resources/scalate/udtDetails.ssp b/cassandra/src/main/resources/scalate/udtDetails.ssp index 80380a4943d..28858f2b757 100644 --- a/cassandra/src/main/resources/scalate/udtDetails.ssp +++ b/cassandra/src/main/resources/scalate/udtDetails.ssp @@ -46,7 +46,7 @@