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 2014/02/02 06:11:32 UTC
git commit: remove bogus template parameter
Updated Branches:
refs/heads/trunk 944c01517 -> 72507b7a1
remove bogus template parameter
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/72507b7a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/72507b7a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/72507b7a
Branch: refs/heads/trunk
Commit: 72507b7a17b4815677acc030a903f03099bdafee
Parents: 944c015
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Sun Feb 2 00:10:12 2014 -0500
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Sun Feb 2 00:10:12 2014 -0500
----------------------------------------------------------------------
.../org/apache/cassandra/utils/btree/NodeBuilder.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/72507b7a/src/java/org/apache/cassandra/utils/btree/NodeBuilder.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/btree/NodeBuilder.java b/src/java/org/apache/cassandra/utils/btree/NodeBuilder.java
index 5a47f35..d48a349 100644
--- a/src/java/org/apache/cassandra/utils/btree/NodeBuilder.java
+++ b/src/java/org/apache/cassandra/utils/btree/NodeBuilder.java
@@ -88,12 +88,12 @@ final class NodeBuilder
* a parent if we do not -- we got here from an earlier key -- and we need to ascend back up),
* or null if we finished the update in this node.
*/
- <V> NodeBuilder update(Object key)
+ NodeBuilder update(Object key)
{
assert copyFrom != null;
int copyFromKeyEnd = getKeyEnd(copyFrom);
- int i = find(comparator, (V) key, copyFrom, copyFromKeyPosition, copyFromKeyEnd);
+ int i = find(comparator, key, copyFrom, copyFromKeyPosition, copyFromKeyEnd);
boolean found = i >= 0; // exact key match?
boolean owns = true; // true iff this node (or a child) should contain the key
if (!found)
@@ -222,23 +222,23 @@ final class NodeBuilder
}
// skips the next key in copyf, and puts the provided key in the builder instead
- private <V> void replaceNextKey(Object with)
+ private void replaceNextKey(Object with)
{
// (this first part differs from addNewKey in that we pass the replaced object to replaceF as well)
ensureRoom(buildKeyPosition + 1);
if (updateFunction != null)
- with = updateFunction.apply((V) copyFrom[copyFromKeyPosition], (V) with);
+ with = updateFunction.apply(copyFrom[copyFromKeyPosition], with);
buildKeys[buildKeyPosition++] = with;
copyFromKeyPosition++;
}
// puts the provided key in the builder, with no impact on treatment of data from copyf
- <V> void addNewKey(Object key)
+ void addNewKey(Object key)
{
ensureRoom(buildKeyPosition + 1);
if (updateFunction != null)
- key = updateFunction.apply((V) key);
+ key = updateFunction.apply(key);
buildKeys[buildKeyPosition++] = key;
}