From 5ce567f99dc4d70b462b6ba687b5faaa8ca9c785 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 8 May 2024 06:38:34 +0000 Subject: [PATCH 1/2] Update parquet-avro, parquet-hadoop to 1.14.0 --- build.sbt | 2 +- scalafix/build.sbt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index c500247e..b817cd18 100644 --- a/build.sbt +++ b/build.sbt @@ -35,7 +35,7 @@ val jodaTimeVersion = "2.12.7" val munitVersion = "0.7.29" val neo4jDriverVersion = "4.4.12" val paigesVersion = "0.4.3" -val parquetVersion = "1.13.1" +val parquetVersion = "1.14.0" val protobufVersion = "3.25.2" val refinedVersion = "0.11.1" val scalaCollectionCompatVersion = "2.12.0" diff --git a/scalafix/build.sbt b/scalafix/build.sbt index 80169b13..148bc011 100644 --- a/scalafix/build.sbt +++ b/scalafix/build.sbt @@ -60,7 +60,7 @@ def magnolify(version: String): List[ModuleID] = { "com.google.cloud.datastore" % "datastore-v1-proto-client" % "2.18.4", "com.google.guava" % "guava" % "33.1.0-jre", "org.neo4j.driver" % "neo4j-java-driver" % "4.4.12", - "org.apache.parquet" % "parquet-hadoop" % "1.13.1", + "org.apache.parquet" % "parquet-hadoop" % "1.14.0", "com.google.protobuf" % "protobuf-java" % "3.25.3", "eu.timepit" %% "refined" % "0.11.1", "org.scalacheck" %% "scalacheck" % "1.17.1", From 5901ab248bee0340af6c6fee55c1203ad8bf6cbe Mon Sep 17 00:00:00 2001 From: Michel Davit Date: Wed, 15 May 2024 09:47:59 +0200 Subject: [PATCH 2/2] WIP --- parquet/src/main/scala/magnolify/parquet/ParquetType.scala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/parquet/src/main/scala/magnolify/parquet/ParquetType.scala b/parquet/src/main/scala/magnolify/parquet/ParquetType.scala index 33e358d8..6003bfaf 100644 --- a/parquet/src/main/scala/magnolify/parquet/ParquetType.scala +++ b/parquet/src/main/scala/magnolify/parquet/ParquetType.scala @@ -32,6 +32,7 @@ import org.apache.parquet.io.api._ import org.apache.parquet.io.{InputFile, OutputFile} import org.apache.parquet.schema.MessageType import org.slf4j.LoggerFactory +import org.typelevel.scalaccompat.annotation.nowarn sealed trait ParquetArray @@ -126,8 +127,10 @@ object ParquetType { override def init(context: hadoop.InitContext): hadoop.ReadSupport.ReadContext = { if (parquetType == null) { - parquetType = - SerializationUtils.fromBase64[ParquetType[T]](context.getConfiguration.get(ReadTypeKey)) + // Use deprecated getConfiguration + // Recommended getParquetConfiguration is only available for parquet 1.14+ + val readKeyType = context.getConfiguration.get(ReadTypeKey): @nowarn("cat=deprecation") + parquetType = SerializationUtils.fromBase64[ParquetType[T]](readKeyType) } val metadata = context.getKeyValueMetadata