Skip to content

[SPARK-30676][CORE][TESTS] Eliminate warnings from deprecated constructors of java.lang.Integer and java.lang.Double #27399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

[SPARK-30676][CORE][TESTS] Eliminate warnings from deprecated constructors of java.lang.Integer and java.lang.Double #27399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7768279
RDD: new Integer(0) -> new Serializable {}
MaxGekk Jan 30, 2020
3b4ff19
MutableProjectionSuite: Replace by Integer.valueOf
MaxGekk Jan 30, 2020
77c9b89
MutableProjectionSuite: Replace by Double.valueOf
MaxGekk Jan 30, 2020
47c8d5d
HiveUserDefinedTypeSuite: Replace by Double.valueOf
MaxGekk Jan 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions core/src/main/scala/org/apache/spark/rdd/RDD.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,10 @@ abstract class RDD[T: ClassTag](
* because DAGs are acyclic, and we only ever hold locks for one path in that DAG, there is no
* chance of deadlock.
*
* The use of Integer is simply so this is serializable -- executors may reference the shared
* fields (though they should never mutate them, that only happens on the driver).
* Executors may reference the shared fields (though they should never mutate them,
* that only happens on the driver).
*/
private val stateLock = new Integer(0)
private val stateLock = new Serializable {}
Copy link
Member

@srowen srowen Jan 30, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah anything Serializable is fine. Integer.valueOf(0) isn't ideal because it's going to be a shared object. Anything would work - String("") for example. This seems OK to just slightly odd looking. It could also be a proper Lock, used as a lock, but whatever.

Copy link
Member Author

@MaxGekk MaxGekk Jan 31, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@srowen Do you want me to modify this?

Copy link
Member

@srowen srowen Jan 31, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems OK to me as a minimal change that shouldn't matter for behavior.


// Our dependencies and partitions will be gotten by calling subclass's methods below, and will
// be overwritten when we're checkpointed
Expand Down
2 changes: 1 addition & 1 deletion ...yst/src/test/scala/org/apache/spark/sql/catalyst/expressions/MutableProjectionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class MutableProjectionSuite extends SparkFunSuite with ExpressionEvalHelper {
val scalaValues = Seq("abc", BigDecimal(10),
IntervalUtils.stringToInterval(UTF8String.fromString("interval 1 day")),
Array[Byte](1, 2), Array("123", "456"), Map(1 -> "a", 2 -> "b"), Row(1, "a"),
new java.lang.Integer(5))
Integer.valueOf(5))
val inputRow = InternalRow.fromSeq(scalaValues.zip(variableLengthTypes).map {
case (v, dataType) => CatalystTypeConverters.createToCatalystConverter(dataType)(v)
})
Expand Down
4 changes: 2 additions & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/UDFSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,12 +443,12 @@ class UDFSuite extends QueryTest with SharedSparkSession {
test("SPARK-25044 Verify null input handling for primitive types - with udf(Any, DataType)") {
val f = udf((x: Int) => x, IntegerType)
checkAnswer(
Seq(new Integer(1), null).toDF("x").select(f($"x")),
Seq(Integer.valueOf(1), null).toDF("x").select(f($"x")),
Row(1) :: Row(0) :: Nil)

val f2 = udf((x: Double) => x, DoubleType)
checkAnswer(
Seq(new java.lang.Double(1.1), null).toDF("x").select(f2($"x")),
Seq(java.lang.Double.valueOf(1.1), null).toDF("x").select(f2($"x")),
Row(1.1) :: Row(0.0) :: Nil)

}
Expand Down
2 changes: 1 addition & 1 deletion sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveUserDefinedTypeSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ class TestUDF extends GenericUDF {

override def evaluate(arguments: Array[GenericUDF.DeferredObject]): AnyRef = {
val point = data.getList(arguments(0).get())
new java.lang.Double(point.get(0).asInstanceOf[Double])
java.lang.Double.valueOf(point.get(0).asInstanceOf[Double])
}
}