You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/02/09 14:40:10 UTC
[4/4] git commit: Fix typo in cql3 SelectStatement
Fix typo in cql3 SelectStatement
patch by Dave Brosius; reviewed by slebresne for CASSANDRA-3879
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a85bbdf6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a85bbdf6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a85bbdf6
Branch: refs/heads/trunk
Commit: a85bbdf633d302ded4861ed95a69375d50566904
Parents: 1616f3f
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Feb 9 09:01:29 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Feb 9 09:01:29 2012 +0100
----------------------------------------------------------------------
.../cassandra/cql3/statements/SelectStatement.java | 2 +-
src/java/org/apache/cassandra/gms/Gossiper.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a85bbdf6/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
index c68a6b6..3b699b9 100644
--- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
@@ -329,7 +329,7 @@ public class SelectStatement implements CQLStatement
private Collection<ByteBuffer> getKeys(final List<ByteBuffer> variables) throws InvalidRequestException
{
- assert keyRestriction != null || keyRestriction.isEquality();
+ assert keyRestriction != null && keyRestriction.isEquality();
List<ByteBuffer> keys = new ArrayList<ByteBuffer>(keyRestriction.eqValues.size());
for (Term t : keyRestriction.eqValues)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a85bbdf6/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 9f73717..30c262f 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -263,7 +263,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
* This method is part of IFailureDetectionEventListener interface. This is invoked
* by the Failure Detector when it convicts an end point.
*
- * param @ endpoint end point that is convicted.
+ * @param endpoint end point that is convicted.
*/
public void convict(InetAddress endpoint, double phi)
{