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 2013/07/22 15:50:02 UTC
git commit: StorageProxy#cas() doesn't order columns names correctly
when querying
Updated Branches:
refs/heads/trunk b7a016d99 -> fbe63ab3d
StorageProxy#cas() doesn't order columns names correctly when querying
patch by slebresne; reviewed by jbellis for CASSANDRA-5788
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fbe63ab3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fbe63ab3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fbe63ab3
Branch: refs/heads/trunk
Commit: fbe63ab3d9d71107261126616fce4199fdd61e36
Parents: b7a016d
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Jul 22 15:48:47 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Jul 22 15:49:54 2013 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbe63ab3/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index dec32d7..5e2f062 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,6 +16,7 @@
* Fix ConcurrentModificationException during streaming (CASSANDRA-5782)
* Update deletion timestamp in Commit#updatesWithPaxosTime (CASSANDRA-5787)
* Thrift cas() method crashes if input columns are not sorted (CASSANDRA-5786)
+ * Order columns names correctly when querying for CAS (CASSANDRA-5788)
2.0.0-beta1
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fbe63ab3/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index 241d038..443d6b8 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -233,7 +233,7 @@ public class StorageProxy implements StorageProxyMBean
else
{
assert !expected.isEmpty();
- readCommand = new SliceByNamesReadCommand(keyspaceName, key, cfName, timestamp, new NamesQueryFilter(ImmutableSortedSet.copyOf(expected.getColumnNames())));
+ readCommand = new SliceByNamesReadCommand(keyspaceName, key, cfName, timestamp, new NamesQueryFilter(ImmutableSortedSet.copyOf(metadata.comparator, expected.getColumnNames())));
}
List<Row> rows = read(Arrays.asList(readCommand), ConsistencyLevel.QUORUM);
ColumnFamily current = rows.get(0).cf;