You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/04/07 00:31:34 UTC
[5/13] git commit: merge from 1.0
merge from 1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a6d0c7c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a6d0c7c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a6d0c7c
Branch: refs/heads/cassandra-1.1.0
Commit: 9a6d0c7cce5bd94df0d7a004d98a55d917e65077
Parents: 25da034 0162447
Author: Jonathan Ellis <jb...@apache.org>
Authored: Fri Apr 6 17:22:59 2012 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Fri Apr 6 17:22:59 2012 -0500
----------------------------------------------------------------------
CHANGES.txt | 12 +++-
conf/cassandra.yaml | 48 ++++++++++++---
src/java/org/apache/cassandra/cli/CliClient.java | 2 +-
src/java/org/apache/cassandra/cli/CliCompiler.java | 2 +-
.../cassandra/config/DatabaseDescriptor.java | 6 +-
.../cassandra/locator/Ec2MultiRegionSnitch.java | 7 +--
.../cassandra/net/OutboundTcpConnectionPool.java | 5 ++
7 files changed, 62 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a6d0c7c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 1d1b4fd,1349299..4c4a41b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,48 -1,10 +1,58 @@@
-1.0.10
+1.1-dev
+ * fix read_repair_chance to really default to 0.1 in the cli (CASSANDRA-4114)
+ * Adds caching and bloomFilterFpChange to CQL options (CASSANDRA-4042)
+ * Adds posibility to autoconfigure size of the KeyCache (CASSANDRA-4087)
+ * fix KEYS index from skipping results (CASSANDRA-3996)
+ * Remove sliced_buffer_size_in_kb dead option (CASSANDRA-4076)
+ * make loadNewSStable preserve sstable version (CASSANDRA-4077)
+ * Respect 1.0 cache settings as much as possible when upgrading
+ (CASSANDRA-4088)
+ * relax path length requirement for sstable files when upgrading on
+ non-Windows platforms (CASSANDRA-4110)
+ * fix terminination of the stress.java when errors were encountered
+ (CASSANDRA-4128)
-
++Merged from 1.0:
+ * allow short snitch names (CASSANDRA-4130)
+
+1.1-beta2
+ * rename loaded sstables to avoid conflicts with local snapshots
+ (CASSANDRA-3967)
+ * start hint replay as soon as FD notifies that the target is back up
+ (CASSANDRA-3958)
+ * avoid unproductive deserializing of cached rows during compaction
+ (CASSANDRA-3921)
+ * fix concurrency issues with CQL keyspace creation (CASSANDRA-3903)
+ * Show Effective Owership via Nodetool ring <keyspace> (CASSANDRA-3412)
+ * Update ORDER BY syntax for CQL3 (CASSANDRA-3925)
+ * Fix BulkRecordWriter to not throw NPE if reducer gets no map data from Hadoop (CASSANDRA-3944)
+ * Fix bug with counters in super columns (CASSANDRA-3821)
+ * Remove deprecated merge_shard_chance (CASSANDRA-3940)
+ * add a convenient way to reset a node's schema (CASSANDRA-2963)
+ * fix for intermittent SchemaDisagreementException (CASSANDRA-3884)
+ * ignore deprecated KsDef/CfDef/ColumnDef fields in native schema (CASSANDRA-3963)
+ * CLI to report when unsupported column_metadata pair was given (CASSANDRA-3959)
+ * reincarnate removed and deprecated KsDef/CfDef attributes (CASSANDRA-3953)
+ * Fix race between writes and read for cache (CASSANDRA-3862)
+ * perform static initialization of StorageProxy on start-up (CASSANDRA-3797)
+ * support trickling fsync() on writes (CASSANDRA-3950)
+ * expose counters for unavailable/timeout exceptions given to thrift clients (CASSANDRA-3671)
+ * avoid quadratic startup time in LeveledManifest (CASSANDRA-3952)
+ * Add type information to new schema_ columnfamilies and remove thrift
+ serialization for schema (CASSANDRA-3792)
+ * add missing column validator options to the CLI help (CASSANDRA-3926)
+ * skip reading saved key cache if CF's caching strategy is NONE or ROWS_ONLY (CASSANDRA-3954)
+ * Unify migration code (CASSANDRA-4017)
+Merged from 1.0:
* cqlsh: guess correct version of Python for Arch Linux (CASSANDRA-4090)
++
++
++1.0.9
++=======
+ * (CLI) properly handle quotes in create/update keyspace commands (CASSANDRA-4129)
+
+
+ 1.0.9
++>>>>>>> cassandra-1.0
* improve index sampling performance (CASSANDRA-4023)
* always compact away deleted hints immediately after handoff (CASSANDRA-3955)
* delete hints from dropped ColumnFamilies on handoff instead of
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a6d0c7c/conf/cassandra.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a6d0c7c/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cli/CliClient.java
index 4e97e82,cb91934..024900c
--- a/src/java/org/apache/cassandra/cli/CliClient.java
+++ b/src/java/org/apache/cassandra/cli/CliClient.java
@@@ -982,9 -989,9 +982,9 @@@ public class CliClien
if (!CliMain.isConnected())
return;
-
+
// first value is the keyspace name, after that it is all key=value
- String keyspaceName = statement.getChild(0).getText();
+ String keyspaceName = CliUtils.unescapeSQLString(statement.getChild(0).getText());
KsDef ksDef = new KsDef(keyspaceName, DEFAULT_PLACEMENT_STRATEGY, new LinkedList<CfDef>());
try
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a6d0c7c/src/java/org/apache/cassandra/cli/CliCompiler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a6d0c7c/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a6d0c7c/src/java/org/apache/cassandra/locator/Ec2MultiRegionSnitch.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a6d0c7c/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
----------------------------------------------------------------------