Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

ByteArrayBody + Redis Feed #551

Merged
merged 1 commit into from

2 participants

@krishnenc

Byte Array Body
Redis Feed

Usage :
https://gist.github.com/2888230
https://gist.github.com/2888208

Please review and let me know if any modifications required

@slandelle slandelle merged commit 99695c3 into gatling:master
@slandelle slandelle referenced this pull request from a commit
@slandelle slandelle Clean up after #551 pull request c522692
@slandelle slandelle commented on the diff
.../com/excilys/ebi/gatling/redis/util/RedisHelper.scala
((15 lines not shown))
+ */
+package com.excilys.ebi.gatling.core.feeder.redis.util
+
+object RedisHelper {
+
+ /*
+ Generate Redis protocol required for mass insert
+ i.e generateRedisProtocol("LPUSH", "SIM", "SOMETHING COOL!")
+ */
+ def generateRedisProtocol(d: String*) = {
+ var protocol = ""
+ val length = d.toList.length
+ protocol = "*" + length + "\r\n"
+ d.toList map {
+ case x =>
+ protocol = protocol + "$" + x.length + "\r\n" + x + "\r\n"
@slandelle Owner

I've never used Redis, but \r\n seems OS specific.
Shouldn't we use StringHelper.END_OF_LINE (ie System.getProperty("line.separator")) here?

I think the protocol (http://redis.io/topics/protocol) is OS independent.
The client hardcodes the line ending as well: https://github.com/debasishg/scala-redis/blob/master/src/main/scala/com/redis/RedisProtocol.scala#L17
However i will make a test on a Windows box on Monday to verify.
I will try to send a few unit tests for these changes as well.
Thks,
Krishnen

@slandelle Owner

"\r\n" is typically Windows, so if your code runs on an X-platform, it should be fine, don't bother.

Do you think you could also write a few lines on the Feeders wiki page when we'll do the release?
https://github.com/excilys/gatling/wiki/Feeders

Thanks again!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@krishnenc

No pb will do that. When are you planning the next release?

@slandelle
Owner

Hopefully at the end of the week.

@krishnenc

Hi Stephane,

I've added a few lines in my version of the wiki :

https://github.com/krishnenc/gatling/wiki/Feeders#wiki-redis
https://github.com/krishnenc/gatling/wiki/HTTP (Under section Method specific methods)

How do we go about to merge it into yours?

Cheers,
Krishnen

@slandelle
Owner

Good question, let me check this.
BTW, I renamed redisfeed into redisFeeder in Predef in order to be consistant with other feeders.

Thanks!

Stephane

@krishnenc

OK cool , I've updated the example to reflect this change as well.

@nremond nremond referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@nremond nremond referenced this pull request from a commit
Commit has since been removed from the repository and is no longer available.
@slandelle slandelle was assigned
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jun 8, 2012
  1. @krishnenc
This page is out of date. Refresh to see the latest.
View
4 gatling-app/pom.xml
@@ -21,6 +21,10 @@
</dependency>
<dependency>
<groupId>com.excilys.ebi.gatling</groupId>
+ <artifactId>gatling-redis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.excilys.ebi.gatling</groupId>
<artifactId>gatling-charts</artifactId>
</dependency>
<dependency>
View
6 gatling-core/pom.xml
@@ -64,7 +64,11 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-math3</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>net.debasishg</groupId>
+ <artifactId>redisclient_2.9.1</artifactId>
+ <version>2.5</version>
+ </dependency>
<!-- CSSelly : used for implementing the CSS checks -->
<dependency>
<groupId>org.jodd</groupId>
View
8 gatling-http/src/main/scala/com/excilys/ebi/gatling/http/request/HttpRequestBody.scala
@@ -43,3 +43,11 @@ case class FilePathBody(filePath: String) extends HttpRequestBody
* @param values the values that will be merged in the template
*/
case class TemplateBody(tplPath: String, values: Map[String, EvaluatableString]) extends HttpRequestBody
+
+/**
+ * Wraps a body that is a Byte Array
+ *
+ * @param byteArray the callback function that returns the Array[Byte] for the body
+*/
+case class ByteArrayBody(byteArray : () => Array[Byte]) extends HttpRequestBody
+
View
17 ...ttp/src/main/scala/com/excilys/ebi/gatling/http/request/builder/AbstractHttpRequestWithBodyBuilder.scala
@@ -30,7 +30,7 @@ import com.excilys.ebi.gatling.core.util.StringHelper.parseEvaluatable
import com.excilys.ebi.gatling.http.check.HttpCheck
import com.excilys.ebi.gatling.http.config.HttpProtocolConfiguration
import com.excilys.ebi.gatling.http.request.builder.AbstractHttpRequestWithBodyBuilder.TEMPLATE_ENGINE
-import com.excilys.ebi.gatling.http.request.{ TemplateBody, StringBody, HttpRequestBody, FilePathBody }
+import com.excilys.ebi.gatling.http.request.{ TemplateBody, StringBody,ByteArrayBody, HttpRequestBody, FilePathBody }
import com.ning.http.client.{ RequestBuilder, Realm }
object AbstractHttpRequestWithBodyBuilder {
@@ -123,6 +123,14 @@ abstract class AbstractHttpRequestWithBodyBuilder[B <: AbstractHttpRequestWithBo
}
/**
+ * Adds a body from a byteArray to the request
+ *
+ * @param byteArray - The callback function which returns the ByteArray from which to build the body
+ */
+ def byteArrayBody(byteArray: () => Array[Byte]): B = newInstance(requestName, url, queryParams, headers, Some(ByteArrayBody(byteArray)), realm, checks)
+
+
+ /**
* This method adds the body to the request builder
*
* @param requestBuilder the request builder to which the body should be added
@@ -136,6 +144,11 @@ abstract class AbstractHttpRequestWithBodyBuilder[B <: AbstractHttpRequestWithBo
case FilePathBody(filePath) => requestBuilder.setBody((GatlingFiles.requestBodiesFolder / filePath).jfile)
case StringBody(body) => requestBuilder.setBody(body(session))
case TemplateBody(tplPath, values) => requestBuilder.setBody(compileBody(tplPath, values, session))
+ case ByteArrayBody(byteArray) =>
+ val body = byteArray()
+ requestBuilder.setBody(body)
+ requestBuilder.setHeader("Content-Length",
+ body.length.toString)
case _ =>
}
case None =>
@@ -156,4 +169,4 @@ abstract class AbstractHttpRequestWithBodyBuilder[B <: AbstractHttpRequestWithBo
TEMPLATE_ENGINE.layout(tplPath + SSP_EXTENSION, templateValues, bindings)
}
-}
+}
View
27 gatling-redis/pom.xml
@@ -0,0 +1,27 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>gatling-parent</artifactId>
+ <groupId>com.excilys.ebi.gatling</groupId>
+ <version>1.2.2-SNAPSHOT</version>
+ </parent>
+ <artifactId>gatling-redis</artifactId>
+ <name>${project.artifactId}</name>
+ <description>Gatling Redis functionalities</description>
+
+ <dependencies>
+ <!-- compile -->
+ <dependency>
+ <groupId>com.excilys.ebi.gatling</groupId>
+ <artifactId>gatling-core</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
View
202 gatling-redis/src/main/resources/META-INF/LICENCE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
View
22 gatling-redis/src/main/scala/com/excilys/ebi/gatling/redis/Predef.scala
@@ -0,0 +1,22 @@
+/**
+ * Copyright 2011-2012 eBusiness Information, Groupe Excilys (www.excilys.com)
+ *
+ * Licensed 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 com.excilys.ebi.gatling.redis
+import com.excilys.ebi.gatling.redis.feeder.RedisFeederBuilder
+import com.redis.RedisClientPool
+
+object Predef {
+ def redisfeed(clients: RedisClientPool, key: String) = RedisFeederBuilder.redisFeeder(clients, key)
+}
View
36 gatling-redis/src/main/scala/com/excilys/ebi/gatling/redis/feeder/RedisBasedFeederBuilder.scala
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2011-2012 eBusiness Information, Groupe Excilys (www.excilys.com)
+ *
+ * Licensed 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 com.excilys.ebi.gatling.redis.feeder
+
+
+object RedisBasedFeederBuilder {
+ implicit def redisFeederBuilderToFeeder(builder: RedisBasedFeederBuilder[_]) = builder.queue
+}
+
+abstract class RedisBasedFeederBuilder[B <: RedisSource] {
+
+ protected def source: B
+
+ //With LPOP
+ def queue = new RedisQueueFeeder(source)
+
+ //With SRAND
+ //def random = new RedisRandomFeeder(source)
+
+ //With Redis Lists RPOPLPUSH ??
+ //def circular = new RedisCircularFeeder(source)
+}
+
View
29 gatling-redis/src/main/scala/com/excilys/ebi/gatling/redis/feeder/RedisFeederBuilder.scala
@@ -0,0 +1,29 @@
+/**
+ * Copyright 2011-2012 eBusiness Information, Groupe Excilys (www.excilys.com)
+ *
+ * Licensed 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 com.excilys.ebi.gatling.redis.feeder
+
+import com.excilys.ebi.gatling.core.feeder.SourceBasedFeederBuilder
+import com.redis.RedisClientPool
+
+object RedisFeederBuilder {
+ def redisFeeder(clients : RedisClientPool, key: String) = new RedisFeederBuilder(clients, key)
+}
+
+class RedisFeederBuilder(clients : RedisClientPool, key: String) extends RedisBasedFeederBuilder[RedisFeederSource] {
+ protected lazy val source = new RedisFeederSource(clients, key)
+}
+
+
View
23 gatling-redis/src/main/scala/com/excilys/ebi/gatling/redis/feeder/RedisFeederSource.scala
@@ -0,0 +1,23 @@
+/**
+ * Copyright 2011-2012 eBusiness Information, Groupe Excilys (www.excilys.com)
+ *
+ * Licensed 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 com.excilys.ebi.gatling.redis.feeder
+
+import com.redis.RedisClientPool
+
+class RedisFeederSource(_clientPool : RedisClientPool, _key: String) extends RedisSource {
+ lazy val key: String = _key
+ lazy val clientPool : RedisClientPool = _clientPool
+}
View
39 gatling-redis/src/main/scala/com/excilys/ebi/gatling/redis/feeder/RedisQueueFeeder.scala
@@ -0,0 +1,39 @@
+/**
+ * Copyright 2011-2012 eBusiness Information, Groupe Excilys (www.excilys.com)
+ *
+ * Licensed 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 com.excilys.ebi.gatling.redis.feeder
+
+import com.excilys.ebi.gatling.core.feeder.Feeder
+import com.redis.RedisClientPool
+import com.redis._
+import serialization._
+import com.excilys.ebi.gatling.core.action.system
+import grizzled.slf4j.Logging
+
+class RedisQueueFeeder(feederSource: RedisSource) extends Feeder with Logging {
+
+ def next: Map[String, String] = {
+ feederSource.clientPool.withClient {
+ client =>
+ val value = client.lpop(feederSource.key).getOrElse {
+ error("There are not enough records in the feeder '" + feederSource.key + "'.\nPlease add records or use another feeder strategy.\nStopping simulation here...")
+ feederSource.clientPool.pool.close
+ system.shutdown
+ sys.exit
+ }
+ Map(feederSource.key -> value)
+ }
+ }
+}
View
23 gatling-redis/src/main/scala/com/excilys/ebi/gatling/redis/feeder/RedisSource.scala
@@ -0,0 +1,23 @@
+/**
+ * Copyright 2011-2012 eBusiness Information, Groupe Excilys (www.excilys.com)
+ *
+ * Licensed 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 com.excilys.ebi.gatling.redis.feeder
+
+import com.redis.RedisClientPool
+
+abstract class RedisSource {
+ def key: String
+ def clientPool : RedisClientPool
+}
View
35 gatling-redis/src/main/scala/com/excilys/ebi/gatling/redis/util/RedisHelper.scala
@@ -0,0 +1,35 @@
+/**
+ * Copyright 2011-2012 eBusiness Information, Groupe Excilys (www.excilys.com)
+ *
+ * Licensed 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 com.excilys.ebi.gatling.core.feeder.redis.util
+
+object RedisHelper {
+
+ /*
+ Generate Redis protocol required for mass insert
+ i.e generateRedisProtocol("LPUSH", "SIM", "SOMETHING COOL!")
+ */
+ def generateRedisProtocol(d: String*) = {
+ var protocol = ""
+ val length = d.toList.length
+ protocol = "*" + length + "\r\n"
+ d.toList map {
+ case x =>
+ protocol = protocol + "$" + x.length + "\r\n" + x + "\r\n"
@slandelle Owner

I've never used Redis, but \r\n seems OS specific.
Shouldn't we use StringHelper.END_OF_LINE (ie System.getProperty("line.separator")) here?

I think the protocol (http://redis.io/topics/protocol) is OS independent.
The client hardcodes the line ending as well: https://github.com/debasishg/scala-redis/blob/master/src/main/scala/com/redis/RedisProtocol.scala#L17
However i will make a test on a Windows box on Monday to verify.
I will try to send a few unit tests for these changes as well.
Thks,
Krishnen

@slandelle Owner

"\r\n" is typically Windows, so if your code runs on an X-platform, it should be fine, don't bother.

Do you think you could also write a few lines on the Feeders wiki page when we'll do the release?
https://github.com/excilys/gatling/wiki/Feeders

Thanks again!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+ }
+ protocol
+ }
+
+}
View
6 pom.xml
@@ -9,6 +9,7 @@
<modules>
<module>gatling-core</module>
<module>gatling-jdbc</module>
+ <module>gatling-redis</module>
<module>gatling-http</module>
<module>gatling-app</module>
<module>gatling-recorder</module>
@@ -140,6 +141,11 @@
</dependency>
<dependency>
<groupId>com.excilys.ebi.gatling</groupId>
+ <artifactId>gatling-redis</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.excilys.ebi.gatling</groupId>
<artifactId>gatling-app</artifactId>
<version>${project.version}</version>
</dependency>
Something went wrong with that request. Please try again.