Merge branch 'b1.6' of github.com:datastax/spark-cassandra-connector …

…into b1.6
datastax · Jan 29, 2018 · 8ec266c · 8ec266c
2 parents b04a223 + e0acab6
commit 8ec266c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/spark-cassandra-connector/src/main/scala/com/datastax/spark/connector/rdd/ReadConf.scala b/spark-cassandra-connector/src/main/scala/com/datastax/spark/connector/rdd/ReadConf.scala
@@ -22,7 +22,7 @@ case class ReadConf(
   consistencyLevel: ConsistencyLevel = ReadConf.ConsistencyLevelParam.default,
   taskMetricsEnabled: Boolean = ReadConf.TaskMetricParam.default,
   throughputJoinQueryPerSec: Long = ReadConf.ThroughputJoinQueryPerSecParam.default,
-   parallelismLevel: Int = ReadConf.ParallelismLevelParam.default
+  parallelismLevel: Int = ReadConf.ParallelismLevelParam.default
 )
 
 
@@ -89,7 +89,8 @@ object ReadConf {
       consistencyLevel = ConsistencyLevel.valueOf(conf.get(ConsistencyLevelParam.name, ConsistencyLevelParam.default.name)),
       taskMetricsEnabled = conf.getBoolean(TaskMetricParam.name, TaskMetricParam.default),
       throughputJoinQueryPerSec = conf.getLong(ThroughputJoinQueryPerSecParam.name,
-        ThroughputJoinQueryPerSecParam.default)
+        ThroughputJoinQueryPerSecParam.default),
+      parallelismLevel = conf.getInt(ParallelismLevelParam.name, ParallelismLevelParam.default)
     )
   }