You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/09/19 20:18:02 UTC
[1/2] cassandra git commit: Fix mixed version read request
compatibility for compact static tables
Repository: cassandra
Updated Branches:
refs/heads/trunk 4bb5976a7 -> bf5dd032f
Fix mixed version read request compatibility for compact static tables
patch by Blake Eggleston; reviewed by Aleksey Yeschenko for
CASSANDRA-10373
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aba97fc2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aba97fc2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aba97fc2
Branch: refs/heads/trunk
Commit: aba97fc265a796ea0ac76c1a4a4953501fe4ab95
Parents: cffa93c
Author: Blake Eggleston <bd...@gmail.com>
Authored: Sat Sep 19 10:45:34 2015 -0700
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Sep 19 19:15:19 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/db/ReadCommand.java | 6 ++++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aba97fc2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 45fa773..851a19b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
3.0.0-rc1
+ * Fix mixed version read request compatibility for compact static tables
+ (CASSANDRA-10373)
* Fix paging of DISTINCT with static and IN (CASSANDRA-10354)
* Allow MATERIALIZED VIEW's SELECT statement to restrict primary key
columns (CASSANDRA-9664)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aba97fc2/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java
index 1c1da42..91227cf 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -1297,6 +1297,12 @@ public abstract class ReadCommand implements ReadQuery
selectionBuilder.add(cellName.column);
}
+ // for compact storage tables without clustering keys, the column holding the selected value is named
+ // 'value' internally we add it to the selection here to prevent errors due to unexpected column names
+ // when serializing the initial local data response
+ if (metadata.isStaticCompactTable() && clusterings.isEmpty())
+ selectionBuilder.addAll(metadata.partitionColumns());
+
in.readBoolean(); // countCql3Rows
// clusterings cannot include STATIC_CLUSTERING, so if the names filter is for static columns, clusterings
[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bf5dd032
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf5dd032
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf5dd032
Branch: refs/heads/trunk
Commit: bf5dd032fc7428cf3532a2d684ba07bd563435d4
Parents: 4bb5976 aba97fc
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Sat Sep 19 19:17:53 2015 +0100
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Sat Sep 19 19:17:53 2015 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/db/ReadCommand.java | 6 ++++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf5dd032/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bd51c80,851a19b..119870d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,6 +1,10 @@@
+3.2
+ * Add transparent data encryption core classes (CASSANDRA-9945)
+
+
3.0.0-rc1
+ * Fix mixed version read request compatibility for compact static tables
+ (CASSANDRA-10373)
* Fix paging of DISTINCT with static and IN (CASSANDRA-10354)
* Allow MATERIALIZED VIEW's SELECT statement to restrict primary key
columns (CASSANDRA-9664)