natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.0' into trunk

This commit is contained in:
T Jake Luciani 2016-04-18 10:01:29 -04:00
parent 28cd76cd84 99ea2ee716
commit fb13df431b
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -49,6 +49,7 @@
* (cqlsh) Show static columns in a different color (CASSANDRA-11059)
* Allow to remove TTLs on table with default_time_to_live (CASSANDRA-11207)
Merged from 3.0:
* Option to specify ProtocolVersion in cassandra-stress (CASSANDRA-11410)
* ArithmeticException in avgFunctionForDecimal (CASSANDRA-11485)
* Allow only DISTINCT queries with partition keys or static columns restrictions (CASSANDRA-11339)
* LogAwareFileLister should only use OLD sstable files in current folder to determine disk consistency (CASSANDRA-11470)

10
tools/stress/src/org/apache/cassandra/stress/settings/SettingsMode.java
View File

@ -29,6 +29,7 @@ import java.util.Map;
import com.datastax.driver.core.AuthProvider;
import com.datastax.driver.core.PlainTextAuthProvider;
import com.datastax.driver.core.ProtocolOptions;
import com.datastax.driver.core.ProtocolVersion;
public class SettingsMode implements Serializable
{
@ -36,6 +37,7 @@ public class SettingsMode implements Serializable
public final ConnectionAPI api;
public final ConnectionStyle style;
public final CqlVersion cqlVersion;
public final ProtocolVersion protocolVersion;
public final String username;
public final String password;
@ -53,6 +55,9 @@ public class SettingsMode implements Serializable
{
cqlVersion = CqlVersion.CQL3;
Cql3Options opts = (Cql3Options) options;
protocolVersion = "NEWEST_SUPPORTED".equals(opts.protocolVersion.value())
? ProtocolVersion.NEWEST_SUPPORTED
: ProtocolVersion.fromInt(Integer.parseInt(opts.protocolVersion.value()));
api = opts.mode().displayPrefix.equals("native") ? ConnectionAPI.JAVA_DRIVER_NATIVE : ConnectionAPI.THRIFT;
style = opts.useUnPrepared.setByUser() ? ConnectionStyle.CQL : ConnectionStyle.CQL_PREPARED;
compression = ProtocolOptions.Compression.valueOf(opts.useCompression.value().toUpperCase()).name();
@ -92,6 +97,7 @@ public class SettingsMode implements Serializable
{
cqlVersion = CqlVersion.CQL3;
Cql3SimpleNativeOptions opts = (Cql3SimpleNativeOptions) options;
protocolVersion = ProtocolVersion.NEWEST_SUPPORTED;
api = ConnectionAPI.SIMPLE_NATIVE;
style = opts.usePrepared.setByUser() ? ConnectionStyle.CQL_PREPARED : ConnectionStyle.CQL;
compression = ProtocolOptions.Compression.NONE.name();
@ -105,6 +111,7 @@ public class SettingsMode implements Serializable
else if (options instanceof ThriftOptions)
{
ThriftOptions opts = (ThriftOptions) options;
protocolVersion = ProtocolVersion.NEWEST_SUPPORTED;
cqlVersion = CqlVersion.NOCQL;
api = opts.smart.setByUser() ? ConnectionAPI.THRIFT_SMART : ConnectionAPI.THRIFT;
style = ConnectionStyle.THRIFT;
@ -148,6 +155,7 @@ public class SettingsMode implements Serializable
private static abstract class Cql3Options extends GroupedOptions
{
final OptionSimple api = new OptionSimple("cql3", "", null, "", true);
final OptionSimple protocolVersion = new OptionSimple("protocolVersion=", "[2-4]+", "NEWEST_SUPPORTED", "CQL Protocol Version", false);
final OptionSimple useUnPrepared = new OptionSimple("unprepared", "", null, "force use of unprepared statements", false);
final OptionSimple useCompression = new OptionSimple("compression=", "none|lz4|snappy", "none", "", false);
final OptionSimple port = new OptionSimple("port=", "[0-9]+", "9046", "", false);
@ -162,7 +170,7 @@ public class SettingsMode implements Serializable
public List<? extends Option> options()
{
return Arrays.asList(mode(), useUnPrepared, api, useCompression, port, user, password, authProvider,
maxPendingPerConnection, connectionsPerHost);
maxPendingPerConnection, connectionsPerHost, protocolVersion);
}
}

4
tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
View File

@ -47,6 +47,7 @@ public class JavaDriverClient
public final int maxPendingPerConnection;
public final int connectionsPerHost;
private final ProtocolVersion protocolVersion;
private final EncryptionOptions.ClientEncryptionOptions encryptionOptions;
private Cluster cluster;
private Session session;
@ -61,6 +62,7 @@ public class JavaDriverClient
public JavaDriverClient(StressSettings settings, String host, int port, EncryptionOptions.ClientEncryptionOptions encryptionOptions)
{
this.protocolVersion = settings.mode.protocolVersion;
this.host = host;
this.port = port;
this.username = settings.mode.username;
@ -115,7 +117,7 @@ public class JavaDriverClient
.withPort(port)
.withPoolingOptions(poolingOpts)
.withoutJMXReporting()
.withProtocolVersion(ProtocolVersion.NEWEST_SUPPORTED)
.withProtocolVersion(protocolVersion)
.withoutMetrics(); // The driver uses metrics 3 with conflict with our version
if (whitelist != null)
clusterBuilder.withLoadBalancingPolicy(whitelist);