natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge from 0.4 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@831186 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-10-30 02:40:35 +00:00
parent f21b80836d
commit f6b54dfc6b
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -40,6 +40,7 @@
* Improve default garbage collector options (CASSANDRA-504)
* Add "nodeprobe flush" (CASSANDRA-505)
* remove NotFoundException from get_slice throws list (CASSANDRA-518)
* fix get (not get_slice) of entire supercolumn (CASSANDRA-508)
0.4.1

4
src/java/org/apache/cassandra/service/CassandraServer.java
View File

@ -257,7 +257,7 @@ public class CassandraServer implements Cassandra.Iface
{
if (logger.isDebugEnabled())
logger.debug("get");
ColumnOrSuperColumn column = multiget(table, Arrays.asList(key), column_path, consistency_level).get(key);
ColumnOrSuperColumn column = multigetInternal(table, Arrays.asList(key), column_path, consistency_level).get(key);
if (!column.isSetColumn() && !column.isSetSuper_column())
{
throw new NotFoundException();
@ -314,7 +314,7 @@ public class CassandraServer implements Cassandra.Iface
{
ThriftValidation.validateColumnPath(table, column_path);
QueryPath path = new QueryPath(column_path.column_family, column_path.super_column);
QueryPath path = new QueryPath(column_path.column_family, column_path.column == null ? null : column_path.super_column);
List<byte[]> nameAsList = Arrays.asList(column_path.column == null ? column_path.super_column : column_path.column);
List<ReadCommand> commands = new ArrayList<ReadCommand>();
for (String key: keys)

5
test/system/test_server.py
View File

@ -180,6 +180,11 @@ class TestMutations(CassandraTester):
_insert_super()
_verify_super()
def test_super_get(self):
_insert_super()
result = client.get('Keyspace1', 'key1', ColumnPath('Super1', 'sc2'), ConsistencyLevel.ONE).super_column
assert result == _SUPER_COLUMNS[1], result
def test_super_subcolumn_limit(self):
_insert_super()
p = SlicePredicate(slice_range=SliceRange('', '', False, 1))