You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/30 19:31:58 UTC
git commit: Fixes data generation and system properties
Repository: incubator-usergrid
Updated Branches:
refs/heads/key-row-sharding fd4b22f3e -> 599d9e73c
Fixes data generation and system properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/599d9e73
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/599d9e73
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/599d9e73
Branch: refs/heads/key-row-sharding
Commit: 599d9e73c6e568271fc8bcfbfd7d73051577291c
Parents: fd4b22f
Author: Todd Nine <tn...@apigee.com>
Authored: Thu Oct 30 12:31:51 2014 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Thu Oct 30 12:31:51 2014 -0600
----------------------------------------------------------------------
stack/loadtests/pom.xml | 1 +
.../apache/usergrid/datagenerators/EntityDataGenerator.scala | 4 +++-
.../org/apache/usergrid/datagenerators/FeederGenerator.scala | 6 ++++--
3 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/599d9e73/stack/loadtests/pom.xml
----------------------------------------------------------------------
diff --git a/stack/loadtests/pom.xml b/stack/loadtests/pom.xml
index 53cf8bb..1da7105 100644
--- a/stack/loadtests/pom.xml
+++ b/stack/loadtests/pom.xml
@@ -148,6 +148,7 @@
<configuration>
<simulationsFolder>src/main/scala</simulationsFolder>
<simulationClass>org.apache.usergrid.simulations.PushNotificationTargetUserSimulation</simulationClass>
+ <propagateSystemProperties>true</propagateSystemProperties>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/599d9e73/stack/loadtests/src/main/scala/org/apache/usergrid/datagenerators/EntityDataGenerator.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/datagenerators/EntityDataGenerator.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/datagenerators/EntityDataGenerator.scala
index 5d1d8f6..b0a4771 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/datagenerators/EntityDataGenerator.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/datagenerators/EntityDataGenerator.scala
@@ -16,6 +16,8 @@
*/
package org.apache.usergrid.datagenerators
+ import java.util.UUID
+
import org.apache.usergrid.settings.Utils
import scala.collection.mutable.ArrayBuffer
@@ -41,7 +43,7 @@ object EntityDataGenerator {
def generateUser(userId: Int): Map[String,String] = {
- return Map("username" -> "user".concat(userId.toString),
+ return Map("username" -> "user".concat(userId.toString).concat(UUID.randomUUID().toString),
"profileId" -> Utils.generateRandomInt(10000, 1000000).toString,
"displayName" -> Utils.generateRandomInt(10000, 1000000).toString,
"showAge" -> Utils.generateRandomInt(0, 1).toString,
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/599d9e73/stack/loadtests/src/main/scala/org/apache/usergrid/datagenerators/FeederGenerator.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/datagenerators/FeederGenerator.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/datagenerators/FeederGenerator.scala
index 9f17900..03ba0f6 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/datagenerators/FeederGenerator.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/datagenerators/FeederGenerator.scala
@@ -16,7 +16,9 @@
*/
package org.apache.usergrid.datagenerators
-import io.gatling.core.Predef._
+ import java.util.UUID
+
+ import io.gatling.core.Predef._
import org.apache.usergrid.settings.Utils
import scala.collection.mutable.ArrayBuffer
@@ -92,7 +94,7 @@ object FeederGenerator {
var nameArray: ArrayBuffer[Map[String, String]] = new ArrayBuffer[Map[String, String]]
for (entityCount <- 1 to numEntities) {
- nameArray += Map("entityName" -> prefix.concat(entityCount.toString))
+ nameArray += Map("entityName" -> prefix.concat(entityCount.toString).concat(UUID.randomUUID().toString))
}
return nameArray.toArray