git commit: remove seed from stress profile. cleanup yamls. ninja

2014-08-01 Thread jake
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1.0 463267372 - d667556d0


remove seed from stress profile. cleanup yamls. ninja


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d667556d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d667556d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d667556d

Branch: refs/heads/cassandra-2.1.0
Commit: d667556d060068a4a93e5331372b92468f0996d8
Parents: 4632673
Author: Jake Luciani j...@apache.org
Authored: Fri Aug 1 09:23:02 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Fri Aug 1 09:23:02 2014 -0400

--
 tools/cqlstress-counter-example.yaml|  7 +---
 tools/cqlstress-example.yaml|  8 +
 tools/cqlstress-insanity-example.yaml   | 18 +++
 .../apache/cassandra/stress/StressProfile.java  | 34 +++-
 .../org/apache/cassandra/stress/StressYaml.java |  1 -
 5 files changed, 25 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d667556d/tools/cqlstress-counter-example.yaml
--
diff --git a/tools/cqlstress-counter-example.yaml 
b/tools/cqlstress-counter-example.yaml
index a65080a..cff14b6 100644
--- a/tools/cqlstress-counter-example.yaml
+++ b/tools/cqlstress-counter-example.yaml
@@ -52,12 +52,11 @@ table_definition: |
 #
 #  If preceded by ~, the distribution is inverted
 #
-# Defaults for all columns are size: uniform(1..256), identity: 
uniform(1..1024)
+# Defaults for all columns are size: uniform(4..8), population: 
uniform(1..100B), cluster: fixed(1)
 #
 
 columnspec:
   - name: name
-clustering: uniform(1..100)
 size: uniform(1..4)
   - name: count
 population: fixed(1)
@@ -79,7 +78,3 @@ insert:
 queries:
simple1: select * from counttest where name = ?
 
-#
-# In order to generate data consistently we need something to generate a 
unique key for this schema profile.
-#
-seed: changing this string changes the generated data. its hashcode is used as 
the random seed.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d667556d/tools/cqlstress-example.yaml
--
diff --git a/tools/cqlstress-example.yaml b/tools/cqlstress-example.yaml
index a997529..d5c90a2 100644
--- a/tools/cqlstress-example.yaml
+++ b/tools/cqlstress-example.yaml
@@ -62,13 +62,12 @@ table_definition: |
 #
 #  If preceded by ~, the distribution is inverted
 #
-# Defaults for all columns are size: uniform(1..256), identity: 
uniform(1..1024)
+# Defaults for all columns are size: uniform(4..8), population: 
uniform(1..100B), cluster: fixed(1)
 #
 columnspec:
   - name: name
 size: uniform(1..10)
 population: uniform(1..1M) # the range of unique values to select for 
the field (default is 100Billion)
-  - name: choice
   - name: date
 cluster: uniform(1..4)
   - name: lval
@@ -92,8 +91,3 @@ insert:
 queries:
simple1: select * from typestest where name = ? and choice = ? LIMIT 100
range1: select * from typestest where name = ? and choice = ? and date = ? 
LIMIT 100
-
-#
-# In order to generate data consistently we need something to generate a 
unique key for this schema profile.
-#
-seed: changing this string changes the generated data. its hashcode is used as 
the random seed.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d667556d/tools/cqlstress-insanity-example.yaml
--
diff --git a/tools/cqlstress-insanity-example.yaml 
b/tools/cqlstress-insanity-example.yaml
index e94c9c3..ef1bb3a 100644
--- a/tools/cqlstress-insanity-example.yaml
+++ b/tools/cqlstress-insanity-example.yaml
@@ -64,26 +64,20 @@ table_definition: |
 #
 #  If preceded by ~, the distribution is inverted
 #
-# Defaults for all columns are size: uniform(1..256), population: 
uniform(1..100B)
+# Defaults for all columns are size: uniform(4..8), population: 
uniform(1..100B), cluster: fixed(1)
 #
 columnspec:
-  - name: name
-clustering: uniform(1..4)
   - name: date
-clustering: gaussian(1..20)
+cluster: gaussian(1..20)
   - name: lval
 population: fixed(1)
-  - name: dates
-clustering: uniform(1..100)
-  - name: inets
-clustering: uniform(1..200)
-  - name: value
+
 
 insert:
   partitions: fixed(1)# number of unique partitions to update in a 
single operation
   # if perbatch  1, multiple batches will be 
used but all partitions will
   # occur in all batches (unless already 
finished); only the row counts will vary
-  pervisit: uniform(1..10)/100K   # ratio of rows each partition should update 
in a single visit 

[1/2] git commit: remove seed from stress profile. cleanup yamls. ninja

2014-08-01 Thread jake
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 b407ebc89 - f5a1c374c


remove seed from stress profile. cleanup yamls. ninja


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d667556d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d667556d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d667556d

Branch: refs/heads/cassandra-2.1
Commit: d667556d060068a4a93e5331372b92468f0996d8
Parents: 4632673
Author: Jake Luciani j...@apache.org
Authored: Fri Aug 1 09:23:02 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Fri Aug 1 09:23:02 2014 -0400

--
 tools/cqlstress-counter-example.yaml|  7 +---
 tools/cqlstress-example.yaml|  8 +
 tools/cqlstress-insanity-example.yaml   | 18 +++
 .../apache/cassandra/stress/StressProfile.java  | 34 +++-
 .../org/apache/cassandra/stress/StressYaml.java |  1 -
 5 files changed, 25 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d667556d/tools/cqlstress-counter-example.yaml
--
diff --git a/tools/cqlstress-counter-example.yaml 
b/tools/cqlstress-counter-example.yaml
index a65080a..cff14b6 100644
--- a/tools/cqlstress-counter-example.yaml
+++ b/tools/cqlstress-counter-example.yaml
@@ -52,12 +52,11 @@ table_definition: |
 #
 #  If preceded by ~, the distribution is inverted
 #
-# Defaults for all columns are size: uniform(1..256), identity: 
uniform(1..1024)
+# Defaults for all columns are size: uniform(4..8), population: 
uniform(1..100B), cluster: fixed(1)
 #
 
 columnspec:
   - name: name
-clustering: uniform(1..100)
 size: uniform(1..4)
   - name: count
 population: fixed(1)
@@ -79,7 +78,3 @@ insert:
 queries:
simple1: select * from counttest where name = ?
 
-#
-# In order to generate data consistently we need something to generate a 
unique key for this schema profile.
-#
-seed: changing this string changes the generated data. its hashcode is used as 
the random seed.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d667556d/tools/cqlstress-example.yaml
--
diff --git a/tools/cqlstress-example.yaml b/tools/cqlstress-example.yaml
index a997529..d5c90a2 100644
--- a/tools/cqlstress-example.yaml
+++ b/tools/cqlstress-example.yaml
@@ -62,13 +62,12 @@ table_definition: |
 #
 #  If preceded by ~, the distribution is inverted
 #
-# Defaults for all columns are size: uniform(1..256), identity: 
uniform(1..1024)
+# Defaults for all columns are size: uniform(4..8), population: 
uniform(1..100B), cluster: fixed(1)
 #
 columnspec:
   - name: name
 size: uniform(1..10)
 population: uniform(1..1M) # the range of unique values to select for 
the field (default is 100Billion)
-  - name: choice
   - name: date
 cluster: uniform(1..4)
   - name: lval
@@ -92,8 +91,3 @@ insert:
 queries:
simple1: select * from typestest where name = ? and choice = ? LIMIT 100
range1: select * from typestest where name = ? and choice = ? and date = ? 
LIMIT 100
-
-#
-# In order to generate data consistently we need something to generate a 
unique key for this schema profile.
-#
-seed: changing this string changes the generated data. its hashcode is used as 
the random seed.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d667556d/tools/cqlstress-insanity-example.yaml
--
diff --git a/tools/cqlstress-insanity-example.yaml 
b/tools/cqlstress-insanity-example.yaml
index e94c9c3..ef1bb3a 100644
--- a/tools/cqlstress-insanity-example.yaml
+++ b/tools/cqlstress-insanity-example.yaml
@@ -64,26 +64,20 @@ table_definition: |
 #
 #  If preceded by ~, the distribution is inverted
 #
-# Defaults for all columns are size: uniform(1..256), population: 
uniform(1..100B)
+# Defaults for all columns are size: uniform(4..8), population: 
uniform(1..100B), cluster: fixed(1)
 #
 columnspec:
-  - name: name
-clustering: uniform(1..4)
   - name: date
-clustering: gaussian(1..20)
+cluster: gaussian(1..20)
   - name: lval
 population: fixed(1)
-  - name: dates
-clustering: uniform(1..100)
-  - name: inets
-clustering: uniform(1..200)
-  - name: value
+
 
 insert:
   partitions: fixed(1)# number of unique partitions to update in a 
single operation
   # if perbatch  1, multiple batches will be 
used but all partitions will
   # occur in all batches (unless already 
finished); only the row counts will vary
-  pervisit: uniform(1..10)/100K   # ratio of rows each partition should update 
in a single visit to 

[1/3] git commit: remove seed from stress profile. cleanup yamls. ninja

2014-08-01 Thread jake
Repository: cassandra
Updated Branches:
  refs/heads/trunk 24e1bc768 - 7633d9205


remove seed from stress profile. cleanup yamls. ninja


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d667556d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d667556d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d667556d

Branch: refs/heads/trunk
Commit: d667556d060068a4a93e5331372b92468f0996d8
Parents: 4632673
Author: Jake Luciani j...@apache.org
Authored: Fri Aug 1 09:23:02 2014 -0400
Committer: Jake Luciani j...@apache.org
Committed: Fri Aug 1 09:23:02 2014 -0400

--
 tools/cqlstress-counter-example.yaml|  7 +---
 tools/cqlstress-example.yaml|  8 +
 tools/cqlstress-insanity-example.yaml   | 18 +++
 .../apache/cassandra/stress/StressProfile.java  | 34 +++-
 .../org/apache/cassandra/stress/StressYaml.java |  1 -
 5 files changed, 25 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d667556d/tools/cqlstress-counter-example.yaml
--
diff --git a/tools/cqlstress-counter-example.yaml 
b/tools/cqlstress-counter-example.yaml
index a65080a..cff14b6 100644
--- a/tools/cqlstress-counter-example.yaml
+++ b/tools/cqlstress-counter-example.yaml
@@ -52,12 +52,11 @@ table_definition: |
 #
 #  If preceded by ~, the distribution is inverted
 #
-# Defaults for all columns are size: uniform(1..256), identity: 
uniform(1..1024)
+# Defaults for all columns are size: uniform(4..8), population: 
uniform(1..100B), cluster: fixed(1)
 #
 
 columnspec:
   - name: name
-clustering: uniform(1..100)
 size: uniform(1..4)
   - name: count
 population: fixed(1)
@@ -79,7 +78,3 @@ insert:
 queries:
simple1: select * from counttest where name = ?
 
-#
-# In order to generate data consistently we need something to generate a 
unique key for this schema profile.
-#
-seed: changing this string changes the generated data. its hashcode is used as 
the random seed.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d667556d/tools/cqlstress-example.yaml
--
diff --git a/tools/cqlstress-example.yaml b/tools/cqlstress-example.yaml
index a997529..d5c90a2 100644
--- a/tools/cqlstress-example.yaml
+++ b/tools/cqlstress-example.yaml
@@ -62,13 +62,12 @@ table_definition: |
 #
 #  If preceded by ~, the distribution is inverted
 #
-# Defaults for all columns are size: uniform(1..256), identity: 
uniform(1..1024)
+# Defaults for all columns are size: uniform(4..8), population: 
uniform(1..100B), cluster: fixed(1)
 #
 columnspec:
   - name: name
 size: uniform(1..10)
 population: uniform(1..1M) # the range of unique values to select for 
the field (default is 100Billion)
-  - name: choice
   - name: date
 cluster: uniform(1..4)
   - name: lval
@@ -92,8 +91,3 @@ insert:
 queries:
simple1: select * from typestest where name = ? and choice = ? LIMIT 100
range1: select * from typestest where name = ? and choice = ? and date = ? 
LIMIT 100
-
-#
-# In order to generate data consistently we need something to generate a 
unique key for this schema profile.
-#
-seed: changing this string changes the generated data. its hashcode is used as 
the random seed.

http://git-wip-us.apache.org/repos/asf/cassandra/blob/d667556d/tools/cqlstress-insanity-example.yaml
--
diff --git a/tools/cqlstress-insanity-example.yaml 
b/tools/cqlstress-insanity-example.yaml
index e94c9c3..ef1bb3a 100644
--- a/tools/cqlstress-insanity-example.yaml
+++ b/tools/cqlstress-insanity-example.yaml
@@ -64,26 +64,20 @@ table_definition: |
 #
 #  If preceded by ~, the distribution is inverted
 #
-# Defaults for all columns are size: uniform(1..256), population: 
uniform(1..100B)
+# Defaults for all columns are size: uniform(4..8), population: 
uniform(1..100B), cluster: fixed(1)
 #
 columnspec:
-  - name: name
-clustering: uniform(1..4)
   - name: date
-clustering: gaussian(1..20)
+cluster: gaussian(1..20)
   - name: lval
 population: fixed(1)
-  - name: dates
-clustering: uniform(1..100)
-  - name: inets
-clustering: uniform(1..200)
-  - name: value
+
 
 insert:
   partitions: fixed(1)# number of unique partitions to update in a 
single operation
   # if perbatch  1, multiple batches will be 
used but all partitions will
   # occur in all batches (unless already 
finished); only the row counts will vary
-  pervisit: uniform(1..10)/100K   # ratio of rows each partition should update 
in a single visit to the partition,
+