Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51016876 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51016876 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51016876 Branch: refs/heads/trunk Commit: 51016876ab7015a3c6f3747943c0387b14cc1322 Parents: e77b70e 9dcdb8b Author: Tyler Hobbs <[email protected]> Authored: Fri Jun 20 12:00:48 2014 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Fri Jun 20 12:00:48 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/cql3/TypeCast.java | 2 +- .../cassandra/cql3/functions/FunctionCall.java | 2 +- .../cassandra/cql3/functions/Functions.java | 4 +- .../cassandra/cql3/statements/Selection.java | 2 +- .../cassandra/db/marshal/AbstractType.java | 23 +++++++-- .../apache/cassandra/db/marshal/BytesType.java | 2 +- .../cassandra/db/marshal/CompositeType.java | 8 +-- .../apache/cassandra/db/marshal/DateType.java | 6 +++ .../cassandra/db/marshal/IntegerType.java | 6 +++ .../apache/cassandra/db/marshal/LongType.java | 6 +++ .../cassandra/db/marshal/ReversedType.java | 6 +++ .../cassandra/db/marshal/TimestampType.java | 6 +++ .../apache/cassandra/db/marshal/TupleType.java | 6 +-- .../apache/cassandra/db/marshal/UUIDType.java | 6 +++ .../org/apache/cassandra/cql3/TypeTest.java | 51 ++++++++++++++++++++ 16 files changed, 119 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/51016876/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/51016876/src/java/org/apache/cassandra/db/marshal/AbstractType.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/51016876/src/java/org/apache/cassandra/db/marshal/DateType.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/51016876/src/java/org/apache/cassandra/db/marshal/TupleType.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/51016876/src/java/org/apache/cassandra/db/marshal/UUIDType.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/marshal/UUIDType.java index e988a58,c4ce1d1..83fa2ba --- a/src/java/org/apache/cassandra/db/marshal/UUIDType.java +++ b/src/java/org/apache/cassandra/db/marshal/UUIDType.java @@@ -173,9 -179,22 +173,15 @@@ public class UUIDType extends AbstractT } } - try - { - return ByteBuffer.wrap(UUIDGen.getTimeUUIDBytes(TimestampSerializer.dateStringToTimestamp(source))); - } - catch (MarshalException e) - { - throw new MarshalException(String.format("unable to make version 1 UUID from '%s'", source), e); - } + throw new MarshalException(String.format("unable to coerce '%s' to version 1 UUID", source)); } + @Override + public boolean isValueCompatibleWithInternal(AbstractType<?> otherType) + { + return this == otherType || otherType == TimeUUIDType.instance; + } + public CQL3Type asCQL3Type() { return CQL3Type.Native.UUID;
