[5/6] git commit: merge from 1.1
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/813a937b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/813a937b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/813a937b Branch: refs/heads/cassandra-1.2 Commit: 813a937b2f1e84a96d45a6ace35d8ec1de7bf68d Parents: 83ff1da 7d36c1e Author: Jonathan Ellis jbel...@apache.org Authored: Fri Apr 19 08:35:06 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri Apr 19 08:35:06 2013 -0500 -- CHANGES.txt|2 + src/java/org/apache/cassandra/db/Memtable.java | 12 ++- .../org/apache/cassandra/utils/SlabAllocator.java | 23 ++- 3 files changed, 34 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/813a937b/CHANGES.txt -- diff --cc CHANGES.txt index 80c9b44,30a09c9..7fc93f4 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,83 -1,11 +1,85 @@@ -1.1.12 +1.2.5 + * Include fatal errors in trace events (CASSANDRA-5447) + * Ensure that PerRowSecondaryIndex is notified of row-level deletes + (CASSANDRA-5445) + * Allow empty blob literals in CQL3 (CASSANDRA-5452) + * Fix streaming RangeTombstones at column index boundary (CASSANDRA-5418) + * Fix preparing statements when current keyspace is not set (CASSANDRA-5468) + * Fix SemanticVersion.isSupportedBy minor/patch handling (CASSANDRA-5496) +Merged from 1.1 * Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393) + * Use allocator information to improve memtable memory usage estimate +(CASSANDRA-5497) + * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463) -1.1.11 - * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463) +1.2.4 + * Ensure that PerRowSecondaryIndex updates see the most recent values + (CASSANDRA-5397) + * avoid duplicate index entries ind PrecompactedRow and + ParallelCompactionIterable (CASSANDRA-5395) + * remove the index entry on oldColumn when new column is a tombstone + (CASSANDRA-5395) + * Change default stream throughput from 400 to 200 mbps (CASSANDRA-5036) + * Gossiper logs DOWN for symmetry with UP (CASSANDRA-5187) + * Fix mixing prepared statements between keyspaces (CASSANDRA-5352) + * Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354) + * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362) + * Improve asynchronous hint delivery (CASSANDRA-5179) + * Fix Guava dependency version (12.0 - 13.0.1) for Maven (CASSANDRA-5364) + * Validate that provided CQL3 collection value are 64K (CASSANDRA-5355) + * Make upgradeSSTable skip current version sstables by default (CASSANDRA-5366) + * Optimize min/max timestamp collection (CASSANDRA-5373) + * Invalid streamId in cql binary protocol when using invalid CL + (CASSANDRA-5164) + * Fix validation for IN where clauses with collections (CASSANDRA-5376) + * Copy resultSet on count query to avoid ConcurrentModificationException + (CASSANDRA-5382) + * Correctly typecheck in CQL3 even with ReversedType (CASSANDRA-5386) + * Fix streaming compressed files when using encryption (CASSANDRA-5391) + * cassandra-all 1.2.0 pom missing netty dependency (CASSANDRA-5392) + * Fix writetime/ttl functions on null values (CASSANDRA-5341) + * Fix NPE during cql3 select with token() (CASSANDRA-5404) + * IndexHelper.skipBloomFilters won't skip non-SHA filters (CASSANDRA-5385) + * cqlsh: Print maps ordered by key, sort sets (CASSANDRA-5413) + * Add null syntax support in CQL3 for inserts (CASSANDRA-3783) + * Allow unauthenticated set_keyspace() calls (CASSANDRA-5423) + * Fix potential incremental backups race (CASSANDRA-5410) + * Fix prepared BATCH statements with batch-level timestamps (CASSANDRA-5415) + * Allow overriding superuser setup delay (CASSANDRA-5430) + * cassandra-shuffle with JMX usernames and passwords (CASSANDRA-5431) +Merged from 1.1: + * cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052) + * Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372) + * Fix cf name extraction from manifest in Directories.migrateFile() + (CASSANDRA-5242) + * Support pluggable internode authentication (CASSANDRA-5401) + + +1.2.3 + * add check for sstable overlap within a level on startup (CASSANDRA-5327) + * replace ipv6 colons in jmx object names (CASSANDRA-5298, 5328) + * Avoid allocating SSTableBoundedScanner during repair when the range does + not intersect the sstable (CASSANDRA-5249) + * Don't lowercase property map keys (this breaks NTS) (CASSANDRA-5292) + * Fix composite comparator with super columns (CASSANDRA-5287) + * Fix
[5/6] git commit: merge from 1.1
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/225cb0e7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/225cb0e7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/225cb0e7 Branch: refs/heads/cassandra-1.2 Commit: 225cb0e7fac97c302783d2334b5b57926bbfa346 Parents: c7eb146 feae9ef Author: Jonathan Ellis jbel...@apache.org Authored: Tue Apr 9 21:25:13 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Tue Apr 9 21:25:13 2013 -0500 -- CHANGES.txt|2 ++ .../org/apache/cassandra/service/CacheService.java |3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/225cb0e7/CHANGES.txt -- diff --cc CHANGES.txt index 32aba15,59a7443..66279f0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,76 -1,5 +1,78 @@@ -1.1.11 +1.2.5 + * Include fatal errors in trace events (CASSANDRA-5447) + * Ensure that PerRowSecondaryIndex is notified of row-level deletes + (CASSANDRA-5445) ++Merged from 1.1: + * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463) + + +1.2.4 + * Ensure that PerRowSecondaryIndex updates see the most recent values + (CASSANDRA-5397) + * avoid duplicate index entries ind PrecompactedRow and + ParallelCompactionIterable (CASSANDRA-5395) + * remove the index entry on oldColumn when new column is a tombstone + (CASSANDRA-5395) + * Change default stream throughput from 400 to 200 mbps (CASSANDRA-5036) + * Gossiper logs DOWN for symmetry with UP (CASSANDRA-5187) + * Fix mixing prepared statements between keyspaces (CASSANDRA-5352) + * Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354) + * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362) + * Improve asynchronous hint delivery (CASSANDRA-5179) + * Fix Guava dependency version (12.0 - 13.0.1) for Maven (CASSANDRA-5364) + * Validate that provided CQL3 collection value are 64K (CASSANDRA-5355) + * Make upgradeSSTable skip current version sstables by default (CASSANDRA-5366) + * Optimize min/max timestamp collection (CASSANDRA-5373) + * Invalid streamId in cql binary protocol when using invalid CL + (CASSANDRA-5164) + * Fix validation for IN where clauses with collections (CASSANDRA-5376) + * Copy resultSet on count query to avoid ConcurrentModificationException + (CASSANDRA-5382) + * Correctly typecheck in CQL3 even with ReversedType (CASSANDRA-5386) + * Fix streaming compressed files when using encryption (CASSANDRA-5391) + * cassandra-all 1.2.0 pom missing netty dependency (CASSANDRA-5392) + * Fix writetime/ttl functions on null values (CASSANDRA-5341) + * Fix NPE during cql3 select with token() (CASSANDRA-5404) + * IndexHelper.skipBloomFilters won't skip non-SHA filters (CASSANDRA-5385) + * cqlsh: Print maps ordered by key, sort sets (CASSANDRA-5413) + * Add null syntax support in CQL3 for inserts (CASSANDRA-3783) + * Allow unauthenticated set_keyspace() calls (CASSANDRA-5423) + * Fix potential incremental backups race (CASSANDRA-5410) + * Fix prepared BATCH statements with batch-level timestamps (CASSANDRA-5415) + * Allow overriding superuser setup delay (CASSANDRA-5430) + * cassandra-shuffle with JMX usernames and passwords (CASSANDRA-5431) +Merged from 1.1: + * cli: Quote ks and cf names in schema output when needed (CASSANDRA-5052) + * Fix bad default for min/max timestamp in SSTableMetadata (CASSANDRA-5372) + * Fix cf name extraction from manifest in Directories.migrateFile() + (CASSANDRA-5242) + * Support pluggable internode authentication (CASSANDRA-5401) + + +1.2.3 + * add check for sstable overlap within a level on startup (CASSANDRA-5327) + * replace ipv6 colons in jmx object names (CASSANDRA-5298, 5328) + * Avoid allocating SSTableBoundedScanner during repair when the range does + not intersect the sstable (CASSANDRA-5249) + * Don't lowercase property map keys (this breaks NTS) (CASSANDRA-5292) + * Fix composite comparator with super columns (CASSANDRA-5287) + * Fix insufficient validation of UPDATE queries against counter cfs + (CASSANDRA-5300) + * Fix PropertyFileSnitch default DC/Rack behavior (CASSANDRA-5285) + * Handle null values when executing prepared statement (CASSANDRA-5081) + * Add netty to pom dependencies (CASSANDRA-5181) + * Include type arguments in Thrift CQLPreparedResult (CASSANDRA-5311) + * Fix compaction not removing columns when bf_fp_ratio is 1 (CASSANDRA-5182) + * cli: Warn about missing CQL3 tables in schema descriptions (CASSANDRA-5309) + * Re-enable unknown option in replication/compaction strategies option for + backward compatibility
[5/6] git commit: merge from 1.1
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d5513829 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5513829 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5513829 Branch: refs/heads/cassandra-1.2 Commit: d5513829ce2fdb48007f09ae34ae49a7a332c379 Parents: 27ed655 01d81d2 Author: Jonathan Ellis jbel...@apache.org Authored: Fri Mar 22 09:23:14 2013 -0500 Committer: Jonathan Ellis jbel...@apache.org Committed: Fri Mar 22 09:23:14 2013 -0500 -- CHANGES.txt|1 + .../apache/cassandra/tools/StandaloneScrubber.java |2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5513829/CHANGES.txt -- diff --cc CHANGES.txt index e309eae,b4fdd1d..f34f7bb --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,38 -1,5 +1,39 @@@ -1.1.11 +1.2.4 + * Fix mixing prepared statements between keyspaces (CASSANDRA-5352) + * Fix consistency level during bootstrap - strike 3 (CASSANDRA-5354) + * Fix transposed arguments in AlreadyExistsException (CASSANDRA-5362) + * Improve asynchronous hint delivery (CASSANDRA-5179) + * Fix Guava dependency version (12.0 - 13.0.1) for Maven (CASSANDRA-5364) + * Validate that provided CQL3 collection value are 64K (CASSANDRA-5355) + * Change Kernel Page Cache skipping into row preheating (disabled by default) + (CASSANDRA-4937) + + +1.2.3 + * add check for sstable overlap within a level on startup (CASSANDRA-5327) + * replace ipv6 colons in jmx object names (CASSANDRA-5298, 5328) + * Avoid allocating SSTableBoundedScanner during repair when the range does + not intersect the sstable (CASSANDRA-5249) + * Don't lowercase property map keys (this breaks NTS) (CASSANDRA-5292) + * Fix composite comparator with super columns (CASSANDRA-5287) + * Fix insufficient validation of UPDATE queries against counter cfs + (CASSANDRA-5300) + * Fix PropertyFileSnitch default DC/Rack behavior (CASSANDRA-5285) + * Handle null values when executing prepared statement (CASSANDRA-5081) + * Add netty to pom dependencies (CASSANDRA-5181) + * Include type arguments in Thrift CQLPreparedResult (CASSANDRA-5311) + * Fix compaction not removing columns when bf_fp_ratio is 1 (CASSANDRA-5182) + * cli: Warn about missing CQL3 tables in schema descriptions (CASSANDRA-5309) + * Re-enable unknown option in replication/compaction strategies option for + backward compatibility (CASSANDRA-4795) + * Add binary protocol support to stress (CASSANDRA-4993) + * cqlsh: Fix COPY FROM value quoting and null handling (CASSANDRA-5305) + * Fix repair -pr for vnodes (CASSANDRA-5329) + * Relax CL for auth queries for non-default users (CASSANDRA-5310) + * Fix AssertionError during repair (CASSANDRA-5245) + * Don't announce migrations to pre-1.2 nodes (CASSANDRA-5334) +Merged from 1.1: + * Update offline scrub for 1.0 - 1.1 directory structure (CASSANDRA-5195) * add tmp flag to Descriptor hashcode (CASSANDRA-4021) * fix logging of Found table data in data directories when only system tables are present (CASSANDRA-5289) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5513829/src/java/org/apache/cassandra/tools/StandaloneScrubber.java --
[5/6] git commit: merge from 1.1
merge from 1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1b601e4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1b601e4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1b601e4
Branch: refs/heads/cassandra-1.2
Commit: a1b601e435a3dc97b46bad32cb4060ba063c5718
Parents: 1b41d6f ccdb632
Author: Jonathan Ellis jbel...@apache.org
Authored: Thu Jan 10 12:52:01 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Thu Jan 10 12:52:01 2013 -0600
--
CHANGES.txt|1 +
.../apache/cassandra/thrift/ThriftValidation.java |7 +++
2 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1b601e4/CHANGES.txt
--
diff --cc CHANGES.txt
index 5100c1a,58dbc7b..63c0b1d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,39 -1,11 +1,40 @@@
-1.1.9
+1.2.1
++ * 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 strategy options (CASSANDRA-4795)
+ * Pick the correct value validator in sstable2json for cql3 tables
(CASSANDRA-5134)
+Merged from 1.1:
* Simplify CompressedRandomAccessReader to work around JDK FD bug
(CASSANDRA-5088)
* Improve handling a changing target throttle rate mid-compaction
(CASSANDRA-5087)
- * fix multithreaded compaction deadlock (CASSANDRA-4492)
- * fix specifying and altering crc_check_chance (CASSANDRA-5053)
- * Don't expire columns sooner than they should in 2ndary indexes
(CASSANDRA-5079)
* Pig: correctly decode row keys in widerow mode (CASSANDRA-5098)
* nodetool repair command now prints progress (CASSANDRA-4767)
+ * Ensure Jackson dependency matches lib (CASSANDRA-5126)
* fix user defined compaction to run against 1.1 data directory
(CASSANDRA-5118)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1b601e4/src/java/org/apache/cassandra/thrift/ThriftValidation.java
--
diff --cc src/java/org/apache/cassandra/thrift/ThriftValidation.java
index c0702b2,bc64018..eebc378
--- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
@@@ -476,18 -502,17 +476,17 @@@ public class ThriftValidatio
if (startToken.compareTo(endToken) 0 !endToken.isMinimum(p))
{
if (p.preservesOrder())
-throw new InvalidRequestException(start key must sort
before (or equal to) finish key in your partitioner!);
+throw new
org.apache.cassandra.exceptions.InvalidRequestException(start key must sort
before (or equal to) finish key in your partitioner!);
else
-throw new InvalidRequestException(start key's md5 sorts
after end key's md5. this is not allowed; you probably should not specify end
key at all, under RandomPartitioner);
+
[5/6] git commit: merge from 1.1
merge from 1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/94f0b856
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/94f0b856
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/94f0b856
Branch: refs/heads/cassandra-1.2
Commit: 94f0b8568db62d09c1c82a2eb3da6d5a1b599c99
Parents: 1c2a69c 0d2410e
Author: Jonathan Ellis jbel...@apache.org
Authored: Wed Jan 9 16:44:13 2013 -0600
Committer: Jonathan Ellis jbel...@apache.org
Committed: Wed Jan 9 16:44:19 2013 -0600
--
.../apache/cassandra/thrift/ThriftValidation.java |8
1 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/94f0b856/src/java/org/apache/cassandra/thrift/ThriftValidation.java
--
diff --cc src/java/org/apache/cassandra/thrift/ThriftValidation.java
index 6473acd,f9733d6..c0702b2
--- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
@@@ -460,7 -486,7 +460,7 @@@ public class ThriftValidatio
if ((range.start_key == null) == (range.start_token == null)
|| (range.end_key == null) == (range.end_token == null))
{
- throw new
org.apache.cassandra.exceptions.InvalidRequestException(exactly one of {start
key, end key} or {start token, end token} must be specified);
-throw new InvalidRequestException(exactly one each of {start
key, start token} and {end key, end token} must be specified);
++throw new
org.apache.cassandra.exceptions.InvalidRequestException(exactly one each of
{start key, start token} and {end key, end token} must be specified);
}
// (key, token) is supported (for wide-row CFRR) but not (token, key)
@@@ -475,10 -501,10 +475,10 @@@
Token endToken = p.getToken(range.end_key);
if (startToken.compareTo(endToken) 0 !endToken.isMinimum(p))
{
- if (p instanceof RandomPartitioner)
- throw new
org.apache.cassandra.exceptions.InvalidRequestException(start key's md5 sorts
after end key's md5. this is not allowed; you probably should not specify end
key at all, under RandomPartitioner);
- else
+ if (p.preservesOrder())
-throw new InvalidRequestException(start key must sort
before (or equal to) finish key in your partitioner!);
+throw new
org.apache.cassandra.exceptions.InvalidRequestException(start key must sort
before (or equal to) finish key in your partitioner!);
+ else
-throw new InvalidRequestException(start key's md5 sorts
after end key's md5. this is not allowed; you probably should not specify end
key at all, under RandomPartitioner);
++throw new
org.apache.cassandra.exceptions.InvalidRequestException(start key's token
sorts after end key's token. this is not allowed; you probably should not
specify end key at all except with an ordered partitioner);
}
}
else if (range.end_token != null)
