Updated Branches: refs/heads/trunk 68fa88d1e -> 84d1aaaea
Correct blob literal + ReversedType parsing patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for CASSANDRA-5629 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/01d4f07d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/01d4f07d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/01d4f07d Branch: refs/heads/trunk Commit: 01d4f07dac3ac9ae4af2638391c5191f5166502b Parents: ac19be9 Author: Aleksey Yeschenko <[email protected]> Authored: Tue Jun 11 01:08:48 2013 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Jun 11 01:08:48 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/Constants.java | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/01d4f07d/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 36493d6..a063d69 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -21,6 +21,7 @@ * Allow creating CUSTOM indexes on collections (CASSANDRA-5615) * Evaluate now() function at execution time (CASSANDRA-5616) * Expose detailed read repair metrics (CASSANDRA-5618) + * Correct blob literal + ReversedType parsing (CASSANDRA-5629) Merged from 1.1: * Remove buggy thrift max message length option (CASSANDRA-5529) * Fix NPE in Pig's widerow mode (CASSANDRA-5488) http://git-wip-us.apache.org/repos/asf/cassandra/blob/01d4f07d/src/java/org/apache/cassandra/cql3/Constants.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/Constants.java b/src/java/org/apache/cassandra/cql3/Constants.java index 096c0a8..4c9d856 100644 --- a/src/java/org/apache/cassandra/cql3/Constants.java +++ b/src/java/org/apache/cassandra/cql3/Constants.java @@ -25,12 +25,7 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.db.ColumnFamily; import org.apache.cassandra.db.filter.QueryPath; -import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.db.marshal.BytesType; -import org.apache.cassandra.db.marshal.CollectionType; -import org.apache.cassandra.db.marshal.CounterColumnType; -import org.apache.cassandra.db.marshal.LongType; -import org.apache.cassandra.db.marshal.MarshalException; +import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.utils.ByteBufferUtil; @@ -133,6 +128,8 @@ public abstract class Constants private ByteBuffer parsedValue(AbstractType<?> validator) throws InvalidRequestException { + if (validator instanceof ReversedType<?>) + validator = ((ReversedType<?>) validator).baseType; try { // BytesType doesn't want it's input prefixed by '0x'.
