cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [7/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Mon, 02 Dec 2013 18:51:38 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/service/SnapshotVerbHandler.java


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

Branch: refs/heads/cassandra-2.0
Commit: 1a80a438ce99cd0896a30524c796644aaa47998e
Parents: e4fc877 c202418
Author: Yuki Morishita <yukim@apache.org>
Authored: Mon Dec 2 12:49:31 2013 -0600
Committer: Yuki Morishita <yukim@apache.org>
Committed: Mon Dec 2 12:49:31 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt                                               |  1 +
 doc/cql3/CQL.textile                                      | 10 ++++++++++
 .../org/apache/cassandra/service/SnapshotVerbHandler.java |  5 ++---
 3 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a80a438/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index bdd6da4,c80a00a..8a95fa8
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -11,44 -7,10 +11,45 @@@ Merged from 1.2
   * Improve gossip performance for typical messages (CASSANDRA-6409)
   * Throw IRE if a prepared has more markers than supported (CASSANDRA-5598)
   * Expose Thread metrics for the native protocol server (CASSANDRA-6234)
+  * Change snapshot response message verb (CASSANDRA-6415)
  
  
 -1.2.12
 +2.0.3
 + * Fix FD leak on slice read path (CASSANDRA-6275)
 + * Cancel read meter task when closing SSTR (CASSANDRA-6358)
 + * free off-heap IndexSummary during bulk (CASSANDRA-6359)
 + * Recover from IOException in accept() thread (CASSANDRA-6349)
 + * Improve Gossip tolerance of abnormally slow tasks (CASSANDRA-6338)
 + * Fix trying to hint timed out counter writes (CASSANDRA-6322)
 + * Allow restoring specific columnfamilies from archived CL (CASSANDRA-4809)
 + * Avoid flushing compaction_history after each operation (CASSANDRA-6287)
 + * Fix repair assertion error when tombstones expire (CASSANDRA-6277)
 + * Skip loading corrupt key cache (CASSANDRA-6260)
 + * Fixes for compacting larger-than-memory rows (CASSANDRA-6274)
 + * Compact hottest sstables first and optionally omit coldest from
 +   compaction entirely (CASSANDRA-6109)
 + * Fix modifying column_metadata from thrift (CASSANDRA-6182)
 + * cqlsh: fix LIST USERS output (CASSANDRA-6242)
 + * Add IRequestSink interface (CASSANDRA-6248)
 + * Update memtable size while flushing (CASSANDRA-6249)
 + * Provide hooks around CQL2/CQL3 statement execution (CASSANDRA-6252)
 + * Require Permission.SELECT for CAS updates (CASSANDRA-6247)
 + * New CQL-aware SSTableWriter (CASSANDRA-5894)
 + * Reject CAS operation when the protocol v1 is used (CASSANDRA-6270)
 + * Correctly throw error when frame too large (CASSANDRA-5981)
 + * Fix serialization bug in PagedRange with 2ndary indexes (CASSANDRA-6299)
 + * Fix CQL3 table validation in Thrift (CASSANDRA-6140)
 + * Fix bug missing results with IN clauses (CASSANDRA-6327)
 + * Fix paging with reversed slices (CASSANDRA-6343)
 + * Set minTimestamp correctly to be able to drop expired sstables (CASSANDRA-6337)
 + * Support NaN and Infinity as float literals (CASSANDRA-6003)
 + * Remove RF from nodetool ring output (CASSANDRA-6289)
 + * Fix attempting to flush empty rows (CASSANDRA-6374)
 + * Fix potential out of bounds exception when paging (CASSANDRA-6333)
 +Merged from 1.2:
 + * Optimize FD phi calculation (CASSANDRA-6386)
 + * Improve initial FD phi estimate when starting up (CASSANDRA-6385)
 + * Don't list CQL3 table in CLI describe even if named explicitely (CASSANDRA-5750)
   * Invalidate row cache when dropping CF (CASSANDRA-6351)
   * add non-jamm path for cached statements (CASSANDRA-6293)
   * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a80a438/doc/cql3/CQL.textile
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a80a438/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
index 718c79f,8a80731..2d393cf
--- a/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
+++ b/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
@@@ -36,10 -35,10 +35,10 @@@ public class SnapshotVerbHandler implem
      {
          SnapshotCommand command = message.payload;
          if (command.clear_snapshot)
 -            Table.open(command.keyspace).clearSnapshot(command.snapshot_name);
 +            Keyspace.open(command.keyspace).clearSnapshot(command.snapshot_name);
          else
 -            Table.open(command.keyspace).getColumnFamilyStore(command.column_family).snapshot(command.snapshot_name);
 +            Keyspace.open(command.keyspace).getColumnFamilyStore(command.column_family).snapshot(command.snapshot_name);
-         Tracing.trace("Enqueuing response to snapshot request {} to {}", command.snapshot_name,
message.from);
-         MessagingService.instance().sendReply(new MessageOut(MessagingService.Verb.REQUEST_RESPONSE),
id, message.from);
+         logger.debug("Enqueuing response to snapshot request {} to {}", command.snapshot_name,
message.from);
+         MessagingService.instance().sendReply(new MessageOut(MessagingService.Verb.INTERNAL_RESPONSE),
id, message.from);
      }
  }


Mime
View raw message