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 2FECF17A7E for ; Wed, 4 Mar 2015 16:44:57 +0000 (UTC) Received: (qmail 39115 invoked by uid 500); 4 Mar 2015 16:44:56 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 38995 invoked by uid 500); 4 Mar 2015 16:44:56 -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 38923 invoked by uid 99); 4 Mar 2015 16:44:56 -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; Wed, 04 Mar 2015 16:44:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 94AE4E05DF; Wed, 4 Mar 2015 16:44:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benedict@apache.org To: commits@cassandra.apache.org Date: Wed, 04 Mar 2015 16:44:56 -0000 Message-Id: <2b70d647bd2946599ac75d1534eb5eae@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] cassandra git commit: cassandra-stress support for varint Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 a1e2978f9 -> 7712e0ef0 refs/heads/trunk 36bd31d05 -> a4221b721 cassandra-stress support for varint patch by sebastian estevez; reviewed by benedict for CASSANDRA-8882 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7712e0ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7712e0ef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7712e0ef Branch: refs/heads/cassandra-2.1 Commit: 7712e0ef071bcfd110bd67723589a4bf0e669c82 Parents: a1e2978 Author: Sebastian Estevez Authored: Wed Mar 4 16:44:14 2015 +0000 Committer: Benedict Elliott Smith Committed: Wed Mar 4 16:44:14 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/stress/StressProfile.java | 3 +- .../stress/generate/values/BigIntegers.java | 39 ++++++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7712e0ef/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 52f33b3..137c0f1 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -29,6 +29,7 @@ each IndexSummary opened from it (CASSANDRA-8757) * markCompacting only succeeds if the exact SSTableReader instances being marked are in the live set (CASSANDRA-8689) + * cassandra-stress support for varint (CASSANDRA-8882) Merged from 2.0: * Add offline tool to relevel sstables (CASSANDRA-8301) * Preserve stream ID for more protocol errors (CASSANDRA-8848) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7712e0ef/tools/stress/src/org/apache/cassandra/stress/StressProfile.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/StressProfile.java b/tools/stress/src/org/apache/cassandra/stress/StressProfile.java index 1517fcb..687b3ae 100644 --- a/tools/stress/src/org/apache/cassandra/stress/StressProfile.java +++ b/tools/stress/src/org/apache/cassandra/stress/StressProfile.java @@ -481,8 +481,9 @@ public class StressProfile implements Serializable case INET: return new Inets(name, config); case INT: - case VARINT: return new Integers(name, config); + case VARINT: + return new BigIntegers(name, config); case TIMESTAMP: return new Dates(name, config); case UUID: http://git-wip-us.apache.org/repos/asf/cassandra/blob/7712e0ef/tools/stress/src/org/apache/cassandra/stress/generate/values/BigIntegers.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/values/BigIntegers.java b/tools/stress/src/org/apache/cassandra/stress/generate/values/BigIntegers.java new file mode 100644 index 0000000..84a4c8f --- /dev/null +++ b/tools/stress/src/org/apache/cassandra/stress/generate/values/BigIntegers.java @@ -0,0 +1,39 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.cassandra.stress.generate.values; + +import org.apache.cassandra.db.marshal.IntegerType; + +import java.math.BigInteger; + +public class BigIntegers extends Generator +{ + public BigIntegers(String name, GeneratorConfig config) + { + super(IntegerType.instance, config, name, BigInteger.class); + } + + @Override + public BigInteger generate() + { + return BigInteger.valueOf(identityDistribution.next()); + } +}