You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2015/04/22 04:25:08 UTC
cassandra git commit: push down allocations to where they are needed
Repository: cassandra
Updated Branches:
refs/heads/trunk 840d9a663 -> 10ff8c9f8
push down allocations to where they are needed
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/10ff8c9f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10ff8c9f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/10ff8c9f
Branch: refs/heads/trunk
Commit: 10ff8c9f892c978a2b0eb0000d907c3d688f5d8d
Parents: 840d9a6
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue Apr 21 22:24:49 2015 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue Apr 21 22:24:49 2015 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/Constants.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/10ff8c9f/src/java/org/apache/cassandra/cql3/Constants.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/Constants.java b/src/java/org/apache/cassandra/cql3/Constants.java
index 8619b24..a0eff94 100644
--- a/src/java/org/apache/cassandra/cql3/Constants.java
+++ b/src/java/org/apache/cassandra/cql3/Constants.java
@@ -319,10 +319,12 @@ public abstract class Constants
public void execute(ByteBuffer rowKey, ColumnFamily cf, Composite prefix, UpdateParameters params) throws InvalidRequestException
{
- CellName cname = cf.getComparator().create(prefix, column);
ByteBuffer value = t.bindAndGet(params.options);
if (value != ByteBufferUtil.UNSET_BYTE_BUFFER) // use reference equality and not object equality
+ {
+ CellName cname = cf.getComparator().create(prefix, column);
cf.addColumn(value == null ? params.makeTombstone(cname) : params.makeColumn(cname, value));
+ }
}
}