cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Thu, 02 Oct 2014 09:22:30 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47438119
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47438119
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/47438119

Branch: refs/heads/trunk
Commit: 4743811931bc813f3fd76889056f432badae48e9
Parents: 31235bc b93ca58
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu Oct 2 11:21:47 2014 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Thu Oct 2 11:21:47 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/47438119/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 306fdca,f3d5998..6b42b6a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,58 -1,6 +1,60 @@@
 -2.0.11:
 +2.1.1
 + * Send notification when opening compaction results early (CASSANDRA-8034)
 + * Make native server start block until properly bound (CASSANDRA-7885)
 + * (cqlsh) Fix IPv6 support (CASSANDRA-7988)
 + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939)
 + * Make sstablerepairedset take a list of files (CASSANDRA-7995)
 + * (cqlsh) Tab completeion for indexes on map keys (CASSANDRA-7972)
 + * (cqlsh) Fix UDT field selection in select clause (CASSANDRA-7891)
 + * Fix resource leak in event of corrupt sstable
 + * (cqlsh) Add command line option for cqlshrc file path (CASSANDRA-7131)
 + * Provide visibility into prepared statements churn (CASSANDRA-7921, CASSANDRA-7930)
 + * Invalidate prepared statements when their keyspace or table is
 +   dropped (CASSANDRA-7566)
 + * cassandra-stress: fix support for NetworkTopologyStrategy (CASSANDRA-7945)
 + * Fix saving caches when a table is dropped (CASSANDRA-7784)
 + * Add better error checking of new stress profile (CASSANDRA-7716)
 + * Use ThreadLocalRandom and remove FBUtilities.threadLocalRandom (CASSANDRA-7934)
 + * Prevent operator mistakes due to simultaneous bootstrap (CASSANDRA-7069)
 + * cassandra-stress supports whitelist mode for node config (CASSANDRA-7658)
 + * GCInspector more closely tracks GC; cassandra-stress and nodetool report it (CASSANDRA-7916)
 + * nodetool won't output bogus ownership info without a keyspace (CASSANDRA-7173)
 + * Add human readable option to nodetool commands (CASSANDRA-5433)
 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913)
 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719)
 + * (cqlsh) tab-completion for triggers (CASSANDRA-7824)
 + * (cqlsh) Support for query paging (CASSANDRA-7514)
 + * (cqlsh) Show progress of COPY operations (CASSANDRA-7789)
 + * Add syntax to remove multiple elements from a map (CASSANDRA-6599)
 + * Support non-equals conditions in lightweight transactions (CASSANDRA-6839)
 + * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
 + * (cqlsh) Display the current logged-in user (CASSANDRA-7785)
 + * (cqlsh) Don't ignore CTRL-C during COPY FROM execution (CASSANDRA-7815)
 + * (cqlsh) Order UDTs according to cross-type dependencies in DESCRIBE
 +   output (CASSANDRA-7659)
 + * (cqlsh) Fix handling of CAS statement results (CASSANDRA-7671)
 + * (cqlsh) COPY TO/FROM improvements (CASSANDRA-7405)
 + * Support list index operations with conditions (CASSANDRA-7499)
 + * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731)
 + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
 + * (cqlsh) Error when tracing query (CASSANDRA-7613)
 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
 + * SSTableExport uses correct validator to create string representation of partition
 +   keys (CASSANDRA-7498)
 + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689)
 + * Add support for custom 2i validation (CASSANDRA-7575)
 + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454)
 + * Add listen_interface and rpc_interface options (CASSANDRA-7417)
 + * Improve schema merge performance (CASSANDRA-7444)
 + * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
 + * Optimise NativeCell comparisons (CASSANDRA-6755)
 + * Configurable client timeout for cqlsh (CASSANDRA-7516)
 + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111)
 + * Make repair -pr work with -local (CASSANDRA-7450)
 + * Fix error in sstableloader with -cph > 1 (CASSANDRA-8007)
 +Merged from 2.0:
+  * Fix potential exception when using ReversedType in DynamicCompositeType
+    (CASSANDRA-7898)
   * Better validation of collection values (CASSANDRA-7833)
   * Track min/max timestamps correctly (CASSANDRA-7969)
   * Fix possible overflow while sorting CL segments for replay (CASSANDRA-7992)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/47438119/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/47438119/test/unit/org/apache/cassandra/SchemaLoader.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/SchemaLoader.java
index 0334117,7dea52c..1f6ffa9
--- a/test/unit/org/apache/cassandra/SchemaLoader.java
+++ b/test/unit/org/apache/cassandra/SchemaLoader.java
@@@ -125,8 -126,16 +125,10 @@@ public class SchemaLoade
          Map<Byte, AbstractType<?>> aliases = new HashMap<Byte, AbstractType<?>>();
          aliases.put((byte)'b', BytesType.instance);
          aliases.put((byte)'t', TimeUUIDType.instance);
+         aliases.put((byte)'B', ReversedType.getInstance(BytesType.instance));
+         aliases.put((byte)'T', ReversedType.getInstance(TimeUUIDType.instance));
          AbstractType<?> dynamicComposite = DynamicCompositeType.getInstance(aliases);
  
 -        // these column definitions will will be applied to the jdbc utf and integer column
familes respectively.
 -        Map<ByteBuffer, ColumnDefinition> integerColumn = new HashMap<ByteBuffer,
ColumnDefinition>();
 -        integerColumn.put(IntegerType.instance.fromString("42"), ColumnDefinition.regularDef(IntegerType.instance.fromString("42"),
UTF8Type.instance, null));
 -        Map<ByteBuffer, ColumnDefinition> utf8Column = new HashMap<ByteBuffer,
ColumnDefinition>();
 -        utf8Column.put(UTF8Type.instance.fromString("fortytwo"), ColumnDefinition.regularDef(UTF8Type.instance.fromString("fortytwo"),
IntegerType.instance, null));
 -
          // Make it easy to test compaction
          Map<String, String> compactionOptions = new HashMap<String, String>();
          compactionOptions.put("tombstone_compaction_interval", "1");

http://git-wip-us.apache.org/repos/asf/cassandra/blob/47438119/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java
----------------------------------------------------------------------


Mime
View raw message