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 CD96610A10 for ; Thu, 8 Aug 2013 16:34:04 +0000 (UTC) Received: (qmail 36617 invoked by uid 500); 8 Aug 2013 16:34:01 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 36367 invoked by uid 500); 8 Aug 2013 16:34:00 -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 35807 invoked by uid 99); 8 Aug 2013 16:33:55 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Aug 2013 16:33:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2BDE5835FC4; Thu, 8 Aug 2013 16:33:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Thu, 08 Aug 2013 16:34:00 -0000 Message-Id: In-Reply-To: <5ffb917cc2ac451da41a6979bef8c26c@git.apache.org> References: <5ffb917cc2ac451da41a6979bef8c26c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/16] git commit: fix potential overflow in extimatedKeys fix potential overflow in extimatedKeys Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23d7bd85 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23d7bd85 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23d7bd85 Branch: refs/heads/cassandra-2.0 Commit: 23d7bd85758762dbc2b717af56c4f590702a8b30 Parents: 7d45d2b Author: Jonathan Ellis Authored: Thu Aug 8 11:15:27 2013 -0500 Committer: Jonathan Ellis Committed: Thu Aug 8 11:15:27 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/23d7bd85/src/java/org/apache/cassandra/io/sstable/SSTableReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java index e9a03c8..412e4c1 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java @@ -597,7 +597,7 @@ public class SSTableReader extends SSTable */ public long estimatedKeys() { - return indexSummary.size() * DatabaseDescriptor.getIndexInterval(); + return ((long) indexSummary.size()) * DatabaseDescriptor.getIndexInterval(); } /**