From 058161d2d53c3fe9bc0f1dc2bb738bf0f6a41a13 Mon Sep 17 00:00:00 2001 From: DuyHai DOAN Date: Tue, 5 Jan 2016 15:54:25 +0100 Subject: [PATCH 1/9] Upgrade Java driver version to 3.0.0-rc1 --- cassandra/pom.xml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/cassandra/pom.xml b/cassandra/pom.xml index 57b501a7a69..82bb412f1d1 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 From 6b46076ecb592e5c8b3da0333da057aa64dd5563 Mon Sep 17 00:00:00 2001 From: DuyHai DOAN Date: Tue, 5 Jan 2016 15:54:54 +0100 Subject: [PATCH 2/9] Add Support for UDF, UDA and Materialized Views --- .../resources/scalate/aggregateDetails.ssp | 81 ++ .../main/resources/scalate/allAggregates.ssp | 68 ++ .../main/resources/scalate/allFunctions.ssp | 68 ++ .../scalate/allMaterializedViews.ssp | 68 ++ .../src/main/resources/scalate/allTables.ssp | 8 - .../src/main/resources/scalate/allUDTs.ssp | 61 ++ .../scalate/dropDownMenuForKeyspace.ssp | 37 +- .../resources/scalate/functionDetails.ssp | 77 ++ .../resources/scalate/keyspaceContent.ssp | 90 ++ .../resources/scalate/keyspaceDetails.ssp | 2 +- .../scalate/materializedViewDetails.ssp | 109 +++ cassandra/src/main/resources/scalate/menu.ssp | 22 +- .../main/resources/scalate/tableDetails.ssp | 83 +- .../src/main/resources/scalate/udtDetails.ssp | 2 +- .../zeppelin/cassandra/DisplaySystem.scala | 417 +++++++-- .../zeppelin/cassandra/EnhancedSession.scala | 108 ++- .../zeppelin/cassandra/InterpreterLogic.scala | 25 +- .../cassandra/MetaDataHierarchy.scala | 31 +- .../zeppelin/cassandra/ParagraphParser.scala | 165 +++- .../cassandra/TextBlockHierarchy.scala | 46 +- .../cassandra/CassandraInterpreterTest.java | 93 +- .../cassandra/InterpreterLogicTest.java | 4 +- .../resources/scalate/DescribeCluster.html | 99 +-- .../scalate/DescribeKeyspace_live_data.html | 820 +----------------- .../resources/scalate/DescribeKeyspaces.html | 401 +-------- ...DescribeTable_live_data_complex_table.html | 327 +------ .../DescribeType_live_data_address.html | 138 +-- ..._data_address_within_current_keyspace.html | 138 +-- .../cassandra/ParagraphParserTest.scala | 305 ++++++- 29 files changed, 1741 insertions(+), 2152 deletions(-) create mode 100644 cassandra/src/main/resources/scalate/aggregateDetails.ssp create mode 100644 cassandra/src/main/resources/scalate/allAggregates.ssp create mode 100644 cassandra/src/main/resources/scalate/allFunctions.ssp create mode 100644 cassandra/src/main/resources/scalate/allMaterializedViews.ssp create mode 100644 cassandra/src/main/resources/scalate/allUDTs.ssp create mode 100644 cassandra/src/main/resources/scalate/functionDetails.ssp create mode 100644 cassandra/src/main/resources/scalate/materializedViewDetails.ssp 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}
+
+ + As CQL statement + + +

+
+ 
${aggregate.asCQL}
+
+
+
+
+ #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..b695a9bf3c6 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) + +
  • Materialized Views
    • + #for((id,name,_) <- ksContent.views) +
  • + +  ${name} + +
    • + #end + #end + #if(ksContent.udts.nonEmpty)
  • User Defined Types
    • #for((id,name,_) <- ksContent.udts) @@ -47,6 +58,30 @@ #end #end + + #if(ksContent.functions.nonEmpty) + +
  • Functions
    • + #for((id,name,_) <- ksContent.functions) +
  • + +  ${name} + +
    • + #end + #end + + #if(ksContent.aggregates.nonEmpty) + +
  • Aggregates
    • + #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)}
    +
    + + As CQL statement + + +

    +
    + 
    ${function.asCQL}
    +
    +
    +
    +
    + #end +
    +
    +
    \ No newline at end of file diff --git a/cassandra/src/main/resources/scalate/keyspaceContent.ssp b/cassandra/src/main/resources/scalate/keyspaceContent.ssp index 51390691976..152c657e609 100644 --- a/cassandra/src/main/resources/scalate/keyspaceContent.ssp +++ b/cassandra/src/main/resources/scalate/keyspaceContent.ssp @@ -57,6 +57,36 @@
    #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 @@
    - + As CQL statement diff --git a/cassandra/src/main/resources/scalate/materializedViewDetails.ssp b/cassandra/src/main/resources/scalate/materializedViewDetails.ssp new file mode 100644 index 00000000000..459b5bc8d74 --- /dev/null +++ b/cassandra/src/main/resources/scalate/materializedViewDetails.ssp @@ -0,0 +1,109 @@ +<%-- +/* +* 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 mvDetails: MaterializedViewDetails %> +<%@ val withCaption: Boolean%> +
    +
    +
    +
    + + #if(withCaption) + + #end + + + + + + + + + #for (column <- mvDetails.columns) + #match (column.columnType) + #case(PartitionKey) + + + + + + + #case(StaticColumn) + + + + + + #case(ClusteringColumn(ASC)) + + + + + + #case(ClusteringColumn(DESC)) + + + + + + #otherwise + + + + + + #end + #end + + +
    +

    + +  ${mvDetails.name} +   +   +  ${mvDetails.baseTable}  +

    +
    Column TypeColumn NameData Type
    + + ${column.name}${column.dataType}
    + + ${column.name}${column.dataType}
    + +   + + ${column.name}${column.dataType}
    + +   + + ${column.name}${column.dataType}
    ${column.name}${column.dataType}
    +
    + + As CQL statement + + +

    +
    + 
    ${mvDetails.asCQL}
    +
    +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/cassandra/src/main/resources/scalate/menu.ssp b/cassandra/src/main/resources/scalate/menu.ssp index 91afc8b88e8..0d5a36e1024 100644 --- a/cassandra/src/main/resources/scalate/menu.ssp +++ b/cassandra/src/main/resources/scalate/menu.ssp @@ -54,6 +54,23 @@   Table +
  • + +   Materialized View + +
    • +
  • + +   Function + +
    • +
  • + +   Aggregate + +
    • + +
  • Table icons
  •   Partition Key @@ -79,11 +96,6 @@   Clustering Order DESC
    • -
  • - -   Indexed Column - -
  • diff --git a/cassandra/src/main/resources/scalate/tableDetails.ssp b/cassandra/src/main/resources/scalate/tableDetails.ssp index 6cfbc49cfbf..41e4517391a 100644 --- a/cassandra/src/main/resources/scalate/tableDetails.ssp +++ b/cassandra/src/main/resources/scalate/tableDetails.ssp @@ -42,15 +42,6 @@ - #match (column.index) - #case (Some(index)) - -   - ${index.name} ${index.info} - #case (None) - - #end - ${column.name} ${column.dataType} @@ -59,15 +50,6 @@ - #match (column.index) - #case (Some(index)) - -   - ${index.name} ${index.info} - #case (None) - - #end - ${column.name} ${column.dataType} @@ -78,15 +60,6 @@   - #match (column.index) - #case (Some(index)) - -   - ${index.name} ${index.info} - #case (None) - - #end - ${column.name} ${column.dataType} @@ -97,32 +70,13 @@   - #match (column.index) - #case (Some(index)) - -   - ${index.name} ${index.info} - #case (None) - - #end - ${column.name} ${column.dataType} #otherwise - - #match (column.index) - #case (Some(index)) - - - ${index.name} ${index.info} - #case (None) - - #end - - + ${column.name} ${column.dataType} @@ -132,7 +86,7 @@
    - + As CQL statement @@ -142,6 +96,39 @@
    • + #if(tableDetails.indices.size > 0) +
    +
    + + + + + + + + + + #for (index <- tableDetails.indices) + + + + + #end + +

     ${tableDetails.tableName}'s indices

    +
    NameTarget
    ${index.name}${index.target}
    +
    + + As CQL statement + + +

    +
    + 
    ${tableDetails.indicesAsCQL}
    +
    +
    +
    + #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 @@
    - + As CQL statement diff --git a/cassandra/src/main/scala/org/apache/zeppelin/cassandra/DisplaySystem.scala b/cassandra/src/main/scala/org/apache/zeppelin/cassandra/DisplaySystem.scala index 2881b4b0598..6380b1171ed 100644 --- a/cassandra/src/main/scala/org/apache/zeppelin/cassandra/DisplaySystem.scala +++ b/cassandra/src/main/scala/org/apache/zeppelin/cassandra/DisplaySystem.scala @@ -18,7 +18,6 @@ package org.apache.zeppelin.cassandra import java.util.UUID -import com.datastax.driver.core.ColumnMetadata.IndexMetadata import com.datastax.driver.core.utils.UUIDs import org.apache.zeppelin.cassandra.MetaDataHierarchy._ import org.fusesource.scalate.TemplateEngine @@ -39,16 +38,30 @@ object DisplaySystem { val CLUSTER_DETAILS_TEMPLATE = "scalate/clusterDetails.ssp" val KEYSPACE_DETAILS_TEMPLATE = "scalate/keyspaceDetails.ssp" + val TABLE_DETAILS_TEMPLATE = "scalate/tableDetails.ssp" + val ALL_TABLES_TEMPLATE = "scalate/allTables.ssp" + val UDT_DETAILS_TEMPLATE = "scalate/udtDetails.ssp" + val ALL_UDTS_TEMPLATE = "scalate/allUDTs.ssp" + + val FUNCTION_DETAILS_TEMPLATE = "scalate/functionDetails.ssp" + val ALL_FUNCTIONS_TEMPLATE = "scalate/allFunctions.ssp" + + val AGGREGATE_DETAILS_TEMPLATE = "scalate/aggregateDetails.ssp" + val ALL_AGGREGATES_TEMPLATE = "scalate/allAggregates.ssp" + + val MATERIALIZED_VIEW_DETAILS_TEMPLATE = "scalate/materializedViewDetails.ssp" + val ALL_MATERIALIZED_VIEWS_TEMPLATE = "scalate/allMaterializedViews.ssp" val MENU_TEMPLATE = "scalate/menu.ssp" val CLUSTER_DROPDOWN_TEMPLATE = "scalate/dropDownMenuForCluster.ssp" - val KEYSPACE_DROPDOWN_TEMPLATE = "scalate/dropDownMenuForKeyspace.ssp" + val KEYSPACE_DROPDOWN_TEMPLATE = "scalate/dropDownMenuForKeyspace.ssp" val CLUSTER_CONTENT_TEMPLATE = "scalate/clusterContent.ssp" val KEYSPACE_CONTENT_TEMPLATE = "scalate/keyspaceContent.ssp" - val ALL_TABLES_TEMPLATE = "scalate/allTables.ssp" + + object TableDisplay { @@ -58,10 +71,12 @@ object DisplaySystem { protected[DisplaySystem] def formatWithoutMenu(meta: TableMetadata, withCaption: Boolean): String = { val tableName: String = meta.getName - val columnsDetails = MetaDataConverter.tableMetaToColumnDetails(meta) + val columnsDetails = MetaDataConverter.Table.tableMetaToColumnDetails(meta) + val indicesDetails = MetaDataConverter.Table.tableMetaToIndexDetails(meta) + val indicesAsCQL = indicesDetails.map(_.asCQL).mkString("\n") engine.layout(TABLE_DETAILS_TEMPLATE, - Map[String, Any]("tableDetails" -> TableDetails(tableName, columnsDetails, meta.exportAsString), "withCaption" -> withCaption)) + Map[String, Any]("tableDetails" -> TableDetails(tableName, columnsDetails, indicesDetails, meta.exportAsString(), indicesAsCQL), "withCaption" -> withCaption)) } } @@ -72,13 +87,49 @@ object DisplaySystem { protected[DisplaySystem] def formatWithoutMenu(userType: UserType, withCaption: Boolean): String = { val udtName: String = userType.getTypeName - val columnsDetails = MetaDataConverter.userTypeToColumnDetails(userType) + val columnsDetails = MetaDataConverter.UDT.userTypeToColumnDetails(userType) engine.layout(UDT_DETAILS_TEMPLATE, - Map[String, Any]("udtDetails" -> UDTDetails(udtName, columnsDetails, userType.exportAsString), "withCaption" -> withCaption)) + Map[String, Any]("udtDetails" -> UDTDetails(udtName,columnsDetails,userType.exportAsString()), "withCaption" -> withCaption)) + } + } + + object FunctionDisplay { + def format(statement: String, functions: List[FunctionMetadata], withCaption: Boolean): String = { + MenuDisplay.formatMenu(statement) ++ formatWithoutMenu(functions, withCaption) + } + + protected[DisplaySystem] def formatWithoutMenu(functions: List[FunctionMetadata], withCaption: Boolean): String = { + val functionDetails: List[FunctionDetails] = functions.map(MetaDataConverter.functionMetaToFunctionDetails(_)) + engine.layout(FUNCTION_DETAILS_TEMPLATE, + Map[String, Any]("sameNameFunctionDetails" -> SameNameFunctionDetails(functionDetails), "withCaption" -> withCaption)) } } - + + object AggregateDisplay { + def format(statement: String, aggregates: List[AggregateMetadata], withCaption: Boolean, codecRegistry: CodecRegistry): String = { + MenuDisplay.formatMenu(statement) ++ formatWithoutMenu(aggregates, withCaption, codecRegistry) + } + + protected[DisplaySystem] def formatWithoutMenu(aggregates: List[AggregateMetadata], withCaption: Boolean, codecRegistry: CodecRegistry): String = { + val aggDetails: List[AggregateDetails] = aggregates.map(agg => MetaDataConverter.aggregateMetaToAggregateDetails(codecRegistry, agg)) + engine.layout(AGGREGATE_DETAILS_TEMPLATE, + Map[String, Any]("sameNameAggregateDetails" -> SameNameAggregateDetails(aggDetails), "withCaption" -> withCaption)) + } + } + + object MaterializedViewDisplay { + def format(statement: String, mv: MaterializedViewMetadata, withCaption: Boolean): String = { + MenuDisplay.formatMenu(statement) ++ formatWithoutMenu(mv, withCaption) + } + + protected[DisplaySystem] def formatWithoutMenu(mv: MaterializedViewMetadata, withCaption: Boolean): String = { + val mvDetails = MetaDataConverter.mvMetaToMaterializedViewDetails(mv) + engine.layout(MATERIALIZED_VIEW_DETAILS_TEMPLATE, + Map[String, Any]("mvDetails" -> mvDetails, "withCaption" -> withCaption)) + } + } + object KeyspaceDisplay { private def formatCQLQuery(cql: String): String = { @@ -97,19 +148,32 @@ object DisplaySystem { Map[String, Any]("ksDetails" -> ksDetails, "withCaption" -> withCaption)) } - def formatKeyspaceContent(statement: String, meta: KeyspaceMetadata): String = { + def formatKeyspaceContent(statement: String, meta: KeyspaceMetadata, codecRegistry: CodecRegistry): String = { val ksName: String = meta.getName - val ksDetails = formatKeyspaceOnly(meta, false) + val ksDetails = formatKeyspaceOnly(meta, true) val tableDetails: List[(UUID, String, String)] = meta.getTables.asScala.toList - .sortBy(meta => meta.getName) - .map(meta => (UUIDs.timeBased(), meta.getName, TableDisplay.formatWithoutMenu(meta, false))) + .sortBy(_.getName) + .map(table => (UUIDs.timeBased(), table.getName, TableDisplay.formatWithoutMenu(table, false))) + + val viewDetails: List[(UUID, String, String)] = meta.getMaterializedViews.asScala.toList + .sortBy(_.getName) + .map(view => (UUIDs.timeBased(), view.getName, MaterializedViewDisplay.formatWithoutMenu(view, false))) val udtDetails: List[(UUID, String, String)] = meta.getUserTypes.asScala.toList - .sortBy(udt => udt.getTypeName) + .sortBy(_.getTypeName) .map(udt => (UUIDs.timeBased(), udt.getTypeName, UDTDisplay.formatWithoutMenu(udt, false))) - val ksContent: KeyspaceContent = KeyspaceContent(ksName, ksDetails, tableDetails, udtDetails) + val functionDetails: List[(UUID, String, String)] = meta.getFunctions.asScala.toList + .sortBy(_.getSimpleName) + .map(function => (UUIDs.timeBased(), function.getSimpleName, FunctionDisplay.formatWithoutMenu(List(function), false))) + + val aggregateDetails: List[(UUID, String, String)] = meta.getAggregates.asScala.toList + .sortBy(_.getSimpleName) + .map(agg => (UUIDs.timeBased(), agg.getSimpleName, AggregateDisplay.formatWithoutMenu(List(agg), false, codecRegistry))) + + val ksContent: KeyspaceContent = KeyspaceContent(ksName, ksDetails, tableDetails, viewDetails, + udtDetails, functionDetails, aggregateDetails) MenuDisplay.formatMenuForKeyspace(statement, ksContent) + engine.layout(KEYSPACE_CONTENT_TEMPLATE, @@ -144,26 +208,152 @@ object DisplaySystem { def formatAllTables(statement: String, meta: Metadata): String = { val ksMetas: List[KeyspaceMetadata] = meta.getKeyspaces.asScala.toList + .filter(_.getTables.size > 0) .sortBy(ks => ks.getName) + if(ksMetas.isEmpty) { + NoResultDisplay.formatNoResult + } else { + val allTables: Map[(UUID, String), List[String]] = ListMap.empty ++ + ksMetas + .map(ks => { + ((UUIDs.timeBased(), ks.getName), + ks.getTables.asScala.toList.map(table => table.getName).sortBy(name => name)) + }) + .sortBy{case ((id,name), _) => name} + + + val keyspaceDetails: List[(UUID, String, String)] = allTables + .keySet.toList.sortBy{case(id,ksName) => ksName} + .map{case(id,ksName) => (id,ksName, "")} + + val clusterContent: ClusterContent = ClusterContent(meta.getClusterName, "", keyspaceDetails) + + MenuDisplay.formatMenuForCluster(statement, clusterContent) + + engine.layout(ALL_TABLES_TEMPLATE, + Map[String, Any]("allTables" -> allTables)) + } + } - val allTables: Map[(UUID, String), List[String]] = ListMap.empty ++ - ksMetas - .map(ks => { - ((UUIDs.timeBased(), ks.getName), - ks.getTables.asScala.toList.map(table => table.getName).sortBy(name => name)) - }) - .sortBy{case ((id,name), _) => name} + def formatAllUDTs(statement: String, meta: Metadata): String = { + val ksMetas: List[KeyspaceMetadata] = meta.getKeyspaces.asScala.toList + .filter(_.getUserTypes.size > 0) + .sortBy(ks => ks.getName) + if(ksMetas.isEmpty) { + NoResultDisplay.formatNoResult + } else { + val allUDTs: Map[(UUID, String), List[String]] = ListMap.empty ++ + ksMetas + .map(ks => { + ((UUIDs.timeBased(), ks.getName), + ks.getUserTypes.asScala.toList.map(udt => udt.getTypeName).sortBy(name => name)) + }) + .sortBy { case ((id, name), _) => name } - val keyspaceDetails: List[(UUID, String, String)] = allTables - .keySet.toList.sortBy{case(id,ksName) => ksName} - .map{case(id,ksName) => (id,ksName, "")} - val clusterContent: ClusterContent = ClusterContent(meta.getClusterName, "", keyspaceDetails) + val keyspaceDetails: List[(UUID, String, String)] = allUDTs + .keySet.toList.sortBy { case (id, ksName) => ksName } + .map { case (id, ksName) => (id, ksName, "") } - MenuDisplay.formatMenuForCluster(statement, clusterContent) + - engine.layout(ALL_TABLES_TEMPLATE, - Map[String, Any]("allTables" -> allTables)) + val clusterContent: ClusterContent = ClusterContent(meta.getClusterName, "", keyspaceDetails) + + MenuDisplay.formatMenuForCluster(statement, clusterContent) + + engine.layout(ALL_UDTS_TEMPLATE, + Map[String, Any]("allUDTs" -> allUDTs)) + } + } + + def formatAllFunctions(statement: String, meta: Metadata): String = { + val ksMetas: List[KeyspaceMetadata] = meta.getKeyspaces.asScala.toList + .filter(_.getFunctions.size > 0) + .sortBy(ks => ks.getName) + + if(ksMetas.isEmpty) { + NoResultDisplay.formatNoResult + } else { + val allFunctions: Map[(UUID, String), List[FunctionSummary]] = ListMap.empty ++ + ksMetas + .map(ks => { + ((UUIDs.timeBased(), ks.getName), + ks.getFunctions.asScala.toList + .map(MetaDataConverter.functionMetaToFunctionSummary(_)) + .sortBy(_.name)) + }) + .sortBy { case ((id, name), _) => name } + + val keyspaceDetails: List[(UUID, String, String)] = allFunctions + .keySet.toList.sortBy { case (id, ksName) => ksName } + .map { case (id, ksName) => (id, ksName, "") } + + + val clusterContent: ClusterContent = ClusterContent(meta.getClusterName, "", keyspaceDetails) + + MenuDisplay.formatMenuForCluster(statement, clusterContent) + + engine.layout(ALL_FUNCTIONS_TEMPLATE, + Map[String, Any]("allFunctions" -> allFunctions)) + } + } + + def formatAllAggregates(statement: String, meta: Metadata): String = { + val ksMetas: List[KeyspaceMetadata] = meta.getKeyspaces.asScala.toList + .filter(_.getAggregates.size > 0) + .sortBy(ks => ks.getName) + + if(ksMetas.isEmpty) { + NoResultDisplay.formatNoResult + } else { + val allAggregates: Map[(UUID, String), List[AggregateSummary]] = ListMap.empty ++ + ksMetas + .map(ks => { + ((UUIDs.timeBased(), ks.getName), + ks.getAggregates.asScala.toList + .map(MetaDataConverter.aggregateMetaToAggregateSummary(_)) + .sortBy(_.name)) + }) + .sortBy { case ((id, name), _) => name } + + val keyspaceDetails: List[(UUID, String, String)] = allAggregates + .keySet.toList.sortBy { case (id, ksName) => ksName } + .map { case (id, ksName) => (id, ksName, "") } + + + val clusterContent: ClusterContent = ClusterContent(meta.getClusterName, "", keyspaceDetails) + + MenuDisplay.formatMenuForCluster(statement, clusterContent) + + engine.layout(ALL_AGGREGATES_TEMPLATE, + Map[String, Any]("allAggregates" -> allAggregates)) + } + } + + def formatAllMaterializedViews(statement: String, meta: Metadata): String = { + val ksMetas: List[KeyspaceMetadata] = meta.getKeyspaces.asScala.toList + .filter(_.getMaterializedViews.size > 0) + .sortBy(ks => ks.getName) + + if(ksMetas.isEmpty) { + NoResultDisplay.formatNoResult + } else { + val allMVs: Map[(UUID, String), List[MaterializedViewSummary]] = ListMap.empty ++ + ksMetas + .map(ks => { + ((UUIDs.timeBased(), ks.getName), + ks.getMaterializedViews.asScala.toList + .map(MetaDataConverter.mvMetaToMaterializedViewSummary(_)) + .sortBy(_.name)) + }) + .sortBy { case ((id, name), _) => name } + + val keyspaceDetails: List[(UUID, String, String)] = allMVs + .keySet.toList.sortBy { case (id, ksName) => ksName } + .map { case (id, ksName) => (id, ksName, "") } + + + val clusterContent: ClusterContent = ClusterContent(meta.getClusterName, "", keyspaceDetails) + + MenuDisplay.formatMenuForCluster(statement, clusterContent) + + engine.layout(ALL_MATERIALIZED_VIEWS_TEMPLATE, + Map[String, Any]("allMVs" -> allMVs)) + } } } @@ -233,63 +423,150 @@ class ColumnMetaWrapper(val columnMeta: ColumnMetadata) { */ object MetaDataConverter { - def tableMetaToColumnDetails(meta: TableMetadata): List[ColumnDetails] = { - val partitionKeys: List[ColumnMetaWrapper] = meta.getPartitionKey.asScala.toList.map(new ColumnMetaWrapper(_)) - val clusteringColumns: List[ColumnMetaWrapper] = meta.getClusteringColumns.asScala.toList.map(new ColumnMetaWrapper(_)) - val columns: List[ColumnMetaWrapper] = meta.getColumns.asScala.toList.map(new ColumnMetaWrapper(_)) - .diff(partitionKeys).diff(clusteringColumns) - val clusteringOrders = meta.getClusteringOrder.asScala.toList - - convertPartitionKeys(partitionKeys)::: - extractStaticColumns(columns)::: - convertClusteringColumns(clusteringColumns, clusteringOrders)::: - extractNormalColumns(columns) - } - - def userTypeToColumnDetails(userType: UserType): List[ColumnDetails] = { - userType.getFieldNames.asScala.toList - .map(name => new ColumnDetails(name, NormalColumn, userType.getFieldType(name), None)) + type DriverClusteringOrder = com.datastax.driver.core.ClusteringOrder + + def functionMetaToFunctionDetails(function: FunctionMetadata): FunctionDetails = { + new FunctionDetails(function.getKeyspace.getName, + function.getSimpleName, + function.getArguments.asScala + .toMap + .map{case(paramName, dataType) => paramName + " " + dataType.asFunctionParameterString()} + .toList, + function.isCalledOnNullInput, + function.getReturnType.asFunctionParameterString(), + function.getLanguage, + function.getBody, + function.exportAsString()) } - private def extractNormalColumns(columns: List[ColumnMetaWrapper]): List[ColumnDetails] = { - columns - .filter(_.columnMeta.isStatic == false) - .map(c => new ColumnDetails(c.columnMeta.getName, NormalColumn, c.columnMeta.getType, extractIndexDetail(c))) + def functionMetaToFunctionSummary(function: FunctionMetadata): FunctionSummary = { + new FunctionSummary(function.getKeyspace.getName, + function.getSimpleName, + function.getArguments.asScala.toMap + .mapValues(dataType => dataType.asFunctionParameterString()) + .values.toList, + function.getReturnType.asFunctionParameterString() + ) } - private def extractIndexDetail(column: ColumnMetaWrapper): Option[IndexDetails] = { - val indexOption = Option(column.columnMeta.getIndex) + def aggregateMetaToAggregateDetails(codecRegistry: CodecRegistry, aggregate: AggregateMetadata): AggregateDetails = { + val sFunc: FunctionSummary = functionMetaToFunctionSummary(aggregate.getStateFunc) + val finalFunc: Option[String] = Option(aggregate.getFinalFunc).map(func => { + val finalFunction = functionMetaToFunctionSummary(func) + finalFunction.name + finalFunction.arguments.mkString("(", ", ", ")") + }) + val sType = aggregate.getStateType + val initCond: Option[String] = Option(aggregate.getInitCond).map(codecRegistry.codecFor(sType).format(_)) + val returnType: String = Option(aggregate.getFinalFunc) match { + case Some(finalFunc) => functionMetaToFunctionSummary(finalFunc).returnType + case None => sFunc.returnType + } + + new AggregateDetails(aggregate.getKeyspace.getName, + aggregate.getSimpleName, + aggregate.getArgumentTypes.asScala.toList.map(_.asFunctionParameterString()), + sFunc.name + sFunc.arguments.mkString("(",", ", ")"), + sType.asFunctionParameterString(), + finalFunc, + initCond, + returnType, + aggregate.exportAsString()) + } - def buildIndexInfo(indexMeta: IndexMetadata): String = { - if(indexMeta.isKeys) "KEYS" - if(indexMeta.isEntries) "ENTRIES" - if(indexMeta.isFull) "FULL" - if(indexMeta.isCustomIndex) s"Class = ${indexMeta.getIndexClassName}" - else "" + def aggregateMetaToAggregateSummary(aggregate: AggregateMetadata): AggregateSummary = { + val returnType: String = Option(aggregate.getFinalFunc) match { + case Some(finalFunc) => functionMetaToFunctionSummary(finalFunc).returnType + case None => aggregate.getStateType.asFunctionParameterString() } - indexOption.map(index => IndexDetails(index.getName, buildIndexInfo(index))) + new AggregateSummary(aggregate.getKeyspace.getName, + aggregate.getSimpleName, + aggregate.getArgumentTypes.asScala.toList.map(_.asFunctionParameterString()), + returnType + ) + } + + def mvMetaToMaterializedViewDetails(mv: MaterializedViewMetadata): MaterializedViewDetails = { + new MaterializedViewDetails(mv.getName, MV.mvMetaToColumnDetails(mv), mv.exportAsString(), mv.getBaseTable.getName) + } + + def mvMetaToMaterializedViewSummary(mv: MaterializedViewMetadata): MaterializedViewSummary = { + new MaterializedViewSummary(mv.getName, mv.getBaseTable.getName) } - private def extractStaticColumns(columns: List[ColumnMetaWrapper]): List[ColumnDetails] = { - columns - .filter(_.columnMeta.isStatic == true) - .map(c => new ColumnDetails(c.columnMeta.getName, StaticColumn, c.columnMeta.getType, extractIndexDetail(c))) + trait TableOrView { + protected def extractNormalColumns(columns: List[ColumnMetaWrapper]): List[ColumnDetails] = { + columns + .filter(_.columnMeta.isStatic == false) + .map(c => new ColumnDetails(c.columnMeta.getName, NormalColumn, c.columnMeta.getType)) + } + + protected def extractStaticColumns(columns: List[ColumnMetaWrapper]): List[ColumnDetails] = { + columns + .filter(_.columnMeta.isStatic == true) + .map(c => new ColumnDetails(c.columnMeta.getName, StaticColumn, c.columnMeta.getType)) + } + + protected def convertClusteringColumns(columns: List[ColumnMetaWrapper], orders: List[DriverClusteringOrder]): List[ColumnDetails] = { + columns + .zip(orders) + .map{case(c,order) => new ColumnDetails(c.columnMeta.getName, + new ClusteringColumn(OrderConverter.convert(order)),c.columnMeta.getType)} + + } + + protected def convertPartitionKeys(columns: List[ColumnMetaWrapper]): List[ColumnDetails] = { + columns + .map(c => new ColumnDetails(c.columnMeta.getName, PartitionKey, c.columnMeta.getType)) + } } - private def convertClusteringColumns(columns: List[ColumnMetaWrapper], orders: List[TableMetadata.Order]): List[ColumnDetails] = { - columns - .zip(orders) - .map{case(c,order) => new ColumnDetails(c.columnMeta.getName, - new ClusteringColumn(OrderConverter.convert(order)), - c.columnMeta.getType, extractIndexDetail(c))} + object Table extends TableOrView { + def tableMetaToColumnDetails(meta: TableMetadata): List[ColumnDetails] = { + val partitionKeys: List[ColumnMetaWrapper] = meta.getPartitionKey.asScala.toList.map(new ColumnMetaWrapper(_)) + val clusteringColumns: List[ColumnMetaWrapper] = meta.getClusteringColumns.asScala.toList.map(new ColumnMetaWrapper(_)) + val columns: List[ColumnMetaWrapper] = meta.getColumns.asScala.toList.map(new ColumnMetaWrapper(_)) + .diff(partitionKeys).diff(clusteringColumns) + val clusteringOrders = meta.getClusteringOrder.asScala.toList + + convertPartitionKeys(partitionKeys)::: + extractStaticColumns(columns)::: + convertClusteringColumns(clusteringColumns, clusteringOrders)::: + extractNormalColumns(columns) + } + + def tableMetaToIndexDetails(meta: TableMetadata): List[IndexDetails] = { + meta.getIndexes.asScala.toList + .map(index => IndexDetails(index.getName, index.getTarget, index.asCQLQuery())) + .sortBy(index => index.name) + } + } - private def convertPartitionKeys(columns: List[ColumnMetaWrapper]): List[ColumnDetails] = { - columns - .map(c => new ColumnDetails(c.columnMeta.getName, PartitionKey, c.columnMeta.getType, extractIndexDetail(c))) + object MV extends TableOrView { + def mvMetaToColumnDetails(meta: MaterializedViewMetadata): List[ColumnDetails] = { + val partitionKeys: List[ColumnMetaWrapper] = meta.getPartitionKey.asScala.toList.map(new ColumnMetaWrapper(_)) + val clusteringColumns: List[ColumnMetaWrapper] = meta.getClusteringColumns.asScala.toList.map(new ColumnMetaWrapper(_)) + val columns: List[ColumnMetaWrapper] = meta.getColumns.asScala.toList.map(new ColumnMetaWrapper(_)) + .diff(partitionKeys).diff(clusteringColumns) + val clusteringOrders = meta.getClusteringOrder.asScala.toList + + convertPartitionKeys(partitionKeys)::: + convertClusteringColumns(clusteringColumns, clusteringOrders)::: + extractNormalColumns(columns) + } } + + object UDT { + def userTypeToColumnDetails(userType: UserType): List[ColumnDetails] = { + userType.getFieldNames.asScala.toList + .map(name => new ColumnDetails(name, NormalColumn, userType.getFieldType(name))) + } + } + + + } diff --git a/cassandra/src/main/scala/org/apache/zeppelin/cassandra/EnhancedSession.scala b/cassandra/src/main/scala/org/apache/zeppelin/cassandra/EnhancedSession.scala index c636de97a56..a0c475ab6dd 100644 --- a/cassandra/src/main/scala/org/apache/zeppelin/cassandra/EnhancedSession.scala +++ b/cassandra/src/main/scala/org/apache/zeppelin/cassandra/EnhancedSession.scala @@ -20,6 +20,7 @@ import com.datastax.driver.core._ import org.apache.zeppelin.cassandra.TextBlockHierarchy._ import org.apache.zeppelin.interpreter.InterpreterException +import scala.collection.JavaConverters._ /** * Enhance the Java driver session @@ -32,6 +33,9 @@ class EnhancedSession(val session: Session) { val keyspaceDisplay = DisplaySystem.KeyspaceDisplay val tableDisplay = DisplaySystem.TableDisplay val udtDisplay = DisplaySystem.UDTDisplay + val functionDisplay = DisplaySystem.FunctionDisplay + val aggregateDisplay = DisplaySystem.AggregateDisplay + val materializedViewDisplay = DisplaySystem.MaterializedViewDisplay val helpDisplay = DisplaySystem.HelpDisplay private val noResultDisplay = DisplaySystem.NoResultDisplay @@ -61,8 +65,12 @@ class EnhancedSession(val session: Session) { private def execute(describeKeyspace: DescribeKeyspaceCmd): String = { val keyspace: String = describeKeyspace.keyspace - val metadata: KeyspaceMetadata = session.getCluster.getMetadata.getKeyspace(keyspace) - HTML_MAGIC + keyspaceDisplay.formatKeyspaceContent(describeKeyspace.statement, metadata) + val metadata: Option[KeyspaceMetadata] = Option(session.getCluster.getMetadata.getKeyspace(keyspace)) + metadata match { + case Some(ksMeta) => HTML_MAGIC + keyspaceDisplay.formatKeyspaceContent(describeKeyspace.statement, ksMeta, + session.getCluster.getConfiguration.getCodecRegistry) + case None => throw new InterpreterException(s"Cannot find keyspace $keyspace") + } } private def execute(describeTable: DescribeTableCmd): String = { @@ -76,7 +84,7 @@ class EnhancedSession(val session: Session) { } } - private def execute(describeUDT: DescribeUDTCmd): String = { + private def execute(describeUDT: DescribeTypeCmd): String = { val metaData = session.getCluster.getMetadata val keyspace: String = describeUDT.keyspace.orElse(Option(session.getLoggedKeyspace)).getOrElse("system") val udtName: String = describeUDT.udtName @@ -87,6 +95,87 @@ class EnhancedSession(val session: Session) { } } + private def execute(describeUDTs: DescribeTypesCmd): String = { + val metadata: Metadata = session.getCluster.getMetadata + HTML_MAGIC + clusterDisplay.formatAllUDTs(describeUDTs.statement, metadata) + } + + private def execute(describeFunction: DescribeFunctionCmd): String = { + val metaData = session.getCluster.getMetadata + val keyspaceName: String = describeFunction.keyspace.orElse(Option(session.getLoggedKeyspace)).getOrElse("system") + val functionName: String = describeFunction.function; + + Option(metaData.getKeyspace(keyspaceName)) match { + case Some(keyspace) => { + val functionMetas: List[FunctionMetadata] = keyspace.getFunctions.asScala.toList + .filter(func => func.getSimpleName.toLowerCase == functionName.toLowerCase) + + if(functionMetas.isEmpty) { + throw new InterpreterException(s"Cannot find function ${keyspaceName}.$functionName") + } else { + HTML_MAGIC + functionDisplay.format(describeFunction.statement, functionMetas, true) + } + } + case None => throw new InterpreterException(s"Cannot find function ${keyspaceName}.$functionName") + } + } + + private def execute(describeFunctions: DescribeFunctionsCmd): String = { + val metadata: Metadata = session.getCluster.getMetadata + HTML_MAGIC + clusterDisplay.formatAllFunctions(describeFunctions.statement, metadata) + } + + private def execute(describeAggregate: DescribeAggregateCmd): String = { + val metaData = session.getCluster.getMetadata + val keyspaceName: String = describeAggregate.keyspace.orElse(Option(session.getLoggedKeyspace)).getOrElse("system") + val aggregateName: String = describeAggregate.aggregate; + + Option(metaData.getKeyspace(keyspaceName)) match { + case Some(keyspace) => { + val aggMetas: List[AggregateMetadata] = keyspace.getAggregates.asScala.toList + .filter(agg => agg.getSimpleName.toLowerCase == aggregateName.toLowerCase) + + if(aggMetas.isEmpty) { + throw new InterpreterException(s"Cannot find aggregate ${keyspaceName}.$aggregateName") + } else { + HTML_MAGIC + aggregateDisplay.format(describeAggregate.statement, aggMetas, true, + session + .getCluster + .getConfiguration + .getCodecRegistry) + } + } + case None => throw new InterpreterException(s"Cannot find aggregate ${keyspaceName}.$aggregateName") + } + } + + private def execute(describeAggregates: DescribeAggregatesCmd): String = { + val metadata: Metadata = session.getCluster.getMetadata + HTML_MAGIC + clusterDisplay.formatAllAggregates(describeAggregates.statement, metadata) + } + + private def execute(describeMV: DescribeMaterializedViewCmd): String = { + val metaData = session.getCluster.getMetadata + val keyspaceName: String = describeMV.keyspace.orElse(Option(session.getLoggedKeyspace)).getOrElse("system") + val viewName: String = describeMV.view + + Option(metaData.getKeyspace(keyspaceName)) match { + case Some(keyspace) => { + val viewMeta: Option[MaterializedViewMetadata] = Option(keyspace.getMaterializedView(viewName)) + viewMeta match { + case Some(vMeta) => HTML_MAGIC + materializedViewDisplay.format(describeMV.statement, vMeta, true) + case None => throw new InterpreterException(s"Cannot find materialized view ${keyspaceName}.$viewName") + } + } + case None => throw new InterpreterException(s"Cannot find materialized view ${keyspaceName}.$viewName") + } + } + + private def execute(describeMVs: DescribeMaterializedViewsCmd): String = { + val metadata: Metadata = session.getCluster.getMetadata + HTML_MAGIC + clusterDisplay.formatAllMaterializedViews(describeMVs.statement, metadata) + } + private def execute(helpCmd: HelpCmd): String = { HTML_MAGIC + helpDisplay.formatHelp() } @@ -95,11 +184,18 @@ class EnhancedSession(val session: Session) { def execute(st: Any): Any = { st match { case x:DescribeClusterCmd => execute(x) - case x:DescribeKeyspacesCmd => execute(x) - case x:DescribeTablesCmd => execute(x) case x:DescribeKeyspaceCmd => execute(x) + case x:DescribeKeyspacesCmd => execute(x) case x:DescribeTableCmd => execute(x) - case x:DescribeUDTCmd => execute(x) + case x:DescribeTablesCmd => execute(x) + case x:DescribeTypeCmd => execute(x) + case x:DescribeTypesCmd => execute(x) + case x:DescribeFunctionCmd => execute(x) + case x:DescribeFunctionsCmd => execute(x) + case x:DescribeAggregateCmd => execute(x) + case x:DescribeAggregatesCmd => execute(x) + case x:DescribeMaterializedViewCmd => execute(x) + case x:DescribeMaterializedViewsCmd => execute(x) case x:HelpCmd => execute(x) case x:Statement => session.execute(x) case _ => throw new InterpreterException(s"Cannot execute statement '$st' of type ${st.getClass}") diff --git a/cassandra/src/main/scala/org/apache/zeppelin/cassandra/InterpreterLogic.scala b/cassandra/src/main/scala/org/apache/zeppelin/cassandra/InterpreterLogic.scala index 809bce7d25a..707c16a8bae 100644 --- a/cassandra/src/main/scala/org/apache/zeppelin/cassandra/InterpreterLogic.scala +++ b/cassandra/src/main/scala/org/apache/zeppelin/cassandra/InterpreterLogic.scala @@ -100,7 +100,7 @@ class InterpreterLogic(val session: Session) { logger.info(s"Executing CQL statements : \n\n$stringStatements\n") try { - val protocolVersion = session.getCluster.getConfiguration.getProtocolOptions.getProtocolVersionEnum + val protocolVersion = session.getCluster.getConfiguration.getProtocolOptions.getProtocolVersion val queries:List[AnyBlock] = parseInput(stringStatements) @@ -137,12 +137,12 @@ class InterpreterLogic(val session: Session) { case x:BatchStm => { val builtStatements: List[Statement] = x.statements.map { case st:SimpleStm => generateSimpleStatement(st, queryOptions, context) - case st:BoundStm => generateBoundStatement(st, queryOptions, context) + case st:BoundStm => generateBoundStatement(session, st, queryOptions, context) case _ => throw new InterpreterException(s"Unknown statement type") } generateBatchStatement(x.batchType, queryOptions, builtStatements) } - case x:BoundStm => generateBoundStatement(x, queryOptions, context) + case x:BoundStm => generateBoundStatement(session, x, queryOptions, context) case x:DescribeCommandStatement => x case x:HelpCmd => x case x => throw new InterpreterException(s"Unknown statement type : ${x}") @@ -208,7 +208,7 @@ class InterpreterLogic(val session: Session) { row => { val data = columnsDefinitions.map { case (name, dataType) => { - if (row.isNull(name)) null else dataType.deserialize(row.getBytesUnsafe(name), protocolVersion) + if (row.isNull(name)) null else row.getObject(name) } } output.append(data.mkString("\t")).append("\n") @@ -283,12 +283,12 @@ class InterpreterLogic(val session: Session) { statement } - def generateBoundStatement(st: BoundStm, options: CassandraQueryOptions,context: InterpreterContext): BoundStatement = { + def generateBoundStatement(session: Session, st: BoundStm, options: CassandraQueryOptions,context: InterpreterContext): BoundStatement = { logger.debug(s"Generating bound statement with name : '${st.name}' and bound values : ${st.values}") preparedStatements.get(st.name) match { case Some(ps) => { val boundValues = maybeExtractVariables(st.values, context) - createBoundStatement(st.name, ps, boundValues) + createBoundStatement(session.getCluster.getConfiguration.getCodecRegistry, st.name, ps, boundValues) } case None => throw new InterpreterException(s"The statement '${st.name}' can not be bound to values. " + s"Are you sure you did prepare it with @prepare[${st.name}] ?") @@ -342,7 +342,7 @@ class InterpreterLogic(val session: Session) { options.fetchSize.foreach(statement.setFetchSize(_)) } - private def createBoundStatement(name: String, ps: PreparedStatement, rawBoundValues: String): BoundStatement = { + private def createBoundStatement(codecRegistry: CodecRegistry, name: String, ps: PreparedStatement, rawBoundValues: String): BoundStatement = { val dataTypes = ps.getVariables.toList .map(cfDef => cfDef.getType) @@ -357,6 +357,7 @@ class InterpreterLogic(val session: Session) { if(value.trim == "null") { null } else { + val codec: TypeCodec[AnyRef] = codecRegistry.codecFor[AnyRef](dataType) dataType.getName match { case (ASCII | TEXT | VARCHAR) => value.trim.replaceAll("(? value.trim.toInt @@ -369,11 +370,11 @@ class InterpreterLogic(val session: Session) { case INET => InetAddress.getByName(value.trim) case TIMESTAMP => parseDate(value.trim) case (UUID | TIMEUUID) => java.util.UUID.fromString(value.trim) - case LIST => dataType.parse(boundValuesParser.parse(boundValuesParser.list, value).get) - case SET => dataType.parse(boundValuesParser.parse(boundValuesParser.set, value).get) - case MAP => dataType.parse(boundValuesParser.parse(boundValuesParser.map, value).get) - case UDT => dataType.parse(boundValuesParser.parse(boundValuesParser.udt, value).get) - case TUPLE => dataType.parse(boundValuesParser.parse(boundValuesParser.tuple, value).get) + case LIST => codec.parse(boundValuesParser.parse(boundValuesParser.list, value).get) + case SET => codec.parse(boundValuesParser.parse(boundValuesParser.set, value).get) + case MAP => codec.parse(boundValuesParser.parse(boundValuesParser.map, value).get) + case UDT => codec.parse(boundValuesParser.parse(boundValuesParser.udt, value).get) + case TUPLE => codec.parse(boundValuesParser.parse(boundValuesParser.tuple, value).get) case _ => throw new InterpreterException(s"Cannot parse data of type : ${dataType.toString}") } } diff --git a/cassandra/src/main/scala/org/apache/zeppelin/cassandra/MetaDataHierarchy.scala b/cassandra/src/main/scala/org/apache/zeppelin/cassandra/MetaDataHierarchy.scala index 66a07764912..4b887768e85 100644 --- a/cassandra/src/main/scala/org/apache/zeppelin/cassandra/MetaDataHierarchy.scala +++ b/cassandra/src/main/scala/org/apache/zeppelin/cassandra/MetaDataHierarchy.scala @@ -28,10 +28,10 @@ import scala.util.parsing.json.JSONObject */ object MetaDataHierarchy { object OrderConverter { - def convert(clusteringOrder: TableMetadata.Order): ClusteringOrder = { + def convert(clusteringOrder: com.datastax.driver.core.ClusteringOrder): ClusteringOrder = { clusteringOrder match { - case TableMetadata.Order.ASC => ASC - case TableMetadata.Order.DESC => DESC + case com.datastax.driver.core.ClusteringOrder.ASC => ASC + case com.datastax.driver.core.ClusteringOrder.DESC => DESC } } } @@ -46,9 +46,8 @@ object MetaDataHierarchy { case class ClusteringColumn(order: ClusteringOrder) extends ColumnType object StaticColumn extends ColumnType object NormalColumn extends ColumnType - case class IndexDetails(name: String, info: String) - case class ColumnDetails(name: String, columnType: ColumnType, dataType: DataType, index: Option[IndexDetails]) - + case class IndexDetails(name: String, target: String, asCQL: String) + case class ColumnDetails(name: String, columnType: ColumnType, dataType: DataType) case class ClusterDetails(name: String, partitioner: String) case class ClusterContent(clusterName: String, clusterDetails: String, keyspaces: List[(UUID, String, String)]) @@ -58,10 +57,26 @@ object MetaDataHierarchy { JSONObject(replication).toString().replaceAll(""""""","'") } } - case class KeyspaceContent(keyspaceName: String, keyspaceDetails: String, tables: List[(UUID,String, String)], udts: List[(UUID, String, String)]) - case class TableDetails(tableName: String, columns: List[ColumnDetails], asCQL: String, uniqueId: UUID = UUIDs.timeBased()) + case class KeyspaceContent(keyspaceName: String, keyspaceDetails: String, + tables: List[(UUID,String, String)], + views: List[(UUID,String, String)], + udts: List[(UUID, String, String)], + functions: List[(UUID, String, String)], + aggregates: List[(UUID, String, String)]) + case class TableDetails(tableName: String, columns: List[ColumnDetails], indices: List[IndexDetails], asCQL: String, indicesAsCQL: String, uniqueId: UUID = UUIDs.timeBased()) case class UDTDetails(typeName: String, columns: List[ColumnDetails], asCQL: String, uniqueId: UUID = UUIDs.timeBased()) + case class SameNameFunctionDetails(functions: List[FunctionDetails]) + case class FunctionDetails(keyspace:String, name: String, arguments: List[String], calledOnNullInput: Boolean, returnType: String, + language:String, body: String, asCQL: String, uniqueId: UUID = UUIDs.timeBased()) + case class FunctionSummary(keyspace:String, name: String, arguments: List[String], returnType: String) + case class AggregateDetails(keyspace:String, name: String, arguments: List[String], sFunc: String, sType: String, + finalFunc: Option[String], initCond: Option[String], returnType: String, + asCQL: String, uniqueId: UUID = UUIDs.timeBased()) + case class AggregateSummary(keyspace:String, name: String, arguments: List[String], returnType: String) + case class SameNameAggregateDetails(aggregates: List[AggregateDetails]) + case class MaterializedViewDetails(name: String, columns: List[ColumnDetails], asCQL: String, baseTable: String, uniqueId: UUID = UUIDs.timeBased()) + case class MaterializedViewSummary(name: String, baseTable: String) } diff --git a/cassandra/src/main/scala/org/apache/zeppelin/cassandra/ParagraphParser.scala b/cassandra/src/main/scala/org/apache/zeppelin/cassandra/ParagraphParser.scala index 0cd98ad5f9c..b0dd1c50d5e 100644 --- a/cassandra/src/main/scala/org/apache/zeppelin/cassandra/ParagraphParser.scala +++ b/cassandra/src/main/scala/org/apache/zeppelin/cassandra/ParagraphParser.scala @@ -19,6 +19,7 @@ package org.apache.zeppelin.cassandra import com.datastax.driver.core._ import org.apache.zeppelin.cassandra.CassandraInterpreter._ import org.apache.zeppelin.interpreter.InterpreterException +import scala.util.matching.Regex import scala.util.parsing.combinator._ import org.apache.zeppelin.cassandra.TextBlockHierarchy._ @@ -42,22 +43,29 @@ object ParagraphParser { val BIND_PATTERN = """^\s*@bind\[([^]]+)\](?:=([^;]+))?""".r val BATCH_PATTERN = """^(?i)\s*BEGIN\s+(UNLOGGED|COUNTER)?\s*BATCH""".r + val UDF_PATTERN = """^(?is)\s*(CREATE(?: OR REPLACE)? FUNCTION(?: IF NOT EXISTS)?.+ AS (?:'|\$\$)[^']+(?:'|\$\$);)""".r + val GENERIC_STATEMENT_PREFIX = """(?is)\s*(?:INSERT|UPDATE|DELETE|SELECT|CREATE|UPDATE| |DROP|GRANT|REVOKE|TRUNCATE|LIST|USE)\s+""".r val VALID_IDENTIFIER = "[a-z][a-z0-9_]*" - val DESCRIBE_CLUSTER_PATTERN = """^(?i)\s*(?:DESCRIBE|DESC)\s+CLUSTER;\s*$""".r - val DESCRIBE_KEYSPACES_PATTERN = """^(?i)\s*(?:DESCRIBE|DESC)\s+KEYSPACES;\s*$""".r - val DESCRIBE_TABLES_PATTERN = """^(?i)\s*(?:DESCRIBE|DESC)\s+TABLES;\s*$""".r + val DESCRIBE_CLUSTER_PATTERN = """^(?i)\s*(?:DESCRIBE|DESC)\s+CLUSTER\s*;\s*$""".r + + val DESCRIBE_KEYSPACE_PATTERN = ("""^(?i)\s*(?:DESCRIBE|DESC)\s+KEYSPACE\s*("""+VALID_IDENTIFIER+""");\s*$""").r + val DESCRIBE_KEYSPACES_PATTERN = """^(?i)\s*(?:DESCRIBE|DESC)\s+KEYSPACES\s*;\s*$""".r + + val DESCRIBE_TABLE_PATTERN = ("""^(?i)\s*(?:DESCRIBE|DESC)\s+TABLE\s*("""+VALID_IDENTIFIER+""");\s*$""").r val DESCRIBE_TABLE_WITH_KEYSPACE_PATTERN = ("""^(?i)\s*(?:DESCRIBE|DESC)\s+TABLE\s*(""" + VALID_IDENTIFIER + """)\.(""" + VALID_IDENTIFIER + """);\s*$""").r + val DESCRIBE_TABLES_PATTERN = """^(?i)\s*(?:DESCRIBE|DESC)\s+TABLES\s*;\s*$""".r + val DESCRIBE_TYPE_PATTERN = ("""^(?i)\s*(?:DESCRIBE|DESC)\s+TYPE\s*("""+VALID_IDENTIFIER+""");\s*$""").r val DESCRIBE_TYPE_WITH_KEYSPACE_PATTERN = ("""^(?i)\s*(?:DESCRIBE|DESC)\s+TYPE\s*(""" + @@ -65,6 +73,35 @@ object ParagraphParser { """)\.(""" + VALID_IDENTIFIER + """);\s*$""").r + val DESCRIBE_TYPES_PATTERN = """^(?i)\s*(?:DESCRIBE|DESC)\s+TYPES\s*;\s*$""".r + + + val DESCRIBE_FUNCTION_PATTERN = ("""^(?i)\s*(?:DESCRIBE|DESC)\s+FUNCTION\s*("""+VALID_IDENTIFIER+""");\s*$""").r + val DESCRIBE_FUNCTION_WITH_KEYSPACE_PATTERN = ("""^(?i)\s*(?:DESCRIBE|DESC)\s+FUNCTION\s*(""" + + VALID_IDENTIFIER + + """)\.(""" + + VALID_IDENTIFIER + + """);\s*$""").r + val DESCRIBE_FUNCTIONS_PATTERN = ("""^(?i)\s*(?:DESCRIBE|DESC)\s+FUNCTIONS\s*;\s*$""").r + + + val DESCRIBE_AGGREGATE_PATTERN = ("""^(?i)\s*(?:DESCRIBE|DESC)\s+AGGREGATE\s*("""+VALID_IDENTIFIER+""");\s*$""").r + val DESCRIBE_AGGREGATE_WITH_KEYSPACE_PATTERN = ("""^(?i)\s*(?:DESCRIBE|DESC)\s+AGGREGATE\s*(""" + + VALID_IDENTIFIER + + """)\.(""" + + VALID_IDENTIFIER + + """);\s*$""").r + val DESCRIBE_AGGREGATES_PATTERN = ("""^(?i)\s*(?:DESCRIBE|DESC)\s+AGGREGATES\s*;\s*$""").r + + + val DESCRIBE_MATERIALIZED_VIEW_PATTERN = ("""^(?i)\s*(?:DESCRIBE|DESC)\s+MATERIALIZED\s+VIEW\s*("""+VALID_IDENTIFIER+""");\s*$""").r + val DESCRIBE_MATERIALIZED_VIEW_WITH_KEYSPACE_PATTERN = ("""^(?i)\s*(?:DESCRIBE|DESC)\s+MATERIALIZED\s+VIEW\s*(""" + + VALID_IDENTIFIER + + """)\.(""" + + VALID_IDENTIFIER + + """);\s*$""").r + val DESCRIBE_MATERIALIZED_VIEWS_PATTERN = ("""^(?i)\s*(?:DESCRIBE|DESC)\s+MATERIALIZED\s+VIEWS\s*;\s*$""").r + val HELP_PATTERN = """^(?i)\s*HELP;\s*$""".r } @@ -74,7 +111,10 @@ class ParagraphParser extends RegexParsers{ import ParagraphParser._ - def singleLineComment: Parser[Comment] = """\s*#.*""".r ^^ {case text => Comment(text.trim.replaceAll("#",""))} + def singleLineCommentHash: Parser[Comment] = """\s*#.*""".r ^^ {case text => Comment(text.trim.replaceAll("#",""))} + def singleLineCommentDoubleSlashes: Parser[Comment] = """\s*//.*""".r ^^ {case text => Comment(text.trim.replaceAll("//",""))} + def singleLineComment: Parser[Comment] = singleLineCommentHash | singleLineCommentDoubleSlashes + def multiLineComment: Parser[Comment] = """(?s)/\*(.*)\*/""".r ^^ {case text => Comment(text.trim.replaceAll("""/\*""","").replaceAll("""\*/""",""))} //Query parameters @@ -85,7 +125,10 @@ class ParagraphParser extends RegexParsers{ def fetchSize: Parser[FetchSize] = """\s*@fetchSize.+""".r ^^ {case x => extractFetchSize(x.trim)} //Statements + def udfStatement: Parser[SimpleStm] = UDF_PATTERN ^^{case x => extractUdfStatement(x.trim)} def genericStatement: Parser[SimpleStm] = s"""$GENERIC_STATEMENT_PREFIX[^;]+;""".r ^^ {case x => extractSimpleStatement(x.trim)} + def allStatement: Parser[SimpleStm] = udfStatement | genericStatement + def prepare: Parser[PrepareStm] = """\s*@prepare.+""".r ^^ {case x => extractPreparedStatement(x.trim)} def removePrepare: Parser[RemovePrepareStm] = """\s*@remove_prepare.+""".r ^^ {case x => extractRemovePreparedStatement(x.trim)} def bind: Parser[BoundStm] = """\s*@bind.+""".r ^^ {case x => extractBoundStatement(x.trim)} @@ -95,9 +138,17 @@ class ParagraphParser extends RegexParsers{ private def describeCluster: Parser[DescribeClusterCmd] = """(?i)\s*(?:DESCRIBE|DESC)\s+CLUSTER.*""".r ^^ {extractDescribeClusterCmd(_)} private def describeKeyspaces: Parser[DescribeKeyspacesCmd] = """(?i)\s*(?:DESCRIBE|DESC)\s+KEYSPACES.*""".r ^^ {extractDescribeKeyspacesCmd(_)} private def describeTables: Parser[DescribeTablesCmd] = """(?i)\s*(?:DESCRIBE|DESC)\s+TABLES.*""".r ^^ {extractDescribeTablesCmd(_)} + private def describeTypes: Parser[DescribeTypesCmd] = """(?i)\s*(?:DESCRIBE|DESC)\s+TYPES.*""".r ^^ {extractDescribeTypesCmd(_)} + private def describeFunctions: Parser[DescribeFunctionsCmd] = """(?i)\s*(?:DESCRIBE|DESC)\s+FUNCTIONS.*""".r ^^ {extractDescribeFunctionsCmd(_)} + private def describeAggregates: Parser[DescribeAggregatesCmd] = """(?i)\s*(?:DESCRIBE|DESC)\s+AGGREGATES.*""".r ^^ {extractDescribeAggregatesCmd(_)} + private def describeMaterializedViews: Parser[DescribeMaterializedViewsCmd] = """(?i)\s*(?:DESCRIBE|DESC)\s+MATERIALIZED\s+VIEWS.*""".r ^^ {extractDescribeMaterializedViewsCmd(_)} private def describeKeyspace: Parser[DescribeKeyspaceCmd] = """\s*(?i)(?:DESCRIBE|DESC)\s+KEYSPACE\s+.+""".r ^^ {extractDescribeKeyspaceCmd(_)} private def describeTable: Parser[DescribeTableCmd] = """(?i)\s*(?:DESCRIBE|DESC)\s+TABLE\s+.+""".r ^^ {extractDescribeTableCmd(_)} - private def describeType: Parser[DescribeUDTCmd] = """(?i)\s*(?:DESCRIBE|DESC)\s+TYPE\s+.*""".r ^^ {extractDescribeTypeCmd(_)} + private def describeType: Parser[DescribeTypeCmd] = """(?i)\s*(?:DESCRIBE|DESC)\s+TYPE\s+.*""".r ^^ {extractDescribeTypeCmd(_)} + private def describeFunction: Parser[DescribeFunctionCmd] = """(?i)\s*(?:DESCRIBE|DESC)\s+FUNCTION\s+.*""".r ^^ {extractDescribeFunctionCmd(_)} + private def describeAggregate: Parser[DescribeAggregateCmd] = """(?i)\s*(?:DESCRIBE|DESC)\s+AGGREGATE\s+.*""".r ^^ {extractDescribeAggregateCmd(_)} + private def describeMaterializedView: Parser[DescribeMaterializedViewCmd] = """(?i)\s*(?:DESCRIBE|DESC)\s+MATERIALIZED\s+VIEW\s+.*""".r ^^ {extractDescribeMaterializedViewCmd(_)} + //Help private def helpCommand: Parser[HelpCmd] = """(?i)\s*HELP.*""".r ^^{extractHelpCmd(_)} @@ -114,8 +165,14 @@ class ParagraphParser extends RegexParsers{ case begin ~ cqls ~ end => BatchStm(extractBatchType(begin),cqls)} def queries:Parser[List[AnyBlock]] = rep(singleLineComment | multiLineComment | consistency | serialConsistency | - timestamp | retryPolicy | fetchSize | removePrepare | prepare | bind | batch | describeCluster | describeKeyspaces | - describeTables | describeKeyspace | describeTable | describeType | helpCommand | genericStatement) + timestamp | retryPolicy | fetchSize | removePrepare | prepare | bind | batch | describeCluster | + describeKeyspace | describeKeyspaces | + describeTable | describeTables | + describeType | describeTypes | + describeFunction | describeFunctions | + describeAggregate | describeAggregates | + describeMaterializedView | describeMaterializedViews | + helpCommand | allStatement) def extractConsistency(text: String): Consistency = { text match { @@ -171,6 +228,13 @@ class ParagraphParser extends RegexParsers{ } } + def extractUdfStatement(text: String): SimpleStm = { + text match { + case UDF_PATTERN(statement) => SimpleStm(statement) + case _ => throw new InterpreterException(s"Invalid statement '$text' for UDF creation. Did you forget to add ; (semi-colon) at the end of each CQL statement ?") + } + } + def extractPreparedStatement(text: String): PrepareStm = { text match { case PREPARE_STATEMENT_PATTERN(name,queryString) => PrepareStm(name.trim,queryString.trim) @@ -214,6 +278,14 @@ class ParagraphParser extends RegexParsers{ } } + def extractDescribeKeyspaceCmd(text: String): DescribeKeyspaceCmd = { + text match { + case DESCRIBE_KEYSPACE_PATTERN(keyspace) => new DescribeKeyspaceCmd(keyspace) + case _ => throw new InterpreterException(s"Invalid syntax for DESCRIBE KEYSPACE. " + + s"""It should comply to the pattern: ${DESCRIBE_KEYSPACE_PATTERN.toString}""") + } + } + def extractDescribeKeyspacesCmd(text: String): DescribeKeyspacesCmd = { text match { case DESCRIBE_KEYSPACES_PATTERN() => new DescribeKeyspacesCmd @@ -222,6 +294,15 @@ class ParagraphParser extends RegexParsers{ } } + def extractDescribeTableCmd(text: String): DescribeTableCmd = { + text match { + case DESCRIBE_TABLE_WITH_KEYSPACE_PATTERN(keyspace,table) => new DescribeTableCmd(Option(keyspace),table) + case DESCRIBE_TABLE_PATTERN(table) => new DescribeTableCmd(Option.empty,table) + case _ => throw new InterpreterException(s"Invalid syntax for DESCRIBE TABLE. " + + s"""It should comply to the patterns: ${DESCRIBE_TABLE_WITH_KEYSPACE_PATTERN.toString} or ${DESCRIBE_TABLE_PATTERN.toString}""".stripMargin) + } + } + def extractDescribeTablesCmd(text: String): DescribeTablesCmd = { text match { case DESCRIBE_TABLES_PATTERN() => new DescribeTablesCmd @@ -230,29 +311,71 @@ class ParagraphParser extends RegexParsers{ } } - def extractDescribeKeyspaceCmd(text: String): DescribeKeyspaceCmd = { + def extractDescribeTypeCmd(text: String): DescribeTypeCmd = { text match { - case DESCRIBE_KEYSPACE_PATTERN(keyspace) => new DescribeKeyspaceCmd(keyspace) - case _ => throw new InterpreterException(s"Invalid syntax for DESCRIBE KEYSPACE. " + - s"""It should comply to the pattern: ${DESCRIBE_KEYSPACE_PATTERN.toString}""") + case DESCRIBE_TYPE_WITH_KEYSPACE_PATTERN(keyspace,table) => new DescribeTypeCmd(Option(keyspace),table) + case DESCRIBE_TYPE_PATTERN(table) => new DescribeTypeCmd(Option.empty,table) + case _ => throw new InterpreterException(s"Invalid syntax for DESCRIBE TYPE. " + + s"""It should comply to the patterns: ${DESCRIBE_TYPE_WITH_KEYSPACE_PATTERN.toString} or ${DESCRIBE_TYPE_PATTERN.toString}""".stripMargin) } } - def extractDescribeTableCmd(text: String): DescribeTableCmd = { + def extractDescribeTypesCmd(text: String): DescribeTypesCmd = { text match { - case DESCRIBE_TABLE_WITH_KEYSPACE_PATTERN(keyspace,table) => new DescribeTableCmd(Option(keyspace),table) - case DESCRIBE_TABLE_PATTERN(table) => new DescribeTableCmd(Option.empty,table) - case _ => throw new InterpreterException(s"Invalid syntax for DESCRIBE TABLE. " + - s"""It should comply to the patterns: ${DESCRIBE_TABLE_WITH_KEYSPACE_PATTERN.toString} or ${DESCRIBE_TABLE_PATTERN.toString}""".stripMargin) + case DESCRIBE_TYPES_PATTERN() => new DescribeTypesCmd + case _ => throw new InterpreterException(s"Invalid syntax for DESCRIBE TYPES. " + + s"""It should comply to the pattern: ${DESCRIBE_TYPES_PATTERN.toString}""") } } - def extractDescribeTypeCmd(text: String): DescribeUDTCmd = { + def extractDescribeFunctionCmd(text: String): DescribeFunctionCmd = { text match { - case DESCRIBE_TYPE_WITH_KEYSPACE_PATTERN(keyspace,table) => new DescribeUDTCmd(Option(keyspace),table) - case DESCRIBE_TYPE_PATTERN(table) => new DescribeUDTCmd(Option.empty,table) - case _ => throw new InterpreterException(s"Invalid syntax for DESCRIBE TYPE. " + - s"""It should comply to the patterns: ${DESCRIBE_TYPE_WITH_KEYSPACE_PATTERN.toString} or ${DESCRIBE_TYPE_PATTERN.toString}""".stripMargin) + case DESCRIBE_FUNCTION_WITH_KEYSPACE_PATTERN(keyspace,function) => new DescribeFunctionCmd(Option(keyspace),function) + case DESCRIBE_FUNCTION_PATTERN(function) => new DescribeFunctionCmd(Option.empty,function) + case _ => throw new InterpreterException(s"Invalid syntax for DESCRIBE FUNCTION. " + + s"""It should comply to the patterns: ${DESCRIBE_FUNCTION_WITH_KEYSPACE_PATTERN.toString} or ${DESCRIBE_FUNCTION_PATTERN.toString}""".stripMargin) + } + } + + def extractDescribeFunctionsCmd(text: String): DescribeFunctionsCmd = { + text match { + case DESCRIBE_FUNCTIONS_PATTERN() => new DescribeFunctionsCmd + case _ => throw new InterpreterException(s"Invalid syntax for DESCRIBE FUNCTIONS. " + + s"""It should comply to the pattern: ${DESCRIBE_FUNCTIONS_PATTERN.toString}""".stripMargin) + } + } + + def extractDescribeAggregateCmd(text: String): DescribeAggregateCmd = { + text match { + case DESCRIBE_AGGREGATE_WITH_KEYSPACE_PATTERN(keyspace,aggregate) => new DescribeAggregateCmd(Option(keyspace),aggregate) + case DESCRIBE_AGGREGATE_PATTERN(aggregate) => new DescribeAggregateCmd(Option.empty,aggregate) + case _ => throw new InterpreterException(s"Invalid syntax for DESCRIBE AGGREGATE. " + + s"""It should comply to the patterns: ${DESCRIBE_AGGREGATE_WITH_KEYSPACE_PATTERN.toString} or ${DESCRIBE_AGGREGATE_PATTERN.toString}""".stripMargin) + } + } + + def extractDescribeAggregatesCmd(text: String): DescribeAggregatesCmd = { + text match { + case DESCRIBE_AGGREGATES_PATTERN() => new DescribeAggregatesCmd + case _ => throw new InterpreterException(s"Invalid syntax for DESCRIBE AGGREGATES. " + + s"""It should comply to the pattern: ${DESCRIBE_AGGREGATES_PATTERN.toString}""".stripMargin) + } + } + + def extractDescribeMaterializedViewCmd(text: String): DescribeMaterializedViewCmd = { + text match { + case DESCRIBE_MATERIALIZED_VIEW_WITH_KEYSPACE_PATTERN(keyspace,view) => new DescribeMaterializedViewCmd(Option(keyspace),view) + case DESCRIBE_MATERIALIZED_VIEW_PATTERN(view) => new DescribeMaterializedViewCmd(Option.empty,view) + case _ => throw new InterpreterException(s"Invalid syntax for DESCRIBE MATERIALIZED VIEW. " + + s"""It should comply to the patterns: ${DESCRIBE_MATERIALIZED_VIEW_WITH_KEYSPACE_PATTERN.toString} or ${DESCRIBE_MATERIALIZED_VIEW_PATTERN.toString}""".stripMargin) + } + } + + def extractDescribeMaterializedViewsCmd(text: String): DescribeMaterializedViewsCmd = { + text match { + case DESCRIBE_MATERIALIZED_VIEWS_PATTERN() => new DescribeMaterializedViewsCmd + case _ => throw new InterpreterException(s"Invalid syntax for DESCRIBE MATERIALIZED VIEWS. " + + s"""It should comply to the pattern: ${DESCRIBE_MATERIALIZED_VIEWS_PATTERN.toString}""".stripMargin) } } diff --git a/cassandra/src/main/scala/org/apache/zeppelin/cassandra/TextBlockHierarchy.scala b/cassandra/src/main/scala/org/apache/zeppelin/cassandra/TextBlockHierarchy.scala index 70b2ce2a5e0..41a9468b4ab 100644 --- a/cassandra/src/main/scala/org/apache/zeppelin/cassandra/TextBlockHierarchy.scala +++ b/cassandra/src/main/scala/org/apache/zeppelin/cassandra/TextBlockHierarchy.scala @@ -77,10 +77,16 @@ object TextBlockHierarchy { object BatchStatementType extends StatementType object DescribeClusterStatementType extends StatementType object DescribeAllKeyspacesStatementType extends StatementType - object DescribeKeyspaceStatementType extends StatementType object DescribeAllTablesStatementType extends StatementType + object DescribeAllTypesStatementType extends StatementType + object DescribeAllFunctionsStatementType extends StatementType + object DescribeAllAggregatesStatementType extends StatementType + object DescribeKeyspaceStatementType extends StatementType object DescribeTableStatementType extends StatementType object DescribeTypeStatementType extends StatementType + object DescribeFunctionStatementType extends StatementType + object DescribeAggregateStatementType extends StatementType + object DescribeMaterializedView extends StatementType object HelpStatementType extends StatementType abstract class QueryStatement(val statementType: StatementType) extends AnyBlock(StatementBlock) { @@ -113,6 +119,18 @@ object TextBlockHierarchy { class DescribeTablesCmd(override val statement: String = "DESCRIBE TABLES;") extends QueryStatement(DescribeAllTablesStatementType) with DescribeCommandStatement + class DescribeTypesCmd(override val statement: String = "DESCRIBE TYPES;") + extends QueryStatement(DescribeAllTypesStatementType) with DescribeCommandStatement + + class DescribeFunctionsCmd(override val statement: String = "DESCRIBE FUNCTIONS;") extends QueryStatement(DescribeAllFunctionsStatementType) + with DescribeCommandStatement + + class DescribeAggregatesCmd(override val statement: String = "DESCRIBE AGGREGATES;") extends QueryStatement(DescribeAllAggregatesStatementType) + with DescribeCommandStatement + + class DescribeMaterializedViewsCmd(override val statement: String = "DESCRIBE MATERIALIZED VIEWS;") extends QueryStatement(DescribeAllAggregatesStatementType) + with DescribeCommandStatement + case class DescribeKeyspaceCmd(keyspace: String) extends QueryStatement(DescribeKeyspaceStatementType) with DescribeCommandStatement { override val statement: String = s"DESCRIBE KEYSPACE $keyspace;" @@ -126,7 +144,7 @@ object TextBlockHierarchy { } } - case class DescribeUDTCmd(keyspace:Option[String],udtName: String) extends QueryStatement(DescribeTypeStatementType) + case class DescribeTypeCmd(keyspace:Option[String], udtName: String) extends QueryStatement(DescribeTypeStatementType) with DescribeCommandStatement { override val statement: String = keyspace match { case Some(ks) => s"DESCRIBE TYPE $ks.$udtName;" @@ -134,6 +152,30 @@ object TextBlockHierarchy { } } + case class DescribeFunctionCmd(keyspace:Option[String], function: String) extends QueryStatement(DescribeFunctionStatementType) + with DescribeCommandStatement { + override val statement: String = keyspace match { + case Some(ks) => s"DESCRIBE FUNCTION $ks.$function;" + case None => s"DESCRIBE FUNCTION $function;" + } + } + + case class DescribeAggregateCmd(keyspace:Option[String], aggregate: String) extends QueryStatement(DescribeAggregateStatementType) + with DescribeCommandStatement { + override val statement: String = keyspace match { + case Some(ks) => s"DESCRIBE AGGREGATE $ks.$aggregate;" + case None => s"DESCRIBE AGGREGATE $aggregate;" + } + } + + case class DescribeMaterializedViewCmd(keyspace:Option[String], view: String) extends QueryStatement(DescribeMaterializedView) + with DescribeCommandStatement { + override val statement: String = keyspace match { + case Some(ks) => s"DESCRIBE MATERIALIZED VIEW $ks.$view;" + case None => s"DESCRIBE MATERIALIZED VIEW $view;" + } + } + class HelpCmd extends QueryStatement(HelpStatementType) } diff --git a/cassandra/src/test/java/org/apache/zeppelin/cassandra/CassandraInterpreterTest.java b/cassandra/src/test/java/org/apache/zeppelin/cassandra/CassandraInterpreterTest.java index afca9dea5dd..4819e97ce3c 100644 --- a/cassandra/src/test/java/org/apache/zeppelin/cassandra/CassandraInterpreterTest.java +++ b/cassandra/src/test/java/org/apache/zeppelin/cassandra/CassandraInterpreterTest.java @@ -30,22 +30,20 @@ import static org.mockito.Mockito.when; import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.ProtocolVersion; import com.datastax.driver.core.Session; -import info.archinnov.achilles.junit.AchillesResource; -import info.archinnov.achilles.junit.AchillesResourceBuilder; + +import info.archinnov.achilles.embedded.CassandraEmbeddedServerBuilder; + +import org.apache.zeppelin.interpreter.Interpreter; import org.apache.zeppelin.interpreter.InterpreterContext; import org.apache.zeppelin.interpreter.InterpreterResult; import org.apache.zeppelin.interpreter.InterpreterResult.Code; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.ClassRule; -import org.junit.Test; +import org.junit.*; import org.junit.runner.RunWith; import org.mockito.Answers; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import scala.io.Source; import java.io.BufferedInputStream; import java.io.BufferedReader; @@ -58,16 +56,14 @@ public class CassandraInterpreterTest { private static final String ARTISTS_TABLE = "zeppelin.artists"; - @ClassRule - public static AchillesResource resource = AchillesResourceBuilder + public static Session session = CassandraEmbeddedServerBuilder .noEntityPackages() .withKeyspaceName("zeppelin") .withScript("prepare_schema.cql") .withScript("prepare_data.cql") - .build(); - - private static Session session = resource.getNativeSession(); - + .withProtocolVersion(ProtocolVersion.V3) + .buildNativeSessionOnly(); +// public static Session session = null; private static CassandraInterpreter interpreter; @Mock(answer = Answers.RETURNS_DEEP_STUBS) @@ -76,7 +72,8 @@ public class CassandraInterpreterTest { @BeforeClass public static void setUp() { Properties properties = new Properties(); - final Cluster cluster = resource.getNativeSession().getCluster(); + final Cluster cluster = session.getCluster(); +// final Cluster cluster = null; properties.setProperty(CASSANDRA_CLUSTER_NAME, cluster.getClusterName()); properties.setProperty(CASSANDRA_COMPRESSION_PROTOCOL, "NONE"); properties.setProperty(CASSANDRA_CREDENTIALS_USERNAME, "none"); @@ -131,7 +128,7 @@ public void prepareContext() { @Test public void should_create_cluster_and_session_upon_call_to_open() throws Exception { assertThat(interpreter.cluster).isNotNull(); - assertThat(interpreter.cluster.getClusterName()).isEqualTo(resource.getNativeSession().getCluster().getClusterName()); + assertThat(interpreter.cluster.getClusterName()).isEqualTo(session.getCluster().getClusterName()); assertThat(interpreter.session).isNotNull(); assertThat(interpreter.helper).isNotNull(); } @@ -241,7 +238,7 @@ public void should_execute_statement_with_consistency_option() throws Exception //Then assertThat(actual.code()).isEqualTo(Code.ERROR); assertThat(actual.message()) - .contains("Not enough replica available for query at consistency THREE (3 required but only 1 alive)"); + .contains("Not enough replicas available for query at consistency THREE (3 required but only 1 alive)"); } @Test @@ -329,14 +326,14 @@ public void should_execute_bound_statement() throws Exception { assertThat(actual.message()).isEqualTo( "login\taddresses\tage\tdeceased\tfirstname\tlast_update\tlastname\tlocation\n" + "jdoe\t" + - "{street_number:3, street_name:'Beverly Hills Bld', zip_code:90209," + - " country:'USA', extra_info:['Right on the hills', 'Next to the post box'], " + - "phone_numbers:{'office':2015790847, 'home':2016778524}}\tnull\t" + + "{street_number:3,street_name:'Beverly Hills Bld',zip_code:90209," + + "country:'USA',extra_info:['Right on the hills','Next to the post box']," + + "phone_numbers:{'office':2015790847,'home':2016778524}}\tnull\t" + "null\t" + "John\t" + "null\t" + "DOE\t" + - "('USA', 90209, 'Beverly Hills')\n"); + "('USA',90209,'Beverly Hills')\n"); } @Test @@ -553,6 +550,55 @@ public void should_describe_keyspace() throws Exception { assertThat(reformatHtml(actual.message())).isEqualTo(expected); } + @Test + @Ignore + //TODO activate test when using Java 8 and C* 3.x + public void should_describe_function() throws Exception { + //Given + Properties properties = new Properties(); + properties.setProperty(CASSANDRA_HOSTS, "127.0.0.1"); + properties.setProperty(CASSANDRA_PORT, "9042"); + Interpreter interpreter = new CassandraInterpreter(properties); + interpreter.open(); + + String createFunction = "CREATE FUNCTION zeppelin.maxof(val1 int,val2 int) " + + "RETURNS NULL ON NULL INPUT " + + "RETURNS int " + + "LANGUAGE java " + + "AS $$" + + " return Math.max(val1, val2);\n" + + "$$;"; + interpreter.interpret(createFunction, intrContext); + String query = "DESCRIBE FUNCTION zeppelin.maxOf;"; + + //When + final InterpreterResult actual = interpreter.interpret(query, intrContext); + + //Then + assertThat(actual.code()).isEqualTo(Code.SUCCESS); + assertThat(actual.message()).isEqualTo("xxxxx"); + } + + @Test + @Ignore + //TODO activate test when using Java 8 and C* 3.x + public void should_describe_aggregate() throws Exception { + //Given + Properties properties = new Properties(); + properties.setProperty(CASSANDRA_HOSTS, "127.0.0.1"); + properties.setProperty(CASSANDRA_PORT, "9042"); + Interpreter interpreter = new CassandraInterpreter(properties); + interpreter.open(); + + final String query = "DESCRIBE AGGREGATES;"; + + //When + final InterpreterResult actual = interpreter.interpret(query, intrContext); + + //Then + assertThat(actual.code()).isEqualTo(Code.SUCCESS); + + } @Test public void should_describe_table() throws Exception { //Given @@ -601,6 +647,7 @@ public void should_describe_udt_withing_logged_in_keyspace() throws Exception { assertThat(reformatHtml(actual.message())).isEqualTo(expected); } + @Test public void should_error_describing_non_existing_table() throws Exception { //Given @@ -647,8 +694,8 @@ private static String reformatHtml(String rawHtml) { return rawHtml .replaceAll("\\s*\n\\s*","") .replaceAll(">\\s+<", "><") - .replaceAll("(?s)data-target=\"#[a-f0-9-]+(?:_asCQL)?\"", "") - .replaceAll("(?s)id=\"[a-f0-9-]+(?:_asCQL)?\"", "") + .replaceAll("(?s)data-target=\"#[a-f0-9-]+(?:_asCQL|_indices_asCQL)?\"", "") + .replaceAll("(?s)id=\"[a-f0-9-]+(?:_asCQL|_indices_asCQL)?\"", "") .trim(); } diff --git a/cassandra/src/test/java/org/apache/zeppelin/cassandra/InterpreterLogicTest.java b/cassandra/src/test/java/org/apache/zeppelin/cassandra/InterpreterLogicTest.java index f7993fb1beb..bf685f1fdb4 100644 --- a/cassandra/src/test/java/org/apache/zeppelin/cassandra/InterpreterLogicTest.java +++ b/cassandra/src/test/java/org/apache/zeppelin/cassandra/InterpreterLogicTest.java @@ -302,10 +302,10 @@ public void should_parse_accurate_date() throws Exception { } private scala.collection.immutable.List toScalaList(java.util.List list) { - return scala.collection.JavaConverters.asScalaBufferConverter(list).asScala().toList(); + return scala.collection.JavaConversions.asScalaIterable(list).toList(); } private java.util.List toJavaList(scala.collection.immutable.List list){ - return scala.collection.JavaConverters.seqAsJavaListConverter(list).asJava(); + return scala.collection.JavaConversions.asJavaList(list); } } \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/DescribeCluster.html b/cassandra/src/test/resources/scalate/DescribeCluster.html index 5d32c7d3fb1..0250301c914 100644 --- a/cassandra/src/test/resources/scalate/DescribeCluster.html +++ b/cassandra/src/test/resources/scalate/DescribeCluster.html @@ -1,98 +1 @@ -
    -
    -     -
    -
    -
    -
    -
    - - - - - - - - - - - - -
    -

    -  Test Cluster -

    -
    Partitioner
    org.apache.cassandra.dht.Murmur3Partitioner
    -
    -
    -
    \ No newline at end of file +

     Test Cluster

    Partitioner
    org.apache.cassandra.dht.Murmur3Partitioner
    \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/DescribeKeyspace_live_data.html b/cassandra/src/test/resources/scalate/DescribeKeyspace_live_data.html index 09e73420f9b..80a04e81562 100644 --- a/cassandra/src/test/resources/scalate/DescribeKeyspace_live_data.html +++ b/cassandra/src/test/resources/scalate/DescribeKeyspace_live_data.html @@ -1,819 +1 @@ -
    -
    - -
    -
    - - - -
    -
    -
    -
    - - - - - - - - - - - - - -
    ReplicationDurable Writes
    {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}false
    -
    - - As CQL statement - - -

    -
    - 
    CREATE KEYSPACE live_data WITH REPLICATION = {
-	'class' : 'org.apache.cassandra.locator.SimpleStrategy',
-	'replication_factor': '1' }
-AND DURABLE_WRITES = false;
    -
    -
    -
    -
    -
    -
    - - -
    - - - - - - -
    		Tables
    -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Column TypeColumn NameData Type
    - - - - - pk1uuid
    - - - -   - pk2idx - - pk2int
    - - - - - my_static1text
    - - - - - my_static2text
    - -   - - - - - clustering1timestamp
    - -   - - - -   - clustering2idx - - clustering2int
    - -   - - - - - clustering3text
    - - - - entries_indexed_mapmap<int, text>
    - - - - idx1 - - indexed1text
    - - - - idx2 - - indexed2int
    - - - - keys_map_idx - - key_indexed_mapmap<int, text>
    - - - - my_listlist<text>
    - - - - my_mapmap<int, text>
    - - - - my_udtfrozen<live_data.address>
    - - - - my_udt_listfrozen<list<frozen<live_data.address>>>
    - - - - simpledouble
    -
    - - As CQL statement - - -

    -
    - 
    CREATE TABLE live_data.complex_table (
-    pk1 uuid,
-    pk2 int,
-    clustering1 timestamp,
-    clustering2 int,
-    clustering3 text,
-    entries_indexed_map map<int, text>,
-    indexed1 text,
-    indexed2 int,
-    key_indexed_map map<int, text>,
-    my_list list<text>,
-    my_map map<int, text>,
-    my_static1 text static,
-    my_static2 text static,
-    my_udt frozen<live_data.address>,
-    my_udt_list frozen<list<frozen<live_data.address>>>,
-    simple double,
-    PRIMARY KEY ((pk1, pk2), clustering1, clustering2, clustering3)
-) WITH CLUSTERING ORDER BY (clustering1 DESC, clustering2 ASC, clustering3 DESC)
-   AND read_repair_chance = 0.0
-   AND dclocal_read_repair_chance = 0.1
-   AND gc_grace_seconds = 864000
-   AND bloom_filter_fp_chance = 0.01
-   AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }
-   AND comment = ''
-   AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }
-   AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }
-   AND default_time_to_live = 0
-   AND speculative_retry = '99.0PERCENTILE'
-   AND min_index_interval = 128
-   AND max_index_interval = 2048;
-CREATE INDEX pk2idx ON live_data.complex_table (pk2);
-CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);
-CREATE INDEX idx1 ON live_data.complex_table (indexed1);
-CREATE INDEX idx2 ON live_data.complex_table (indexed2);
-CREATE INDEX keys_map_idx ON live_data.complex_table (KEYS(key_indexed_map));
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Column TypeColumn NameData Type
    - - - - - sensor_iduuid
    - - - - - monthint
    - - - - - characteristicsmap<text, text>
    - - - - - model_numbertext
    - - - - - providertext
    - -   - - - - - datetimestamp
    - - - - valuedouble
    -
    - - As CQL statement - - -

    -
    - 
    CREATE TABLE live_data.sensor_data (
-    sensor_id uuid,
-    month int,
-    date timestamp,
-    characteristics map<text, text> static,
-    model_number text static,
-    provider text static,
-    value double,
-    PRIMARY KEY ((sensor_id, month), date)
-) WITH CLUSTERING ORDER BY (date DESC)
-   AND read_repair_chance = 0.0
-   AND dclocal_read_repair_chance = 0.1
-   AND gc_grace_seconds = 864000
-   AND bloom_filter_fp_chance = 0.01
-   AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }
-   AND comment = ''
-   AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }
-   AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }
-   AND default_time_to_live = 0
-   AND speculative_retry = '99.0PERCENTILE'
-   AND min_index_interval = 128
-   AND max_index_interval = 2048;
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - -
    Column TypeColumn NameData Type
    - - - - - station_iduuid
    - - - - sensorsfrozen<map<uuid, frozen<live_data.geolocation>>>
    -
    - - As CQL statement - - -

    -
    - 
    CREATE TABLE live_data.stations (
-    station_id uuid,
-    sensors frozen<map<uuid, frozen<live_data.geolocation>>>,
-    PRIMARY KEY (station_id)
-) WITH read_repair_chance = 0.0
-   AND dclocal_read_repair_chance = 0.1
-   AND gc_grace_seconds = 864000
-   AND bloom_filter_fp_chance = 0.01
-   AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }
-   AND comment = ''
-   AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }
-   AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }
-   AND default_time_to_live = 0
-   AND speculative_retry = '99.0PERCENTILE'
-   AND min_index_interval = 128
-   AND max_index_interval = 2048;
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    - - - - - - - -
    		User Defined Types
    -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Column NameData Type
    numberint
    streettext
    zipint
    citytext
    countrytext
    -
    - - As CQL statement - - -

    -
    - 
    CREATE TYPE live_data.address (
-    number int,
-    street text,
-    zip int,
-    city text,
-    country text
-);
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    - -
    - -
    -
    - -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - -
    Column NameData Type
    latitudedouble
    longitudedouble
    -
    - - As CQL statement - - -

    -
    - 
    CREATE TYPE live_data.geolocation (
-    latitude double,
-    longitude double
-);
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    - -
    -
    - -
    \ No newline at end of file +

      live_data

    ReplicationDurable Writes
    {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}false
    As CQL statement

    CREATE KEYSPACE live_data WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '1' }AND DURABLE_WRITES = false;
    		Tables
    Column TypeColumn NameData Type
    pk1uuid
    pk2int
    my_static1text
    my_static2text
     clustering1timestamp
     clustering2int
     clustering3text
    entries_indexed_mapmap<int, text>
    indexed1text
    indexed2int
    key_indexed_mapmap<int, text>
    my_listlist<text>
    my_mapmap<int, text>
    my_udtfrozen<live_data.address>
    my_udt_listfrozen<list<frozen<live_data.address>>>
    simpledouble
    As CQL statement

    CREATE TABLE live_data.complex_table (pk1 uuid,pk2 int,clustering1 timestamp,clustering2 int,clustering3 text,entries_indexed_map map<int, text>,indexed1 text,indexed2 int,key_indexed_map map<int, text>,my_list list<text>,my_map map<int, text>,my_static1 text static,my_static2 text static,my_udt frozen<live_data.address>,my_udt_list frozen<list<frozen<live_data.address>>>,simple double,PRIMARY KEY ((pk1, pk2), clustering1, clustering2, clustering3)) WITH CLUSTERING ORDER BY (clustering1 DESC, clustering2 ASC, clustering3 DESC) AND read_repair_chance = 0.0 AND dclocal_read_repair_chance = 0.1 AND gc_grace_seconds = 864000 AND bloom_filter_fp_chance = 0.01 AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' } AND comment = '' AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' } AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' } AND default_time_to_live = 0 AND speculative_retry = '99.0PERCENTILE' AND min_index_interval = 128 AND max_index_interval = 2048;

     complex_table's indices

    NameTarget
    clustering2idxclustering2
    idx1indexed1
    idx2indexed2
    keys_map_idxkeys(key_indexed_map)
    pk2idxpk2
    As CQL statement

    CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));CREATE INDEX pk2idx ON live_data.complex_table (pk2);
    Column TypeColumn NameData Type
    sensor_iduuid
    monthint
    characteristicsmap<text, text>
    model_numbertext
    providertext
     datetimestamp
    valuedouble
    As CQL statement

    CREATE TABLE live_data.sensor_data (sensor_id uuid,month int,date timestamp,characteristics map<text, text> static,model_number text static,provider text static,value double,PRIMARY KEY ((sensor_id, month), date)) WITH CLUSTERING ORDER BY (date DESC) AND read_repair_chance = 0.0 AND dclocal_read_repair_chance = 0.1 AND gc_grace_seconds = 864000 AND bloom_filter_fp_chance = 0.01 AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' } AND comment = '' AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' } AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' } AND default_time_to_live = 0 AND speculative_retry = '99.0PERCENTILE' AND min_index_interval = 128 AND max_index_interval = 2048;
    Column TypeColumn NameData Type
    station_iduuid
    sensorsfrozen<map<uuid, frozen<live_data.geolocation>>>
    As CQL statement

    CREATE TABLE live_data.stations (station_id uuid,sensors frozen<map<uuid, frozen<live_data.geolocation>>>,PRIMARY KEY (station_id)) WITH read_repair_chance = 0.0 AND dclocal_read_repair_chance = 0.1 AND gc_grace_seconds = 864000 AND bloom_filter_fp_chance = 0.01 AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' } AND comment = '' AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' } AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' } AND default_time_to_live = 0 AND speculative_retry = '99.0PERCENTILE' AND min_index_interval = 128 AND max_index_interval = 2048;
    		User Defined Types
    Column NameData Type
    numberint
    streettext
    zipint
    citytext
    countrytext
    As CQL statement

    CREATE TYPE live_data.address (number int,street text,zip int,city text,country text);
    Column NameData Type
    latitudedouble
    longitudedouble
    As CQL statement

    CREATE TYPE live_data.geolocation (latitude double,longitude double);
    \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/DescribeKeyspaces.html b/cassandra/src/test/resources/scalate/DescribeKeyspaces.html index 77293abdcd9..47d3386c52f 100644 --- a/cassandra/src/test/resources/scalate/DescribeKeyspaces.html +++ b/cassandra/src/test/resources/scalate/DescribeKeyspaces.html @@ -1,400 +1 @@ -
    -
    - -
    -
    - - -
    -
    -
    -
    - - - - - - - - - - - - -
    -

    -  Test Cluster -

    -
    Partitioner
    org.apache.cassandra.dht.Murmur3Partitioner
    -
    -
    -
    - - -
    - - - - - -
    		Keyspaces
    -
    -
    - -
    - -
    -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - -
    ReplicationDurable Writes
    {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}false
    -
    - - As CQL statement - - -

    -
    - 
    CREATE KEYSPACE live_data WITH REPLICATION = {
-	'class' : 'org.apache.cassandra.locator.SimpleStrategy',
-	'replication_factor': '1' }
-AND DURABLE_WRITES = false;
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - -
    ReplicationDurable Writes
    {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}false
    -
    - - As CQL statement - - -

    -
    - 
    CREATE KEYSPACE samples WITH REPLICATION = {
-	'class' : 'org.apache.cassandra.locator.SimpleStrategy',
-	'replication_factor': '1' }
-AND DURABLE_WRITES = false;
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - -
    ReplicationDurable Writes
    {'class' : 'org.apache.cassandra.locator.LocalStrategy'}true
    -
    - - As CQL statement - - -

    -
    - 
    CREATE KEYSPACE system WITH REPLICATION = {
-	'class' : 'org.apache.cassandra.locator.LocalStrategy' }
-AND DURABLE_WRITES = true;
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - -
    ReplicationDurable Writes
    {'replication_factor' : '2', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}true
    -
    - - As CQL statement - - -

    -
    - 
    CREATE KEYSPACE system_traces WITH REPLICATION = {
-	'class' : 'org.apache.cassandra.locator.SimpleStrategy',
-	'replication_factor': '2' }
-AND DURABLE_WRITES = true;
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    - - -
    -
    -
    -
    - - - - - - - - - - - - - -
    ReplicationDurable Writes
    {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}false
    -
    - - As CQL statement - - -

    -
    - 
    CREATE KEYSPACE zeppelin WITH REPLICATION = {
-	'class' : 'org.apache.cassandra.locator.SimpleStrategy',
-	'replication_factor': '1' }
-AND DURABLE_WRITES = false;
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    \ No newline at end of file +

     Test Cluster

    Partitioner
    org.apache.cassandra.dht.Murmur3Partitioner
    		Keyspaces
    ReplicationDurable Writes
    {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}false
    As CQL statement

    CREATE KEYSPACE live_data WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '1' }AND DURABLE_WRITES = false;
    ReplicationDurable Writes
    {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}false
    As CQL statement

    CREATE KEYSPACE samples WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '1' }AND DURABLE_WRITES = false;
    ReplicationDurable Writes
    {'class' : 'org.apache.cassandra.locator.LocalStrategy'}true
    As CQL statement

    CREATE KEYSPACE system WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.LocalStrategy' }AND DURABLE_WRITES = true;
    ReplicationDurable Writes
    {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}true
    As CQL statement

    CREATE KEYSPACE system_auth WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '1' }AND DURABLE_WRITES = true;
    ReplicationDurable Writes
    {'replication_factor' : '3', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}true
    As CQL statement

    CREATE KEYSPACE system_distributed WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '3' }AND DURABLE_WRITES = true;
    ReplicationDurable Writes
    {'replication_factor' : '2', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}true
    As CQL statement

    CREATE KEYSPACE system_traces WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '2' }AND DURABLE_WRITES = true;
    ReplicationDurable Writes
    {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}true
    As CQL statement

    CREATE KEYSPACE zeppelin WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '1' }AND DURABLE_WRITES = true;
    \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/DescribeTable_live_data_complex_table.html b/cassandra/src/test/resources/scalate/DescribeTable_live_data_complex_table.html index 9ff84f1a54e..d072c6b85ec 100644 --- a/cassandra/src/test/resources/scalate/DescribeTable_live_data_complex_table.html +++ b/cassandra/src/test/resources/scalate/DescribeTable_live_data_complex_table.html @@ -1,326 +1 @@ -
    -
    - -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

     complex_table

    Column TypeColumn NameData Type
    - - - - - pk1uuid
    - - - -   - pk2idx - - pk2int
    - - - - - my_static1text
    - - - - - my_static2text
    - -   - - - - - clustering1timestamp
    - -   - - - -   - clustering2idx - - clustering2int
    - -   - - - - - clustering3text
    - - - - entries_indexed_mapmap<int, text>
    - - - - idx1 - - indexed1text
    - - - - idx2 - - indexed2int
    - - - - keys_map_idx - - key_indexed_mapmap<int, text>
    - - - - my_listlist<text>
    - - - - my_mapmap<int, text>
    - - - - my_udtfrozen<live_data.address>
    - - - - my_udt_listfrozen<list<frozen<live_data.address>>>
    - - - - simpledouble
    -
    - - As CQL statement - - -

    -
    - 
    CREATE TABLE live_data.complex_table (
-    pk1 uuid,
-    pk2 int,
-    clustering1 timestamp,
-    clustering2 int,
-    clustering3 text,
-    entries_indexed_map map<int, text>,
-    indexed1 text,
-    indexed2 int,
-    key_indexed_map map<int, text>,
-    my_list list<text>,
-    my_map map<int, text>,
-    my_static1 text static,
-    my_static2 text static,
-    my_udt frozen<live_data.address>,
-    my_udt_list frozen<list<frozen<live_data.address>>>,
-    simple double,
-    PRIMARY KEY ((pk1, pk2), clustering1, clustering2, clustering3)
-) WITH CLUSTERING ORDER BY (clustering1 DESC, clustering2 ASC, clustering3 DESC)
-   AND read_repair_chance = 0.0
-   AND dclocal_read_repair_chance = 0.1
-   AND gc_grace_seconds = 864000
-   AND bloom_filter_fp_chance = 0.01
-   AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }
-   AND comment = ''
-   AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }
-   AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }
-   AND default_time_to_live = 0
-   AND speculative_retry = '99.0PERCENTILE'
-   AND min_index_interval = 128
-   AND max_index_interval = 2048;
-CREATE INDEX pk2idx ON live_data.complex_table (pk2);
-CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);
-CREATE INDEX idx1 ON live_data.complex_table (indexed1);
-CREATE INDEX idx2 ON live_data.complex_table (indexed2);
-CREATE INDEX keys_map_idx ON live_data.complex_table (KEYS(key_indexed_map));
    -
    -
    -
    -
    -
    -
    \ No newline at end of file +

     complex_table

    Column TypeColumn NameData Type
    pk1uuid
    pk2int
    my_static1text
    my_static2text
     clustering1timestamp
     clustering2int
     clustering3text
    entries_indexed_mapmap<int, text>
    indexed1text
    indexed2int
    key_indexed_mapmap<int, text>
    my_listlist<text>
    my_mapmap<int, text>
    my_udtfrozen<live_data.address>
    my_udt_listfrozen<list<frozen<live_data.address>>>
    simpledouble
    As CQL statement

    CREATE TABLE live_data.complex_table (pk1 uuid,pk2 int,clustering1 timestamp,clustering2 int,clustering3 text,entries_indexed_map map<int, text>,indexed1 text,indexed2 int,key_indexed_map map<int, text>,my_list list<text>,my_map map<int, text>,my_static1 text static,my_static2 text static,my_udt frozen<live_data.address>,my_udt_list frozen<list<frozen<live_data.address>>>,simple double,PRIMARY KEY ((pk1, pk2), clustering1, clustering2, clustering3)) WITH CLUSTERING ORDER BY (clustering1 DESC, clustering2 ASC, clustering3 DESC) AND read_repair_chance = 0.0 AND dclocal_read_repair_chance = 0.1 AND gc_grace_seconds = 864000 AND bloom_filter_fp_chance = 0.01 AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' } AND comment = '' AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' } AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' } AND default_time_to_live = 0 AND speculative_retry = '99.0PERCENTILE' AND min_index_interval = 128 AND max_index_interval = 2048;

     complex_table's indices

    NameTarget
    clustering2idxclustering2
    idx1indexed1
    idx2indexed2
    keys_map_idxkeys(key_indexed_map)
    pk2idxpk2
    As CQL statement

    CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));CREATE INDEX pk2idx ON live_data.complex_table (pk2);
    \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/DescribeType_live_data_address.html b/cassandra/src/test/resources/scalate/DescribeType_live_data_address.html index 5c4546fd482..3e34d2800e5 100644 --- a/cassandra/src/test/resources/scalate/DescribeType_live_data_address.html +++ b/cassandra/src/test/resources/scalate/DescribeType_live_data_address.html @@ -1,137 +1 @@ -
    -
    - -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

     address

    Column NameData Type
    numberint
    streettext
    zipint
    citytext
    countrytext
    -
    - - As CQL statement - - -

    -
    - 
    CREATE TYPE live_data.address (
-    number int,
-    street text,
-    zip int,
-    city text,
-    country text
-);
    -
    -
    -
    -
    -
    -
    +

     address

    Column NameData Type
    numberint
    streettext
    zipint
    citytext
    countrytext
    As CQL statement

    CREATE TYPE live_data.address (number int,street text,zip int,city text,country text);
    \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/DescribeType_live_data_address_within_current_keyspace.html b/cassandra/src/test/resources/scalate/DescribeType_live_data_address_within_current_keyspace.html index aa657f9cc22..1a75e754223 100644 --- a/cassandra/src/test/resources/scalate/DescribeType_live_data_address_within_current_keyspace.html +++ b/cassandra/src/test/resources/scalate/DescribeType_live_data_address_within_current_keyspace.html @@ -1,137 +1 @@ -
    -
    - -
    -
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

     address

    Column NameData Type
    numberint
    streettext
    zipint
    citytext
    countrytext
    -
    - - As CQL statement - - -

    -
    - 
    CREATE TYPE live_data.address (
-    number int,
-    street text,
-    zip int,
-    city text,
-    country text
-);
    -
    -
    -
    -
    -
    -
    +

     address

    Column NameData Type
    numberint
    streettext
    zipint
    citytext
    countrytext
    As CQL statement

    CREATE TYPE live_data.address (number int,street text,zip int,city text,country text);
    \ No newline at end of file diff --git a/cassandra/src/test/scala/org/apache/zeppelin/cassandra/ParagraphParserTest.scala b/cassandra/src/test/scala/org/apache/zeppelin/cassandra/ParagraphParserTest.scala index b1a8866bd1d..9af1b78a698 100644 --- a/cassandra/src/test/scala/org/apache/zeppelin/cassandra/ParagraphParserTest.scala +++ b/cassandra/src/test/scala/org/apache/zeppelin/cassandra/ParagraphParserTest.scala @@ -78,13 +78,19 @@ class ParagraphParserTest extends FlatSpec )) } - "Parser" should "parse single-line comment" in { + "Parser" should "parse hash single-line comment" in { val query :CharSequence="""#This is a comment""".stripMargin val parsed = parser.parseAll[Comment](parser.singleLineComment, query) parsed.get should be(Comment("This is a comment")) } + "Parser" should "parse double slashses single-line comment" in { + val query :CharSequence="""//This is another comment""".stripMargin + + val parsed = parser.parseAll[Comment](parser.singleLineComment, query) + parsed.get should be(Comment("This is another comment")) + } "Parser" should "parse multi-line comment" in { val query:String = @@ -462,6 +468,23 @@ class ParagraphParserTest extends FlatSpec ex.getMessage should be(s"Invalid syntax for DESCRIBE CLUSTER. It should comply to the pattern: ${DESCRIBE_CLUSTER_PATTERN.toString}") } + "Parser" should "parse describe keyspace" in { + val queries ="Describe KeYsPaCe toto;" + + val parsed = parser.parseAll(parser.queries, queries) + + parsed.get should be(List(DescribeKeyspaceCmd("toto"))) + } + + "Parser" should "fail parsing describe keyspace" in { + val queries ="Describe KeYsPaCe toto" + + val ex = intercept[InterpreterException] { + parser.parseAll(parser.queries, queries) + } + ex.getMessage should be(s"Invalid syntax for DESCRIBE KEYSPACE. It should comply to the pattern: ${DESCRIBE_KEYSPACE_PATTERN.toString}") + } + "Parser" should "parse describe keyspaces" in { val queries ="Describe KeYsPaCeS;" @@ -479,6 +502,32 @@ class ParagraphParserTest extends FlatSpec ex.getMessage should be(s"Invalid syntax for DESCRIBE KEYSPACES. It should comply to the pattern: ${DESCRIBE_KEYSPACES_PATTERN.toString}") } + "Parser" should "parse describe table" in { + val queries ="Describe TaBlE toto;" + + val parsed = parser.parseAll(parser.queries, queries) + + parsed.get should be(List(DescribeTableCmd(None,"toto"))) + } + + "Parser" should "parse describe table with keyspace" in { + val queries ="Describe TaBlE ks.toto;" + + val parsed = parser.parseAll(parser.queries, queries) + + parsed.get should be(List(DescribeTableCmd(Some("ks"),"toto"))) + } + + "Parser" should "fail parsing describe table" in { + val queries ="Describe TaBlE toto" + + val ex = intercept[InterpreterException] { + parser.parseAll(parser.queries, queries) + } + ex.getMessage should be(s"Invalid syntax for DESCRIBE TABLE. It should comply to the patterns: " + + s"${DESCRIBE_TABLE_WITH_KEYSPACE_PATTERN.toString} or ${DESCRIBE_TABLE_PATTERN.toString}") + } + "Parser" should "parse describe tables" in { val queries ="Describe TaBlEs;" @@ -496,73 +545,180 @@ class ParagraphParserTest extends FlatSpec ex.getMessage should be(s"Invalid syntax for DESCRIBE TABLES. It should comply to the pattern: ${DESCRIBE_TABLES_PATTERN.toString}") } - "Parser" should "parse describe keyspace" in { - val queries ="Describe KeYsPaCe toto;" + "Parser" should "parse describe type" in { + val queries ="Describe Type toto;" val parsed = parser.parseAll(parser.queries, queries) - parsed.get should be(List(DescribeKeyspaceCmd("toto"))) + parsed.get should be(List(DescribeTypeCmd(None,"toto"))) } - "Parser" should "fail parsing describe keyspace" in { - val queries ="Describe KeYsPaCe toto" + "Parser" should "parse describe type with keyspace" in { + val queries ="Describe Type ks.toto;" + + val parsed = parser.parseAll(parser.queries, queries) + + parsed.get should be(List(DescribeTypeCmd(Some("ks"),"toto"))) + } + + "Parser" should "fail parsing describe type" in { + val queries ="Describe Type toto" val ex = intercept[InterpreterException] { parser.parseAll(parser.queries, queries) } - ex.getMessage should be(s"Invalid syntax for DESCRIBE KEYSPACE. It should comply to the pattern: ${DESCRIBE_KEYSPACE_PATTERN.toString}") + ex.getMessage should be(s"Invalid syntax for DESCRIBE TYPE. It should comply to the patterns: " + + s"${DESCRIBE_TYPE_WITH_KEYSPACE_PATTERN.toString} or ${DESCRIBE_TYPE_PATTERN.toString}") } - "Parser" should "parse describe table" in { - val queries ="Describe TaBlE toto;" + "Parser" should "parse describe types" in { + val queries ="Describe types;" val parsed = parser.parseAll(parser.queries, queries) - parsed.get should be(List(DescribeTableCmd(None,"toto"))) + parsed.get(0) shouldBe a [DescribeTypesCmd] } - "Parser" should "parse describe table with keyspace" in { - val queries ="Describe TaBlE ks.toto;" + "Parser" should "fail parsing describe types" in { + val queries ="Describe types" + + val ex = intercept[InterpreterException] { + parser.parseAll(parser.queries, queries) + } + ex.getMessage should be(s"Invalid syntax for DESCRIBE TYPES. It should comply to the pattern: ${DESCRIBE_TYPES_PATTERN.toString}") + } + + "Parser" should "parse describe function" in { + val queries ="Describe function toto;" val parsed = parser.parseAll(parser.queries, queries) - parsed.get should be(List(DescribeTableCmd(Some("ks"),"toto"))) + parsed.get should be(List(DescribeFunctionCmd(None,"toto"))) } - "Parser" should "fail parsing describe table" in { - val queries ="Describe TaBlE toto" + "Parser" should "parse describe function with keyspace" in { + val queries ="Describe function ks.toto;" + + val parsed = parser.parseAll(parser.queries, queries) + + parsed.get should be(List(DescribeFunctionCmd(Some("ks"),"toto"))) + } + + "Parser" should "fail parsing describe function" in { + val queries ="Describe function toto" val ex = intercept[InterpreterException] { parser.parseAll(parser.queries, queries) } - ex.getMessage should be(s"Invalid syntax for DESCRIBE TABLE. It should comply to the patterns: " + - s"${DESCRIBE_TABLE_WITH_KEYSPACE_PATTERN.toString} or ${DESCRIBE_TABLE_PATTERN.toString}") + ex.getMessage should be(s"Invalid syntax for DESCRIBE FUNCTION. It should comply to the patterns: " + + s"${DESCRIBE_FUNCTION_WITH_KEYSPACE_PATTERN.toString} or ${DESCRIBE_FUNCTION_PATTERN.toString}") } - "Parser" should "parse describe type" in { - val queries ="Describe Type toto;" + "Parser" should "parse describe functions" in { + val queries ="Describe functions;" val parsed = parser.parseAll(parser.queries, queries) - parsed.get should be(List(DescribeUDTCmd(None,"toto"))) + parsed.get(0) shouldBe a [DescribeFunctionsCmd] } - "Parser" should "parse describe type with keyspace" in { - val queries ="Describe Type ks.toto;" + "Parser" should "fail parsing describe functions" in { + val queries ="Describe functions toto" + + val ex = intercept[InterpreterException] { + parser.parseAll(parser.queries, queries) + } + ex.getMessage should be(s"Invalid syntax for DESCRIBE FUNCTIONS. It should comply to the pattern: " + + s"${DESCRIBE_FUNCTIONS_PATTERN.toString}") + } + + + "Parser" should "parse describe aggregate" in { + val queries ="Describe aggregate toto;" val parsed = parser.parseAll(parser.queries, queries) - parsed.get should be(List(DescribeUDTCmd(Some("ks"),"toto"))) + parsed.get should be(List(DescribeAggregateCmd(None,"toto"))) } - "Parser" should "fail parsing describe type" in { - val queries ="Describe Type toto" + "Parser" should "parse describe aggregate with keyspace" in { + val queries ="Describe aggregate ks.toto;" + + val parsed = parser.parseAll(parser.queries, queries) + + parsed.get should be(List(DescribeAggregateCmd(Some("ks"),"toto"))) + } + + "Parser" should "fail parsing describe aggregate" in { + val queries ="Describe aggregate toto" val ex = intercept[InterpreterException] { parser.parseAll(parser.queries, queries) } - ex.getMessage should be(s"Invalid syntax for DESCRIBE TYPE. It should comply to the patterns: " + - s"${DESCRIBE_TYPE_WITH_KEYSPACE_PATTERN.toString} or ${DESCRIBE_TYPE_PATTERN.toString}") + ex.getMessage should be(s"Invalid syntax for DESCRIBE AGGREGATE. It should comply to the patterns: " + + s"${DESCRIBE_AGGREGATE_WITH_KEYSPACE_PATTERN.toString} or ${DESCRIBE_AGGREGATE_PATTERN.toString}") + } + + "Parser" should "parse describe aggregates" in { + val queries ="Describe aggregates;" + + val parsed = parser.parseAll(parser.queries, queries) + + parsed.get(0) shouldBe a [DescribeAggregatesCmd] + } + + "Parser" should "fail parsing describe aggregates" in { + val queries ="Describe aggregates toto" + + val ex = intercept[InterpreterException] { + parser.parseAll(parser.queries, queries) + } + ex.getMessage should be(s"Invalid syntax for DESCRIBE AGGREGATES. It should comply to the pattern: " + + s"${DESCRIBE_AGGREGATES_PATTERN.toString}") + } + + "Parser" should "parse describe materialized view" in { + val queries ="Describe materialized view toto;" + + val parsed = parser.parseAll(parser.queries, queries) + + parsed.get should be(List(DescribeMaterializedViewCmd(None,"toto"))) + } + + "Parser" should "parse describe materialized view with keyspace" in { + val queries ="Describe materialized view ks.toto;" + + val parsed = parser.parseAll(parser.queries, queries) + + parsed.get should be(List(DescribeMaterializedViewCmd(Some("ks"),"toto"))) + } + + "Parser" should "fail parsing describe materialized view" in { + val queries ="Describe materialized view toto" + + val ex = intercept[InterpreterException] { + parser.parseAll(parser.queries, queries) + } + ex.getMessage should be(s"Invalid syntax for DESCRIBE MATERIALIZED VIEW. It should comply to the patterns: " + + s"${DESCRIBE_MATERIALIZED_VIEW_WITH_KEYSPACE_PATTERN.toString} or ${DESCRIBE_MATERIALIZED_VIEW_PATTERN.toString}") + } + + "Parser" should "parse describe materialized views" in { + val queries ="Describe materialized views;" + + val parsed = parser.parseAll(parser.queries, queries) + + parsed.get(0) shouldBe a [DescribeMaterializedViewsCmd] + } + + "Parser" should "fail parsing describe materialized views" in { + val queries ="Describe materialized views toto" + + val ex = intercept[InterpreterException] { + parser.parseAll(parser.queries, queries) + } + ex.getMessage should be(s"Invalid syntax for DESCRIBE MATERIALIZED VIEWS. It should comply to the pattern: " + + s"${DESCRIBE_MATERIALIZED_VIEWS_PATTERN.toString}") } "Parser" should "parse help" in { @@ -582,4 +738,99 @@ class ParagraphParserTest extends FlatSpec ex.getMessage should be(s"Invalid syntax for HELP. It should comply to the patterns: " + s"${HELP_PATTERN.toString}") } + + "Parser" should "parse CREATE FUNCTION" in { + val query = "CREATE FUNCTION keyspace.udf xxx AS 'return true;';" + + val parsed = parser.parseAll(parser.queries, query) + + parsed.get(0) should be(SimpleStm(query)) + + } + + "Parser" should "parse CREATE OR REPLACE FUNCTION" in { + val query = "CREATE or Replace FUNCTION keyspace.udf xxx AS 'return true;';" + + val parsed = parser.parseAll(parser.queries, query) + + parsed.get(0) should be(SimpleStm(query)) + + } + + "Parser" should "parse CREATE FUNCTION IF NOT Exists" in { + val query = "CREATE FUNCTION IF NOT EXISTS keyspace.udf xxx AS 'return true;';" + + val parsed = parser.parseAll(parser.queries, query) + + parsed.get(0) should be(SimpleStm(query)) + + } + + "Parser" should "parse CREATE FUNCTION multiline with simple quote" in { + val query = + """CREATE FUNCTION IF NOT EXISTS keyspace.udf(input text) xxx + | CALLED ON NULL INPUT + | RETURN text + | LANGUAGE java + | AS ' + | return input.toLowerCase("abc"); + | ';""".stripMargin + + val parsed = parser.parseAll(parser.queries, query) + + parsed.get(0) should be(SimpleStm(query)) + + } + + "Parser" should "parse CREATE FUNCTION multiline with double dollar" in { + val query = + """CREATE FUNCTION IF NOT EXISTS keyspace.udf(input text) xxx + | CALLED ON NULL INPUT + | RETURN text + | LANGUAGE java + | AS $$ + | return input.toLowerCase("abc"); + | $$;""".stripMargin + + val parsed = parser.parseAll(parser.queries, query) + + parsed.get(0) should be(SimpleStm(query)) + + } + + "Parser" should "parse CREATE FUNCTION multiline with SELECT" in { + + val udf = + """CREATE FUNCTION IF NOT EXISTS keyspace.udf(input text) xxx + | CALLED ON NULL INPUT + | RETURN text + | LANGUAGE java + | AS ' + | return input.toLowerCase("abc"); + | ';""".stripMargin + + val select = "SELECT udf(val) from table WHERe id=1;" + val queries = + s"""$udf + |$select + """.stripMargin + + val parsed = parser.parseAll(parser.queries, queries) + + parsed.get should be(List(SimpleStm(udf), SimpleStm(select))) + + } + + "Parser" should "parse CREATE Materalized View" in { + val query = + """CREATE MATERIALIZED VIEW xxx + | AS SELECT * FROM myTable + | WHERE partition IS NOT NULL + | PRIMARY KEY(col, partition);""".stripMargin + + val parsed = parser.parseAll(parser.queries, query) + + parsed.get(0) should be(SimpleStm(query)) + + } } From 6ea9e55610a3faddac3e98e3ae9e7888c8e5264f Mon Sep 17 00:00:00 2001 From: DuyHai DOAN Date: Tue, 5 Jan 2016 16:36:27 +0100 Subject: [PATCH 3/9] Update help menu and changelog --- .../src/main/resources/scalate/helpMenu.ssp | 135 ++++++++++++++++-- 1 file changed, 120 insertions(+), 15 deletions(-) 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 @@
    • - Version 1.0 + Version 2.0
    • - Java Driver Version 2.1.7.1 + Java Driver Version 3.0.0-rc1
    • @@ -237,7 +249,7 @@

      II Comments

      It is possible to add comments between statements. Single line comments start with the - hash sign (#). Multi-line comments are enclosed between + hash sign (#) or double slashes (//). Multi-line comments are enclosed between /** and **/. Ex:
      @@ -246,9 +258,12 @@ 

       
-    #First comment
+    #Single line comment style 1
     INSERT INTO users(login,name) VALUES('jdoe','John DOE');
 
+    //Single line comment style 2
+
+
     /**
      Multi line
      comments
@@ -313,6 +328,22 @@
                                     DESCRIBE TABLES;
                                     List all existing keyspaces in the cluster and for each, all the tables name
                                 
+                                
+                                    DESCRIBE TYPES;
+                                    List all existing keyspaces in the cluster and for each, all the types name
+                                
+                                
+                                    DESCRIBE FUNCTIONS;
+                                    List all existing keyspaces in the cluster and for each, all the functions name and arguments
+                                
+                                
+                                    DESCRIBE AGGREGATES;
+                                    List all existing keyspaces in the cluster and for each, all the aggregates name and arguments
+                                
+                                
+                                    DESCRIBE MATERIALIZED VIEWS;
+                                    List all existing keyspaces in the cluster and for each, all the materialized view name
+                                
                                 
                                     DESCRIBE KEYSPACE <keyspace name>;
                                     Describe the given keyspace configuration and all its table details (name, columns, ...)
@@ -333,6 +364,30 @@
                                         the default system keyspace is used. If no type is found, an error message is raised
                                     
                                 
+                                
+                                    DESCRIBE FUNCTION (<keyspace name>).<function name>;
+                                    
+                                        Describe the given function. If the keyspace is not provided, the current
+                                        logged in keyspace is used. If there is no logged in keyspace,
+                                        the default system keyspace is used. If no function is found, an error message is raised
+                                    
+                                
+                                
+                                    DESCRIBE AGGREGATE (<keyspace name>).<aggregate name>;
+                                    
+                                        Describe the given aggregate. If the keyspace is not provided, the current
+                                        logged in keyspace is used. If there is no logged in keyspace,
+                                        the default system keyspace is used. If no aggregate is found, an error message is raised
+                                    
+                                        
+                                
+                                    DESCRIBE MATERIALIZED VIEW (<keyspace name>).<view name>;
+                                    
+                                        Describe the given materialized view. If the keyspace is not provided, the current
+                                        logged in keyspace is used. If there is no logged in keyspace,
+                                        the default system keyspace is used. If no materialized view is found, an error message is raised
+                                    
+                                                                                                                          
                             
                         
                         
      
@@ -342,9 +397,7 @@
                     
      
                     
      II Schema Display
      
                     
      
-                        The schema objects (cluster, keyspace, table & type) are displayed in a tabular format.
-                        There is a drop-down menu on the top left corner to expand objects details.
-                        On the top right menu is shown the Icon legend.
+                        The schema objects (cluster, keyspace, table, type, view, function & aggregate) are displayed in a tabular format. There is a drop-down menu on the top left corner to expand objects details. On the top right menu is shown the Icon legend.
      @@ -886,16 +939,68 @@
      -
      +
      -

      Execution parallelism

      - It is possible to execute many paragraphs in parallel. However, at the back-end side, we’re still using synchronous queries. Asynchronous execution is only possible when it is possible to return a Future value in the InterpreterResult. It may be an interesting proposal for the Zeppelin project. + It is possible to execute many paragraphs in parallel. However, at the back-end side, we’re still using synchronous queries. Asynchronous execution is only possible when it is possible to return a Future value in the InterpreterResult. It may be an interesting proposal for the Zeppelin project. +
      + Another caveat is that the same com.datastax.driver.core.Session object is used for all notebooks and paragraphs. Consequently, if you use the USE keyspace name; statement to log into a keyspace, it will change the keyspace for all current users of the Cassandra interpreter because we only create 1 com.datastax.driver.core.Session object per instance of Cassandra interpreter. +
      + The same remark does apply to the prepared statement hash map, it is shared by all users using the same instance of Cassandra interpreter. +
      + Until Zeppelin offers a real multi-users separation, there is a work-around to segregate user environment and states: create different Cassandra interpreter instances +
      +
        +
      1. First go to the Interpreter menu and click on the Create button
        2. +
      2. In the interpreter creation form, put cass-instance2 as Name and select the cassandra in the interpreter drop-down list
        3. +
      3. Click on Save to create the new interpreter instance. Now you should be able to see it in the interpreter list
        4. +
      4. Go back to your notebook and click on the Gear icon to configure interpreter bindings. You should be able to see and select the cass-instance2 interpreter instance in the available interpreter list instead of the standard cassandra instance
        5. +
      +
      + +
      + +
      +
      + 2.0 : +
      +
        +
      • Update help menu and add changelog
        • +
      • Add Support for User Defined Functions, User Defined Aggregates and Materialized Views
        • +
      • Upgrade Java driver version to 3.0.0-rc1
        • +
      + 1.0 : +
      +
        +
      • Initial version
        • +
      +
      +
      +
      +
      + +
      +
      + If you encounter a bug for this interpreter, please create a JIRA ticket and ping me on Twitter at @doanduyhai +
      +
      \ No newline at end of file From 7a5ac396c6157ba392e8884aae2231d60df12f75 Mon Sep 17 00:00:00 2001 From: DuyHai DOAN Date: Wed, 6 Jan 2016 10:16:58 +0100 Subject: [PATCH 4/9] Update RegExp for UDF creation to fix multiple statements match --- .../zeppelin/cassandra/ParagraphParser.scala | 31 +++++++++++++-- .../cassandra/ParagraphParserTest.scala | 39 ++++++++++++++++++- 2 files changed, 65 insertions(+), 5 deletions(-) diff --git a/cassandra/src/main/scala/org/apache/zeppelin/cassandra/ParagraphParser.scala b/cassandra/src/main/scala/org/apache/zeppelin/cassandra/ParagraphParser.scala index b0dd1c50d5e..a26c7891c92 100644 --- a/cassandra/src/main/scala/org/apache/zeppelin/cassandra/ParagraphParser.scala +++ b/cassandra/src/main/scala/org/apache/zeppelin/cassandra/ParagraphParser.scala @@ -23,7 +23,16 @@ import scala.util.matching.Regex import scala.util.parsing.combinator._ import org.apache.zeppelin.cassandra.TextBlockHierarchy._ +/** + * Parser using Scala combinator parsing + * + * (?i) means case-insensitive mode + * (?s) means DOT ALL mode + * (?is) means case-insensitive and DOT ALL mode + * + */ object ParagraphParser { + val CONSISTENCY_LEVEL_PATTERN = ConsistencyLevel.values().toList .map(_.name()).filter(!_.contains("SERIAL")).mkString("""^\s*@consistency\s*=\s*(""", "|" , """)\s*$""").r @@ -43,7 +52,21 @@ object ParagraphParser { val BIND_PATTERN = """^\s*@bind\[([^]]+)\](?:=([^;]+))?""".r val BATCH_PATTERN = """^(?i)\s*BEGIN\s+(UNLOGGED|COUNTER)?\s*BATCH""".r - val UDF_PATTERN = """^(?is)\s*(CREATE(?: OR REPLACE)? FUNCTION(?: IF NOT EXISTS)?.+ AS (?:'|\$\$)[^']+(?:'|\$\$);)""".r + /** + * Very complicated RegExp + * (?: OR REPLACE)? -> optional presence of OR REPLACE + * .+? -> match ANY character in RELUCTANT mode + * (?:\s*|\n|\r|\f) -> white space OR line returns (\n, \r, \f) + * (?:\s*|\n|\r|\f)AS(?:\s*|\n|\r|\f) -> AS preceded and followed by white space or line return + * (?:'|\$\$) -> simple quote (') OR double dollar ($$) as source code separator + * (?:'|\$\$).+?(?:'|\$\$)\s*; -> + * source code separator (?:'|\$\$) + * followed by ANY character in RELUCTANT mode (.+?) + * followed by source code separator (?:'|\$\$) + * followed by optional white-space(s) (\s*) + * followed by semi-colon (;) + */ + val UDF_PATTERN = """(?is)\s*(CREATE(?: OR REPLACE)? FUNCTION(?: IF NOT EXISTS)?.+?(?:\s+|\n|\r|\f)AS(?:\s+|\n|\r|\f)(?:'|\$\$).+?(?:'|\$\$)\s*;)""".r val GENERIC_STATEMENT_PREFIX = """(?is)\s*(?:INSERT|UPDATE|DELETE|SELECT|CREATE|UPDATE| @@ -125,9 +148,9 @@ class ParagraphParser extends RegexParsers{ def fetchSize: Parser[FetchSize] = """\s*@fetchSize.+""".r ^^ {case x => extractFetchSize(x.trim)} //Statements - def udfStatement: Parser[SimpleStm] = UDF_PATTERN ^^{case x => extractUdfStatement(x.trim)} + def createFunctionStatement: Parser[SimpleStm] = UDF_PATTERN ^^{case x => extractUdfStatement(x.trim)} def genericStatement: Parser[SimpleStm] = s"""$GENERIC_STATEMENT_PREFIX[^;]+;""".r ^^ {case x => extractSimpleStatement(x.trim)} - def allStatement: Parser[SimpleStm] = udfStatement | genericStatement +// def allStatement: Parser[SimpleStm] = udfStatement | genericStatement def prepare: Parser[PrepareStm] = """\s*@prepare.+""".r ^^ {case x => extractPreparedStatement(x.trim)} def removePrepare: Parser[RemovePrepareStm] = """\s*@remove_prepare.+""".r ^^ {case x => extractRemovePreparedStatement(x.trim)} @@ -172,7 +195,7 @@ class ParagraphParser extends RegexParsers{ describeFunction | describeFunctions | describeAggregate | describeAggregates | describeMaterializedView | describeMaterializedViews | - helpCommand | allStatement) + helpCommand | createFunctionStatement | genericStatement) def extractConsistency(text: String): Consistency = { text match { diff --git a/cassandra/src/test/scala/org/apache/zeppelin/cassandra/ParagraphParserTest.scala b/cassandra/src/test/scala/org/apache/zeppelin/cassandra/ParagraphParserTest.scala index 9af1b78a698..c019d9847dc 100644 --- a/cassandra/src/test/scala/org/apache/zeppelin/cassandra/ParagraphParserTest.scala +++ b/cassandra/src/test/scala/org/apache/zeppelin/cassandra/ParagraphParserTest.scala @@ -821,7 +821,44 @@ class ParagraphParserTest extends FlatSpec } - "Parser" should "parse CREATE Materalized View" in { + "Parser" should "parse CREATE multiple FUNCTIONS" in { + + val udf1 = + """CREATE FUNCTION IF NOT EXISTS keyspace.udf(input text) xxx + | CALLED ON NULL INPUT + | RETURN text + | LANGUAGE java + | AS ' + | return input.toLowerCase("abc"); + | ';""".stripMargin + + val select = "SELECT * FROM keyspace.table;" + + val udf2 = """CREATE FUNCTION IF NOT EXISTS keyspace.maxOf(val1 int, val2 int) + | CALLED ON NULL INPUT + | RETURN text + | LANGUAGE java + | AS ' + | return Math.max(val1,val2); + | ';""".stripMargin + + val queries = + s"""$udf1 + | + |$select + | + |$udf2 + """.stripMargin + + val parsed = parser.parseAll(parser.queries, queries) + + parsed.get.size should be(3) + + parsed.get should be(List(SimpleStm(udf1), SimpleStm(select), SimpleStm(udf2))) + + } + + "Parser" should "parse CREATE Materialized View" in { val query = """CREATE MATERIALIZED VIEW xxx | AS SELECT * FROM myTable From 6509da5e4b33288074ff60c2bd1a3dac4a003af7 Mon Sep 17 00:00:00 2001 From: DuyHai DOAN Date: Tue, 5 Jan 2016 23:57:29 +0100 Subject: [PATCH 5/9] Fix failing tests --- cassandra/pom.xml | 1 - .../resources/scalate/DescribeCluster.html | 2 +- .../scalate/DescribeKeyspace_live_data.html | 2 +- .../resources/scalate/DescribeKeyspaces.html | 2 +- ...DescribeTable_live_data_complex_table.html | 2 +- .../DescribeType_live_data_address.html | 2 +- ..._data_address_within_current_keyspace.html | 2 +- .../src/test/resources/scalate/Help.html | 871 +----------------- 8 files changed, 7 insertions(+), 877 deletions(-) diff --git a/cassandra/pom.xml b/cassandra/pom.xml index 82bb412f1d1..ca8c5e81150 100644 --- a/cassandra/pom.xml +++ b/cassandra/pom.xml @@ -293,7 +293,6 @@ - diff --git a/cassandra/src/test/resources/scalate/DescribeCluster.html b/cassandra/src/test/resources/scalate/DescribeCluster.html index 0250301c914..3a5c0011e30 100644 --- a/cassandra/src/test/resources/scalate/DescribeCluster.html +++ b/cassandra/src/test/resources/scalate/DescribeCluster.html @@ -1 +1 @@ -

       Test Cluster

      Partitioner
      org.apache.cassandra.dht.Murmur3Partitioner
      \ No newline at end of file +

       Test Cluster

      Partitioner
      org.apache.cassandra.dht.Murmur3Partitioner
      \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/DescribeKeyspace_live_data.html b/cassandra/src/test/resources/scalate/DescribeKeyspace_live_data.html index 80a04e81562..aec542b4337 100644 --- a/cassandra/src/test/resources/scalate/DescribeKeyspace_live_data.html +++ b/cassandra/src/test/resources/scalate/DescribeKeyspace_live_data.html @@ -1 +1 @@ -

        live_data

      ReplicationDurable Writes
      {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}false
      As CQL statement

      CREATE KEYSPACE live_data WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '1' }AND DURABLE_WRITES = false;
      		Tables
      Column TypeColumn NameData Type
      pk1uuid
      pk2int
      my_static1text
      my_static2text
       clustering1timestamp
       clustering2int
       clustering3text
      entries_indexed_mapmap<int, text>
      indexed1text
      indexed2int
      key_indexed_mapmap<int, text>
      my_listlist<text>
      my_mapmap<int, text>
      my_udtfrozen<live_data.address>
      my_udt_listfrozen<list<frozen<live_data.address>>>
      simpledouble
      As CQL statement

      CREATE TABLE live_data.complex_table (pk1 uuid,pk2 int,clustering1 timestamp,clustering2 int,clustering3 text,entries_indexed_map map<int, text>,indexed1 text,indexed2 int,key_indexed_map map<int, text>,my_list list<text>,my_map map<int, text>,my_static1 text static,my_static2 text static,my_udt frozen<live_data.address>,my_udt_list frozen<list<frozen<live_data.address>>>,simple double,PRIMARY KEY ((pk1, pk2), clustering1, clustering2, clustering3)) WITH CLUSTERING ORDER BY (clustering1 DESC, clustering2 ASC, clustering3 DESC) AND read_repair_chance = 0.0 AND dclocal_read_repair_chance = 0.1 AND gc_grace_seconds = 864000 AND bloom_filter_fp_chance = 0.01 AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' } AND comment = '' AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' } AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' } AND default_time_to_live = 0 AND speculative_retry = '99.0PERCENTILE' AND min_index_interval = 128 AND max_index_interval = 2048;

       complex_table's indices

      NameTarget
      clustering2idxclustering2
      idx1indexed1
      idx2indexed2
      keys_map_idxkeys(key_indexed_map)
      pk2idxpk2
      As CQL statement

      CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));CREATE INDEX pk2idx ON live_data.complex_table (pk2);
      Column TypeColumn NameData Type
      sensor_iduuid
      monthint
      characteristicsmap<text, text>
      model_numbertext
      providertext
       datetimestamp
      valuedouble
      As CQL statement

      CREATE TABLE live_data.sensor_data (sensor_id uuid,month int,date timestamp,characteristics map<text, text> static,model_number text static,provider text static,value double,PRIMARY KEY ((sensor_id, month), date)) WITH CLUSTERING ORDER BY (date DESC) AND read_repair_chance = 0.0 AND dclocal_read_repair_chance = 0.1 AND gc_grace_seconds = 864000 AND bloom_filter_fp_chance = 0.01 AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' } AND comment = '' AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' } AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' } AND default_time_to_live = 0 AND speculative_retry = '99.0PERCENTILE' AND min_index_interval = 128 AND max_index_interval = 2048;
      Column TypeColumn NameData Type
      station_iduuid
      sensorsfrozen<map<uuid, frozen<live_data.geolocation>>>
      As CQL statement

      CREATE TABLE live_data.stations (station_id uuid,sensors frozen<map<uuid, frozen<live_data.geolocation>>>,PRIMARY KEY (station_id)) WITH read_repair_chance = 0.0 AND dclocal_read_repair_chance = 0.1 AND gc_grace_seconds = 864000 AND bloom_filter_fp_chance = 0.01 AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' } AND comment = '' AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' } AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' } AND default_time_to_live = 0 AND speculative_retry = '99.0PERCENTILE' AND min_index_interval = 128 AND max_index_interval = 2048;
      		User Defined Types
      Column NameData Type
      numberint
      streettext
      zipint
      citytext
      countrytext
      As CQL statement

      CREATE TYPE live_data.address (number int,street text,zip int,city text,country text);
      Column NameData Type
      latitudedouble
      longitudedouble
      As CQL statement

      CREATE TYPE live_data.geolocation (latitude double,longitude double);
      \ No newline at end of file +

        live_data

      ReplicationDurable Writes
      {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}false
      As CQL statement

      CREATE KEYSPACE live_data WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '1' }AND DURABLE_WRITES = false;
      		Tables
      Column TypeColumn NameData Type
      pk1uuid
      pk2int
      my_static1text
      my_static2text
       clustering1timestamp
       clustering2int
       clustering3text
      entries_indexed_mapmap<int, text>
      indexed1text
      indexed2int
      key_indexed_mapmap<int, text>
      my_listlist<text>
      my_mapmap<int, text>
      my_udtfrozen<live_data.address>
      my_udt_listfrozen<list<frozen<live_data.address>>>
      simpledouble
      As CQL statement

      CREATE TABLE live_data.complex_table (pk1 uuid,pk2 int,clustering1 timestamp,clustering2 int,clustering3 text,entries_indexed_map map<int, text>,indexed1 text,indexed2 int,key_indexed_map map<int, text>,my_list list<text>,my_map map<int, text>,my_static1 text static,my_static2 text static,my_udt frozen<live_data.address>,my_udt_list frozen<list<frozen<live_data.address>>>,simple double,PRIMARY KEY ((pk1, pk2), clustering1, clustering2, clustering3)) WITH CLUSTERING ORDER BY (clustering1 DESC, clustering2 ASC, clustering3 DESC)AND read_repair_chance = 0.0AND dclocal_read_repair_chance = 0.1AND gc_grace_seconds = 864000AND bloom_filter_fp_chance = 0.01AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }AND comment = ''AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }AND default_time_to_live = 0AND speculative_retry = '99.0PERCENTILE'AND min_index_interval = 128AND max_index_interval = 2048;CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));CREATE INDEX pk2idx ON live_data.complex_table (pk2);CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);

       complex_table's indices

      NameTarget
      clustering2idxclustering2
      idx1indexed1
      idx2indexed2
      keys_map_idxkeys(key_indexed_map)
      pk2idxpk2
      As CQL statement

      CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));CREATE INDEX pk2idx ON live_data.complex_table (pk2);
      Column TypeColumn NameData Type
      sensor_iduuid
      monthint
      characteristicsmap<text, text>
      model_numbertext
      providertext
       datetimestamp
      valuedouble
      As CQL statement

      CREATE TABLE live_data.sensor_data (sensor_id uuid,month int,date timestamp,characteristics map<text, text> static,model_number text static,provider text static,value double,PRIMARY KEY ((sensor_id, month), date)) WITH CLUSTERING ORDER BY (date DESC)AND read_repair_chance = 0.0AND dclocal_read_repair_chance = 0.1AND gc_grace_seconds = 864000AND bloom_filter_fp_chance = 0.01AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }AND comment = ''AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }AND default_time_to_live = 0AND speculative_retry = '99.0PERCENTILE'AND min_index_interval = 128AND max_index_interval = 2048;
      Column TypeColumn NameData Type
      station_iduuid
      sensorsfrozen<map<uuid, frozen<live_data.geolocation>>>
      As CQL statement

      CREATE TABLE live_data.stations (station_id uuid,sensors frozen<map<uuid, frozen<live_data.geolocation>>>,PRIMARY KEY (station_id)) WITH read_repair_chance = 0.0AND dclocal_read_repair_chance = 0.1AND gc_grace_seconds = 864000AND bloom_filter_fp_chance = 0.01AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }AND comment = ''AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }AND default_time_to_live = 0AND speculative_retry = '99.0PERCENTILE'AND min_index_interval = 128AND max_index_interval = 2048;
      		User Defined Types
      Column NameData Type
      numberint
      streettext
      zipint
      citytext
      countrytext
      As CQL statement

      CREATE TYPE live_data.address (number int,street text,zip int,city text,country text);
      Column NameData Type
      latitudedouble
      longitudedouble
      As CQL statement

      CREATE TYPE live_data.geolocation (latitude double,longitude double);
      \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/DescribeKeyspaces.html b/cassandra/src/test/resources/scalate/DescribeKeyspaces.html index 47d3386c52f..b5c364e69aa 100644 --- a/cassandra/src/test/resources/scalate/DescribeKeyspaces.html +++ b/cassandra/src/test/resources/scalate/DescribeKeyspaces.html @@ -1 +1 @@ -

       Test Cluster

      Partitioner
      org.apache.cassandra.dht.Murmur3Partitioner
      		Keyspaces
      ReplicationDurable Writes
      {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}false
      As CQL statement

      CREATE KEYSPACE live_data WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '1' }AND DURABLE_WRITES = false;
      ReplicationDurable Writes
      {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}false
      As CQL statement

      CREATE KEYSPACE samples WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '1' }AND DURABLE_WRITES = false;
      ReplicationDurable Writes
      {'class' : 'org.apache.cassandra.locator.LocalStrategy'}true
      As CQL statement

      CREATE KEYSPACE system WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.LocalStrategy' }AND DURABLE_WRITES = true;
      ReplicationDurable Writes
      {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}true
      As CQL statement

      CREATE KEYSPACE system_auth WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '1' }AND DURABLE_WRITES = true;
      ReplicationDurable Writes
      {'replication_factor' : '3', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}true
      As CQL statement

      CREATE KEYSPACE system_distributed WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '3' }AND DURABLE_WRITES = true;
      ReplicationDurable Writes
      {'replication_factor' : '2', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}true
      As CQL statement

      CREATE KEYSPACE system_traces WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '2' }AND DURABLE_WRITES = true;
      ReplicationDurable Writes
      {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}true
      As CQL statement

      CREATE KEYSPACE zeppelin WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '1' }AND DURABLE_WRITES = true;
      \ No newline at end of file +

       Test Cluster

      Partitioner
      org.apache.cassandra.dht.Murmur3Partitioner
      		Keyspaces
      ReplicationDurable Writes
      {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}false
      As CQL statement

      CREATE KEYSPACE live_data WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '1' }AND DURABLE_WRITES = false;
      ReplicationDurable Writes
      {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}false
      As CQL statement

      CREATE KEYSPACE samples WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '1' }AND DURABLE_WRITES = false;
      ReplicationDurable Writes
      {'class' : 'org.apache.cassandra.locator.LocalStrategy'}true
      As CQL statement

      CREATE KEYSPACE system WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.LocalStrategy' }AND DURABLE_WRITES = true;
      ReplicationDurable Writes
      {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}true
      As CQL statement

      CREATE KEYSPACE system_auth WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '1' }AND DURABLE_WRITES = true;
      ReplicationDurable Writes
      {'replication_factor' : '3', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}true
      As CQL statement

      CREATE KEYSPACE system_distributed WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '3' }AND DURABLE_WRITES = true;
      ReplicationDurable Writes
      {'replication_factor' : '2', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}true
      As CQL statement

      CREATE KEYSPACE system_traces WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '2' }AND DURABLE_WRITES = true;
      ReplicationDurable Writes
      {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}true
      As CQL statement

      CREATE KEYSPACE zeppelin WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '1' }AND DURABLE_WRITES = true;
      \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/DescribeTable_live_data_complex_table.html b/cassandra/src/test/resources/scalate/DescribeTable_live_data_complex_table.html index d072c6b85ec..3aefbae2db9 100644 --- a/cassandra/src/test/resources/scalate/DescribeTable_live_data_complex_table.html +++ b/cassandra/src/test/resources/scalate/DescribeTable_live_data_complex_table.html @@ -1 +1 @@ -

       complex_table

      Column TypeColumn NameData Type
      pk1uuid
      pk2int
      my_static1text
      my_static2text
       clustering1timestamp
       clustering2int
       clustering3text
      entries_indexed_mapmap<int, text>
      indexed1text
      indexed2int
      key_indexed_mapmap<int, text>
      my_listlist<text>
      my_mapmap<int, text>
      my_udtfrozen<live_data.address>
      my_udt_listfrozen<list<frozen<live_data.address>>>
      simpledouble
      As CQL statement

      CREATE TABLE live_data.complex_table (pk1 uuid,pk2 int,clustering1 timestamp,clustering2 int,clustering3 text,entries_indexed_map map<int, text>,indexed1 text,indexed2 int,key_indexed_map map<int, text>,my_list list<text>,my_map map<int, text>,my_static1 text static,my_static2 text static,my_udt frozen<live_data.address>,my_udt_list frozen<list<frozen<live_data.address>>>,simple double,PRIMARY KEY ((pk1, pk2), clustering1, clustering2, clustering3)) WITH CLUSTERING ORDER BY (clustering1 DESC, clustering2 ASC, clustering3 DESC) AND read_repair_chance = 0.0 AND dclocal_read_repair_chance = 0.1 AND gc_grace_seconds = 864000 AND bloom_filter_fp_chance = 0.01 AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' } AND comment = '' AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' } AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' } AND default_time_to_live = 0 AND speculative_retry = '99.0PERCENTILE' AND min_index_interval = 128 AND max_index_interval = 2048;

       complex_table's indices

      NameTarget
      clustering2idxclustering2
      idx1indexed1
      idx2indexed2
      keys_map_idxkeys(key_indexed_map)
      pk2idxpk2
      As CQL statement

      CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));CREATE INDEX pk2idx ON live_data.complex_table (pk2);
      \ No newline at end of file +

       complex_table

      Column TypeColumn NameData Type
      pk1uuid
      pk2int
      my_static1text
      my_static2text
       clustering1timestamp
       clustering2int
       clustering3text
      entries_indexed_mapmap<int, text>
      indexed1text
      indexed2int
      key_indexed_mapmap<int, text>
      my_listlist<text>
      my_mapmap<int, text>
      my_udtfrozen<live_data.address>
      my_udt_listfrozen<list<frozen<live_data.address>>>
      simpledouble
      As CQL statement

      CREATE TABLE live_data.complex_table (pk1 uuid,pk2 int,clustering1 timestamp,clustering2 int,clustering3 text,entries_indexed_map map<int, text>,indexed1 text,indexed2 int,key_indexed_map map<int, text>,my_list list<text>,my_map map<int, text>,my_static1 text static,my_static2 text static,my_udt frozen<live_data.address>,my_udt_list frozen<list<frozen<live_data.address>>>,simple double,PRIMARY KEY ((pk1, pk2), clustering1, clustering2, clustering3)) WITH CLUSTERING ORDER BY (clustering1 DESC, clustering2 ASC, clustering3 DESC)AND read_repair_chance = 0.0AND dclocal_read_repair_chance = 0.1AND gc_grace_seconds = 864000AND bloom_filter_fp_chance = 0.01AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }AND comment = ''AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }AND default_time_to_live = 0AND speculative_retry = '99.0PERCENTILE'AND min_index_interval = 128AND max_index_interval = 2048;CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));CREATE INDEX pk2idx ON live_data.complex_table (pk2);CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);

       complex_table's indices

      NameTarget
      clustering2idxclustering2
      idx1indexed1
      idx2indexed2
      keys_map_idxkeys(key_indexed_map)
      pk2idxpk2
      As CQL statement

      CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));CREATE INDEX pk2idx ON live_data.complex_table (pk2);
      \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/DescribeType_live_data_address.html b/cassandra/src/test/resources/scalate/DescribeType_live_data_address.html index 3e34d2800e5..9d4aaffff90 100644 --- a/cassandra/src/test/resources/scalate/DescribeType_live_data_address.html +++ b/cassandra/src/test/resources/scalate/DescribeType_live_data_address.html @@ -1 +1 @@ -

       address

      Column NameData Type
      numberint
      streettext
      zipint
      citytext
      countrytext
      As CQL statement

      CREATE TYPE live_data.address (number int,street text,zip int,city text,country text);
      \ No newline at end of file +

       address

      Column NameData Type
      numberint
      streettext
      zipint
      citytext
      countrytext
      As CQL statement

      CREATE TYPE live_data.address (number int,street text,zip int,city text,country text);
      \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/DescribeType_live_data_address_within_current_keyspace.html b/cassandra/src/test/resources/scalate/DescribeType_live_data_address_within_current_keyspace.html index 1a75e754223..13b1ce4fabc 100644 --- a/cassandra/src/test/resources/scalate/DescribeType_live_data_address_within_current_keyspace.html +++ b/cassandra/src/test/resources/scalate/DescribeType_live_data_address_within_current_keyspace.html @@ -1 +1 @@ -

       address

      Column NameData Type
      numberint
      streettext
      zipint
      citytext
      countrytext
      As CQL statement

      CREATE TYPE live_data.address (number int,street text,zip int,city text,country text);
      \ No newline at end of file +

       address

      Column NameData Type
      numberint
      streettext
      zipint
      citytext
      countrytext
      As CQL statement

      CREATE TYPE live_data.address (number int,street text,zip int,city text,country text);
      \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/Help.html b/cassandra/src/test/resources/scalate/Help.html index de71d649c37..1c82c66dd13 100644 --- a/cassandra/src/test/resources/scalate/Help.html +++ b/cassandra/src/test/resources/scalate/Help.html @@ -1,870 +1 @@ -
      -
      - -

      -
      -
      - -
      -
      - -
      -
      -

      I CQL Statements

      -

      This interpreter is compatible with any CQL statement supported by Cassandra. Ex: -

      -

      -
      - 
      -
-    INSERT INTO users(login,name) VALUES('jdoe','John DOE');
-    SELECT * FROM users WHERE login='jdoe';
-
      -
      -
      -
      - Each statement should be separated by a semi-colon (;). -
      - Multi-line statements as well as multiple statements on the same line - are also supported as long as they are separated by a semi-colon. Ex: -
      -
      -
      -
      - 
      -
-    USE spark_demo;
-
-    SELECT * FROM albums_by_country LIMIT 1; SELECT * FROM countries LIMIT 1;
-
-    SELECT *
-    FROM artists
-    WHERE login='jlennon';
-
      -
      -
      -
      - Batch statements are supported and can span multiple lines, as well as - DDL(CREATE/ALTER/DROP) statements: -
      -
      -
      -
      - 
      -
-    BEGIN BATCH
-        INSERT INTO users(login,name) VALUES('jdoe','John DOE');
-        INSERT INTO users_preferences(login,account_type) VALUES('jdoe','BASIC');
-    APPLY BATCH;
-
-    CREATE TABLE IF NOT EXISTS test(
-        key int PRIMARY KEY,
-        value text
-    );
-
      -
      -
      -
      - CQL statements are case-insensitive (except for column names and values). - This means that the following statements are equivalent and valid: -
      -
      -
      -
      - 
      -
-    INSERT INTO users(login,name) VALUES('jdoe','John DOE');
-    Insert into users(login,name) vAlues('hsue','Helen SUE');
-
      -
      -
      -
      - The complete list of all CQL statements and versions can be found below: -

      -
      -
      - - - - - - - - - - - - - - - - - - -
      Cassandra versionDocumentation
      2.2 - - http://docs.datastax.com/en/cql/3.3/cql/cqlIntro.html - -
      2.1 & 2.0 - - http://docs.datastax.com/en/cql/3.1/cql/cql_intro_c.html - -
      1.2 - - http://docs.datastax.com/en/cql/3.0/cql/aboutCQL.html - -
      -
      -
      - - -

      -

      II Comments

      -

      - It is possible to add comments between statements. Single line comments start with the - hash sign (#). Multi-line comments are enclosed between - /** and **/. Ex: - -
      -
      -

      -
      - 
      -
-    #First comment
-    INSERT INTO users(login,name) VALUES('jdoe','John DOE');
-
-    /**
-     Multi line
-     comments
-     **/
-    Insert into users(login,name) vAlues('hsue','Helen SUE');
-
      -
      -
      -
      - -

      -

      III Syntax Validation

      -

      - The interpreters is shipped with a built-in syntax validator. This validator only - checks for basic syntax errors. All CQL-related syntax validation is delegated - directly to Cassandra -

      - Most of the time, syntax errors are due to missing semi-colons between statements or typo errors. - -

      - -
      -
      - - - -
      -
      -
      -
      - -
      -
      - -
      -
      -

      I Commands For Discovery

      -

      - To make schema discovery easier and more interactive, the following commands are supported: -

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      CommandDescription
      DESCRIBE CLUSTER;Show the current cluster name and its partitioner
      DESCRIBE KEYSPACES;List all existing keyspaces in the cluster and their configuration - (replication factor, durable write ...)
      DESCRIBE TABLES;List all existing keyspaces in the cluster and for each, all the tables name
      DESCRIBE KEYSPACE <keyspace name>;Describe the given keyspace configuration and all its table details (name, columns, ...)
      DESCRIBE TABLE (<keyspace name>).<table name>; - Describe the given table. If the keyspace is not provided, the current - logged in keyspace is used. If there is no logged in keyspace, - the default system keyspace is used. If no table is found, an error message is raised -
      DESCRIBE TYPE (<keyspace name>).<type name>; - Describe the given type(UDT). If the keyspace is not provided, the current - logged in keyspace is used. If there is no logged in keyspace, - the default system keyspace is used. If no type is found, an error message is raised -
      -
      -

      -

      -

      II Schema Display

      -

      - The schema objects (cluster, keyspace, table & type) are displayed in a tabular format. - There is a drop-down menu on the top left corner to expand objects details. - On the top right menu is shown the Icon legend. - -

      -
      -
      - -
      -
      -
      -
      - -
      -
      - -
      -
      -

      - Sometimes you want to be able to pass runtime query parameters to your statements. - Those parameters are not part of the CQL specs and are specific to the interpreter. - Below is the list of all parameters: - -

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      -

      Query Parameters

      -
      ParameterSyntaxDescription
      Consistency Level@consistency=valueApply the given consistency level to all queries in the paragraph
      Serial Consistency Level@serialConsistency=valueApply the given serial consistency level to all queries in the paragraph
      Timestamp@timestamp=long valueApply the given timestamp to all queries in the paragraph.
      - Please note that timestamp value passed directly in CQL statement will override this value -
      Retry Policy@retryPolicy=valueApply the given retry policy to all queries in the paragraph
      Fetch Size@fetchSize=int valueApply the given fetch size to all queries in the paragraph
      -
      - Some parameters only accept restricted values: - -

      - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      -

      Allowed Values

      -
      ParameterPossible Values
      Consistency LevelALL, ANY, ONE, TWO, THREE, QUORUM, LOCAL_ONE, LOCAL_QUORUM, EACH_QUORUM
      Serial Consistency LevelSERIAL, LOCAL_SERIAL
      TimestampAny long value
      Retry Policy - - DEFAULT, DOWNGRADING_CONSISTENCY, FALLTHROUGH, LOGGING_DEFAULT, - LOGGING_DOWNGRADING, LOGGING_FALLTHROUGH - -
      Fetch SizeAny integer value
      -
      - -

      - - Some example: -

      -
      -
      - 
      -
-    CREATE TABLE IF NOT EXISTS spark_demo.ts(
-        key int PRIMARY KEY,
-        value text
-    );
-    TRUNCATE spark_demo.ts;
-
-    # Timestamp in the past
-    @timestamp=10
-
-    # Force timestamp directly in the first insert
-    INSERT INTO spark_demo.ts(key,value) VALUES(1,'first insert') USING TIMESTAMP 100;
-
-    # Select some data to make the clock turn
-    SELECT * FROM spark_demo.albums LIMIT 100;
-
-    # Now insert using the timestamp parameter set at the beginning(10)
-    INSERT INTO spark_demo.ts(key,value) VALUES(1,'second insert');
-
-    # Check for the result. You should see 'first insert'
-    SELECT value FROM spark_demo.ts WHERE key=1;
-
      -
      -
      -
      - - Some remarks about query parameters: -

      - -

      -
      -
      - - -
      -
      -
      - -
      - -
      -
      -
      -
      -

      I Syntax

      -
      -

      - For performance reason, it is better to prepare statements before-hand and reuse - them later by providing bound values. This interpreter provides 3 commands to handle prepared and - bound statements: -

      -

        -
      1. @prepare
        2. -
      2. @bind
        3. -
      3. @remove_prepared
        4. -
      -
      - Example: -
      -
      -
      - 
      -
-    @prepare[statement_name]=...
-
-    @bind[statement_name]=’text’, 1223, ’2015-07-30 12:00:01’, null, true, [‘list_item1’, ’list_item2’]
-
-    @bind[statement_name_with_no_bound_value]
-
-    @remove_prepare[statement_name]
-
-
      -
      -
      -
      - -

      II @prepare

      -
      -

      - You can use the syntax "@prepare[statement_name]=SELECT ..." to create a prepared statement. - The statement_name is mandatory because the interpreter prepares the given statement with the - Java driver and saves the generated prepared statement in an internal map, using the provided - statement_name as search key. -

      -

      - Please note that this internal prepared statement map is shared with all notebooks - and all paragraphs because there is only one instance of the interpreter for Cassandra -
      -
      -
      - If the interpreter encounters many @prepare for the same statement_name (key), - only the first statement will be taken into account. -
      -
      - Example: -
      -
      -
      - 
      -
-    @prepare[select]=SELECT * FROM spark_demo.albums LIMIT ?
-
-    @prepare[select]=SELECT * FROM spark_demo.artists LIMIT ?
-
      -
      -
      -
      - - For the above example, the prepared statement is "SELECT * FROM spark_demo.albums LIMIT ?". - "SELECT * FROM spark_demo.artists LIMIT ?" is ignored because an entry already exists in the - prepared statements map with the key select. -

      - In the context of Zeppelin, a notebook can be scheduled to be executed at regular interval, - thus it is necessary to avoid re-preparing many time the same statement (considered an anti-pattern). -

      -

      III @bind

      -
      -

      - Once the statement is prepared (possibly in a separated notebook/paragraph). You can bind values to it: -

      -

      -
      - 
      -
-    @bind[select_first]=10
-
      -
      -
      -
      - Bound values are not mandatory for the @bind statement. - However if you provide bound values, they need to comply to some syntax: - -
        -
      • String values should be enclosed between simple quotes ( ‘ )
        • -
      • Date values should be enclosed between simple quotes ( ‘ ) and respect the formats: -
          -
        1. yyyy-MM-dd HH:MM:ss
          2. -
        2. yyyy-MM-dd HH:MM:ss.SSS
          3. -
        -
        • -
      • null is parsed as-is
        • -
      • boolean (true|false) are parsed as-is
        • -
      • collection values must follow the - standard CQL syntax: -
          -
        • list: [‘list_item1’, ’list_item2’, ...]
          • -
        • set: {‘set_item1’, ‘set_item2’, …}
          • -
        • map: {‘key1’: ‘val1’, ‘key2’: ‘val2’, …}
          • -
        -
        • -
      • - tuple values should be enclosed between parenthesis - (see tuple CQL syntax): - (‘text’, 123, true) -
        • -
      • - udt values should be enclosed between brackets - (see udt CQL syntax): - {stree_name: ‘Beverly Hills’, number: 104, zip_code: 90020, state: ‘California’, …} -
        • -
      -
      -
      - It is possible to use the @bind statement inside a batch:
      - 
      -    BEGIN BATCH
-        @bind[insert_user]='jdoe','John DOE'
-        UPDATE users SET age = 27 WHERE login='hsue';
-    APPLY BATCH;
-
      -
      -
      -

      -

      IV @remove_prepare

      -
      -

      - To avoid for a prepared statement to stay forever in the prepared statement map, you can use the @remove_prepare[statement_name] syntax - to remove it. Removing a non-existing prepared statement yields no error. -

      -
      -
      -
      -
      -
      - -
      - -
      -
      - -
      -
      -

      - Instead of hard-coding your CQL queries, it is possible to use the mustache syntax ({{ }}) - to inject simple value or multiple choices forms. -

      - - The syntax for simple parameter is: {{input_Label=default value}}. - The default value is mandatory because the first time the paragraph is executed, - we launch the CQL query before rendering the form so at least one value should be provided. -

      - The syntax for multiple choices parameter is: {{input_Label=value1 | value2 | … | valueN }}. - By default the first choice is used for CQL query the first time the paragraph is executed. -

      - Example: -
      -

      -
      - 
      -
-    #Secondary index on performer style
-    SELECT name, country, performer
-    FROM spark_demo.performers
-    WHERE name='{{performer=Sheryl Crow|Doof|Fanfarlo|Los Paranoia}}'
-    AND styles CONTAINS '{{style=Rock}}';
-
-
      -
      -
      -
      - - In the above example, the first CQL query will be executed for performer='Sheryl Crow' - AND style='Rock'. For subsequent queries, you can change the value directly using the form. - Please note that we enclosed the {{ }} block between simple quotes (') because Cassandra expects a String here. - We could have also use the {{style='Rock'}} syntax but this time, the value - displayed on the form is 'Rock' and not Rock. - -

      -
      - It is also possible to use dynamic forms for prepared statements:
      - @bind[select]=='{{performer=Sheryl Crow|Doof|Fanfarlo|Los Paranoia}}', '{{style=Rock}}' -
      - -

      -
      -
      - -
      -
      -
      - -
      - -
      -
      - The Cassandra interpreter comes with some some configuration values for the Java driver: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
      -

      Interpreter Configuration

      -
      ParameterDefault Value
      cassandra.clusterTest Cluster
      cassandra.compression.protocolNONE, possible values: LZ4, SNAPPY
      cassandra.credentials.passwordnone
      cassandra.credentials.usernamenone
      cassandra.hostslocalhost
      cassandra.interpreter.parallelism10
      cassandra.keyspacesystem
      cassandra.load.balancing.policyDEFAULT, or a FQCN of a custom class
      cassandra.max.schema.agreement.wait.second10
      cassandra.native.port9042
      cassandra.pooling.core.connection.per.host.localProtocol V2 and below: 2, V3 and above: 1
      cassandra.pooling.core.connection.per.host.remoteProtocol V2 and below: 1, V3 and above: 1
      cassandra.pooling.heartbeat.interval.seconds30
      cassandra.pooling.idle.timeout.secondsTest Cluster
      cassandra.pooling.max.connection.per.host.localProtocol V2 and below: 8, V3 and above: 1
      cassandra.pooling.max.connection.per.host.remoteProtocol V2 and below: 2, V3 and above: 1
      cassandra.pooling.max.request.per.connection.localProtocol V2 and below: 128, V3 and above: 1024
      cassandra.pooling.max.request.per.connection.remoteProtocol V2 and below: 128, V3 and above: 256
      cassandra.pooling.new.connection.threshold.localProtocol V2 and below: 100, V3 and above: 800
      cassandra.pooling.new.connection.threshold.remoteProtocol V2 and below: 100, V3 and above: 200
      cassandra.pooling.pool.timeout.millisecs5000
      cassandra.protocol.version3
      cassandra.query.default.consistencyONE
      cassandra.query.default.fetchSize5000
      cassandra.query.default.serial.consistencySERIAL
      cassandra.reconnection.policyDEFAULT, or a FQCN of a custom class
      cassandra.retry.policyDEFAULT, or a FQCN of a custom class
      cassandra.socket.connection.timeout.millisecs500
      cassandra.socket.read.timeout.millisecs12000
      cassandra.socket.tcp.no_delaytrue
      cassandra.speculative.execution.policyDEFAULT, or a FQCN of a custom class
      -
      -
      -
      - -
      - -
      -
      -

      Execution parallelism

      - It is possible to execute many paragraphs in parallel. However, at the back-end side, we’re still using synchronous queries. Asynchronous execution is only possible when it is possible to return a Future value in the InterpreterResult. It may be an interesting proposal for the Zeppelin project. -
      -
      -
      -
      \ No newline at end of file +



      I CQL Statements

      This interpreter is compatible with any CQL statement supported by Cassandra. Ex:

      INSERT INTO users(login,name) VALUES('jdoe','John DOE');SELECT * FROM users WHERE login='jdoe';

      Each statement should be separated by a semi-colon (;).
      Multi-line statements as well as multiple statements on the same lineare also supported as long as they are separated by a semi-colon. Ex:

      USE spark_demo;SELECT * FROM albums_by_country LIMIT 1; SELECT * FROM countries LIMIT 1;SELECT *FROM artistsWHERE login='jlennon';

      Batch statements are supported and can span multiple lines, as well asDDL(CREATE/ALTER/DROP) statements:

      BEGIN BATCHINSERT INTO users(login,name) VALUES('jdoe','John DOE');INSERT INTO users_preferences(login,account_type) VALUES('jdoe','BASIC');APPLY BATCH;CREATE TABLE IF NOT EXISTS test(key int PRIMARY KEY,value text);

      CQL statements are case-insensitive (except for column names and values).This means that the following statements are equivalent and valid:

      INSERT INTO users(login,name) VALUES('jdoe','John DOE');Insert into users(login,name) vAlues('hsue','Helen SUE');

      The complete list of all CQL statements and versions can be found below:

      Cassandra versionDocumentation
      2.2http://docs.datastax.com/en/cql/3.3/cql/cqlIntro.html
      2.1 & 2.0http://docs.datastax.com/en/cql/3.1/cql/cql_intro_c.html
      1.2http://docs.datastax.com/en/cql/3.0/cql/aboutCQL.html

      II Comments

      It is possible to add comments between statements. Single line comments start with thehash sign (#) or double slashes (//). Multi-line comments are enclosed between/** and **/. Ex:

      #Single line comment style 1INSERT INTO users(login,name) VALUES('jdoe','John DOE');//Single line comment style 2/**Multi linecomments**/Insert into users(login,name) vAlues('hsue','Helen SUE');

      III Syntax Validation

      The interpreters is shipped with a built-in syntax validator. This validator onlychecks for basic syntax errors. All CQL-related syntax validation is delegateddirectly to Cassandra

      Most of the time, syntax errors are due to missing semi-colons between statements or typo errors.

      I Commands For Discovery

      To make schema discovery easier and more interactive, the following commands are supported:

      CommandDescription
      DESCRIBE CLUSTER;Show the current cluster name and its partitioner
      DESCRIBE KEYSPACES;List all existing keyspaces in the cluster and their configuration(replication factor, durable write ...)
      DESCRIBE TABLES;List all existing keyspaces in the cluster and for each, all the tables name
      DESCRIBE TYPES;List all existing keyspaces in the cluster and for each, all the types name
      DESCRIBE FUNCTIONS;List all existing keyspaces in the cluster and for each, all the functions name and arguments
      DESCRIBE AGGREGATES;List all existing keyspaces in the cluster and for each, all the aggregates name and arguments
      DESCRIBE MATERIALIZED VIEWS;List all existing keyspaces in the cluster and for each, all the materialized view name
      DESCRIBE KEYSPACE <keyspace name>;Describe the given keyspace configuration and all its table details (name, columns, ...)
      DESCRIBE TABLE (<keyspace name>).<table name>;Describe the given table. If the keyspace is not provided, the currentlogged in keyspace is used. If there is no logged in keyspace,the default system keyspace is used. If no table is found, an error message is raised
      DESCRIBE TYPE (<keyspace name>).<type name>;Describe the given type(UDT). If the keyspace is not provided, the currentlogged in keyspace is used. If there is no logged in keyspace,the default system keyspace is used. If no type is found, an error message is raised
      DESCRIBE FUNCTION (<keyspace name>).<function name>;Describe the given function. If the keyspace is not provided, the currentlogged in keyspace is used. If there is no logged in keyspace,the default system keyspace is used. If no function is found, an error message is raised
      DESCRIBE AGGREGATE (<keyspace name>).<aggregate name>;Describe the given aggregate. If the keyspace is not provided, the currentlogged in keyspace is used. If there is no logged in keyspace,the default system keyspace is used. If no aggregate is found, an error message is raised
      DESCRIBE MATERIALIZED VIEW (<keyspace name>).<view name>;Describe the given materialized view. If the keyspace is not provided, the currentlogged in keyspace is used. If there is no logged in keyspace,the default system keyspace is used. If no materialized view is found, an error message is raised

      II Schema Display

      The schema objects (cluster, keyspace, table, type, view, function & aggregate) are displayed in a tabular format. There is a drop-down menu on the top left corner to expand objects details. On the top right menu is shown the Icon legend.

      Sometimes you want to be able to pass runtime query parameters to your statements.Those parameters are not part of the CQL specs and are specific to the interpreter.Below is the list of all parameters:

      Query Parameters

      ParameterSyntaxDescription
      Consistency Level@consistency=valueApply the given consistency level to all queries in the paragraph
      Serial Consistency Level@serialConsistency=valueApply the given serial consistency level to all queries in the paragraph
      Timestamp@timestamp=long valueApply the given timestamp to all queries in the paragraph.
      Please note that timestamp value passed directly in CQL statement will override this value
      Retry Policy@retryPolicy=valueApply the given retry policy to all queries in the paragraph
      Fetch Size@fetchSize=int valueApply the given fetch size to all queries in the paragraph

      Some parameters only accept restricted values:

      Allowed Values

      ParameterPossible Values
      Consistency LevelALL, ANY, ONE, TWO, THREE, QUORUM, LOCAL_ONE, LOCAL_QUORUM, EACH_QUORUM
      Serial Consistency LevelSERIAL, LOCAL_SERIAL
      TimestampAny long value
      Retry PolicyDEFAULT, DOWNGRADING_CONSISTENCY, FALLTHROUGH, LOGGING_DEFAULT,LOGGING_DOWNGRADING, LOGGING_FALLTHROUGH
      Fetch SizeAny integer value

      Some example:

      CREATE TABLE IF NOT EXISTS spark_demo.ts(key int PRIMARY KEY,value text);TRUNCATE spark_demo.ts;# Timestamp in the past@timestamp=10# Force timestamp directly in the first insertINSERT INTO spark_demo.ts(key,value) VALUES(1,'first insert') USING TIMESTAMP 100;# Select some data to make the clock turnSELECT * FROM spark_demo.albums LIMIT 100;# Now insert using the timestamp parameter set at the beginning(10)INSERT INTO spark_demo.ts(key,value) VALUES(1,'second insert');# Check for the result. You should see 'first insert'SELECT value FROM spark_demo.ts WHERE key=1;

      Some remarks about query parameters:

      I Syntax


      For performance reason, it is better to prepare statements before-hand and reusethem later by providing bound values. This interpreter provides 3 commands to handle prepared andbound statements:

      1. @prepare
      2. @bind
      3. @remove_prepared

      Example:
      @prepare[statement_name]=...@bind[statement_name]=’text’, 1223, ’2015-07-30 12:00:01’, null, true, [‘list_item1’, ’list_item2’]@bind[statement_name_with_no_bound_value]@remove_prepare[statement_name]

      II @prepare


      You can use the syntax "@prepare[statement_name]=SELECT ..." to create a prepared statement.The statement_name is mandatory because the interpreter prepares the given statement with theJava driver and saves the generated prepared statement in an internal map, using the providedstatement_name as search key.

      Please note that this internal prepared statement map is shared with all notebooksand all paragraphs because there is only one instance of the interpreter for Cassandra

      If the interpreter encounters many @prepare for the same statement_name (key),only the first statement will be taken into account.

      Example:
      @prepare[select]=SELECT * FROM spark_demo.albums LIMIT ?@prepare[select]=SELECT * FROM spark_demo.artists LIMIT ?

      For the above example, the prepared statement is "SELECT * FROM spark_demo.albums LIMIT ?"."SELECT * FROM spark_demo.artists LIMIT ?" is ignored because an entry already exists in theprepared statements map with the key select.

      In the context of Zeppelin, a notebook can be scheduled to be executed at regular interval,thus it is necessary to avoid re-preparing many time the same statement (considered an anti-pattern).

      III @bind


      Once the statement is prepared (possibly in a separated notebook/paragraph). You can bind values to it:

      @bind[select_first]=10

      Bound values are not mandatory for the @bind statement.However if you provide bound values, they need to comply to some syntax:
      • String values should be enclosed between simple quotes ( ‘ )
      • Date values should be enclosed between simple quotes ( ‘ ) and respect the formats:
        1. yyyy-MM-dd HH:MM:ss
        2. yyyy-MM-dd HH:MM:ss.SSS
      • null is parsed as-is
      • boolean (true|false) are parsed as-is
      • collection values must follow thestandard CQL syntax:
        • list: [‘list_item1’, ’list_item2’, ...]
        • set: {‘set_item1’, ‘set_item2’, …}
        • map: {‘key1’: ‘val1’, ‘key2’: ‘val2’, …}
      • tuple values should be enclosed between parenthesis(see tuple CQL syntax):(‘text’, 123, true)
      • udt values should be enclosed between brackets(see udt CQL syntax):{stree_name: ‘Beverly Hills’, number: 104, zip_code: 90020, state: ‘California’, …}

      It is possible to use the @bind statement inside a batch: 
      BEGIN BATCH@bind[insert_user]='jdoe','John DOE'UPDATE users SET age = 27 WHERE login='hsue';APPLY BATCH;

      IV @remove_prepare


      To avoid for a prepared statement to stay forever in the prepared statement map, you can use the @remove_prepare[statement_name] syntaxto remove it. Removing a non-existing prepared statement yields no error.

      Instead of hard-coding your CQL queries, it is possible to use the mustache syntax ({{ }})to inject simple value or multiple choices forms.

      The syntax for simple parameter is: {{input_Label=default value}}.The default value is mandatory because the first time the paragraph is executed,we launch the CQL query before rendering the form so at least one value should be provided.

      The syntax for multiple choices parameter is: {{input_Label=value1 | value2 | … | valueN }}.By default the first choice is used for CQL query the first time the paragraph is executed.

      Example:

      #Secondary index on performer styleSELECT name, country, performerFROM spark_demo.performersWHERE name='{{performer=Sheryl Crow|Doof|Fanfarlo|Los Paranoia}}'AND styles CONTAINS '{{style=Rock}}';

      In the above example, the first CQL query will be executed for performer='Sheryl Crow'AND style='Rock'. For subsequent queries, you can change the value directly using the form.Please note that we enclosed the {{ }} block between simple quotes (') because Cassandra expects a String here.We could have also use the {{style='Rock'}} syntax but this time, the valuedisplayed on the form is 'Rock' and not Rock.

      It is also possible to use dynamic forms for prepared statements:
      @bind[select]=='{{performer=Sheryl Crow|Doof|Fanfarlo|Los Paranoia}}', '{{style=Rock}}'

      The Cassandra interpreter comes with some some configuration values for the Java driver:

      Interpreter Configuration

      ParameterDefault Value
      cassandra.clusterTest Cluster
      cassandra.compression.protocolNONE, possible values: LZ4, SNAPPY
      cassandra.credentials.passwordnone
      cassandra.credentials.usernamenone
      cassandra.hostslocalhost
      cassandra.interpreter.parallelism10
      cassandra.keyspacesystem
      cassandra.load.balancing.policyDEFAULT, or a FQCN of a custom class
      cassandra.max.schema.agreement.wait.second10
      cassandra.native.port9042
      cassandra.pooling.core.connection.per.host.localProtocol V2 and below: 2, V3 and above: 1
      cassandra.pooling.core.connection.per.host.remoteProtocol V2 and below: 1, V3 and above: 1
      cassandra.pooling.heartbeat.interval.seconds30
      cassandra.pooling.idle.timeout.secondsTest Cluster
      cassandra.pooling.max.connection.per.host.localProtocol V2 and below: 8, V3 and above: 1
      cassandra.pooling.max.connection.per.host.remoteProtocol V2 and below: 2, V3 and above: 1
      cassandra.pooling.max.request.per.connection.localProtocol V2 and below: 128, V3 and above: 1024
      cassandra.pooling.max.request.per.connection.remoteProtocol V2 and below: 128, V3 and above: 256
      cassandra.pooling.new.connection.threshold.localProtocol V2 and below: 100, V3 and above: 800
      cassandra.pooling.new.connection.threshold.remoteProtocol V2 and below: 100, V3 and above: 200
      cassandra.pooling.pool.timeout.millisecs5000
      cassandra.protocol.version3
      cassandra.query.default.consistencyONE
      cassandra.query.default.fetchSize5000
      cassandra.query.default.serial.consistencySERIAL
      cassandra.reconnection.policyDEFAULT, or a FQCN of a custom class
      cassandra.retry.policyDEFAULT, or a FQCN of a custom class
      cassandra.socket.connection.timeout.millisecs500
      cassandra.socket.read.timeout.millisecs12000
      cassandra.socket.tcp.no_delaytrue
      cassandra.speculative.execution.policyDEFAULT, or a FQCN of a custom class
      It is possible to execute many paragraphs in parallel. However, at the back-end side, we’re still using synchronous queries. Asynchronous execution is only possible when it is possible to return a Future value in the InterpreterResult. It may be an interesting proposal for the Zeppelin project.
      Another caveat is that the same com.datastax.driver.core.Session object is used for all notebooks and paragraphs. Consequently, if you use the USE keyspace name; statement to log into a keyspace, it will change the keyspace for all current users of the Cassandra interpreter because we only create 1 com.datastax.driver.core.Session object per instance of Cassandra interpreter.
      The same remark does apply to the prepared statement hash map, it is shared by all users using the same instance of Cassandra interpreter.
      Until Zeppelin offers a real multi-users separation, there is a work-around to segregate user environment and states: create different Cassandra interpreter instances
      1. First go to the Interpreter menu and click on the Create button
      2. In the interpreter creation form, put cass-instance2 as Name and select the cassandra in the interpreter drop-down list
      3. Click on Save to create the new interpreter instance. Now you should be able to see it in the interpreter list
      4. Go back to your notebook and click on the Gear icon to configure interpreter bindings. You should be able to see and select the cass-instance2 interpreter instance in the available interpreter list instead of the standard cassandra instance
      2.0 :
      • Update help menu and add changelog
      • Add Support for User Defined Functions, User Defined Aggregates and Materialized Views
      • Upgrade Java driver version to 3.0.0-rc1
      1.0 :
      • Initial version
      If you encounter a bug for this interpreter, please create a JIRA ticket and ping me on Twitter at @doanduyhai
      \ No newline at end of file From 138804c8d2b5cb6df355263e39ab8c5dc7898a61 Mon Sep 17 00:00:00 2001 From: DuyHai DOAN Date: Sat, 9 Jan 2016 11:41:04 +0100 Subject: [PATCH 6/9] Fix CSS style for UDF & MV in menu display --- .../src/main/resources/scalate/dropDownMenuForKeyspace.ssp | 4 ++-- .../test/resources/scalate/DescribeKeyspace_live_data.html | 2 +- .../scalate/DescribeTable_live_data_complex_table.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cassandra/src/main/resources/scalate/dropDownMenuForKeyspace.ssp b/cassandra/src/main/resources/scalate/dropDownMenuForKeyspace.ssp index b695a9bf3c6..6c2aad1d86b 100644 --- a/cassandra/src/main/resources/scalate/dropDownMenuForKeyspace.ssp +++ b/cassandra/src/main/resources/scalate/dropDownMenuForKeyspace.ssp @@ -65,7 +65,7 @@ #for((id,name,_) <- ksContent.functions)
    • -  ${name} +  ${name}
      • #end @@ -77,7 +77,7 @@ #for((id,name,_) <- ksContent.aggregates)
    • -  ${name} +  ${name}
      • #end diff --git a/cassandra/src/test/resources/scalate/DescribeKeyspace_live_data.html b/cassandra/src/test/resources/scalate/DescribeKeyspace_live_data.html index aec542b4337..cb06f7724e5 100644 --- a/cassandra/src/test/resources/scalate/DescribeKeyspace_live_data.html +++ b/cassandra/src/test/resources/scalate/DescribeKeyspace_live_data.html @@ -1 +1 @@ -

        live_data

      ReplicationDurable Writes
      {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}false
      As CQL statement

      CREATE KEYSPACE live_data WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '1' }AND DURABLE_WRITES = false;
      		Tables
      Column TypeColumn NameData Type
      pk1uuid
      pk2int
      my_static1text
      my_static2text
       clustering1timestamp
       clustering2int
       clustering3text
      entries_indexed_mapmap<int, text>
      indexed1text
      indexed2int
      key_indexed_mapmap<int, text>
      my_listlist<text>
      my_mapmap<int, text>
      my_udtfrozen<live_data.address>
      my_udt_listfrozen<list<frozen<live_data.address>>>
      simpledouble
      As CQL statement

      CREATE TABLE live_data.complex_table (pk1 uuid,pk2 int,clustering1 timestamp,clustering2 int,clustering3 text,entries_indexed_map map<int, text>,indexed1 text,indexed2 int,key_indexed_map map<int, text>,my_list list<text>,my_map map<int, text>,my_static1 text static,my_static2 text static,my_udt frozen<live_data.address>,my_udt_list frozen<list<frozen<live_data.address>>>,simple double,PRIMARY KEY ((pk1, pk2), clustering1, clustering2, clustering3)) WITH CLUSTERING ORDER BY (clustering1 DESC, clustering2 ASC, clustering3 DESC)AND read_repair_chance = 0.0AND dclocal_read_repair_chance = 0.1AND gc_grace_seconds = 864000AND bloom_filter_fp_chance = 0.01AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }AND comment = ''AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }AND default_time_to_live = 0AND speculative_retry = '99.0PERCENTILE'AND min_index_interval = 128AND max_index_interval = 2048;CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));CREATE INDEX pk2idx ON live_data.complex_table (pk2);CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);

       complex_table's indices

      NameTarget
      clustering2idxclustering2
      idx1indexed1
      idx2indexed2
      keys_map_idxkeys(key_indexed_map)
      pk2idxpk2
      As CQL statement

      CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));CREATE INDEX pk2idx ON live_data.complex_table (pk2);
      Column TypeColumn NameData Type
      sensor_iduuid
      monthint
      characteristicsmap<text, text>
      model_numbertext
      providertext
       datetimestamp
      valuedouble
      As CQL statement

      CREATE TABLE live_data.sensor_data (sensor_id uuid,month int,date timestamp,characteristics map<text, text> static,model_number text static,provider text static,value double,PRIMARY KEY ((sensor_id, month), date)) WITH CLUSTERING ORDER BY (date DESC)AND read_repair_chance = 0.0AND dclocal_read_repair_chance = 0.1AND gc_grace_seconds = 864000AND bloom_filter_fp_chance = 0.01AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }AND comment = ''AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }AND default_time_to_live = 0AND speculative_retry = '99.0PERCENTILE'AND min_index_interval = 128AND max_index_interval = 2048;
      Column TypeColumn NameData Type
      station_iduuid
      sensorsfrozen<map<uuid, frozen<live_data.geolocation>>>
      As CQL statement

      CREATE TABLE live_data.stations (station_id uuid,sensors frozen<map<uuid, frozen<live_data.geolocation>>>,PRIMARY KEY (station_id)) WITH read_repair_chance = 0.0AND dclocal_read_repair_chance = 0.1AND gc_grace_seconds = 864000AND bloom_filter_fp_chance = 0.01AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }AND comment = ''AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }AND default_time_to_live = 0AND speculative_retry = '99.0PERCENTILE'AND min_index_interval = 128AND max_index_interval = 2048;
      		User Defined Types
      Column NameData Type
      numberint
      streettext
      zipint
      citytext
      countrytext
      As CQL statement

      CREATE TYPE live_data.address (number int,street text,zip int,city text,country text);
      Column NameData Type
      latitudedouble
      longitudedouble
      As CQL statement

      CREATE TYPE live_data.geolocation (latitude double,longitude double);
      \ No newline at end of file +

        live_data

      ReplicationDurable Writes
      {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}false
      As CQL statement

      CREATE KEYSPACE live_data WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '1' }AND DURABLE_WRITES = false;
      		Tables
      Column TypeColumn NameData Type
      pk1uuid
      pk2int
      my_static1text
      my_static2text
       clustering1timestamp
       clustering2int
       clustering3text
      entries_indexed_mapmap<int, text>
      indexed1text
      indexed2int
      key_indexed_mapmap<int, text>
      my_listlist<text>
      my_mapmap<int, text>
      my_udtfrozen<live_data.address>
      my_udt_listfrozen<list<frozen<live_data.address>>>
      simpledouble
      As CQL statement

      CREATE TABLE live_data.complex_table (pk1 uuid,pk2 int,clustering1 timestamp,clustering2 int,clustering3 text,entries_indexed_map map<int, text>,indexed1 text,indexed2 int,key_indexed_map map<int, text>,my_list list<text>,my_map map<int, text>,my_static1 text static,my_static2 text static,my_udt frozen<live_data.address>,my_udt_list frozen<list<frozen<live_data.address>>>,simple double,PRIMARY KEY ((pk1, pk2), clustering1, clustering2, clustering3)) WITH CLUSTERING ORDER BY (clustering1 DESC, clustering2 ASC, clustering3 DESC)AND read_repair_chance = 0.0AND dclocal_read_repair_chance = 0.1AND gc_grace_seconds = 864000AND bloom_filter_fp_chance = 0.01AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }AND comment = ''AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }AND default_time_to_live = 0AND speculative_retry = '99.0PERCENTILE'AND min_index_interval = 128AND max_index_interval = 2048;CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);CREATE INDEX pk2idx ON live_data.complex_table (pk2);CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));

       complex_table's indices

      NameTarget
      clustering2idxclustering2
      idx1indexed1
      idx2indexed2
      keys_map_idxkeys(key_indexed_map)
      pk2idxpk2
      As CQL statement

      CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));CREATE INDEX pk2idx ON live_data.complex_table (pk2);
      Column TypeColumn NameData Type
      sensor_iduuid
      monthint
      characteristicsmap<text, text>
      model_numbertext
      providertext
       datetimestamp
      valuedouble
      As CQL statement

      CREATE TABLE live_data.sensor_data (sensor_id uuid,month int,date timestamp,characteristics map<text, text> static,model_number text static,provider text static,value double,PRIMARY KEY ((sensor_id, month), date)) WITH CLUSTERING ORDER BY (date DESC)AND read_repair_chance = 0.0AND dclocal_read_repair_chance = 0.1AND gc_grace_seconds = 864000AND bloom_filter_fp_chance = 0.01AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }AND comment = ''AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }AND default_time_to_live = 0AND speculative_retry = '99.0PERCENTILE'AND min_index_interval = 128AND max_index_interval = 2048;
      Column TypeColumn NameData Type
      station_iduuid
      sensorsfrozen<map<uuid, frozen<live_data.geolocation>>>
      As CQL statement

      CREATE TABLE live_data.stations (station_id uuid,sensors frozen<map<uuid, frozen<live_data.geolocation>>>,PRIMARY KEY (station_id)) WITH read_repair_chance = 0.0AND dclocal_read_repair_chance = 0.1AND gc_grace_seconds = 864000AND bloom_filter_fp_chance = 0.01AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }AND comment = ''AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }AND default_time_to_live = 0AND speculative_retry = '99.0PERCENTILE'AND min_index_interval = 128AND max_index_interval = 2048;
      		User Defined Types
      Column NameData Type
      numberint
      streettext
      zipint
      citytext
      countrytext
      As CQL statement

      CREATE TYPE live_data.address (number int,street text,zip int,city text,country text);
      Column NameData Type
      latitudedouble
      longitudedouble
      As CQL statement

      CREATE TYPE live_data.geolocation (latitude double,longitude double);
      \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/DescribeTable_live_data_complex_table.html b/cassandra/src/test/resources/scalate/DescribeTable_live_data_complex_table.html index 3aefbae2db9..bbb778b82db 100644 --- a/cassandra/src/test/resources/scalate/DescribeTable_live_data_complex_table.html +++ b/cassandra/src/test/resources/scalate/DescribeTable_live_data_complex_table.html @@ -1 +1 @@ -

       complex_table

      Column TypeColumn NameData Type
      pk1uuid
      pk2int
      my_static1text
      my_static2text
       clustering1timestamp
       clustering2int
       clustering3text
      entries_indexed_mapmap<int, text>
      indexed1text
      indexed2int
      key_indexed_mapmap<int, text>
      my_listlist<text>
      my_mapmap<int, text>
      my_udtfrozen<live_data.address>
      my_udt_listfrozen<list<frozen<live_data.address>>>
      simpledouble
      As CQL statement

      CREATE TABLE live_data.complex_table (pk1 uuid,pk2 int,clustering1 timestamp,clustering2 int,clustering3 text,entries_indexed_map map<int, text>,indexed1 text,indexed2 int,key_indexed_map map<int, text>,my_list list<text>,my_map map<int, text>,my_static1 text static,my_static2 text static,my_udt frozen<live_data.address>,my_udt_list frozen<list<frozen<live_data.address>>>,simple double,PRIMARY KEY ((pk1, pk2), clustering1, clustering2, clustering3)) WITH CLUSTERING ORDER BY (clustering1 DESC, clustering2 ASC, clustering3 DESC)AND read_repair_chance = 0.0AND dclocal_read_repair_chance = 0.1AND gc_grace_seconds = 864000AND bloom_filter_fp_chance = 0.01AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }AND comment = ''AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }AND default_time_to_live = 0AND speculative_retry = '99.0PERCENTILE'AND min_index_interval = 128AND max_index_interval = 2048;CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));CREATE INDEX pk2idx ON live_data.complex_table (pk2);CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);

       complex_table's indices

      NameTarget
      clustering2idxclustering2
      idx1indexed1
      idx2indexed2
      keys_map_idxkeys(key_indexed_map)
      pk2idxpk2
      As CQL statement

      CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));CREATE INDEX pk2idx ON live_data.complex_table (pk2);
      \ No newline at end of file +

       complex_table

      Column TypeColumn NameData Type
      pk1uuid
      pk2int
      my_static1text
      my_static2text
       clustering1timestamp
       clustering2int
       clustering3text
      entries_indexed_mapmap<int, text>
      indexed1text
      indexed2int
      key_indexed_mapmap<int, text>
      my_listlist<text>
      my_mapmap<int, text>
      my_udtfrozen<live_data.address>
      my_udt_listfrozen<list<frozen<live_data.address>>>
      simpledouble
      As CQL statement

      CREATE TABLE live_data.complex_table (pk1 uuid,pk2 int,clustering1 timestamp,clustering2 int,clustering3 text,entries_indexed_map map<int, text>,indexed1 text,indexed2 int,key_indexed_map map<int, text>,my_list list<text>,my_map map<int, text>,my_static1 text static,my_static2 text static,my_udt frozen<live_data.address>,my_udt_list frozen<list<frozen<live_data.address>>>,simple double,PRIMARY KEY ((pk1, pk2), clustering1, clustering2, clustering3)) WITH CLUSTERING ORDER BY (clustering1 DESC, clustering2 ASC, clustering3 DESC)AND read_repair_chance = 0.0AND dclocal_read_repair_chance = 0.1AND gc_grace_seconds = 864000AND bloom_filter_fp_chance = 0.01AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }AND comment = ''AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }AND default_time_to_live = 0AND speculative_retry = '99.0PERCENTILE'AND min_index_interval = 128AND max_index_interval = 2048;CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);CREATE INDEX pk2idx ON live_data.complex_table (pk2);CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));

       complex_table's indices

      NameTarget
      clustering2idxclustering2
      idx1indexed1
      idx2indexed2
      keys_map_idxkeys(key_indexed_map)
      pk2idxpk2
      As CQL statement

      CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));CREATE INDEX pk2idx ON live_data.complex_table (pk2);
      \ No newline at end of file From 41b86679d1c2975674c1438f2a3f32da360fe667 Mon Sep 17 00:00:00 2001 From: DuyHai DOAN Date: Sat, 9 Jan 2016 11:41:29 +0100 Subject: [PATCH 7/9] Tune regular expression for FUNCTION creation pattern --- .../scala/org/apache/zeppelin/cassandra/ParagraphParser.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cassandra/src/main/scala/org/apache/zeppelin/cassandra/ParagraphParser.scala b/cassandra/src/main/scala/org/apache/zeppelin/cassandra/ParagraphParser.scala index a26c7891c92..e2cb64dbbe8 100644 --- a/cassandra/src/main/scala/org/apache/zeppelin/cassandra/ParagraphParser.scala +++ b/cassandra/src/main/scala/org/apache/zeppelin/cassandra/ParagraphParser.scala @@ -66,7 +66,7 @@ object ParagraphParser { * followed by optional white-space(s) (\s*) * followed by semi-colon (;) */ - val UDF_PATTERN = """(?is)\s*(CREATE(?: OR REPLACE)? FUNCTION(?: IF NOT EXISTS)?.+?(?:\s+|\n|\r|\f)AS(?:\s+|\n|\r|\f)(?:'|\$\$).+?(?:'|\$\$)\s*;)""".r + val UDF_PATTERN = """(?is)\s*(CREATE(?:\s+OR REPLACE)?\s+FUNCTION(?:\s+IF\s+NOT\s+EXISTS)?.+?(?:\s+|\n|\r|\f)AS(?:\s+|\n|\r|\f)(?:'|\$\$).+?(?:'|\$\$)\s*;)""".r val GENERIC_STATEMENT_PREFIX = """(?is)\s*(?:INSERT|UPDATE|DELETE|SELECT|CREATE|UPDATE| From a2d831b8209e02b085d89e34dcfa6c8d3886f30c Mon Sep 17 00:00:00 2001 From: DuyHai DOAN Date: Sun, 10 Jan 2016 14:31:11 +0100 Subject: [PATCH 8/9] Refactor after code review --- .../cassandra/TextBlockHierarchy.scala | 16 +- .../cassandra/ParagraphParserTest.scala | 260 +++++++++++------- 2 files changed, 175 insertions(+), 101 deletions(-) diff --git a/cassandra/src/main/scala/org/apache/zeppelin/cassandra/TextBlockHierarchy.scala b/cassandra/src/main/scala/org/apache/zeppelin/cassandra/TextBlockHierarchy.scala index 41a9468b4ab..61a2d8d9cb5 100644 --- a/cassandra/src/main/scala/org/apache/zeppelin/cassandra/TextBlockHierarchy.scala +++ b/cassandra/src/main/scala/org/apache/zeppelin/cassandra/TextBlockHierarchy.scala @@ -110,25 +110,25 @@ object TextBlockHierarchy { val statement: String } - class DescribeClusterCmd(override val statement: String = "DESCRIBE CLUSTER;") + case class DescribeClusterCmd(override val statement: String = "DESCRIBE CLUSTER;") extends QueryStatement(DescribeClusterStatementType) with DescribeCommandStatement - class DescribeKeyspacesCmd(override val statement: String = "DESCRIBE KEYSPACES;") + case class DescribeKeyspacesCmd(override val statement: String = "DESCRIBE KEYSPACES;") extends QueryStatement(DescribeAllKeyspacesStatementType) with DescribeCommandStatement - class DescribeTablesCmd(override val statement: String = "DESCRIBE TABLES;") + case class DescribeTablesCmd(override val statement: String = "DESCRIBE TABLES;") extends QueryStatement(DescribeAllTablesStatementType) with DescribeCommandStatement - class DescribeTypesCmd(override val statement: String = "DESCRIBE TYPES;") + case class DescribeTypesCmd(override val statement: String = "DESCRIBE TYPES;") extends QueryStatement(DescribeAllTypesStatementType) with DescribeCommandStatement - class DescribeFunctionsCmd(override val statement: String = "DESCRIBE FUNCTIONS;") extends QueryStatement(DescribeAllFunctionsStatementType) + case class DescribeFunctionsCmd(override val statement: String = "DESCRIBE FUNCTIONS;") extends QueryStatement(DescribeAllFunctionsStatementType) with DescribeCommandStatement - class DescribeAggregatesCmd(override val statement: String = "DESCRIBE AGGREGATES;") extends QueryStatement(DescribeAllAggregatesStatementType) + case class DescribeAggregatesCmd(override val statement: String = "DESCRIBE AGGREGATES;") extends QueryStatement(DescribeAllAggregatesStatementType) with DescribeCommandStatement - class DescribeMaterializedViewsCmd(override val statement: String = "DESCRIBE MATERIALIZED VIEWS;") extends QueryStatement(DescribeAllAggregatesStatementType) + case class DescribeMaterializedViewsCmd(override val statement: String = "DESCRIBE MATERIALIZED VIEWS;") extends QueryStatement(DescribeAllAggregatesStatementType) with DescribeCommandStatement case class DescribeKeyspaceCmd(keyspace: String) extends QueryStatement(DescribeKeyspaceStatementType) @@ -176,6 +176,6 @@ object TextBlockHierarchy { } } - class HelpCmd extends QueryStatement(HelpStatementType) + case class HelpCmd(val statement:String = "HELP;") extends QueryStatement(HelpStatementType) } diff --git a/cassandra/src/test/scala/org/apache/zeppelin/cassandra/ParagraphParserTest.scala b/cassandra/src/test/scala/org/apache/zeppelin/cassandra/ParagraphParserTest.scala index c019d9847dc..520f7a61fc5 100644 --- a/cassandra/src/test/scala/org/apache/zeppelin/cassandra/ParagraphParserTest.scala +++ b/cassandra/src/test/scala/org/apache/zeppelin/cassandra/ParagraphParserTest.scala @@ -23,6 +23,8 @@ import org.scalatest.{BeforeAndAfterEach, FlatSpec, Matchers} import org.apache.zeppelin.cassandra.ParagraphParser._ import org.apache.zeppelin.cassandra.TextBlockHierarchy._ +import scala.Option + class ParagraphParserTest extends FlatSpec with BeforeAndAfterEach with Matchers @@ -57,39 +59,45 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parse(parser.queries,query) - parsed.get should be(List( - SimpleStm("SELECT * FROM albums LIMIT 10;"), - BatchStm(BatchStatement.Type.UNLOGGED, - List( - SimpleStm("INSERT INTO users(id) VALUES(10);"), - BoundStm("test","'a',12.34") - ) - ), - SimpleStm("SELECT * FROM users LIMIT 10;"), - BatchStm(BatchStatement.Type.LOGGED, - List( - SimpleStm("Insert INTO users(id) VALUES(11);"), - SimpleStm("INSERT INTO users(id) VALUES(12);") - ) - ), - BoundStm("toto","'a',12.34"), - DescribeTableCmd(Option("zeppelin"),"users"), - DescribeKeyspaceCmd("zeppelin") - )) + parsed should matchPattern { + case parser.Success(List( + SimpleStm("SELECT * FROM albums LIMIT 10;"), + BatchStm(BatchStatement.Type.UNLOGGED, + List( + SimpleStm("INSERT INTO users(id) VALUES(10);"), + BoundStm("test","'a',12.34") + ) + ), + SimpleStm("SELECT * FROM users LIMIT 10;"), + BatchStm(BatchStatement.Type.LOGGED, + List( + SimpleStm("Insert INTO users(id) VALUES(11);"), + SimpleStm("INSERT INTO users(id) VALUES(12);") + ) + ), + BoundStm("toto","'a',12.34"), + DescribeTableCmd(Some("zeppelin"),"users"), + DescribeKeyspaceCmd("zeppelin") + ),_) => + } } "Parser" should "parse hash single-line comment" in { val query :CharSequence="""#This is a comment""".stripMargin val parsed = parser.parseAll[Comment](parser.singleLineComment, query) - parsed.get should be(Comment("This is a comment")) + parsed should matchPattern { + case parser.Success(Comment("This is a comment"), _) => + } } - "Parser" should "parse double slashses single-line comment" in { + "Parser" should "parse double slashes single-line comment" in { val query :CharSequence="""//This is another comment""".stripMargin val parsed = parser.parseAll[Comment](parser.singleLineComment, query) - parsed.get should be(Comment("This is another comment")) + parsed should matchPattern { + case parser.Success(Comment("This is another comment"), _) => + } } "Parser" should "parse multi-line comment" in { @@ -102,13 +110,17 @@ class ParagraphParserTest extends FlatSpec """.stripMargin val parsed = parser.parseAll(parser.multiLineComment, query) - parsed.get should be(Comment("This is a comment\nline1\nline2\nline3\n")) + parsed should matchPattern { + case parser.Success(Comment("This is a comment\nline1\nline2\nline3\n"), _) => + } } "Parser" should "parse consistency level" in { val query:String =""" @consistency=ONE""".stripMargin val parsed = parser.parseAll(parser.consistency, query) - parsed.get should be(Consistency(ConsistencyLevel.ONE)) + parsed should matchPattern { + case parser.Success(Consistency(ConsistencyLevel.ONE), _) => + } } "Parser" should "fails parsing unknown consistency level" in { @@ -122,7 +134,9 @@ class ParagraphParserTest extends FlatSpec "Parser" should "parse serial consistency level" in { val query:String =""" @serialConsistency=LOCAL_SERIAL""".stripMargin val parsed = parser.parseAll(parser.serialConsistency, query) - parsed.get should be(SerialConsistency(ConsistencyLevel.LOCAL_SERIAL)) + parsed should matchPattern { + case parser.Success(SerialConsistency(ConsistencyLevel.LOCAL_SERIAL), _) => + } } "Parser" should "fails parsing unknown serial consistency level" in { @@ -136,7 +150,8 @@ class ParagraphParserTest extends FlatSpec "Parser" should "parse timestamp" in { val query:String =""" @timestamp=111""".stripMargin val parsed = parser.parseAll(parser.timestamp, query) - parsed.get should be(Timestamp(111L)) + parsed should matchPattern { + case parser.Success(Timestamp(111L), _) => } } "Parser" should "fails parsing invalid timestamp" in { @@ -150,7 +165,7 @@ class ParagraphParserTest extends FlatSpec "Parser" should "parse retry policy" in { val query:String ="@retryPolicy="+CassandraInterpreter.DOWNGRADING_CONSISTENCY_RETRY val parsed = parser.parseAll(parser.retryPolicy, query) - parsed.get should be(DowngradingRetryPolicy) + parsed should matchPattern {case parser.Success(DowngradingRetryPolicy, _) => } } "Parser" should "fails parsing invalid retry policy" in { @@ -164,7 +179,7 @@ class ParagraphParserTest extends FlatSpec "Parser" should "parse fetch size" in { val query:String ="@fetchSize=100" val parsed = parser.parseAll(parser.fetchSize, query) - parsed.get should be(FetchSize(100)) + parsed should matchPattern { case parser.Success(FetchSize(100), _) =>} } "Parser" should "fails parsing invalid fetch size" in { @@ -183,7 +198,7 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.genericStatement, query) //Then - parsed.get should be(SimpleStm("sElecT * FROM users LIMIT ? ;")) + parsed should matchPattern { case parser.Success(SimpleStm("sElecT * FROM users LIMIT ? ;"), _) =>} } "Parser" should "parse prepare" in { @@ -194,7 +209,7 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.prepare, query) //Then - parsed.get should be(PrepareStm("select_users","SELECT * FROM users LIMIT ?")) + parsed should matchPattern { case parser.Success(PrepareStm("select_users","SELECT * FROM users LIMIT ?"), _) => } } "Parser" should "fails parsing invalid prepared statement" in { @@ -213,7 +228,7 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.removePrepare, query) //Then - parsed.get should be(RemovePrepareStm("select_users")) + parsed should matchPattern { case parser.Success(RemovePrepareStm("select_users"), _) => } } "Parser" should "fails parsing invalid remove prepared statement" in { @@ -232,7 +247,7 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.bind, query) //Then - parsed.get should be(BoundStm("select_users","10,'toto'")) + parsed should matchPattern { case parser.Success(BoundStm("select_users","10,'toto'"), _) => } } "Parser" should "fails parsing invalid bind statement" in { @@ -257,17 +272,17 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.batch, query) //Then - parsed.get should be( - BatchStm( - BatchStatement.Type.LOGGED, - List[QueryStatement]( - SimpleStm("Insert INTO users(id) VALUES(10);"), - BoundStm("select_users", "10,'toto'"), - SimpleStm("update users SET name ='John DOE' WHERE id=10;"), - SimpleStm("dElEtE users WHERE id=11;") + parsed should matchPattern { + case parser.Success(BatchStm( + BatchStatement.Type.LOGGED, + List( + SimpleStm("Insert INTO users(id) VALUES(10);"), + BoundStm("select_users", "10,'toto'"), + SimpleStm("update users SET name ='John DOE' WHERE id=10;"), + SimpleStm("dElEtE users WHERE id=11;") ) - ) - ) + ), _) => + } } "Parser" should "fails parsing invalid batch type" in { @@ -286,10 +301,12 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, query) - parsed.get should be (List( - SerialConsistency(ConsistencyLevel.SERIAL), - SimpleStm("SELECT * FROM zeppelin.artists LIMIT 1;") - )) + parsed should matchPattern { + case parser.Success(List( + SerialConsistency(ConsistencyLevel.SERIAL), + SimpleStm("SELECT * FROM zeppelin.artists LIMIT 1;") + ), _) => + } } "Parser" should "parse multi-line single statement" in { @@ -298,13 +315,15 @@ class ParagraphParserTest extends FlatSpec " title text PRIMARY KEY,\n" + " artist text,\n" + " year int\n" + - ");\n"; + ");\n" val parsed = parser.parseAll(parser.queries, query) - parsed.get should be (List( - SimpleStm("CREATE TABLE IF NOT EXISTS zeppelin.albums(\n title text PRIMARY KEY,\n artist text,\n year int\n);") - )) + parsed should matchPattern { + case parser.Success(List( + SimpleStm("CREATE TABLE IF NOT EXISTS zeppelin.albums(\n title text PRIMARY KEY,\n artist text,\n year int\n);") + ), _) => + } } "Parser" should "parse multi-line statements" in { @@ -322,11 +341,12 @@ class ParagraphParserTest extends FlatSpec "APPLY BATCH;\n"+ "@timestamp=10\n" + "@retryPolicy=DOWNGRADING_CONSISTENCY\n" + - "SELECT * FROM zeppelin.albums;"; + "SELECT * FROM zeppelin.albums;" val parsed = parser.parseAll(parser.queries, query) - parsed.get should be (List( + parsed should matchPattern { + case parser.Success(List( SimpleStm("CREATE TABLE IF NOT EXISTS zeppelin.albums(\n title text PRIMARY KEY,\n artist text,\n year int\n);"), Consistency(ConsistencyLevel.THREE), SerialConsistency(ConsistencyLevel.SERIAL), @@ -340,7 +360,8 @@ class ParagraphParserTest extends FlatSpec Timestamp(10L), DowngradingRetryPolicy, SimpleStm("SELECT * FROM zeppelin.albums;") - )) + ), _) => + } } "Parser" should "parse mixed single-line and multi-line statements" in { @@ -355,11 +376,12 @@ class ParagraphParserTest extends FlatSpec " INSERT INTO zeppelin.albums(title,artist,year) VALUES('The Way You Are','Tears for Fears',1983);"+ " INSERT INTO zeppelin.albums(title,artist,year) VALUES('Primitive','Soulfly',2003);\n"+ "APPLY BATCH;"+ - "SELECT * FROM zeppelin.albums;"; + "SELECT * FROM zeppelin.albums;" val parsed = parser.parseAll(parser.queries, query) - parsed.get should be (List( + parsed should matchPattern { + case parser.Success(List( SimpleStm("CREATE TABLE IF NOT EXISTS zeppelin.albums(\n title text PRIMARY KEY,\n artist text,\n year int\n);"), BatchStm(BatchStatement.Type.LOGGED, List( @@ -369,7 +391,8 @@ class ParagraphParserTest extends FlatSpec ) ), SimpleStm("SELECT * FROM zeppelin.albums;") - )) + ), _) => + } } "Parser" should "parse a block queries with comments" in { @@ -401,7 +424,8 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, query) - parsed.get should be (List( + parsed should matchPattern { + case parser.Success(List( Comment("\n This example show how to force a\n timestamp on the query\n "), Comment("Timestamp in the past"), Timestamp(10L), @@ -415,8 +439,9 @@ class ParagraphParserTest extends FlatSpec SimpleStm("INSERT INTO spark_demo.ts(key,value) VALUES(1,'val2');"), Comment("Check the result"), SimpleStm("SELECT * FROM spark_demo.ts WHERE key=1;") - ) - ) + ), _ + ) => + } } "Parser" should "remove prepared statement" in { @@ -432,13 +457,14 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, queries) - parsed.get should be(List( + parsed should matchPattern { + case parser.Success(List( Comment("Removing an unknown statement should has no side effect"), RemovePrepareStm("unknown_statement"), RemovePrepareStm("select_artist_by_name"), Comment("This should fail because the 'select_artist_by_name' has been removed"), BoundStm("select_artist_by_name","'The Beatles'") - )) + ), _) => } } "Parser" should "parse only parameter" in { @@ -447,7 +473,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, queries) - parsed.get should be(List(FetchSize(1000))) + parsed should matchPattern { + case parser.Success(List(FetchSize(1000)), _) => + } } @@ -456,7 +484,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, queries) - parsed.get(0) shouldBe a [DescribeClusterCmd] + parsed should matchPattern { + case parser.Success(List(DescribeClusterCmd("DESCRIBE CLUSTER;")), _) => + } } "Parser" should "fail parsing describe cluster" in { @@ -473,7 +503,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, queries) - parsed.get should be(List(DescribeKeyspaceCmd("toto"))) + parsed should matchPattern { + case parser.Success(List(DescribeKeyspaceCmd("toto")), _) => + } } "Parser" should "fail parsing describe keyspace" in { @@ -490,7 +522,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, queries) - parsed.get(0) shouldBe a [DescribeKeyspacesCmd] + parsed should matchPattern { + case parser.Success(List(DescribeKeyspacesCmd("DESCRIBE KEYSPACES;")), _) => + } } "Parser" should "fail parsing describe keyspaces" in { @@ -533,7 +567,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, queries) - parsed.get(0) shouldBe a [DescribeTablesCmd] + parsed should matchPattern { + case parser.Success(List(DescribeTablesCmd("DESCRIBE TABLES;")), _) => + } } "Parser" should "fail parsing describe tables" in { @@ -550,7 +586,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, queries) - parsed.get should be(List(DescribeTypeCmd(None,"toto"))) + parsed should matchPattern { + case parser.Success(List(DescribeTypeCmd(None, "toto")), _) => + } } "Parser" should "parse describe type with keyspace" in { @@ -558,7 +596,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, queries) - parsed.get should be(List(DescribeTypeCmd(Some("ks"),"toto"))) + parsed should matchPattern { + case parser.Success(List(DescribeTypeCmd(Some("ks"), "toto")), _) => + } } "Parser" should "fail parsing describe type" in { @@ -576,7 +616,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, queries) - parsed.get(0) shouldBe a [DescribeTypesCmd] + parsed should matchPattern { + case parser.Success(List(DescribeTypesCmd("DESCRIBE TYPES;")), _) => + } } "Parser" should "fail parsing describe types" in { @@ -593,15 +635,21 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, queries) - parsed.get should be(List(DescribeFunctionCmd(None,"toto"))) + parsed should matchPattern { + case parser.Success(List(DescribeFunctionCmd(None,"toto")),_) => + } } + + "Parser" should "parse describe function with keyspace" in { val queries ="Describe function ks.toto;" val parsed = parser.parseAll(parser.queries, queries) - parsed.get should be(List(DescribeFunctionCmd(Some("ks"),"toto"))) + parsed should matchPattern { + case parser.Success(List(DescribeFunctionCmd(Some("ks"), "toto")), _) => + } } "Parser" should "fail parsing describe function" in { @@ -619,7 +667,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, queries) - parsed.get(0) shouldBe a [DescribeFunctionsCmd] + parsed should matchPattern { + case parser.Success(List(DescribeFunctionsCmd("DESCRIBE FUNCTIONS;")), _) => + } } "Parser" should "fail parsing describe functions" in { @@ -638,7 +688,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, queries) - parsed.get should be(List(DescribeAggregateCmd(None,"toto"))) + parsed should matchPattern { + case parser.Success(List(DescribeAggregateCmd(None, "toto")), _) => + } } "Parser" should "parse describe aggregate with keyspace" in { @@ -646,7 +698,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, queries) - parsed.get should be(List(DescribeAggregateCmd(Some("ks"),"toto"))) + parsed should matchPattern { + case parser.Success(List(DescribeAggregateCmd(Some("ks"),"toto")), _) => + } } "Parser" should "fail parsing describe aggregate" in { @@ -664,7 +718,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, queries) - parsed.get(0) shouldBe a [DescribeAggregatesCmd] + parsed should matchPattern { + case parser.Success(List(DescribeAggregatesCmd("DESCRIBE AGGREGATES;")), _) => + } } "Parser" should "fail parsing describe aggregates" in { @@ -682,7 +738,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, queries) - parsed.get should be(List(DescribeMaterializedViewCmd(None,"toto"))) + parsed should matchPattern { + case parser.Success(List(DescribeMaterializedViewCmd(None, "toto")), _) => + } } "Parser" should "parse describe materialized view with keyspace" in { @@ -690,7 +748,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, queries) - parsed.get should be(List(DescribeMaterializedViewCmd(Some("ks"),"toto"))) + parsed should matchPattern { + case parser.Success(List(DescribeMaterializedViewCmd(Some("ks"), "toto")), _) => + } } "Parser" should "fail parsing describe materialized view" in { @@ -708,7 +768,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, queries) - parsed.get(0) shouldBe a [DescribeMaterializedViewsCmd] + parsed should matchPattern { + case parser.Success(List(DescribeMaterializedViewsCmd("DESCRIBE MATERIALIZED VIEWS;")), _) => + } } "Parser" should "fail parsing describe materialized views" in { @@ -726,7 +788,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, queries) - parsed.get(0) shouldBe a [HelpCmd] + parsed should matchPattern { + case parser.Success(List(HelpCmd("HELP;")), _) => + } } "Parser" should "fail parsing help" in { @@ -744,7 +808,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, query) - parsed.get(0) should be(SimpleStm(query)) + parsed should matchPattern { + case parser.Success(List(SimpleStm(query)), _) => + } } @@ -753,7 +819,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, query) - parsed.get(0) should be(SimpleStm(query)) + parsed should matchPattern { + case parser.Success(List(SimpleStm(query)), _) => + } } @@ -762,8 +830,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, query) - parsed.get(0) should be(SimpleStm(query)) - + parsed should matchPattern { + case parser.Success(List(SimpleStm(query)), _) => + } } "Parser" should "parse CREATE FUNCTION multiline with simple quote" in { @@ -778,8 +847,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, query) - parsed.get(0) should be(SimpleStm(query)) - + parsed should matchPattern { + case parser.Success(List(SimpleStm(query)), _) => + } } "Parser" should "parse CREATE FUNCTION multiline with double dollar" in { @@ -794,8 +864,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, query) - parsed.get(0) should be(SimpleStm(query)) - + parsed should matchPattern { + case parser.Success(List(SimpleStm(query)), _) => + } } "Parser" should "parse CREATE FUNCTION multiline with SELECT" in { @@ -817,8 +888,9 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, queries) - parsed.get should be(List(SimpleStm(udf), SimpleStm(select))) - + parsed should matchPattern { + case parser.Success(List(SimpleStm(udf), SimpleStm(select)), _) => + } } "Parser" should "parse CREATE multiple FUNCTIONS" in { @@ -854,8 +926,9 @@ class ParagraphParserTest extends FlatSpec parsed.get.size should be(3) - parsed.get should be(List(SimpleStm(udf1), SimpleStm(select), SimpleStm(udf2))) - + parsed should matchPattern { + case parser.Success(List(SimpleStm(udf1), SimpleStm(select), SimpleStm(udf2)), _) => + } } "Parser" should "parse CREATE Materialized View" in { @@ -867,7 +940,8 @@ class ParagraphParserTest extends FlatSpec val parsed = parser.parseAll(parser.queries, query) - parsed.get(0) should be(SimpleStm(query)) - + parsed should matchPattern { + case parser.Success(List(SimpleStm(query)), _) => + } } } From 36e3bdb245336c675b2f748683b3438535f27aba Mon Sep 17 00:00:00 2001 From: DuyHai DOAN Date: Sun, 10 Jan 2016 15:44:53 +0100 Subject: [PATCH 9/9] Fix random test failure --- cassandra/pom.xml | 1 - .../driver/core/TableMetadataWrapper.scala | 23 +++++++++++++++++++ .../zeppelin/cassandra/DisplaySystem.scala | 2 +- .../cassandra/CassandraInterpreterTest.java | 21 +++++++++++++++++ .../scalate/DescribeKeyspace_live_data.html | 2 +- ...DescribeTable_live_data_complex_table.html | 2 +- 6 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 cassandra/src/main/scala/com/datastax/driver/core/TableMetadataWrapper.scala diff --git a/cassandra/pom.xml b/cassandra/pom.xml index ca8c5e81150..1b825b4f0da 100644 --- a/cassandra/pom.xml +++ b/cassandra/pom.xml @@ -167,7 +167,6 @@ - diff --git a/cassandra/src/main/scala/com/datastax/driver/core/TableMetadataWrapper.scala b/cassandra/src/main/scala/com/datastax/driver/core/TableMetadataWrapper.scala new file mode 100644 index 00000000000..feddbe1a174 --- /dev/null +++ b/cassandra/src/main/scala/com/datastax/driver/core/TableMetadataWrapper.scala @@ -0,0 +1,23 @@ +/* + * 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. + */ +package com.datastax.driver.core + +case class TableMetadataWrapper(val meta: TableMetadata) { + def exportTableOnlyAsString(): String = { + meta.asCQLQuery(true) + } +} diff --git a/cassandra/src/main/scala/org/apache/zeppelin/cassandra/DisplaySystem.scala b/cassandra/src/main/scala/org/apache/zeppelin/cassandra/DisplaySystem.scala index 6380b1171ed..135d4cd780e 100644 --- a/cassandra/src/main/scala/org/apache/zeppelin/cassandra/DisplaySystem.scala +++ b/cassandra/src/main/scala/org/apache/zeppelin/cassandra/DisplaySystem.scala @@ -76,7 +76,7 @@ object DisplaySystem { val indicesAsCQL = indicesDetails.map(_.asCQL).mkString("\n") engine.layout(TABLE_DETAILS_TEMPLATE, - Map[String, Any]("tableDetails" -> TableDetails(tableName, columnsDetails, indicesDetails, meta.exportAsString(), indicesAsCQL), "withCaption" -> withCaption)) + Map[String, Any]("tableDetails" -> TableDetails(tableName, columnsDetails, indicesDetails, TableMetadataWrapper(meta).exportTableOnlyAsString(), indicesAsCQL), "withCaption" -> withCaption)) } } diff --git a/cassandra/src/test/java/org/apache/zeppelin/cassandra/CassandraInterpreterTest.java b/cassandra/src/test/java/org/apache/zeppelin/cassandra/CassandraInterpreterTest.java index 4819e97ce3c..560c57e8239 100644 --- a/cassandra/src/test/java/org/apache/zeppelin/cassandra/CassandraInterpreterTest.java +++ b/cassandra/src/test/java/org/apache/zeppelin/cassandra/CassandraInterpreterTest.java @@ -599,6 +599,27 @@ public void should_describe_aggregate() throws Exception { assertThat(actual.code()).isEqualTo(Code.SUCCESS); } + + @Test + @Ignore + //TODO activate test when using Java 8 and C* 3.x + public void should_describe_materialized_view() throws Exception { + //Given + Properties properties = new Properties(); + properties.setProperty(CASSANDRA_HOSTS, "127.0.0.1"); + properties.setProperty(CASSANDRA_PORT, "9042"); + Interpreter interpreter = new CassandraInterpreter(properties); + interpreter.open(); + + final String query = "DESCRIBE MATERIALIZED VIEWS;"; + + //When + final InterpreterResult actual = interpreter.interpret(query, intrContext); + + //Then + assertThat(actual.code()).isEqualTo(Code.SUCCESS); + } + @Test public void should_describe_table() throws Exception { //Given diff --git a/cassandra/src/test/resources/scalate/DescribeKeyspace_live_data.html b/cassandra/src/test/resources/scalate/DescribeKeyspace_live_data.html index cb06f7724e5..344780a9bae 100644 --- a/cassandra/src/test/resources/scalate/DescribeKeyspace_live_data.html +++ b/cassandra/src/test/resources/scalate/DescribeKeyspace_live_data.html @@ -1 +1 @@ -

        live_data

      ReplicationDurable Writes
      {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}false
      As CQL statement

      CREATE KEYSPACE live_data WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '1' }AND DURABLE_WRITES = false;
      		Tables
      Column TypeColumn NameData Type
      pk1uuid
      pk2int
      my_static1text
      my_static2text
       clustering1timestamp
       clustering2int
       clustering3text
      entries_indexed_mapmap<int, text>
      indexed1text
      indexed2int
      key_indexed_mapmap<int, text>
      my_listlist<text>
      my_mapmap<int, text>
      my_udtfrozen<live_data.address>
      my_udt_listfrozen<list<frozen<live_data.address>>>
      simpledouble
      As CQL statement

      CREATE TABLE live_data.complex_table (pk1 uuid,pk2 int,clustering1 timestamp,clustering2 int,clustering3 text,entries_indexed_map map<int, text>,indexed1 text,indexed2 int,key_indexed_map map<int, text>,my_list list<text>,my_map map<int, text>,my_static1 text static,my_static2 text static,my_udt frozen<live_data.address>,my_udt_list frozen<list<frozen<live_data.address>>>,simple double,PRIMARY KEY ((pk1, pk2), clustering1, clustering2, clustering3)) WITH CLUSTERING ORDER BY (clustering1 DESC, clustering2 ASC, clustering3 DESC)AND read_repair_chance = 0.0AND dclocal_read_repair_chance = 0.1AND gc_grace_seconds = 864000AND bloom_filter_fp_chance = 0.01AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }AND comment = ''AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }AND default_time_to_live = 0AND speculative_retry = '99.0PERCENTILE'AND min_index_interval = 128AND max_index_interval = 2048;CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);CREATE INDEX pk2idx ON live_data.complex_table (pk2);CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));

       complex_table's indices

      NameTarget
      clustering2idxclustering2
      idx1indexed1
      idx2indexed2
      keys_map_idxkeys(key_indexed_map)
      pk2idxpk2
      As CQL statement

      CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));CREATE INDEX pk2idx ON live_data.complex_table (pk2);
      Column TypeColumn NameData Type
      sensor_iduuid
      monthint
      characteristicsmap<text, text>
      model_numbertext
      providertext
       datetimestamp
      valuedouble
      As CQL statement

      CREATE TABLE live_data.sensor_data (sensor_id uuid,month int,date timestamp,characteristics map<text, text> static,model_number text static,provider text static,value double,PRIMARY KEY ((sensor_id, month), date)) WITH CLUSTERING ORDER BY (date DESC)AND read_repair_chance = 0.0AND dclocal_read_repair_chance = 0.1AND gc_grace_seconds = 864000AND bloom_filter_fp_chance = 0.01AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }AND comment = ''AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }AND default_time_to_live = 0AND speculative_retry = '99.0PERCENTILE'AND min_index_interval = 128AND max_index_interval = 2048;
      Column TypeColumn NameData Type
      station_iduuid
      sensorsfrozen<map<uuid, frozen<live_data.geolocation>>>
      As CQL statement

      CREATE TABLE live_data.stations (station_id uuid,sensors frozen<map<uuid, frozen<live_data.geolocation>>>,PRIMARY KEY (station_id)) WITH read_repair_chance = 0.0AND dclocal_read_repair_chance = 0.1AND gc_grace_seconds = 864000AND bloom_filter_fp_chance = 0.01AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }AND comment = ''AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }AND default_time_to_live = 0AND speculative_retry = '99.0PERCENTILE'AND min_index_interval = 128AND max_index_interval = 2048;
      		User Defined Types
      Column NameData Type
      numberint
      streettext
      zipint
      citytext
      countrytext
      As CQL statement

      CREATE TYPE live_data.address (number int,street text,zip int,city text,country text);
      Column NameData Type
      latitudedouble
      longitudedouble
      As CQL statement

      CREATE TYPE live_data.geolocation (latitude double,longitude double);
      \ No newline at end of file +

        live_data

      ReplicationDurable Writes
      {'replication_factor' : '1', 'class' : 'org.apache.cassandra.locator.SimpleStrategy'}false
      As CQL statement

      CREATE KEYSPACE live_data WITH REPLICATION = {'class' : 'org.apache.cassandra.locator.SimpleStrategy','replication_factor': '1' }AND DURABLE_WRITES = false;
      		Tables
      Column TypeColumn NameData Type
      pk1uuid
      pk2int
      my_static1text
      my_static2text
       clustering1timestamp
       clustering2int
       clustering3text
      entries_indexed_mapmap<int, text>
      indexed1text
      indexed2int
      key_indexed_mapmap<int, text>
      my_listlist<text>
      my_mapmap<int, text>
      my_udtfrozen<live_data.address>
      my_udt_listfrozen<list<frozen<live_data.address>>>
      simpledouble
      As CQL statement

      CREATE TABLE live_data.complex_table (pk1 uuid,pk2 int,clustering1 timestamp,clustering2 int,clustering3 text,entries_indexed_map map<int, text>,indexed1 text,indexed2 int,key_indexed_map map<int, text>,my_list list<text>,my_map map<int, text>,my_static1 text static,my_static2 text static,my_udt frozen<live_data.address>,my_udt_list frozen<list<frozen<live_data.address>>>,simple double,PRIMARY KEY ((pk1, pk2), clustering1, clustering2, clustering3)) WITH CLUSTERING ORDER BY (clustering1 DESC, clustering2 ASC, clustering3 DESC)AND read_repair_chance = 0.0AND dclocal_read_repair_chance = 0.1AND gc_grace_seconds = 864000AND bloom_filter_fp_chance = 0.01AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }AND comment = ''AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }AND default_time_to_live = 0AND speculative_retry = '99.0PERCENTILE'AND min_index_interval = 128AND max_index_interval = 2048;

       complex_table's indices

      NameTarget
      clustering2idxclustering2
      idx1indexed1
      idx2indexed2
      keys_map_idxkeys(key_indexed_map)
      pk2idxpk2
      As CQL statement

      CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));CREATE INDEX pk2idx ON live_data.complex_table (pk2);
      Column TypeColumn NameData Type
      sensor_iduuid
      monthint
      characteristicsmap<text, text>
      model_numbertext
      providertext
       datetimestamp
      valuedouble
      As CQL statement

      CREATE TABLE live_data.sensor_data (sensor_id uuid,month int,date timestamp,characteristics map<text, text> static,model_number text static,provider text static,value double,PRIMARY KEY ((sensor_id, month), date)) WITH CLUSTERING ORDER BY (date DESC)AND read_repair_chance = 0.0AND dclocal_read_repair_chance = 0.1AND gc_grace_seconds = 864000AND bloom_filter_fp_chance = 0.01AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }AND comment = ''AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }AND default_time_to_live = 0AND speculative_retry = '99.0PERCENTILE'AND min_index_interval = 128AND max_index_interval = 2048;
      Column TypeColumn NameData Type
      station_iduuid
      sensorsfrozen<map<uuid, frozen<live_data.geolocation>>>
      As CQL statement

      CREATE TABLE live_data.stations (station_id uuid,sensors frozen<map<uuid, frozen<live_data.geolocation>>>,PRIMARY KEY (station_id)) WITH read_repair_chance = 0.0AND dclocal_read_repair_chance = 0.1AND gc_grace_seconds = 864000AND bloom_filter_fp_chance = 0.01AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }AND comment = ''AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }AND default_time_to_live = 0AND speculative_retry = '99.0PERCENTILE'AND min_index_interval = 128AND max_index_interval = 2048;
      		User Defined Types
      Column NameData Type
      numberint
      streettext
      zipint
      citytext
      countrytext
      As CQL statement

      CREATE TYPE live_data.address (number int,street text,zip int,city text,country text);
      Column NameData Type
      latitudedouble
      longitudedouble
      As CQL statement

      CREATE TYPE live_data.geolocation (latitude double,longitude double);
      \ No newline at end of file diff --git a/cassandra/src/test/resources/scalate/DescribeTable_live_data_complex_table.html b/cassandra/src/test/resources/scalate/DescribeTable_live_data_complex_table.html index bbb778b82db..fd3ee67f7c1 100644 --- a/cassandra/src/test/resources/scalate/DescribeTable_live_data_complex_table.html +++ b/cassandra/src/test/resources/scalate/DescribeTable_live_data_complex_table.html @@ -1 +1 @@ -

       complex_table

      Column TypeColumn NameData Type
      pk1uuid
      pk2int
      my_static1text
      my_static2text
       clustering1timestamp
       clustering2int
       clustering3text
      entries_indexed_mapmap<int, text>
      indexed1text
      indexed2int
      key_indexed_mapmap<int, text>
      my_listlist<text>
      my_mapmap<int, text>
      my_udtfrozen<live_data.address>
      my_udt_listfrozen<list<frozen<live_data.address>>>
      simpledouble
      As CQL statement

      CREATE TABLE live_data.complex_table (pk1 uuid,pk2 int,clustering1 timestamp,clustering2 int,clustering3 text,entries_indexed_map map<int, text>,indexed1 text,indexed2 int,key_indexed_map map<int, text>,my_list list<text>,my_map map<int, text>,my_static1 text static,my_static2 text static,my_udt frozen<live_data.address>,my_udt_list frozen<list<frozen<live_data.address>>>,simple double,PRIMARY KEY ((pk1, pk2), clustering1, clustering2, clustering3)) WITH CLUSTERING ORDER BY (clustering1 DESC, clustering2 ASC, clustering3 DESC)AND read_repair_chance = 0.0AND dclocal_read_repair_chance = 0.1AND gc_grace_seconds = 864000AND bloom_filter_fp_chance = 0.01AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }AND comment = ''AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }AND default_time_to_live = 0AND speculative_retry = '99.0PERCENTILE'AND min_index_interval = 128AND max_index_interval = 2048;CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);CREATE INDEX pk2idx ON live_data.complex_table (pk2);CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));

       complex_table's indices

      NameTarget
      clustering2idxclustering2
      idx1indexed1
      idx2indexed2
      keys_map_idxkeys(key_indexed_map)
      pk2idxpk2
      As CQL statement

      CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));CREATE INDEX pk2idx ON live_data.complex_table (pk2);
      \ No newline at end of file +

       complex_table

      Column TypeColumn NameData Type
      pk1uuid
      pk2int
      my_static1text
      my_static2text
       clustering1timestamp
       clustering2int
       clustering3text
      entries_indexed_mapmap<int, text>
      indexed1text
      indexed2int
      key_indexed_mapmap<int, text>
      my_listlist<text>
      my_mapmap<int, text>
      my_udtfrozen<live_data.address>
      my_udt_listfrozen<list<frozen<live_data.address>>>
      simpledouble
      As CQL statement

      CREATE TABLE live_data.complex_table (pk1 uuid,pk2 int,clustering1 timestamp,clustering2 int,clustering3 text,entries_indexed_map map<int, text>,indexed1 text,indexed2 int,key_indexed_map map<int, text>,my_list list<text>,my_map map<int, text>,my_static1 text static,my_static2 text static,my_udt frozen<live_data.address>,my_udt_list frozen<list<frozen<live_data.address>>>,simple double,PRIMARY KEY ((pk1, pk2), clustering1, clustering2, clustering3)) WITH CLUSTERING ORDER BY (clustering1 DESC, clustering2 ASC, clustering3 DESC)AND read_repair_chance = 0.0AND dclocal_read_repair_chance = 0.1AND gc_grace_seconds = 864000AND bloom_filter_fp_chance = 0.01AND caching = { 'keys' : 'ALL', 'rows_per_partition' : 'NONE' }AND comment = ''AND compaction = { 'class' : 'org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy' }AND compression = { 'sstable_compression' : 'org.apache.cassandra.io.compress.LZ4Compressor' }AND default_time_to_live = 0AND speculative_retry = '99.0PERCENTILE'AND min_index_interval = 128AND max_index_interval = 2048;

       complex_table's indices

      NameTarget
      clustering2idxclustering2
      idx1indexed1
      idx2indexed2
      keys_map_idxkeys(key_indexed_map)
      pk2idxpk2
      As CQL statement

      CREATE INDEX clustering2idx ON live_data.complex_table (clustering2);CREATE INDEX idx1 ON live_data.complex_table (indexed1);CREATE INDEX idx2 ON live_data.complex_table (indexed2);CREATE INDEX keys_map_idx ON live_data.complex_table (keys(key_indexed_map));CREATE INDEX pk2idx ON live_data.complex_table (pk2);
      \ No newline at end of file