Merge branch cassandra-2.2 into cassandra-3.0 Conflicts: src/java/org/apache/cassandra/db/marshal/ReversedType.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d332c7e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d332c7e6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d332c7e6 Branch: refs/heads/cassandra-3.0 Commit: d332c7e6e1f648f4c4f50a9f5eba6607171c39e6 Parents: 0a07977 c12abfb Author: blerer <benjamin.le...@datastax.com> Authored: Fri Sep 11 11:22:37 2015 +0200 Committer: blerer <benjamin.le...@datastax.com> Committed: Fri Sep 11 11:22:37 2015 +0200 ---------------------------------------------------------------------- .../apache/cassandra/cql3/selection/Selector.java | 4 ++++ .../apache/cassandra/db/marshal/AbstractType.java | 5 +++++ .../apache/cassandra/db/marshal/ReversedType.java | 6 ++++++ .../cassandra/cql3/validation/entities/UFTest.java | 15 +++++++++++++++ .../cql3/validation/operations/AggregationTest.java | 12 ++++++++++++ 5 files changed, 42 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d332c7e6/src/java/org/apache/cassandra/cql3/selection/Selector.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d332c7e6/src/java/org/apache/cassandra/db/marshal/AbstractType.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d332c7e6/src/java/org/apache/cassandra/db/marshal/ReversedType.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/marshal/ReversedType.java index 2e01d9b,2aea3cd..2f4fdb7 --- a/src/java/org/apache/cassandra/db/marshal/ReversedType.java +++ b/src/java/org/apache/cassandra/db/marshal/ReversedType.java @@@ -136,12 -129,12 +136,18 @@@ public class ReversedType<T> extends Ab } @Override + protected int valueLengthIfFixed() + { + return baseType.valueLengthIfFixed(); + } + + @Override + public boolean isReversed() + { + return true; + } + + @Override public String toString() { return getClass().getName() + "(" + baseType + ")"; http://git-wip-us.apache.org/repos/asf/cassandra/blob/d332c7e6/test/unit/org/apache/cassandra/cql3/validation/entities/UFTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d332c7e6/test/unit/org/apache/cassandra/cql3/validation/operations/AggregationTest.java ----------------------------------------------------------------------