You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/04/02 11:40:08 UTC
[2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7005a780
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7005a780
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7005a780
Branch: refs/heads/trunk
Commit: 7005a780881c414c2166f743e5f9cd52f8ada3db
Parents: b735555 65b9093
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Apr 2 11:40:01 2013 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Apr 2 11:40:01 2013 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/cql3/statements/Selection.java | 16 +++++++++++---
2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7005a780/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7005a780/src/java/org/apache/cassandra/cql3/statements/Selection.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/Selection.java
index b322cda,983c35b..6a70130
--- a/src/java/org/apache/cassandra/cql3/statements/Selection.java
+++ b/src/java/org/apache/cassandra/cql3/statements/Selection.java
@@@ -246,12 -246,12 +246,12 @@@ public abstract class Selectio
current.add(v);
}
- public void add(IColumn c)
+ public void add(Column c)
{
- current.add(c == null || c.isMarkedForDelete() ? null : value(c));
+ current.add(isDead(c) ? null : value(c));
if (timestamps != null)
{
- timestamps[current.size() - 1] = c.timestamp();
+ timestamps[current.size() - 1] = isDead(c) ? -1 : c.timestamp();
}
if (ttls != null)
{