diff --git a/cassandra/pom.xml b/cassandra/pom.xml index d5731933b77..46d2530d462 100644 --- a/cassandra/pom.xml +++ b/cassandra/pom.xml @@ -30,12 +30,12 @@ zeppelin-cassandra jar 0.6.0-SNAPSHOT - Zeppelin: Cassandra + Zeppelin: Apache Cassandra interpreter Zeppelin cassandra support http://zeppelin.apache.org - 3.0.0-rc1 + 3.0.1 1.0.5.4 1.3.0 2.10.4 diff --git a/cassandra/src/main/java/org/apache/zeppelin/cassandra/CassandraInterpreter.java b/cassandra/src/main/java/org/apache/zeppelin/cassandra/CassandraInterpreter.java index cc4520d2101..ca77aba2991 100644 --- a/cassandra/src/main/java/org/apache/zeppelin/cassandra/CassandraInterpreter.java +++ b/cassandra/src/main/java/org/apache/zeppelin/cassandra/CassandraInterpreter.java @@ -110,7 +110,7 @@ public class CassandraInterpreter extends Interpreter { public static final String DEFAULT_PORT = "9042"; public static final String DEFAULT_CLUSTER = "Test Cluster"; public static final String DEFAULT_KEYSPACE = "system"; - public static final String DEFAULT_PROTOCOL_VERSION = "3"; + public static final String DEFAULT_PROTOCOL_VERSION = "4"; public static final String DEFAULT_COMPRESSION = "NONE"; public static final String DEFAULT_CREDENTIAL = "none"; public static final String DEFAULT_POLICY = "DEFAULT"; @@ -159,7 +159,7 @@ public CassandraInterpreter(Properties properties) { "IP address). Default = localhost. Ex: '192.168.0.12,node2,node3'") .add(CASSANDRA_PORT, DEFAULT_PORT, "Cassandra native port. Default = 9042") .add(CASSANDRA_PROTOCOL_VERSION, DEFAULT_PROTOCOL_VERSION, - "Cassandra protocol version. Default = 3") + "Cassandra protocol version. Default = 4") .add(CASSANDRA_CLUSTER_NAME, DEFAULT_CLUSTER, "Cassandra cluster name. " + "Default = 'Test Cluster'") .add(CASSANDRA_KEYSPACE_NAME, DEFAULT_KEYSPACE, "Cassandra keyspace name. " + @@ -311,7 +311,7 @@ public void cancel(InterpreterContext context) { @Override public FormType getFormType() { - return FormType.NATIVE; + return FormType.SIMPLE; } @Override diff --git a/cassandra/src/main/resources/scalate/helpMenu.ssp b/cassandra/src/main/resources/scalate/helpMenu.ssp index 26ff1171abd..c61a68f7e31 100644 --- a/cassandra/src/main/resources/scalate/helpMenu.ssp +++ b/cassandra/src/main/resources/scalate/helpMenu.ssp @@ -103,12 +103,12 @@