JAVA-2563 and JAVA-2564

build.sbt

@@ -4,20 +4,21 @@ val gatlingVersion = "2.3.0"
 
 scalacOptions += "-target:jvm-1.8"
 
-libraryDependencies += "com.datastax.dse"             %  "dse-java-driver-core"     % "1.6.8"
-libraryDependencies += "com.datastax.dse"             %  "dse-java-driver-graph"    % "1.6.8"
-libraryDependencies += "com.github.nscala-time"       %% "nscala-time"              % "2.18.0"
-libraryDependencies += "com.fasterxml.jackson.module" %% "jackson-module-scala"     % "2.9.1"
-libraryDependencies += "org.hdrhistogram"             %  "HdrHistogram"             % "2.1.10"
+libraryDependencies += "com.datastax.oss"             %  "java-driver-core"              % "4.5.0"
+libraryDependencies += "com.github.nscala-time"       %% "nscala-time"                   % "2.18.0"
+libraryDependencies += "com.fasterxml.jackson.module" %% "jackson-module-scala"          % "2.9.1"
+libraryDependencies += "org.hdrhistogram"             %  "HdrHistogram"                  % "2.1.10"
 
-libraryDependencies += "io.gatling.highcharts"        % "gatling-charts-highcharts" % gatlingVersion % Provided
+libraryDependencies += "io.gatling.highcharts"        % "gatling-charts-highcharts"      % gatlingVersion % Provided
+
+libraryDependencies += "org.fusesource"               %  "sigar"                         % "1.6.4"        % Test
+libraryDependencies += "org.scalatest"                %% "scalatest"                     % "3.0.5"        % Test
+libraryDependencies += "org.easymock"                 %  "easymock"                      % "3.5"          % Test
+libraryDependencies += "org.cassandraunit"            %  "cassandra-unit"                % "4.3.1.0"      % Test
+libraryDependencies += "org.pegdown"                  %  "pegdown"                       % "1.6.0"        % Test
+libraryDependencies += "com.typesafe.akka"            %% "akka-testkit"                  % "2.5.11"       % Test
+libraryDependencies += "com.datastax.oss"             %  "java-driver-query-builder"     % "4.4.0"        % Test
 
-libraryDependencies += "org.fusesource"               %  "sigar"                    % "1.6.4"        % Test
-libraryDependencies += "org.scalatest"                %% "scalatest"                % "3.0.5"        % Test
-libraryDependencies += "org.easymock"                 %  "easymock"                 % "3.5"          % Test
-libraryDependencies += "org.cassandraunit"            %  "cassandra-unit"           % "3.3.0.2"      % Test
-libraryDependencies += "org.pegdown"                  %  "pegdown"                  % "1.6.0"        % Test
-libraryDependencies += "com.typesafe.akka"            %% "akka-testkit"             % "2.5.11"       % Test
 
 resolvers += Resolver.mavenLocal
 resolvers += Resolver.mavenCentral

src/main/scala/com/datastax/gatling/plugin/DseProtocol.scala

@@ -11,10 +11,10 @@ import java.util.concurrent.atomic.AtomicLong
 
 import akka.Done
 import akka.actor.ActorSystem
-import com.datastax.driver.dse.DseSession
 import com.datastax.gatling.plugin.metrics.MetricsLogger
 import com.datastax.gatling.plugin.request.{CqlRequestActionBuilder, GraphRequestActionBuilder}
 import com.datastax.gatling.plugin.utils.GatlingTimingSource
+import com.datastax.oss.driver.api.core.CqlSession
 import com.typesafe.scalalogging.StrictLogging
 import io.gatling.core.CoreComponents
 import io.gatling.core.config.GatlingConfiguration
@@ -63,7 +63,7 @@ object DseProtocol extends StrictLogging {
   }
 }
 
-case class DseProtocol(session: DseSession) extends Protocol
+case class DseProtocol(session: CqlSession) extends Protocol
 
 object DseComponents {
   private val componentsCache = mutable.Map[ActorSystem, DseComponents]()
@@ -126,10 +126,10 @@ case class DseComponents(dseProtocol: DseProtocol,
 
 
 object DseProtocolBuilder {
-  def session(session: DseSession) = DseProtocolBuilder(session)
+  def session(session: CqlSession) = DseProtocolBuilder(session)
 }
 
-case class DseProtocolBuilder(session: DseSession) {
+case class DseProtocolBuilder(session: CqlSession) {
   def build = DseProtocol(session)
 }
 

src/main/scala/com/datastax/gatling/plugin/Predef.scala

@@ -36,9 +36,9 @@ trait DsePredefBase extends DseCheckSupport {
 
   implicit def protocolBuilder2DseProtocol(builder: DseProtocolBuilder): DseProtocol = builder.build
 
-  implicit def cqlRequestAttributes2ActionBuilder(builder: DseCqlAttributesBuilder): ActionBuilder = builder.build()
+  implicit def cqlRequestAttributes2ActionBuilder(builder: DseCqlAttributesBuilder[_,_]): ActionBuilder = builder.build()
 
-  implicit def graphRequestAttributes2ActionBuilder(builder: DseGraphAttributesBuilder): ActionBuilder = builder.build()
+  implicit def graphRequestAttributes2ActionBuilder(builder: DseGraphAttributesBuilder[_, _]): ActionBuilder = builder.build()
 }
 
 /**

src/main/scala/com/datastax/gatling/plugin/checks/CqlChecks.scala

@@ -6,16 +6,15 @@
 
 package com.datastax.gatling.plugin.checks
 
-import com.datastax.driver.core.{ResultSet, Row}
+import com.datastax.oss.driver.api.core.cql.{AsyncResultSet, Statement, StatementBuilder}
 import com.datastax.gatling.plugin.response.CqlResponse
 import io.gatling.commons.validation.{SuccessWrapper, Validation}
 import io.gatling.core.check._
-import io.gatling.core.check.extractor.{CountArity, CriterionExtractor, Extractor, FindAllArity, FindArity, SingleArity, _}
+import io.gatling.core.check.extractor.{Extractor, SingleArity}
 import io.gatling.core.session.{Expression, ExpressionSuccessWrapper, Session}
 
 import scala.collection.mutable
 
-
 /**
   * This class serves as model for the CQL-specific checks.
   *
@@ -51,50 +50,10 @@ private class CqlResponseExtractor[X](val name: String,
   }
 }
 
-private abstract class ColumnValueExtractor[X] extends CriterionExtractor[CqlResponse, Any, X] {
-  val criterionName = "columnValue"
-}
-
-private class SingleColumnValueExtractor(val criterion: String, val occurrence: Int) extends ColumnValueExtractor[Any] with FindArity {
-  def extract(response: CqlResponse): Validation[Option[Any]] =
-    response.getCqlResultColumnValues(criterion).lift(occurrence).success
-}
-
-private class MultipleColumnValueExtractor(val criterion: String) extends ColumnValueExtractor[Seq[Any]] with FindAllArity {
-  def extract(response: CqlResponse): Validation[Option[Seq[Any]]] =
-    response.getCqlResultColumnValues(criterion).liftSeqOption.success
-}
-
-private class CountColumnValueExtractor(val criterion: String) extends ColumnValueExtractor[Int] with CountArity {
-  def extract(response: CqlResponse): Validation[Option[Int]] =
-    response.getCqlResultColumnValues(criterion).liftSeqOption.map(_.size).success
-}
-
 object CqlChecks {
-  val resultSet =
-    new CqlResponseExtractor[ResultSet](
+  val resultSet:CqlCheckBuilder[AsyncResultSet] =
+    new CqlResponseExtractor[AsyncResultSet](
       "resultSet",
-      r => r.getCqlResultSet)
-      .toCheckBuilder
-
-  val allRows =
-    new CqlResponseExtractor[Seq[Row]](
-      "allRows",
-      r => r.getAllRows)
+      r => r.resultSet)
       .toCheckBuilder
-
-  val oneRow =
-    new CqlResponseExtractor[Row](
-      "oneRow",
-      r => r.getOneRow)
-      .toCheckBuilder
-
-  def columnValue(columnName: Expression[String]) = {
-    val cqlResponseExtender: Extender[DseCqlCheck, CqlResponse] = wrapped => DseCqlCheck(wrapped)
-    new DefaultMultipleFindCheckBuilder[DseCqlCheck, CqlResponse, CqlResponse, Any](cqlResponseExtender, x => x.success) {
-      def findExtractor(occurrence: Int) = columnName.map(new SingleColumnValueExtractor(_, occurrence))
-      def findAllExtractor = columnName.map(new MultipleColumnValueExtractor(_))
-      def countExtractor = columnName.map(new CountColumnValueExtractor(_))
-    }
-  }
 }

src/main/scala/com/datastax/gatling/plugin/checks/DseCheckSupport.scala

@@ -6,49 +6,75 @@
 
 package com.datastax.gatling.plugin.checks
 
-import io.gatling.core.session.ExpressionSuccessWrapper
+import com.datastax.dse.driver.api.core.graph.AsyncGraphResultSet
+import com.datastax.oss.driver.api.core.cql.AsyncResultSet
+import com.datastax.gatling.plugin.utils.ResultSetUtils
 
+/**
+  * Make both CQL and Graph checks available to the DSL.
+  *
+  * Note that as of 1.3.5 (and the upgrade to the unified OSS driver it brings along) the API here has changed.
+  * The old check API exposed a rich set of checks for various operations including row counts and validating
+  * data in individual rows.  Several (most?) of these checks were built on the idea that all rows were immediately
+  * available in memory.  This design has changed in 1.3.5, so maintaining the old API would've proven quite difficult
+  * (if not impossible).  Additionally, the rich API shields the user from the intricacies of the driver API at the
+  * cost of limited flexibility; implementing new functionality requires modifications to the plugin itself (or at
+  * least an awareness of it's innards).
+  *
+  * With 1.3.5 this relationship has been inverted.  The check API has been reduced to a single check which makes the
+  * underlying [[AsyncResultSet]] or [[AsyncGraphResultSet]] available.  Simulations can then use transform() to
+  * extract values and evaluate them as necessary.  So, for instance, something like this:
+  *
+  * {{{
+  * .check(columnValue("counter_type") is 2)
+  * }}}
+  *
+  * now becomes:
+  *
+  * {{{
+  * .check(resultSet.transform(rs => rs.one().getLong("counter_type")) is 2L)
+  * }}}
+  *
+  * Note that these transforms are now managed as Scala code within the simulations so they can be abstracted and
+  * built into libraries which can be re-used across simulations.  Also note that this abstraction can be implemented
+  * without modifying the plugin itself.
+  *
+  * A similar pattern applies to checks based on metadata.  So this:
+  *
+  * {{{
+  * .check(exhausted is true)
+  * }}}
+  *
+  * now becomes:
+  *
+  * {{{
+  * .check(resultSet.transform(_.hasMorePages) is false)
+  * .check(resultSet.transform(_.remaining) is 0)
+  * }}}
+  *
+  * At this point we should also note that checks are now explicitly executed in the order in which hey are declared
+  * in the simulation.  This matters because iterating through rows will impact methods such as remaining().  So, for
+  * example, if you want to validate that a single row was returned and it contained a specific value you should do
+  * something like:
+  *
+  * {{{
+  * .check(resultSet.transform(_.remaining) is 1)
+  * .check(resultSet.transform(rs => rs.one().getLong("counter_type")) is 2L)
+  * }}}
+  *
+  * and not:
+  *
+  * {{{
+  * .check(resultSet.transform(rs => rs.one().getLong("counter_type")) is 2L)
+  * .check(resultSet.transform(_.remaining) is 1)
+  * }}}
+  *
+  * Finally, in general the expectation is that you won't need to realize all rows in a result set, but if for some
+  * reason you find this necessary this functionality is supplied in [[ResultSetUtils]].  This class also serves as
+  * an example of the kind of abstraction over common extraction operations discussed above.
+  */
 trait DseCheckSupport {
 
-  // start global checks
-  lazy val exhausted = GenericChecks.exhausted
-  lazy val applied = GenericChecks.applied
-  lazy val rowCount = GenericChecks.rowCount
-
-  // execution info and subsets
-  lazy val executionInfo = GenericChecks.executionInfo
-  lazy val achievedCL = GenericChecks.achievedConsistencyLevel
-  lazy val pagingState = GenericChecks.pagingState
-  lazy val queriedHost = GenericChecks.queriedHost
-  lazy val schemaAgreement = GenericChecks.schemaInAgreement
-  lazy val successfulExecutionIndex = GenericChecks.successfulExecutionIndex
-  lazy val triedHosts = GenericChecks.triedHosts
-  lazy val warnings = GenericChecks.warnings
-
-  // start CQL only checks
   lazy val resultSet = CqlChecks.resultSet
-  lazy val allRows = CqlChecks.allRows
-  lazy val oneRow = CqlChecks.oneRow
-
-  // start Graph only checks
-  lazy val graphResultSet = GraphChecks.graphResultSet
-  lazy val allNodes = GraphChecks.allNodes
-  lazy val oneNode = GraphChecks.oneNode
-
-  def edges(columnName: String) = GraphChecks.edges(columnName)
-
-  def vertexes(columnName: String) = GraphChecks.vertexes(columnName)
-
-  def paths(columnName: String) = GraphChecks.paths(columnName)
-
-  def properties(columnName: String) = GraphChecks.paths(columnName)
-
-  def vertexProperties(columnName: String) = GraphChecks.vertexProperties(columnName)
-
-  /**
-    * Get a column by name returned by the CQL statement.
-    * Note that this statement implicitly fetches <b>all</b> rows from the result set!
-    */
-  def columnValue(columnName: String) = CqlChecks.columnValue(columnName.expressionSuccess)
+  lazy val graphResultSet = GraphChecks.resultSet
 }
-