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 B454110A4A for ; Mon, 19 Jan 2015 21:46:58 +0000 (UTC) Received: (qmail 63139 invoked by uid 500); 19 Jan 2015 21:47:00 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 63102 invoked by uid 500); 19 Jan 2015 21:47: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 63091 invoked by uid 99); 19 Jan 2015 21:47:00 -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; Mon, 19 Jan 2015 21:47:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8D919E081B; Mon, 19 Jan 2015 21:47:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Mon, 19 Jan 2015 21:47:00 -0000 Message-Id: <865b393edea942529ececb841fa3d545@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] cassandra git commit: Round up time deltas lower than 1ms in BulkLoader Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 d469b4b81 -> cc0831c60 Round up time deltas lower than 1ms in BulkLoader patch by Max Barnash; reviewed by Aleksey Yeschenko for CASSANDRA-8645 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ae380da9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ae380da9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ae380da9 Branch: refs/heads/cassandra-2.1 Commit: ae380da9e9d73a4c0243ae35aa60cfee57a9cdf3 Parents: ce207cb Author: Max Barnash Authored: Tue Jan 20 04:13:11 2015 +0700 Committer: Aleksey Yeschenko Committed: Tue Jan 20 00:36:36 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ src/java/org/apache/cassandra/tools/BulkLoader.java | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae380da9/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 54a6096..6604783 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,7 @@ +2.0.13: + * Round up time deltas lower than 1ms in BulkLoader (CASSANDRA-8645) + + 2.0.12: * Use more efficient slice size for querying internal secondary index tables (CASSANDRA-8550) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ae380da9/src/java/org/apache/cassandra/tools/BulkLoader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/BulkLoader.java b/src/java/org/apache/cassandra/tools/BulkLoader.java index 4077722..8e9cfb3 100644 --- a/src/java/org/apache/cassandra/tools/BulkLoader.java +++ b/src/java/org/apache/cassandra/tools/BulkLoader.java @@ -188,7 +188,7 @@ public class BulkLoader sb.append(" (").append(size == 0 ? 100L : current * 100L / size).append("%)] "); } long time = System.nanoTime(); - long deltaTime = TimeUnit.NANOSECONDS.toMillis(time - lastTime); + long deltaTime = Math.max(1L, TimeUnit.NANOSECONDS.toMillis(time - lastTime)); lastTime = time; long deltaProgress = totalProgress - lastProgress; lastProgress = totalProgress; @@ -204,7 +204,7 @@ public class BulkLoader private int mbPerSec(long bytes, long timeInMs) { double bytesPerMs = ((double)bytes) / timeInMs; - return (int)((bytesPerMs * 1000) / (1024 * 2024)); + return (int)((bytesPerMs * 1000) / (1024 * 1024)); } }