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-1.2' into cassandra-2.0
Date Thu, 19 Sep 2013 10:28:25 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	NEWS.txt
	build.xml
	debian/changelog


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

Branch: refs/heads/cassandra-2.0
Commit: 2c316afb2160de703f79d1c163413c7d801b3f1e
Parents: 6e3a241 9375363
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu Sep 19 12:28:04 2013 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Thu Sep 19 12:28:04 2013 +0200

----------------------------------------------------------------------
 CHANGES.txt                                          |  1 +
 src/java/org/apache/cassandra/config/CFMetaData.java | 15 ++++++++++++++-
 .../org/apache/cassandra/tools/SSTableImport.java    |  7 ++++++-
 3 files changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c316afb/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c218af5,f853cce..6003ed2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -49,54 -21,14 +49,55 @@@ Merged from 1.2
   * Fix snapshots in use get deleted during snapshot repair (CASSANDRA-6011)
   * Move hints and exception count to o.a.c.metrics (CASSANDRA-6017)
   * Fix memory leak in snapshot repair (CASSANDRA-6047)
+  * Fix sstable2sjon for CQL3 tables (CASSANDRA-5852)
  
  
 -1.2.9
 +2.0.0
 + * Fix thrift validation when inserting into CQL3 tables (CASSANDRA-5138)
 + * Fix periodic memtable flushing behavior with clean memtables (CASSANDRA-5931)
 + * Fix dateOf() function for pre-2.0 timestamp columns (CASSANDRA-5928)
 + * Fix SSTable unintentionally loads BF when opened for batch (CASSANDRA-5938)
 + * Add stream session progress to JMX (CASSANDRA-4757)
 + * Fix NPE during CAS operation (CASSANDRA-5925)
 +Merged from 1.2:
   * Fix getBloomFilterDiskSpaceUsed for AlwaysPresentFilter (CASSANDRA-5900)
 - * migrate 1.1 schema_columnfamilies.key_alias column to key_aliases
 -   (CASSANDRA-5800)
 - * add --migrate option to sstableupgrade and sstablescrub (CASSANDRA-5831)
 + * Don't announce schema version until we've loaded the changes locally
 +   (CASSANDRA-5904)
 + * Fix to support off heap bloom filters size greater than 2 GB (CASSANDRA-5903)
 + * Properly handle parsing huge map and set literals (CASSANDRA-5893)
 +
 +
 +2.0.0-rc2
 + * enable vnodes by default (CASSANDRA-5869)
 + * fix CAS contention timeout (CASSANDRA-5830)
 + * fix HsHa to respect max frame size (CASSANDRA-4573)
 + * Fix (some) 2i on composite components omissions (CASSANDRA-5851)
 + * cqlsh: add DESCRIBE FULL SCHEMA variant (CASSANDRA-5880)
 +Merged from 1.2:
 + * Correctly validate sparse composite cells in scrub (CASSANDRA-5855)
 + * Add KeyCacheHitRate metric to CF metrics (CASSANDRA-5868)
 + * cqlsh: add support for multiline comments (CASSANDRA-5798)
 + * Handle CQL3 SELECT duplicate IN restrictions on clustering columns
 +   (CASSANDRA-5856)
 +
 +
 +2.0.0-rc1
 + * improve DecimalSerializer performance (CASSANDRA-5837)
 + * fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690)
 + * fix schema-related trigger issues (CASSANDRA-5774)
 + * Better validation when accessing CQL3 table from thrift (CASSANDRA-5138)
 + * Fix assertion error during repair (CASSANDRA-5801)
 + * Fix range tombstone bug (CASSANDRA-5805)
 + * DC-local CAS (CASSANDRA-5797)
 + * Add a native_protocol_version column to the system.local table (CASSANRDA-5819)
 + * Use index_interval from cassandra.yaml when upgraded (CASSANDRA-5822)
 + * Fix buffer underflow on socket close (CASSANDRA-5792)
 +Merged from 1.2:
 + * Fix reading DeletionTime from 1.1-format sstables (CASSANDRA-5814)
 + * cqlsh: add collections support to COPY (CASSANDRA-5698)
 + * retry important messages for any IOException (CASSANDRA-5804)
 + * Allow empty IN relations in SELECT/UPDATE/DELETE statements (CASSANDRA-5626)
 + * cqlsh: fix crashing on Windows due to libedit detection (CASSANDRA-5812)
   * fix bulk-loading compressed sstables (CASSANDRA-5820)
   * (Hadoop) fix quoting in CqlPagingRecordReader and CqlRecordWriter 
     (CASSANDRA-5824)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c316afb/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c316afb/src/java/org/apache/cassandra/tools/SSTableImport.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/tools/SSTableImport.java
index bd74541,68d4397..79584c5
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@@ -245,12 -243,16 +245,17 @@@ public class SSTableImpor
              }
              else if (col.isRangeTombstone())
              {
 -                cfamily.addAtom(new RangeTombstone(col.getName(), col.getValue(), col.timestamp,
col.localExpirationTime));
 +                ByteBuffer end = superName == null ? col.getValue() : CompositeType.build(superName,
col.getValue());
 +                cfamily.addAtom(new RangeTombstone(cname, end, col.timestamp, col.localExpirationTime));
              }
+             // cql3 row marker, see CASSANDRA-5852
 -            else if (!path.columnName.hasRemaining())
++            else if (!cname.hasRemaining())
+             {
 -                cfamily.addColumn(new QueryPath(cfm.cfName, superName, ByteBuffer.wrap(new
byte[3])), col.getValue(), col.timestamp);
++                cfamily.addColumn(ByteBuffer.wrap(new byte[3]), col.getValue(), col.timestamp);
+             }
              else
              {
 -                cfamily.addColumn(path, col.getValue(), col.timestamp);
 +                cfamily.addColumn(cname, col.getValue(), col.timestamp);
              }
          }
      }


Mime
View raw message