Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0981e9a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0981e9a2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0981e9a2
Branch: refs/heads/trunk
Commit: 0981e9a24b9e345fe46f8b84951d085129b52441
Parents: 42ceccb 4c98854
Author: Aleksey Yeschenko <[email protected]>
Authored: Fri Feb 15 22:50:01 2013 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Fri Feb 15 22:50:01 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/cli/CliOptions.java | 14 ++++++++++++++
.../org/apache/cassandra/cli/CliSessionState.java | 8 ++++++--
3 files changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0981e9a2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a83efe9,4e1db62..f8deb34
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,76 -1,8 +1,78 @@@
-1.1.11
+1.2.2
+ * avoid no-op caching of byte[] on commitlog append (CASSANDRA-5199)
+ * fix symlinks under data dir not working (CASSANDRA-5185)
+ * fix bug in compact storage metadata handling (CASSANDRA-5189)
+ * Validate login for USE queries (CASSANDRA-5207)
+ * cli: remove default username and password (CASSANDRA-5208)
+ * configure populate_io_cache_on_flush per-CF (CASSANDRA-4694)
+ * allow configuration of internode socket buffer (CASSANDRA-3378)
+ * Make sstable directory picking blacklist-aware again (CASSANDRA-5193)
+ * Correctly expire gossip states for edge cases (CASSANDRA-5216)
+ * Improve handling of directory creation failures (CASSANDRA-5196)
+ * Expose secondary indicies to the rest of nodetool (CASSANDRA-4464)
+ * Binary protocol: avoid sending notification for 0.0.0.0 (CASSANDRA-5227)
+ * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
+ * CQL3 refactor to allow conversion function (CASSANDRA-5226)
+ * Fix drop of sstables in some circumstance (CASSANDRA-5232)
+ * Implement caching of authorization results (CASSANDRA-4295)
+ * Add support for LZ4 compression (CASSANDRA-5038)
+ * Fix missing columns in wide rows queries (CASSANDRA-5225)
+ * Simplify auth setup and make system_auth ks alterable (CASSANDRA-5112)
+ * Stop compactions from hanging during bootstrap (CASSANDRA-5244)
+ * fix compressed streaming sending extra chunk (CASSANDRA-5105)
+ * Add CQL3-based implementations of IAuthenticator and IAuthorizer
+ (CASSANDRA-4898)
+ * Fix timestamp-based tomstone removal logic (CASSANDRA-5248)
++Merged from 1.1:
+ * cli: Add JMX authentication support (CASSANDRA-5080)
-1.1.10
+1.2.1
+ * stream undelivered hints on decommission (CASSANDRA-5128)
+ * GossipingPropertyFileSnitch loads saved dc/rack info if needed
(CASSANDRA-5133)
+ * drain should flush system CFs too (CASSANDRA-4446)
+ * add inter_dc_tcp_nodelay setting (CASSANDRA-5148)
+ * re-allow wrapping ranges for start_token/end_token range pairing
(CASSANDRA-5106)
+ * fix validation compaction of empty rows (CASSADRA-5136)
+ * nodetool methods to enable/disable hint storage/delivery (CASSANDRA-4750)
+ * disallow bloom filter false positive chance of 0 (CASSANDRA-5013)
+ * add threadpool size adjustment methods to JMXEnabledThreadPoolExecutor and
+ CompactionManagerMBean (CASSANDRA-5044)
+ * fix hinting for dropped local writes (CASSANDRA-4753)
+ * off-heap cache doesn't need mutable column container (CASSANDRA-5057)
+ * apply disk_failure_policy to bad disks on initial directory creation
+ (CASSANDRA-4847)
+ * Optimize name-based queries to use ArrayBackedSortedColumns
(CASSANDRA-5043)
+ * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041)
+ * pool [Compressed]RandomAccessReader objects on the partitioned read path
+ (CASSANDRA-4942)
+ * Add debug logging to list filenames processed by Directories.migrateFile
+ method (CASSANDRA-4939)
+ * Expose black-listed directories via JMX (CASSANDRA-4848)
+ * Log compaction merge counts (CASSANDRA-4894)
+ * Minimize byte array allocation by AbstractData{Input,Output}
(CASSANDRA-5090)
+ * Add SSL support for the binary protocol (CASSANDRA-5031)
+ * Allow non-schema system ks modification for shuffle to work
(CASSANDRA-5097)
+ * cqlsh: Add default limit to SELECT statements (CASSANDRA-4972)
+ * cqlsh: fix DESCRIBE for 1.1 cfs in CQL3 (CASSANDRA-5101)
+ * Correctly gossip with nodes >= 1.1.7 (CASSANDRA-5102)
+ * Ensure CL guarantees on digest mismatch (CASSANDRA-5113)
+ * Validate correctly selects on composite partition key (CASSANDRA-5122)
+ * Fix exception when adding collection (CASSANDRA-5117)
+ * Handle states for non-vnode clusters correctly (CASSANDRA-5127)
+ * Refuse unrecognized replication and compaction strategy options
(CASSANDRA-4795)
+ * Pick the correct value validator in sstable2json for cql3 tables
(CASSANDRA-5134)
+ * Validate login for describe_keyspace, describe_keyspaces and set_keyspace
+ (CASSANDRA-5144)
+ * Fix inserting empty maps (CASSANDRA-5141)
+ * Don't remove tokens from System table for node we know (CASSANDRA-5121)
+ * fix streaming progress report for compresed files (CASSANDRA-5130)
+ * Coverage analysis for low-CL queries (CASSANDRA-4858)
+ * Stop interpreting dates as valid timeUUID value (CASSANDRA-4936)
+ * Adds E notation for floating point numbers (CASSANDRA-4927)
+ * Detect (and warn) unintentional use of the cql2 thrift methods when cql3
was
+ intended (CASSANDRA-5172)
+Merged from 1.1:
* fix saved key cache not loading at startup (CASSANDRA-5166)
* fix ConcurrentModificationException in getBootstrapSource (CASSANDRA-5170)
* fix sstable maxtimestamp for row deletes and pre-1.1.1 sstables
(CASSANDRA-5153)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0981e9a2/src/java/org/apache/cassandra/cli/CliOptions.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cli/CliOptions.java
index fc5eb03,3616f5d..cb58ddc
--- a/src/java/org/apache/cassandra/cli/CliOptions.java
+++ b/src/java/org/apache/cassandra/cli/CliOptions.java
@@@ -71,16 -65,9 +73,18 @@@ public class CliOption
options.addOption("k", KEYSPACE_OPTION, "KEYSPACE", "cassandra
keyspace user is authenticated against");
options.addOption("f", FILE_OPTION, "FILENAME", "load statements
from the specific file");
options.addOption(null, JMX_PORT_OPTION, "JMX-PORT", "JMX service
port");
+ options.addOption(null, JMX_USERNAME_OPTION, "JMX-USERNAME", "JMX
service username");
+ options.addOption(null, JMX_PASSWORD_OPTION, "JMX-PASSWORD", "JMX
service password");
options.addOption(null, SCHEMA_MIGRATION_WAIT_TIME, "TIME", "Schema
migration wait time (secs.), default is 10 secs");
+ options.addOption("tf", TRANSPORT_FACTORY, "TRANSPORT-FACTORY",
"Fully-qualified TTransportFactory class name for creating a connection to
cassandra");
+
+ // ssl connection-related options
+ options.addOption("ts", SSL_TRUSTSTORE, "TRUSTSTORE", "SSL: full path
to truststore");
+ options.addOption("tspw", SSL_TRUSTSTORE_PW, "TRUSTSTORE-PASSWORD",
"SSL: full path to truststore");
+ options.addOption("prtcl", SSL_PROTOCOL, "PROTOCOL", "SSL:
connections protocol to use (default: TLS)");
+ options.addOption("alg", SSL_ALGORITHM, "ALGORITHM", "SSL: algorithm
(default: SunX509)");
+ options.addOption("st", SSL_STORE_TYPE, "STORE-TYPE", "SSL: type of
store");
+ options.addOption("ciphers", SSL_CIPHER_SUITES, "CIPHER-SUITES",
"SSL: comma-separated list of encryption suites to use");
// options without argument
options.addOption("B", BATCH_OPTION, "enabled batch mode (suppress
output; errors are fatal)");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0981e9a2/src/java/org/apache/cassandra/cli/CliSessionState.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cli/CliSessionState.java
index e1a2ebd,b2b64dd..2178f8a
--- a/src/java/org/apache/cassandra/cli/CliSessionState.java
+++ b/src/java/org/apache/cassandra/cli/CliSessionState.java
@@@ -41,11 -39,10 +41,13 @@@ public class CliSessionStat
public boolean batch = false; // enable/disable batch processing mode
public String filename = ""; // file to read commands from
public int jmxPort = 7199;// JMX service port
+ public String jmxUsername; // JMX service username
+ public String jmxPassword; // JMX service password
public boolean verbose = false; // verbose output
public int schema_mwt = 10 * 1000; // Schema migration wait time
(secs.)
+ public TTransportFactory transportFactory = new FramedTransportFactory();
+ public EncryptionOptions encOptions = new ClientEncryptionOptions();
+
/*
* Streams to read/write from
*/
