Skip to content

Commit 557ade5

Browse files
Fix Feature Test Errors
1 parent 1ce521d commit 557ade5

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

src/main/scala/com/datastax/cdm/job/BaseJob.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ abstract class BaseJob[T: ClassTag] extends App {
3232
var maxPartition: BigInteger = _
3333
var coveragePercent: Int = _
3434
var numSplits: Int = _
35+
var partitionFile: String = _
3536

3637
var parts: util.Collection[T] = _
3738
var slices: RDD[T] = _
@@ -69,8 +70,9 @@ abstract class BaseJob[T: ClassTag] extends App {
6970
maxPartition = getMaxPartition(propertyHelper.getString(KnownProperties.PARTITION_MAX), hasRandomPartitioner)
7071
coveragePercent = propertyHelper.getInteger(KnownProperties.TOKEN_COVERAGE_PERCENT)
7172
numSplits = propertyHelper.getInteger(KnownProperties.PERF_NUM_PARTS)
72-
if ("".equals(this.fileName)) {
73-
this.fileName = propertyHelper.getString(KnownProperties.PARTITIONS_TOKEN_RANGE_FILE)
73+
partitionFile = propertyHelper.getString(KnownProperties.PARTITIONS_TOKEN_RANGE_FILE)
74+
if (partitionFile.trim.nonEmpty && jobName.contains("Partitions from File")) {
75+
this.fileName = partitionFile
7476
}
7577
abstractLogger.info("PARAM -- Min Partition: " + minPartition)
7678
abstractLogger.info("PARAM -- Max Partition: " + maxPartition)

src/main/scala/com/datastax/cdm/job/DiffPartitionsFromFile.scala

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
package com.datastax.cdm.job
22

33
object DiffPartitionsFromFile extends BasePartitionJob {
4-
setup("Diff Partitions from File Job", new DiffJobSessionFactory())
5-
if ("".equals(this.fileName)) {
6-
abstractLogger.error("Please set conf for spark.input.partitionFile ")
7-
}
8-
else {
9-
execute()
10-
finish()
11-
}
4+
setup("Diff Partitions from File Job", new DiffJobSessionFactory(), "./partitions.csv")
5+
execute()
6+
finish()
127

138
override def execute(): Unit = {
149
slices.foreach(slice => {

0 commit comments

Comments
 (0)