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

add more robust sanity checking of get_column arguments. patch by jbellis; reviewed by Jun Rao for CASSANDRA-151 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@773016 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-05-08 14:53:25 +00:00
parent 85a121b474
commit f2260f107b
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,11 +212,27 @@ public class CassandraServer implements Cassandra.Iface
{ {
logger.debug("get_column"); logger.debug("get_column");
String[] values = RowMutation.getColumnAndColumnFamily(columnFamily_column); String[] values = RowMutation.getColumnAndColumnFamily(columnFamily_column);
if (values.length < 2) if (values.length < 1)
{ {
throw new InvalidRequestException("get_column requires both parts of columnfamily:column"); throw new InvalidRequestException("get_column requires non-empty columnfamily");
} }
ColumnFamily cfamily = readColumnFamily(new ColumnReadCommand(tablename, key, columnFamily_column)); if (DatabaseDescriptor.getColumnFamilyType(values[0]).equals("Standard"))
{
if (values.length != 2)
{
throw new InvalidRequestException("get_column requires both parts of columnfamily:column for standard CF " + values[0]);
}
}
else
{
if (values.length != 3)
{
throw new InvalidRequestException("get_column requires all parts of columnfamily:supercolumn:subcolumn for super CF " + values[0]);
}
}
ColumnReadCommand readCommand = new ColumnReadCommand(tablename, key, columnFamily_column);
ColumnFamily cfamily = readColumnFamily(readCommand);
if (cfamily == null) if (cfamily == null)
{ {
throw new NotFoundException(); throw new NotFoundException();

19
test/system/test_server.py
View File

@ -3,7 +3,7 @@ import os, sys, time
from . import client, root, CassandraTester from . import client, root, CassandraTester
from thrift.Thrift import TApplicationException from thrift.Thrift import TApplicationException
from ttypes import batch_mutation_t, batch_mutation_super_t, superColumn_t, column_t, NotFoundException from ttypes import batch_mutation_t, batch_mutation_super_t, superColumn_t, column_t, NotFoundException, InvalidRequestException
_SIMPLE_COLUMNS = [column_t(columnName='c1', value='value1', timestamp=0), _SIMPLE_COLUMNS = [column_t(columnName='c1', value='value1', timestamp=0),
column_t(columnName='c2', value='value2', timestamp=0)] column_t(columnName='c2', value='value2', timestamp=0)]
@ -45,13 +45,15 @@ def _verify_super(supercolumn='Super1'):
slice = client.get_slice_super('Table1', 'key1', 'Super1', -1, -1) slice = client.get_slice_super('Table1', 'key1', 'Super1', -1, -1)
assert slice == _SUPER_COLUMNS, slice assert slice == _SUPER_COLUMNS, slice
def _expect_missing(fn): def _expect_exception(fn, type_):
try: try:
r = fn() r = fn()
except NotFoundException: except type_:
pass pass
else: else:
raise Exception('expected missing result; got %s' % r) raise Exception('expected %s; got %s' % (type_.__name__, r))
def _expect_missing(fn):
_expect_exception(fn, NotFoundException)
class TestMutations(CassandraTester): class TestMutations(CassandraTester):
@ -62,7 +64,7 @@ class TestMutations(CassandraTester):
assert client.get_slice('Table1', 'key1', 'Super1', -1, -1) == [] assert client.get_slice('Table1', 'key1', 'Super1', -1, -1) == []
def test_missing_super(self): def test_missing_super(self):
_expect_missing(lambda: client.get_column('Table1', 'key1', 'Super1:sc1')) _expect_missing(lambda: client.get_column('Table1', 'key1', 'Super1:sc1:c1'))
def test_count(self): def test_count(self):
assert client.get_column_count('Table1', 'key1', 'Standard2') == 0 assert client.get_column_count('Table1', 'key1', 'Standard2') == 0
@ -89,6 +91,13 @@ class TestMutations(CassandraTester):
_insert_batch(True) _insert_batch(True)
_verify_batch() _verify_batch()
def test_bad_gets(self):
_expect_exception(lambda: client.get_column('Table1', 'key1', 'Standard1'), InvalidRequestException)
_expect_exception(lambda: client.get_column('Table1', 'key1', 'Standard1:x:y'), InvalidRequestException)
_expect_exception(lambda: client.get_column('Table1', 'key1', 'Super1'), InvalidRequestException)
_expect_exception(lambda: client.get_column('Table1', 'key1', 'Super1:x'), InvalidRequestException)
_expect_exception(lambda: client.get_column('Table1', 'key1', 'Super1:x:y:z'), InvalidRequestException)
def test_batch_insert_super(self): def test_batch_insert_super(self):
cfmap = {'Super1': _SUPER_COLUMNS, cfmap = {'Super1': _SUPER_COLUMNS,
'Super2': _SUPER_COLUMNS} 'Super2': _SUPER_COLUMNS}