You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2011/04/01 17:19:39 UTC
svn commit: r1087745 - in
/cassandra/trunk/tools/stress/src/org/apache/cassandra: contrib/stress/
contrib/stress/operations/ contrib/stress/util/ stress/ stress/operations/
stress/util/
Author: jbellis
Date: Fri Apr 1 15:19:38 2011
New Revision: 1087745
URL: http://svn.apache.org/viewvc?rev=1087745&view=rev
Log:
move stress package from o.a.c.contrib to o.a.c
Added:
cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/
cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/Session.java
- copied, changed from r1087744, cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/Session.java
cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/Stress.java
- copied, changed from r1087744, cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/Stress.java
cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/
cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/CounterAdder.java
- copied, changed from r1087744, cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/CounterAdder.java
cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/CounterGetter.java
- copied, changed from r1087744, cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/CounterGetter.java
cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/IndexedRangeSlicer.java
- copied, changed from r1087744, cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/IndexedRangeSlicer.java
cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/Inserter.java
- copied, changed from r1087744, cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/Inserter.java
cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/MultiGetter.java
- copied, changed from r1087744, cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/MultiGetter.java
cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/RangeSlicer.java
- copied, changed from r1087744, cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/RangeSlicer.java
cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/Reader.java
- copied, changed from r1087744, cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/Reader.java
cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/util/
cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/util/Operation.java
- copied, changed from r1087744, cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/util/Operation.java
Removed:
cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/Session.java
cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/Stress.java
cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/CounterAdder.java
cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/CounterGetter.java
cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/IndexedRangeSlicer.java
cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/Inserter.java
cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/MultiGetter.java
cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/RangeSlicer.java
cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/Reader.java
cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/util/Operation.java
Copied: cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/Session.java (from r1087744, cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/Session.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/Session.java?p2=cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/Session.java&p1=cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/Session.java&r1=1087744&r2=1087745&rev=1087745&view=diff
==============================================================================
--- cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/Session.java (original)
+++ cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/Session.java Fri Apr 1 15:19:38 2011
@@ -15,10 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cassandra.contrib.stress;
+package org.apache.cassandra.stress;
import java.io.*;
-import java.nio.ByteBuffer;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
Copied: cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/Stress.java (from r1087744, cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/Stress.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/Stress.java?p2=cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/Stress.java&p1=cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/Stress.java&r1=1087744&r2=1087745&rev=1087745&view=diff
==============================================================================
--- cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/Stress.java (original)
+++ cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/Stress.java Fri Apr 1 15:19:38 2011
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cassandra.contrib.stress;
+package org.apache.cassandra.stress;
-import org.apache.cassandra.contrib.stress.operations.*;
-import org.apache.cassandra.contrib.stress.util.Operation;
+import org.apache.cassandra.stress.operations.*;
+import org.apache.cassandra.stress.util.Operation;
import org.apache.cassandra.thrift.Cassandra;
import org.apache.commons.cli.Option;
Copied: cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/CounterAdder.java (from r1087744, cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/CounterAdder.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/CounterAdder.java?p2=cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/CounterAdder.java&p1=cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/CounterAdder.java&r1=1087744&r2=1087745&rev=1087745&view=diff
==============================================================================
--- cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/CounterAdder.java (original)
+++ cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/CounterAdder.java Fri Apr 1 15:19:38 2011
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cassandra.contrib.stress.operations;
+package org.apache.cassandra.stress.operations;
-import org.apache.cassandra.contrib.stress.util.Operation;
+import org.apache.cassandra.stress.util.Operation;
import org.apache.cassandra.db.ColumnFamilyType;
import org.apache.cassandra.thrift.*;
import org.apache.cassandra.utils.ByteBufferUtil;
Copied: cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/CounterGetter.java (from r1087744, cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/CounterGetter.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/CounterGetter.java?p2=cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/CounterGetter.java&p1=cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/CounterGetter.java&r1=1087744&r2=1087745&rev=1087745&view=diff
==============================================================================
--- cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/CounterGetter.java (original)
+++ cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/CounterGetter.java Fri Apr 1 15:19:38 2011
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cassandra.contrib.stress.operations;
+package org.apache.cassandra.stress.operations;
-import org.apache.cassandra.contrib.stress.util.Operation;
+import org.apache.cassandra.stress.util.Operation;
import org.apache.cassandra.db.ColumnFamilyType;
import org.apache.cassandra.thrift.*;
Copied: cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/IndexedRangeSlicer.java (from r1087744, cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/IndexedRangeSlicer.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/IndexedRangeSlicer.java?p2=cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/IndexedRangeSlicer.java&p1=cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/IndexedRangeSlicer.java&r1=1087744&r2=1087745&rev=1087745&view=diff
==============================================================================
--- cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/IndexedRangeSlicer.java (original)
+++ cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/IndexedRangeSlicer.java Fri Apr 1 15:19:38 2011
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cassandra.contrib.stress.operations;
+package org.apache.cassandra.stress.operations;
-import org.apache.cassandra.contrib.stress.util.Operation;
+import org.apache.cassandra.stress.util.Operation;
import org.apache.cassandra.thrift.*;
import org.apache.cassandra.utils.ByteBufferUtil;
Copied: cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/Inserter.java (from r1087744, cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/Inserter.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/Inserter.java?p2=cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/Inserter.java&p1=cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/Inserter.java&r1=1087744&r2=1087745&rev=1087745&view=diff
==============================================================================
--- cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/Inserter.java (original)
+++ cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/Inserter.java Fri Apr 1 15:19:38 2011
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cassandra.contrib.stress.operations;
+package org.apache.cassandra.stress.operations;
-import org.apache.cassandra.contrib.stress.util.Operation;
+import org.apache.cassandra.stress.util.Operation;
import org.apache.cassandra.db.ColumnFamilyType;
import org.apache.cassandra.thrift.*;
import org.apache.cassandra.utils.ByteBufferUtil;
Copied: cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/MultiGetter.java (from r1087744, cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/MultiGetter.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/MultiGetter.java?p2=cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/MultiGetter.java&p1=cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/MultiGetter.java&r1=1087744&r2=1087745&rev=1087745&view=diff
==============================================================================
--- cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/MultiGetter.java (original)
+++ cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/MultiGetter.java Fri Apr 1 15:19:38 2011
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cassandra.contrib.stress.operations;
+package org.apache.cassandra.stress.operations;
-import org.apache.cassandra.contrib.stress.util.Operation;
+import org.apache.cassandra.stress.util.Operation;
import org.apache.cassandra.db.ColumnFamilyType;
import org.apache.cassandra.thrift.*;
import org.apache.cassandra.utils.ByteBufferUtil;
Copied: cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/RangeSlicer.java (from r1087744, cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/RangeSlicer.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/RangeSlicer.java?p2=cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/RangeSlicer.java&p1=cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/RangeSlicer.java&r1=1087744&r2=1087745&rev=1087745&view=diff
==============================================================================
--- cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/RangeSlicer.java (original)
+++ cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/RangeSlicer.java Fri Apr 1 15:19:38 2011
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cassandra.contrib.stress.operations;
+package org.apache.cassandra.stress.operations;
-import org.apache.cassandra.contrib.stress.util.Operation;
+import org.apache.cassandra.stress.util.Operation;
import org.apache.cassandra.db.ColumnFamilyType;
import org.apache.cassandra.thrift.*;
import org.apache.cassandra.utils.ByteBufferUtil;
Copied: cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/Reader.java (from r1087744, cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/Reader.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/Reader.java?p2=cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/Reader.java&p1=cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/Reader.java&r1=1087744&r2=1087745&rev=1087745&view=diff
==============================================================================
--- cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/operations/Reader.java (original)
+++ cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/operations/Reader.java Fri Apr 1 15:19:38 2011
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cassandra.contrib.stress.operations;
+package org.apache.cassandra.stress.operations;
-import org.apache.cassandra.contrib.stress.util.Operation;
+import org.apache.cassandra.stress.util.Operation;
import org.apache.cassandra.db.ColumnFamilyType;
import org.apache.cassandra.thrift.*;
Copied: cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/util/Operation.java (from r1087744, cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/util/Operation.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/util/Operation.java?p2=cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/util/Operation.java&p1=cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/util/Operation.java&r1=1087744&r2=1087745&rev=1087745&view=diff
==============================================================================
--- cassandra/trunk/tools/stress/src/org/apache/cassandra/contrib/stress/util/Operation.java (original)
+++ cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/util/Operation.java Fri Apr 1 15:19:38 2011
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.cassandra.contrib.stress.util;
+package org.apache.cassandra.stress.util;
import java.io.IOException;
import java.math.BigInteger;
@@ -27,8 +27,8 @@ import java.util.Random;
import static com.google.common.base.Charsets.UTF_8;
-import org.apache.cassandra.contrib.stress.Session;
-import org.apache.cassandra.contrib.stress.Stress;
+import org.apache.cassandra.stress.Session;
+import org.apache.cassandra.stress.Stress;
import org.apache.cassandra.thrift.Cassandra;
import org.apache.cassandra.thrift.InvalidRequestException;
import org.apache.cassandra.utils.FBUtilities;