Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F33C5188D6 for ; Fri, 25 Dec 2015 22:46:28 +0000 (UTC) Received: (qmail 84626 invoked by uid 500); 25 Dec 2015 22:46:28 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 84584 invoked by uid 500); 25 Dec 2015 22:46:28 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 84573 invoked by uid 99); 25 Dec 2015 22:46:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Dec 2015 22:46:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5AE65E00A0; Fri, 25 Dec 2015 22:46:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Message-Id: <88b952d83ce5454a999517d83ab3f5fd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cassandra git commit: remove unbound method template parameters Date: Fri, 25 Dec 2015 22:46:28 +0000 (UTC) Repository: cassandra Updated Branches: refs/heads/trunk 53e370f62 -> ffcb0be3f remove unbound method template parameters Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ffcb0be3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffcb0be3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ffcb0be3 Branch: refs/heads/trunk Commit: ffcb0be3fc899289526124ff270ad33da09118a2 Parents: 53e370f Author: Dave Brosius Authored: Fri Dec 25 17:46:12 2015 -0500 Committer: Dave Brosius Committed: Fri Dec 25 17:46:12 2015 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/utils/btree/BTreeRemoval.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffcb0be3/src/java/org/apache/cassandra/utils/btree/BTreeRemoval.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/btree/BTreeRemoval.java b/src/java/org/apache/cassandra/utils/btree/BTreeRemoval.java index 74fa402..a4402b8 100644 --- a/src/java/org/apache/cassandra/utils/btree/BTreeRemoval.java +++ b/src/java/org/apache/cassandra/utils/btree/BTreeRemoval.java @@ -71,7 +71,7 @@ public class BTreeRemoval /** * Remove |elem| from |btree|. It has to be present and it has to reside in a leaf node. */ - private static Object[] removeFromLeaf(Object[] node, int index) + private static Object[] removeFromLeaf(Object[] node, int index) { Object[] result = null; Object[] prevNode = null; @@ -107,7 +107,7 @@ public class BTreeRemoval if (i > 0) { final Object[] leftNeighbour = (Object[]) node[keyEnd + i - 1]; - final V nodeKey = (V) node[i - 1]; + final Object nodeKey = node[i - 1]; node = keyEnd == 1 ? null : copyWithKeyAndChildRemoved(node, i - 1, i - 1, false); nextNode = merge(leftNeighbour, nextNode, nodeKey); i = i - 1; @@ -116,7 +116,7 @@ public class BTreeRemoval else { final Object[] rightNeighbour = (Object[]) node[keyEnd + i + 1]; - final V nodeKey = (V) node[i]; + final Object nodeKey = node[i]; node = keyEnd == 1 ? null : copyWithKeyAndChildRemoved(node, i, i, false); nextNode = merge(nextNode, rightNeighbour, nodeKey); } @@ -148,7 +148,7 @@ public class BTreeRemoval return result; } - private static Object[] rotateRight(final Object[] node, final int i) { + private static Object[] rotateRight(final Object[] node, final int i) { final int keyEnd = BTree.getBranchKeyEnd(node); final Object[] nextNode = (Object[]) node[keyEnd + i]; final Object[] rightNeighbour = (Object[]) node[keyEnd + i + 1]; @@ -222,7 +222,7 @@ public class BTreeRemoval return copy; } - private static Object[] copyWithKeyAndChildRemoved(final Object[] node, final int keyIndex, final int childIndex, final boolean substractSize) + private static Object[] copyWithKeyAndChildRemoved(final Object[] node, final int keyIndex, final int childIndex, final boolean substractSize) { final boolean leaf = BTree.isLeaf(node); final int keyEnd = BTree.getKeyEnd(node);