review

Signed-off-by: Gera Shegalov <gera@apache.org>
NVIDIA · Oct 24, 2022 · 9b32ba3 · 9b32ba3
1 parent cad5763
commit 9b32ba3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/sql-plugin/src/main/330+/scala/com/nvidia/spark/rapids/shims/GpuIntervalUtils.scala b/sql-plugin/src/main/330+/scala/com/nvidia/spark/rapids/shims/GpuIntervalUtils.scala
@@ -300,10 +300,8 @@ object GpuIntervalUtils extends Arm {
     }
 
     withResource(negatives) { _ =>
-      withResource(Scalar.fromLong(1L)) { posOne =>
-        withResource(Scalar.fromLong(-1L)) { negOne =>
-          negatives.ifElse(negOne, posOne)
-        }
+      withResource(Seq(1L, -1L).safeMap(Scalar.fromLong)) { case Seq(posOne, negOne) =>
+        negatives.ifElse(negOne, posOne)
       }
     }
   }

diff --git a/sql-plugin/src/main/scala/com/nvidia/spark/rapids/GpuCSVScan.scala b/sql-plugin/src/main/scala/com/nvidia/spark/rapids/GpuCSVScan.scala
@@ -344,22 +344,20 @@ class CSVPartitionReader(
       _.lower()
     }
 
-    val isTrue = closeOnExcept(lowerStripped) { _ =>
-      withResource(Scalar.fromString(true.toString)) {
+    val (isTrue, isValidBool) = withResource(lowerStripped) { _ =>
+      val isTrueRes = withResource(Scalar.fromString(true.toString)) {
         lowerStripped.equalTo
       }
-    }
-
-    withResource(isTrue) { _ =>
-      val isValidBool = withResource(lowerStripped) { _ =>
+      val isValidBoolRes = closeOnExcept(isTrueRes) { _ =>
         withResource(ColumnVector.fromStrings(true.toString, false.toString)) {
           lowerStripped.contains
         }
       }
-      withResource(isValidBool) { _ =>
-        withResource(Scalar.fromNull(DType.BOOL8)) { nullBool =>
-          isValidBool.ifElse(isTrue, nullBool)
-        }
+      (isTrueRes, isValidBoolRes)
+    }
+    withResource(Seq(isTrue, isValidBool)) { _ =>
+      withResource(Scalar.fromNull(DType.BOOL8)) { nullBool =>
+        isValidBool.ifElse(isTrue, nullBool)
       }
     }
   }