Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
Jonathan Ellis 2014-03-19 12:12:11 -05:00
commit 335aa9f1f6
1 changed files with 8 additions and 1 deletions

View File

@ -529,7 +529,14 @@ enum CqlResultType {
INT = 3
}
/** Row returned from a CQL query */
/**
Row returned from a CQL query.
This struct is used for both CQL2 and CQL3 queries. For CQL2, the partition key
is special-cased and is always returned. For CQL3, it is not special cased;
it will be included in the columns list if it was included in the SELECT and
the key field is always null.
*/
struct CqlRow {
1: required binary key,
2: required list<Column> columns