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/01/18 14:39:06 UTC
[2/5] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk
Conflicts:
src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b02851b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b02851b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b02851b
Branch: refs/heads/trunk
Commit: 6b02851b8da1611fde54405d56e6abc0a0ee4d10
Parents: 8cb7bc4 8be7e5c
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 18 14:00:20 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 18 14:00:20 2013 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 14 ++
doc/cql3/CQL.textile | 71 +++++-----
pylib/cqlshlib/formatting.py | 8 +-
.../apache/cassandra/cql/AlterTableStatement.java | 2 +-
.../cassandra/cql/CreateColumnFamilyStatement.java | 2 +-
src/java/org/apache/cassandra/cql/Term.java | 2 +-
src/java/org/apache/cassandra/cql3/Cql.g | 16 ++-
.../org/apache/cassandra/cql3/QueryProcessor.java | 2 +-
.../cassandra/cql3/statements/SelectStatement.java | 107 ++++++++------
.../apache/cassandra/cql3/statements/Selector.java | 17 ++-
.../apache/cassandra/db/marshal/AbstractType.java | 6 +
.../apache/cassandra/db/marshal/TimeUUIDType.java | 65 +++++++++-
src/java/org/apache/cassandra/utils/UUIDGen.java | 61 ++++++++-
14 files changed, 279 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b02851b/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b02851b/src/java/org/apache/cassandra/cql/AlterTableStatement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b02851b/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b02851b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b02851b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index 4888c37,1cf6d01..f875254
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@@ -919,15 -935,17 +918,17 @@@ public class SelectStatement implement
case COLUMN_METADATA:
if (name.type.isCollection())
{
- List<Pair<ByteBuffer, IColumn>> collection = columns.getCollection(name.name.key);
+ List<Pair<ByteBuffer, Column>> collection = columns.getCollection(name.name.key);
- if (collection == null)
- cqlRows.addColumnValue(null);
- else
- cqlRows.addColumnValue(((CollectionType)name.type).serialize(collection));
- break;
+ ByteBuffer value = collection == null
+ ? null
+ : ((CollectionType)name.type).serialize(collection);
+ addReturnValue(cqlRows, selector, value);
+ }
+ else
+ {
- IColumn c = columns.getSimple(name.name.key);
++ Column c = columns.getSimple(name.name.key);
+ addReturnValue(cqlRows, selector, c);
}
- Column c = columns.getSimple(name.name.key);
- addReturnValue(cqlRows, selector, c);
break;
default:
throw new AssertionError();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b02851b/src/java/org/apache/cassandra/db/marshal/AbstractType.java
----------------------------------------------------------------------