You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/05/29 00:01:04 UTC
[1/3] git commit: Ninja: remove redundant check for null
Repository: cassandra
Updated Branches:
refs/heads/trunk bf2000404 -> 76bd6bb8c
Ninja: remove redundant check for null
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d92a79f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d92a79f5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d92a79f5
Branch: refs/heads/trunk
Commit: d92a79f5b3287ee26e45b666b2c4c5feec823f74
Parents: 04ba462
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed May 28 16:59:06 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed May 28 16:59:06 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/Tuples.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d92a79f5/src/java/org/apache/cassandra/cql3/Tuples.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/Tuples.java b/src/java/org/apache/cassandra/cql3/Tuples.java
index 9e86912..818e3e6 100644
--- a/src/java/org/apache/cassandra/cql3/Tuples.java
+++ b/src/java/org/apache/cassandra/cql3/Tuples.java
@@ -308,9 +308,6 @@ public class Tuples
public Value bind(List<ByteBuffer> values) throws InvalidRequestException
{
ByteBuffer value = values.get(bindIndex);
- if (value == null)
- return null;
-
return value == null ? null : Value.fromSerialized(value, (TupleType)receiver.type);
}
}
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by ty...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76bd6bb8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76bd6bb8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76bd6bb8
Branch: refs/heads/trunk
Commit: 76bd6bb8c2844b34f2c5c7a9a94af4081dad7740
Parents: bf20004 ea02b69
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed May 28 17:00:53 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed May 28 17:00:53 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/Tuples.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by ty...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
src/java/org/apache/cassandra/cql3/Tuples.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea02b690
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea02b690
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ea02b690
Branch: refs/heads/trunk
Commit: ea02b690019e0fe9c7326e30e8dc1d3de18373ce
Parents: 5767757 d92a79f
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed May 28 17:00:28 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed May 28 17:00:28 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/Tuples.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ea02b690/src/java/org/apache/cassandra/cql3/Tuples.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/Tuples.java
index 3aabbd3,818e3e6..384633d
--- a/src/java/org/apache/cassandra/cql3/Tuples.java
+++ b/src/java/org/apache/cassandra/cql3/Tuples.java
@@@ -305,12 -305,9 +305,9 @@@ public class Tuple
super(bindIndex, receiver);
}
- public Value bind(List<ByteBuffer> values) throws InvalidRequestException
+ public Value bind(QueryOptions options) throws InvalidRequestException
{
- ByteBuffer value = values.get(bindIndex);
+ ByteBuffer value = options.getValues().get(bindIndex);
- if (value == null)
- return null;
-
return value == null ? null : Value.fromSerialized(value, (TupleType)receiver.type);
}
}