From f4ecf5a6042a8d897ec282e0275fc0bcc342538f Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Tue, 4 Oct 2011 13:51:42 +0000 Subject: [PATCH] merge from 0.8 git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-1.0.0@1178787 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 1 + .../org/apache/cassandra/stress/operations/CounterGetter.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index d2b167c8b8..4dfa96fcbc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -10,6 +10,7 @@ * (Hadoop) allow wrapping ranges in queries (CASSANDRA-3137) * (Hadoop) check all interfaces for a match with split location before falling back to random replica (CASSANDRA-3211) + * Fix stress COUNTER_GET option (CASSANDRA-3301) 1.0.0-rc2 diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/CounterGetter.java b/tools/stress/src/org/apache/cassandra/stress/operations/CounterGetter.java index 4c74aee414..3d8b1fdf89 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/CounterGetter.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/CounterGetter.java @@ -64,7 +64,7 @@ public class CounterGetter extends Operation for (int j = 0; j < session.getSuperColumns(); j++) { String superColumn = 'S' + Integer.toString(j); - ColumnParent parent = new ColumnParent("CounterSuper1").setSuper_column(superColumn.getBytes()); + ColumnParent parent = new ColumnParent("SuperCounter1").setSuper_column(superColumn.getBytes()); long start = System.currentTimeMillis();