From a409d0e5e74858dc6558c6edbdff0808db70bda5 Mon Sep 17 00:00:00 2001 From: Niranjan Artal <50492963+nartal1@users.noreply.github.com> Date: Fri, 21 Jan 2022 13:31:23 -0800 Subject: [PATCH] Make shims.v2.ParquetCachedBatchSerializer as protected (#4560) * Change ParquetCachedSerializer and other classes as protected. Signed-off-by: Niranjan Artal --- .../rapids/shims/v2/ParquetCachedBatchSerializer.scala | 2 +- .../rapids/{ => shims/v2}/Spark310ParquetWriterSuite.scala | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename tests-spark310+/src/test/scala/com/nvidia/spark/rapids/{ => shims/v2}/Spark310ParquetWriterSuite.scala (97%) diff --git a/sql-plugin/src/main/311+-all/scala/com/nvidia/spark/rapids/shims/v2/ParquetCachedBatchSerializer.scala b/sql-plugin/src/main/311+-all/scala/com/nvidia/spark/rapids/shims/v2/ParquetCachedBatchSerializer.scala index 6a4972eb08a..45e38bfcce7 100644 --- a/sql-plugin/src/main/311+-all/scala/com/nvidia/spark/rapids/shims/v2/ParquetCachedBatchSerializer.scala +++ b/sql-plugin/src/main/311+-all/scala/com/nvidia/spark/rapids/shims/v2/ParquetCachedBatchSerializer.scala @@ -259,7 +259,7 @@ private case class CloseableColumnBatchIterator(iter: Iterator[ColumnarBatch]) e /** * This class assumes, the data is Columnar and the plugin is on */ -class ParquetCachedBatchSerializer extends GpuCachedBatchSerializer with Arm { +protected class ParquetCachedBatchSerializer extends GpuCachedBatchSerializer with Arm { override def supportsColumnarInput(schema: Seq[Attribute]): Boolean = true diff --git a/tests-spark310+/src/test/scala/com/nvidia/spark/rapids/Spark310ParquetWriterSuite.scala b/tests-spark310+/src/test/scala/com/nvidia/spark/rapids/shims/v2/Spark310ParquetWriterSuite.scala similarity index 97% rename from tests-spark310+/src/test/scala/com/nvidia/spark/rapids/Spark310ParquetWriterSuite.scala rename to tests-spark310+/src/test/scala/com/nvidia/spark/rapids/shims/v2/Spark310ParquetWriterSuite.scala index 6163f85f3df..fda83439f54 100644 --- a/tests-spark310+/src/test/scala/com/nvidia/spark/rapids/Spark310ParquetWriterSuite.scala +++ b/tests-spark310+/src/test/scala/com/nvidia/spark/rapids/shims/v2/Spark310ParquetWriterSuite.scala @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021, NVIDIA CORPORATION. + * Copyright (c) 2021-2022, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.nvidia.spark.rapids +package com.nvidia.spark.rapids.shims.v2 import scala.collection.mutable import ai.rapids.cudf.{ColumnVector, DType, Table, TableWriter} -import com.nvidia.spark.rapids.shims.v2.{ParquetCachedBatchSerializer, ParquetOutputFileFormat} +import com.nvidia.spark.rapids._ import org.apache.hadoop.mapreduce.{RecordWriter, TaskAttemptContext} import org.mockito.ArgumentMatchers._ import org.mockito.Mockito._