cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 02 Oct 2014 09:22:31 GMT
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/f07c8420
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f07c8420
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f07c8420

Branch: refs/heads/trunk
Commit: f07c842080dbffde107b16b622e587ad7b08e8f5
Parents: d92932a 4743811
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu Oct 2 11:22:19 2014 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Thu Oct 2 11:22:19 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +
 .../db/marshal/DynamicCompositeType.java        | 13 +++-
 .../unit/org/apache/cassandra/SchemaLoader.java |  2 +
 .../db/marshal/DynamicCompositeTypeTest.java    | 79 ++++++++++++++++++--
 4 files changed, 90 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f07c8420/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f07c8420/test/unit/org/apache/cassandra/SchemaLoader.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f07c8420/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
index 7056a40,87e6ac9..eaedb4b
--- a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
+++ b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
@@@ -49,8 -42,11 +49,10 @@@ public class DynamicCompositeTypeTes
      private static final DynamicCompositeType comparator;
      static
      {
 -        Map<Byte, AbstractType<?>> aliases = new HashMap<Byte, AbstractType<?>>();
          aliases.put((byte)'b', BytesType.instance);
+         aliases.put((byte)'B', ReversedType.getInstance(BytesType.instance));
          aliases.put((byte)'t', TimeUUIDType.instance);
+         aliases.put((byte)'T', ReversedType.getInstance(TimeUUIDType.instance));
          comparator = DynamicCompositeType.getInstance(aliases);
      }
  


Mime
View raw message