You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2013/12/02 19:51:32 UTC
[1/8] git commit: Add warning on collection limitations in CQL doc
Updated Branches:
refs/heads/cassandra-1.2 c63d068af -> c20241838
refs/heads/cassandra-2.0 e4fc8771e -> 1a80a438c
refs/heads/trunk cf9baefc8 -> 679ec7e88
Add warning on collection limitations in CQL doc
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c63d068a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c63d068a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c63d068a
Branch: refs/heads/cassandra-2.0
Commit: c63d068af8e8c6db4cad077181598fe8452b0b72
Parents: f393504
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Dec 2 11:23:13 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Dec 2 11:23:13 2013 +0100
----------------------------------------------------------------------
doc/cql3/CQL.textile | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c63d068a/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 507ad13..b02d24a 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -807,6 +807,16 @@ The use of the counter type is limited in the following way:
h3(#collections). Working with collections
+h4. Noteworthy characteristics
+
+Collections are meant for storing/denormalizing relatively small amount of data. They work well for things like "the phone numbers of a given user", "labels applied to an email", etc. But when items are expected to grow unbounded ("all the messages sent by a given user", "events registered by a sensor", ...), then collections are not appropriate anymore and a specific table (with clustering columns) should be used. Concretely, collections have the following limitations:
+* Collections are always read in their entirety (and reading one is not paged internally).
+* Collections cannot have more than 65535 elements. More precisely, while it may be possible to insert more than 65535 elements, it is not possible to read more than the 65535 first elements (see "CASSANDRA-5428":https://issues.apache.org/jira/browse/CASSANDRA-5428 for details).
+* While insertion operations on sets and maps never incur a read-before-write internally, some operations on lists do (see the section on lists below for details). It is thus advised to prefer sets over lists when possible.
+
+Please note that while some of those limitations may or may not be loosen in the future, the general rule that collections are for denormalizing small amount of data is meant to stay.
+
+
h4(#map). Maps
A @map@ is a "typed":#types set of key-value pairs, where keys are unique. Furthermore, note that the map are internally sorted by their keys and will thus always be returned in that order. To create a column of type @map@, use the @map@ keyword suffixed with comma-separated key and value types, enclosed in angle brackets. For example:
[4/8] git commit: Change snapshot response message verb
Posted by yu...@apache.org.
Change snapshot response message verb
to make sure response do not get dropped
patch by yukim; reviewed by jbellis for CASSANDRA-6415
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2024183
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2024183
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2024183
Branch: refs/heads/trunk
Commit: c202418386c512dcb0410d9c50f696048e305d78
Parents: c63d068
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Dec 2 12:31:38 2013 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Dec 2 12:31:38 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/SnapshotVerbHandler.java | 5 ++---
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2024183/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2119f77..c80a00a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@
* 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2024183/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java b/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
index f15e8c5..8a80731 100644
--- a/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
+++ b/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
@@ -26,7 +26,6 @@ import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.MessageIn;
import org.apache.cassandra.net.MessageOut;
import org.apache.cassandra.net.MessagingService;
-import org.apache.cassandra.tracing.Tracing;
public class SnapshotVerbHandler implements IVerbHandler<SnapshotCommand>
{
@@ -39,7 +38,7 @@ public class SnapshotVerbHandler implements IVerbHandler<SnapshotCommand>
Table.open(command.keyspace).clearSnapshot(command.snapshot_name);
else
Table.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);
}
}
[7/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by yu...@apache.org.
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 <yu...@apache.org>
Authored: Mon Dec 2 12:49:31 2013 -0600
Committer: Yuki Morishita <yu...@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);
}
}
[6/8] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by yu...@apache.org.
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/trunk
Commit: 1a80a438ce99cd0896a30524c796644aaa47998e
Parents: e4fc877 c202418
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Dec 2 12:49:31 2013 -0600
Committer: Yuki Morishita <yu...@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);
}
}
[2/8] git commit: Add warning on collection limitations in CQL doc
Posted by yu...@apache.org.
Add warning on collection limitations in CQL doc
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c63d068a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c63d068a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c63d068a
Branch: refs/heads/trunk
Commit: c63d068af8e8c6db4cad077181598fe8452b0b72
Parents: f393504
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Dec 2 11:23:13 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Dec 2 11:23:13 2013 +0100
----------------------------------------------------------------------
doc/cql3/CQL.textile | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c63d068a/doc/cql3/CQL.textile
----------------------------------------------------------------------
diff --git a/doc/cql3/CQL.textile b/doc/cql3/CQL.textile
index 507ad13..b02d24a 100644
--- a/doc/cql3/CQL.textile
+++ b/doc/cql3/CQL.textile
@@ -807,6 +807,16 @@ The use of the counter type is limited in the following way:
h3(#collections). Working with collections
+h4. Noteworthy characteristics
+
+Collections are meant for storing/denormalizing relatively small amount of data. They work well for things like "the phone numbers of a given user", "labels applied to an email", etc. But when items are expected to grow unbounded ("all the messages sent by a given user", "events registered by a sensor", ...), then collections are not appropriate anymore and a specific table (with clustering columns) should be used. Concretely, collections have the following limitations:
+* Collections are always read in their entirety (and reading one is not paged internally).
+* Collections cannot have more than 65535 elements. More precisely, while it may be possible to insert more than 65535 elements, it is not possible to read more than the 65535 first elements (see "CASSANDRA-5428":https://issues.apache.org/jira/browse/CASSANDRA-5428 for details).
+* While insertion operations on sets and maps never incur a read-before-write internally, some operations on lists do (see the section on lists below for details). It is thus advised to prefer sets over lists when possible.
+
+Please note that while some of those limitations may or may not be loosen in the future, the general rule that collections are for denormalizing small amount of data is meant to stay.
+
+
h4(#map). Maps
A @map@ is a "typed":#types set of key-value pairs, where keys are unique. Furthermore, note that the map are internally sorted by their keys and will thus always be returned in that order. To create a column of type @map@, use the @map@ keyword suffixed with comma-separated key and value types, enclosed in angle brackets. For example:
[3/8] git commit: Change snapshot response message verb
Posted by yu...@apache.org.
Change snapshot response message verb
to make sure response do not get dropped
patch by yukim; reviewed by jbellis for CASSANDRA-6415
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2024183
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2024183
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2024183
Branch: refs/heads/cassandra-2.0
Commit: c202418386c512dcb0410d9c50f696048e305d78
Parents: c63d068
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Dec 2 12:31:38 2013 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Dec 2 12:31:38 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/SnapshotVerbHandler.java | 5 ++---
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2024183/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2119f77..c80a00a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@
* 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2024183/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java b/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
index f15e8c5..8a80731 100644
--- a/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
+++ b/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
@@ -26,7 +26,6 @@ import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.MessageIn;
import org.apache.cassandra.net.MessageOut;
import org.apache.cassandra.net.MessagingService;
-import org.apache.cassandra.tracing.Tracing;
public class SnapshotVerbHandler implements IVerbHandler<SnapshotCommand>
{
@@ -39,7 +38,7 @@ public class SnapshotVerbHandler implements IVerbHandler<SnapshotCommand>
Table.open(command.keyspace).clearSnapshot(command.snapshot_name);
else
Table.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);
}
}
[5/8] git commit: Change snapshot response message verb
Posted by yu...@apache.org.
Change snapshot response message verb
to make sure response do not get dropped
patch by yukim; reviewed by jbellis for CASSANDRA-6415
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2024183
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2024183
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2024183
Branch: refs/heads/cassandra-1.2
Commit: c202418386c512dcb0410d9c50f696048e305d78
Parents: c63d068
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Dec 2 12:31:38 2013 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Dec 2 12:31:38 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/SnapshotVerbHandler.java | 5 ++---
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2024183/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2119f77..c80a00a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@
* 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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2024183/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java b/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
index f15e8c5..8a80731 100644
--- a/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
+++ b/src/java/org/apache/cassandra/service/SnapshotVerbHandler.java
@@ -26,7 +26,6 @@ import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.MessageIn;
import org.apache.cassandra.net.MessageOut;
import org.apache.cassandra.net.MessagingService;
-import org.apache.cassandra.tracing.Tracing;
public class SnapshotVerbHandler implements IVerbHandler<SnapshotCommand>
{
@@ -39,7 +38,7 @@ public class SnapshotVerbHandler implements IVerbHandler<SnapshotCommand>
Table.open(command.keyspace).clearSnapshot(command.snapshot_name);
else
Table.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);
}
}
[8/8] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/679ec7e8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/679ec7e8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/679ec7e8
Branch: refs/heads/trunk
Commit: 679ec7e888d94de39eaa2aa6f22956224199d1c0
Parents: cf9baef 1a80a43
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Dec 2 12:49:51 2013 -0600
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Dec 2 12:49:51 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/679ec7e8/CHANGES.txt
----------------------------------------------------------------------