Skip to content

Commit c07b405

Browse files
tgravescstgravescs
committed
remove explicit getters from ResourceInformation
1 parent d2ed08f commit c07b405

File tree

4 files changed

+47
-53
lines changed

4 files changed

+47
-53
lines changed

‎core/src/main/scala/org/apache/spark/ResourceInformation.scala‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,7 @@ import org.apache.spark.annotation.Evolving
3535
*/
3636
@Evolving
3737
case class ResourceInformation(
38-
private val name: String,
39-
private val units: String,
40-
private val count: Long,
41-
private val addresses: Array[String] = Array.empty) {
42-
43-
def getName(): String = name
44-
def getUnits(): String = units
45-
def getCount(): Long = count
46-
def getAddresses(): Array[String] = addresses
47-
}
38+
val name: String,
39+
val units: String,
40+
val count: Long,
41+
val addresses: Array[String] = Array.empty)

‎core/src/main/scala/org/apache/spark/executor/CoarseGrainedExecutorBackend.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ private[spark] class CoarseGrainedExecutorBackend(
9191
val source = new BufferedInputStream(new FileInputStream(resourceFileStr))
9292
val resourceMap = try {
9393
val parsedJson = parse(source).asInstanceOf[JArray].arr
94-
parsedJson.map(_.extract[ResourceInformation]).map(x => (x.getName() -> x)).toMap
94+
parsedJson.map(_.extract[ResourceInformation]).map(x => (x.name -> x)).toMap
9595
} catch {
9696
case e @ (_: MappingException | _: MismatchedInputException | _: ClassCastException) =>
9797
throw new SparkException(
@@ -111,8 +111,8 @@ private[spark] class CoarseGrainedExecutorBackend(
111111
logDebug("===============================================================================")
112112
logDebug("Executor Resources:")
113113
resources.foreach{ case (k, v) =>
114-
logDebug(s"$k -> [name: ${v.getName}, units: ${v.getUnits}, count: ${v.getCount}," +
115-
s" addresses: ${v.getAddresses().deep}]")}
114+
logDebug(s"$k -> [name: ${v.name}, units: ${v.units}, count: ${v.count}," +
115+
s" addresses: ${v.addresses.deep}]")}
116116
logDebug("===============================================================================")
117117
}
118118
resources

‎core/src/test/scala/org/apache/spark/ResourceDiscovererSuite.scala‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ class ResourceDiscovererSuite extends SparkFunSuite
5454
val resources = ResourceDiscoverer.findResources(sparkconf, false)
5555
val gpuValue = resources.get("gpu")
5656
assert(gpuValue.nonEmpty, "Should have a gpu entry")
57-
assert(gpuValue.get.getCount() == 2, "Should have 2")
58-
assert(gpuValue.get.getName() == "gpu", "name should be gpu")
59-
assert(gpuValue.get.getUnits() == "", "units should be empty")
60-
assert(gpuValue.get.getAddresses().size == 2, "Should have 2 indexes")
61-
assert(gpuValue.get.getAddresses().deep == Array("0", "1").deep, "should have 0,1 entries")
57+
assert(gpuValue.get.count == 2, "Should have 2")
58+
assert(gpuValue.get.name == "gpu", "name should be gpu")
59+
assert(gpuValue.get.units == "", "units should be empty")
60+
assert(gpuValue.get.addresses.size == 2, "Should have 2 indexes")
61+
assert(gpuValue.get.addresses.deep == Array("0", "1").deep, "should have 0,1 entries")
6262
}
6363
}
6464

@@ -76,10 +76,10 @@ class ResourceDiscovererSuite extends SparkFunSuite
7676
val resources = ResourceDiscoverer.findResources(sparkconf, false)
7777
val gpuValue = resources.get("gpu")
7878
assert(gpuValue.nonEmpty, "Should have a gpu entry")
79-
assert(gpuValue.get.getCount() == 2, "Should have 2")
80-
assert(gpuValue.get.getName() == "gpu", "name should be gpu")
81-
assert(gpuValue.get.getUnits() == "", "units should be empty")
82-
assert(gpuValue.get.getAddresses().size == 0, "Should have 0 indexes")
79+
assert(gpuValue.get.count == 2, "Should have 2")
80+
assert(gpuValue.get.name == "gpu", "name should be gpu")
81+
assert(gpuValue.get.units == "", "units should be empty")
82+
assert(gpuValue.get.addresses.size == 0, "Should have 0 indexes")
8383
}
8484
}
8585

@@ -146,19 +146,19 @@ class ResourceDiscovererSuite extends SparkFunSuite
146146
assert(resources.size === 2)
147147
val gpuValue = resources.get("gpu")
148148
assert(gpuValue.nonEmpty, "Should have a gpu entry")
149-
assert(gpuValue.get.getCount() == 2, "Should have 2")
150-
assert(gpuValue.get.getName() == "gpu", "name should be gpu")
151-
assert(gpuValue.get.getUnits() == "", "units should be empty")
152-
assert(gpuValue.get.getAddresses().size == 2, "Should have 2 indexes")
153-
assert(gpuValue.get.getAddresses().deep == Array("0", "1").deep, "should have 0,1 entries")
149+
assert(gpuValue.get.count == 2, "Should have 2")
150+
assert(gpuValue.get.name == "gpu", "name should be gpu")
151+
assert(gpuValue.get.units == "", "units should be empty")
152+
assert(gpuValue.get.addresses.size == 2, "Should have 2 indexes")
153+
assert(gpuValue.get.addresses.deep == Array("0", "1").deep, "should have 0,1 entries")
154154

155155
val fpgaValue = resources.get("fpga")
156156
assert(fpgaValue.nonEmpty, "Should have a gpu entry")
157-
assert(fpgaValue.get.getCount() == 3, "Should have 3")
158-
assert(fpgaValue.get.getName() == "fpga", "name should be fpga")
159-
assert(fpgaValue.get.getUnits() == "mb", "units should be mb")
160-
assert(fpgaValue.get.getAddresses().size == 3, "Should have 3 indexes")
161-
assert(fpgaValue.get.getAddresses().deep == Array("f1", "f2", "f3").deep,
157+
assert(fpgaValue.get.count == 3, "Should have 3")
158+
assert(fpgaValue.get.name == "fpga", "name should be fpga")
159+
assert(fpgaValue.get.units == "mb", "units should be mb")
160+
assert(fpgaValue.get.addresses.size == 3, "Should have 3 indexes")
161+
assert(fpgaValue.get.addresses.deep == Array("f1", "f2", "f3").deep,
162162
"should have f1,f2,f3 entries")
163163
}
164164
}
@@ -180,11 +180,11 @@ class ResourceDiscovererSuite extends SparkFunSuite
180180
val resources = ResourceDiscoverer.findResources(sparkconf, true)
181181
val gpuValue = resources.get("gpu")
182182
assert(gpuValue.nonEmpty, "Should have a gpu entry")
183-
assert(gpuValue.get.getCount() == 2, "Should have 2")
184-
assert(gpuValue.get.getName() == "gpu", "name should be gpu")
185-
assert(gpuValue.get.getUnits() == "", "units should be empty")
186-
assert(gpuValue.get.getAddresses().size == 2, "Should have 2 indexes")
187-
assert(gpuValue.get.getAddresses().deep == Array("0", "1").deep, "should have 0,1 entries")
183+
assert(gpuValue.get.count == 2, "Should have 2")
184+
assert(gpuValue.get.name == "gpu", "name should be gpu")
185+
assert(gpuValue.get.units == "", "units should be empty")
186+
assert(gpuValue.get.addresses.size == 2, "Should have 2 indexes")
187+
assert(gpuValue.get.addresses.deep == Array("0", "1").deep, "should have 0,1 entries")
188188

189189
}
190190
}

‎core/src/test/scala/org/apache/spark/executor/CoarseGrainedExecutorBackendSuite.scala‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ class CoarseGrainedExecutorBackendSuite extends SparkFunSuite
9292

9393
assert(parsedResources.size === 1)
9494
assert(parsedResources.get("gpu").nonEmpty)
95-
assert(parsedResources.get("gpu").get.getName() === "gpu")
96-
assert(parsedResources.get("gpu").get.getUnits() === "")
97-
assert(parsedResources.get("gpu").get.getCount() === 2)
98-
assert(parsedResources.get("gpu").get.getAddresses().deep === Array("0", "1").deep)
95+
assert(parsedResources.get("gpu").get.name === "gpu")
96+
assert(parsedResources.get("gpu").get.units === "")
97+
assert(parsedResources.get("gpu").get.count === 2)
98+
assert(parsedResources.get("gpu").get.addresses.deep === Array("0", "1").deep)
9999
}
100100
}
101101

@@ -125,15 +125,15 @@ class CoarseGrainedExecutorBackendSuite extends SparkFunSuite
125125

126126
assert(parsedResources.size === 2)
127127
assert(parsedResources.get("gpu").nonEmpty)
128-
assert(parsedResources.get("gpu").get.getName() === "gpu")
129-
assert(parsedResources.get("gpu").get.getUnits() === "")
130-
assert(parsedResources.get("gpu").get.getCount() === 2)
131-
assert(parsedResources.get("gpu").get.getAddresses().deep === Array("0", "1").deep)
128+
assert(parsedResources.get("gpu").get.name === "gpu")
129+
assert(parsedResources.get("gpu").get.units === "")
130+
assert(parsedResources.get("gpu").get.count === 2)
131+
assert(parsedResources.get("gpu").get.addresses.deep === Array("0", "1").deep)
132132
assert(parsedResources.get("fpga").nonEmpty)
133-
assert(parsedResources.get("fpga").get.getName() === "fpga")
134-
assert(parsedResources.get("fpga").get.getUnits() === "mb")
135-
assert(parsedResources.get("fpga").get.getCount() === 3)
136-
assert(parsedResources.get("fpga").get.getAddresses().deep === Array("f1", "f2", "f3").deep)
133+
assert(parsedResources.get("fpga").get.name === "fpga")
134+
assert(parsedResources.get("fpga").get.units === "mb")
135+
assert(parsedResources.get("fpga").get.count === 3)
136+
assert(parsedResources.get("fpga").get.addresses.deep === Array("f1", "f2", "f3").deep)
137137
}
138138
}
139139

@@ -162,10 +162,10 @@ class CoarseGrainedExecutorBackendSuite extends SparkFunSuite
162162

163163
assert(parsedResources.size === 1)
164164
assert(parsedResources.get("fpga").nonEmpty)
165-
assert(parsedResources.get("fpga").get.getName() === "fpga")
166-
assert(parsedResources.get("fpga").get.getUnits() === "")
167-
assert(parsedResources.get("fpga").get.getCount() === 3)
168-
assert(parsedResources.get("fpga").get.getAddresses().deep === Array("f1", "f2", "f3").deep)
165+
assert(parsedResources.get("fpga").get.name === "fpga")
166+
assert(parsedResources.get("fpga").get.units === "")
167+
assert(parsedResources.get("fpga").get.count === 3)
168+
assert(parsedResources.get("fpga").get.addresses.deep === Array("f1", "f2", "f3").deep)
169169
}
170170
}
171171

0 commit comments

Comments
 (0)