Add CastOptions to make GpuCast extendible to handle more options [da…

…tabricks] (#9285) * Refactored GpuCast to take a CastOptions to make it easer to pass in options * singing off --------- Signed-off-by: Raza Jafri <[email protected]>
NVIDIA · Sep 23, 2023 · 056c187 · 056c187
1 parent f68cb94
commit 056c187
Show file tree

Hide file tree

Showing 8 changed files with 167 additions and 102 deletions.
diff --git a/sql-plugin/src/main/java/com/nvidia/spark/rapids/iceberg/spark/source/GpuIcebergReader.java b/sql-plugin/src/main/java/com/nvidia/spark/rapids/iceberg/spark/source/GpuIcebergReader.java
@@ -23,6 +23,7 @@
 import java.util.NoSuchElementException;
 
 import ai.rapids.cudf.Scalar;
+import com.nvidia.spark.rapids.CastOptions$;
 import com.nvidia.spark.rapids.GpuCast;
 import com.nvidia.spark.rapids.GpuColumnVector;
 import com.nvidia.spark.rapids.GpuScalar;
@@ -158,7 +159,7 @@ static ColumnarBatch addUpcastsIfNeeded(ColumnarBatch batch, Schema expectedSche
         GpuColumnVector oldColumn = columns[i];
         columns[i] = GpuColumnVector.from(
             GpuCast.doCast(oldColumn.getBase(), oldColumn.dataType(), expectedSparkType,
-            false, false, false), expectedSparkType);
+            CastOptions$.MODULE$.DEFAULT_CAST_OPTIONS()), expectedSparkType);
       }
       ColumnarBatch newBatch = new ColumnarBatch(columns, batch.numRows());
       columns = null;

diff --git a/sql-plugin/src/main/scala/com/nvidia/spark/rapids/GpuApproximatePercentile.scala b/sql-plugin/src/main/scala/com/nvidia/spark/rapids/GpuApproximatePercentile.scala
@@ -144,9 +144,7 @@ case class ApproxPercentileFromTDigestExpr(
           // array and return that (after converting from Double to finalDataType)
           withResource(cv.getBase.approxPercentile(Array(p))) { percentiles =>
             withResource(percentiles.extractListElement(0)) { childView =>
-              withResource(doCast(childView, DataTypes.DoubleType, finalDataType,
-                  ansiMode = false, legacyCastToString = false,
-                  stringToDateAnsiModeEnabled = false)) { childCv =>
+              withResource(doCast(childView, DataTypes.DoubleType, finalDataType)) { childCv =>
                 GpuColumnVector.from(childCv.copyToColumnVector(), dataType)
               }
             }
@@ -159,9 +157,7 @@ case class ApproxPercentileFromTDigestExpr(
               GpuColumnVector.from(percentiles.incRefCount(), dataType)
             } else {
               withResource(percentiles.getChildColumnView(0)) { childView =>
-                withResource(doCast(childView, DataTypes.DoubleType, finalDataType,
-                    ansiMode = false, legacyCastToString = false,
-                    stringToDateAnsiModeEnabled = false)) { childCv =>
+                withResource(doCast(childView, DataTypes.DoubleType, finalDataType)) { childCv =>
                   withResource(percentiles.replaceListChild(childCv)) { x =>
                     GpuColumnVector.from(x.copyToColumnVector(), dataType)
                   }