You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2014/06/30 16:47:56 UTC
[1/3] git commit: Fix Assertion errors when using empty clustering
with static columns
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 d21332655 -> d677e790d
Fix Assertion errors when using empty clustering with static columns
patch by slebresne; reviewed by iamaleksey for CASSANDRA-7455
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a9c71e4a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9c71e4a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9c71e4a
Branch: refs/heads/cassandra-2.1
Commit: a9c71e4a2049070247535f5870253148619b14e8
Parents: fc9eeb9
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Jun 30 15:56:56 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Jun 30 15:56:56 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../org/apache/cassandra/cql3/statements/ColumnGroupMap.java | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9c71e4a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index e88753f..094f2a4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,8 @@
* Properly handle unrecognized opcodes and flags (CASSANDRA-7440)
* (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459)
* Make sure high level sstables get compacted (CASSANDRA-7414)
+ * Fix AssertionError when using empty clustering columns and static columns
+ (CASSANDRA-7455)
2.0.9
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9c71e4a/src/java/org/apache/cassandra/cql3/statements/ColumnGroupMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/ColumnGroupMap.java b/src/java/org/apache/cassandra/cql3/statements/ColumnGroupMap.java
index 077a034..58428ed 100644
--- a/src/java/org/apache/cassandra/cql3/statements/ColumnGroupMap.java
+++ b/src/java/org/apache/cassandra/cql3/statements/ColumnGroupMap.java
@@ -136,13 +136,13 @@ public class ColumnGroupMap
if (currentGroup == null)
{
- currentGroup = new ColumnGroupMap(current, composite.isStaticName(c.name()));
+ currentGroup = new ColumnGroupMap(current, CompositeType.isStaticName(c.name()));
currentGroup.add(current, idx, c);
previous = current;
return;
}
- if (!isSameGroup(current))
+ if ((currentGroup.isStatic && !CompositeType.isStaticName(c.name())) || !isSameGroup(current))
{
groups.add(currentGroup);
// Note that we know that only the first group built can be static
[3/3] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d677e790
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d677e790
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d677e790
Branch: refs/heads/cassandra-2.1
Commit: d677e790d220ce4249d394bf87cd0bd7479ba7cc
Parents: d213326 0bbfabb
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Jun 30 16:47:48 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Jun 30 16:47:48 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d677e790/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c912094,46e7475..5b6b4eb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -17,8 -11,9 +17,10 @@@ Merged from 2.0
* (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459)
* Commit disk failure policy (CASSANDRA-7429)
* Make sure high level sstables get compacted (CASSANDRA-7414)
+ * Fix AssertionError when using empty clustering columns and static columns
+ (CASSANDRA-7455)
+
2.1.0-rc2
* Fix heap size calculation for CompoundSparseCellName and
CompoundSparseCellName.WithCollection (CASSANDRA-7421)
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by sl...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
src/java/org/apache/cassandra/cql3/statements/ColumnGroupMap.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0bbfabb5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0bbfabb5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0bbfabb5
Branch: refs/heads/cassandra-2.1
Commit: 0bbfabb5d6106a8cc831c6d63f630825ef9ec23a
Parents: 4cc4acb a9c71e4
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Jun 30 16:47:29 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Jun 30 16:47:29 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0bbfabb5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c2e5a00,094f2a4..46e7475
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -9,37 -4,31 +9,39 @@@ Merged from 2.0
operations to incorrect become full QUORUM (CASSANDRA-7345)
* Properly handle unrecognized opcodes and flags (CASSANDRA-7440)
* (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459)
+ * Commit disk failure policy (CASSANDRA-7429)
* Make sure high level sstables get compacted (CASSANDRA-7414)
+ * Fix AssertionError when using empty clustering columns and static columns
+ (CASSANDRA-7455)
-
-2.0.9
- * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
- * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
- * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
+2.1.0-rc2
+ * Fix heap size calculation for CompoundSparseCellName and
+ CompoundSparseCellName.WithCollection (CASSANDRA-7421)
+ * Allow counter mutations in UNLOGGED batches (CASSANDRA-7351)
+ * Modify reconcile logic to always pick a tombstone over a counter cell
+ (CASSANDRA-7346)
+ * Avoid incremental compaction on Windows (CASSANDRA-7365)
+ * Fix exception when querying a composite-keyed table with a collection index
+ (CASSANDRA-7372)
+ * Use node's host id in place of counter ids (CASSANDRA-7366)
* Fix native protocol CAS batches (CASSANDRA-7337)
+ * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
+ * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
+ * Make sure we clear out repair sessions from netstats (CASSANDRA-7329)
+ * Don't fail streams on failure detector downs (CASSANDRA-3569)
+ * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314)
+ * Reduce run time for CQL tests (CASSANDRA-7327)
+ * Fix heap size calculation on Windows (CASSANDRA-7352, 7353)
+ * RefCount native frames from netty (CASSANDRA-7245)
+ * Use tarball dir instead of /var for default paths (CASSANDRA-7136)
+ * Remove rows_per_partition_to_cache keyword (CASSANDRA-7193)
+ * Fix schema change response in native protocol v3 (CASSANDRA-7413)
+Merged from 2.0:
+ * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
* Add per-CF range read request latency metrics (CASSANDRA-7338)
* Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
- * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
- * Swap local and global default read repair chances (CASSANDRA-7320)
- * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
- * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
- * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
- * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
- * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
- * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
- * Add authentication support to shuffle (CASSANDRA-6484)
- * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325)
* Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
* Fix infinite loop on exception while streaming (CASSANDRA-7330)
- * Reference sstables before populating key cache (CASSANDRA-7234)
* Account for range tombstones in min/max column names (CASSANDRA-7235)
* Improve sub range repair validation (CASSANDRA-7317)
* Accept subtypes for function results, type casts (CASSANDRA-6766)