Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6B3A1200B9C for ; Mon, 10 Oct 2016 15:52:24 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 69B6D160AF1; Mon, 10 Oct 2016 13:52:24 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B1E5C160ACA for ; Mon, 10 Oct 2016 15:52:23 +0200 (CEST) Received: (qmail 93913 invoked by uid 500); 10 Oct 2016 13:52:22 -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 93892 invoked by uid 99); 10 Oct 2016 13:52:22 -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, 10 Oct 2016 13:52:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9653FDFDEC; Mon, 10 Oct 2016 13:52:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jake@apache.org To: commits@cassandra.apache.org Date: Mon, 10 Oct 2016 13:52:22 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] cassandra git commit: Fix cassandra-stress to Use single seed in UUID generation archived-at: Mon, 10 Oct 2016 13:52:24 -0000 Repository: cassandra Updated Branches: refs/heads/cassandra-3.X 37551e99e -> 1bc736d93 refs/heads/trunk 03e2e0a17 -> 25a3759f1 Fix cassandra-stress to Use single seed in UUID generation Patch by Chris Splinter; reviewed by tjake for CASSANDRA-12729 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1bc736d9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1bc736d9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1bc736d9 Branch: refs/heads/cassandra-3.X Commit: 1bc736d9358c375542c8361afac4065515221ed9 Parents: 37551e9 Author: T Jake Luciani Authored: Mon Oct 10 09:50:29 2016 -0400 Committer: T Jake Luciani Committed: Mon Oct 10 09:50:29 2016 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../src/org/apache/cassandra/stress/generate/values/UUIDs.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bc736d9/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 06205df..f4dda82 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.10 + * Fix cassandra-stress to use single seed in UUID generation (CASSANDRA-12729) * CQLSSTableWriter does not allow Update statement (CASSANDRA-12450) * Config class uses boxed types but DD exposes primitive types (CASSANDRA-12199) * Add pre- and post-shutdown hooks to Storage Service (CASSANDRA-12461) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bc736d9/tools/stress/src/org/apache/cassandra/stress/generate/values/UUIDs.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/values/UUIDs.java b/tools/stress/src/org/apache/cassandra/stress/generate/values/UUIDs.java index faa58c6..b90bb74 100644 --- a/tools/stress/src/org/apache/cassandra/stress/generate/values/UUIDs.java +++ b/tools/stress/src/org/apache/cassandra/stress/generate/values/UUIDs.java @@ -34,6 +34,7 @@ public class UUIDs extends Generator @Override public UUID generate() { - return new UUID(identityDistribution.next(), identityDistribution.next()); + long seed = identityDistribution.next(); + return new UUID(seed, seed); } }