From d615cb94ebe0f8ed4b647666db00776603758cc0 Mon Sep 17 00:00:00 2001 From: Zhihong Yu Date: Wed, 27 Nov 2024 11:31:53 -0800 Subject: [PATCH 1/4] Use putAll to populate Properties --- .../sql/hive/execution/HiveScriptTransformationExec.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/HiveScriptTransformationExec.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/HiveScriptTransformationExec.scala index 0fcc43e5c3919..691ab034f70cd 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/HiveScriptTransformationExec.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/HiveScriptTransformationExec.scala @@ -299,9 +299,7 @@ object HiveScriptIOSchema extends HiveInspectors { val instance = Utils.classForName[RecordReader](klass).getConstructor(). newInstance() val props = new Properties() - // Can not use props.putAll(outputSerdeProps.toMap.asJava) in scala-2.12 - // See https://github.com/scala/bug/issues/10418 - ioschema.outputSerdeProps.toMap.foreach { case (k, v) => props.put(k, v) } + props.putAll(ioschema.outputSerdeProps.toMap) instance.initialize(inputStream, conf, props) instance } From 6a038cdbba482b6b056397c806933045cf707c1d Mon Sep 17 00:00:00 2001 From: Zhihong Yu Date: Wed, 27 Nov 2024 12:37:44 -0800 Subject: [PATCH 2/4] java conversion --- .../spark/sql/hive/execution/HiveScriptTransformationExec.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/HiveScriptTransformationExec.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/HiveScriptTransformationExec.scala index 691ab034f70cd..1403378d27ac6 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/HiveScriptTransformationExec.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/HiveScriptTransformationExec.scala @@ -299,7 +299,7 @@ object HiveScriptIOSchema extends HiveInspectors { val instance = Utils.classForName[RecordReader](klass).getConstructor(). newInstance() val props = new Properties() - props.putAll(ioschema.outputSerdeProps.toMap) + props.putAll(ioschema.outputSerdeProps.toMap.asJava) instance.initialize(inputStream, conf, props) instance } From 1070db5907b4192517f9ebbed0fb6a6f020906ae Mon Sep 17 00:00:00 2001 From: Zhihong Yu Date: Wed, 27 Nov 2024 12:43:57 -0800 Subject: [PATCH 3/4] one more replacement --- .../sql/hive/execution/HiveScriptTransformationExec.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/HiveScriptTransformationExec.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/HiveScriptTransformationExec.scala index 1403378d27ac6..de2d15415837a 100644 --- a/sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/HiveScriptTransformationExec.scala +++ b/sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/HiveScriptTransformationExec.scala @@ -283,9 +283,7 @@ object HiveScriptIOSchema extends HiveInspectors { propsMap = propsMap + (serdeConstants.LIST_COLUMN_TYPES -> columnTypesNames) val properties = new Properties() - // Can not use properties.putAll(propsMap.asJava) in scala-2.12 - // See https://github.com/scala/bug/issues/10418 - propsMap.foreach { case (k, v) => properties.put(k, v) } + properties.putAll(propsMap.asJava) serde.initialize(null, properties) serde From b4db5bac0e9c6c08372188261d2979346046f680 Mon Sep 17 00:00:00 2001 From: Zhihong Yu Date: Wed, 27 Nov 2024 12:46:22 -0800 Subject: [PATCH 4/4] one more replacement --- .../scala/org/apache/spark/sql/kafka010/KafkaTestUtils.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/connector/kafka-0-10-sql/src/test/scala/org/apache/spark/sql/kafka010/KafkaTestUtils.scala b/connector/kafka-0-10-sql/src/test/scala/org/apache/spark/sql/kafka010/KafkaTestUtils.scala index 9e06b6c6ff4a2..60de3705636ec 100644 --- a/connector/kafka-0-10-sql/src/test/scala/org/apache/spark/sql/kafka010/KafkaTestUtils.scala +++ b/connector/kafka-0-10-sql/src/test/scala/org/apache/spark/sql/kafka010/KafkaTestUtils.scala @@ -504,9 +504,7 @@ class KafkaTestUtils( props.put("sasl.enabled.mechanisms", "GSSAPI,SCRAM-SHA-512") } - // Can not use properties.putAll(propsMap.asJava) in scala-2.12 - // See https://github.com/scala/bug/issues/10418 - withBrokerProps.foreach { case (k, v) => props.put(k, v) } + props.putAll(withBrokerProps.asJava) props }