Author: jbellis
Date: Fri Oct 22 13:57:50 2010
New Revision: 1026327
URL: http://svn.apache.org/viewvc?rev=1026327&view=rev
Log:
fix back CASSANDRA-1622 merge. patch by jbellis and Todd Nine
Modified:
cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java
cassandra/trunk/test/system/test_thrift_server.py
Modified:
cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java?rev=1026327&r1=1026326&r2=1026327&view=diff
==============================================================================
---
cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java
(original)
+++
cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java
Fri Oct 22 13:57:50 2010
@@ -202,7 +202,7 @@ public class ReadResponseResolver implem
ReadResponse result = results.get(message);
if (result == null)
continue; // arrived concurrently
- if (result.isDigestQuery())
+ if (!result.isDigestQuery())
return true;
}
return false;
Modified: cassandra/trunk/test/system/test_thrift_server.py
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/system/test_thrift_server.py?rev=1026327&r1=1026326&r2=1026327&view=diff
==============================================================================
--- cassandra/trunk/test/system/test_thrift_server.py (original)
+++ cassandra/trunk/test/system/test_thrift_server.py Fri Oct 22 13:57:50 2010
@@ -1447,6 +1447,16 @@ class TestMutations(ThriftTester):
time.sleep(2)
result = client.get_indexed_slices(cp, clause, sp,
ConsistencyLevel.ONE)
assert len(result) == 0, result
+
+ def test_column_not_found_quorum(self):
+ _set_keyspace('Keyspace1')
+ key = 'doesntexist'
+ column_path = ColumnPath(column_family="Standard1",
column="idontexist")
+ try:
+ client.get(key, column_path, ConsistencyLevel.QUORUM)
+ assert False, ('columnpath %s existed in %s when it should not' %
(column_path, key))
+ except NotFoundException:
+ assert True, 'column did not exist'
class TestTruncate(ThriftTester):
def test_truncate(self):
