feat: [+] #105 improve raiseError with location

partially resolves #105
hablapps · Oct 1, 2022 · 0cfcbf2 · 0cfcbf2
1 parent c0b4ee0
commit 0cfcbf2
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 5 deletions.
diff --git a/core/src/main/spark_3.1_3.2_3.3/scala/doric/syntax/StringColumns31.scala b/core/src/main/spark_3.1_3.2_3.3/scala/doric/syntax/StringColumns31.scala
@@ -1,10 +1,21 @@
 package doric
 package syntax
 
+import doric.sem.Location
 import org.apache.spark.sql.{functions => f}
 
 private[syntax] trait StringColumns31 {
 
+  /**
+    * Throws an exception with the provided error message.
+    *
+    * @throws java.lang.RuntimeException with the error message
+    * @group String Type
+    * @see [[doric.syntax.StringColumns31.StringOperationsSyntax31.raiseError]]
+    */
+  def raiseError(str: String)(implicit l: Location): NullColumn =
+    str.lit.raiseError
+
   implicit class StringOperationsSyntax31(s: DoricColumn[String]) {
 
     /**
@@ -20,6 +31,13 @@ private[syntax] trait StringColumns31 {
       * @group String Type
       * @see [[org.apache.spark.sql.functions.raise_error]]
       */
-    def raiseError: NullColumn = s.elem.map(f.raise_error).toDC
+    def raiseError(implicit l: Location): NullColumn =
+      concat(
+        s,
+        "\n  at ".lit,
+        l.fileName.value.lit,
+        ":".lit,
+        l.lineNumber.value.toString.lit
+      ).elem.map(f.raise_error).toDC
   }
 }
diff --git a/core/src/test/spark_3.1_3.2_3.3/scala/doric/syntax/StringColumns31Spec.scala b/core/src/test/spark_3.1_3.2_3.3/scala/doric/syntax/StringColumns31Spec.scala
@@ -1,9 +1,8 @@
 package doric
 package syntax
 
-import org.scalatest.EitherValues
+import org.scalatest.{Assertion, EitherValues}
 import org.scalatest.matchers.should.Matchers
-
 import org.apache.spark.sql.{functions => f}
 import org.apache.spark.sql.types.NullType
 
@@ -15,7 +14,16 @@ class StringColumns31Spec
   describe("raiseError doric function") {
     import spark.implicits._
 
-    val df = List("this is an error").toDF("errorMsg")
+    lazy val errorMsg = "this is an error"
+    lazy val df       = List(errorMsg).toDF("errorMsg")
+
+    def validateExceptions(
+        doricExc: RuntimeException,
+        sparkExc: RuntimeException
+    ): Assertion = {
+      doricExc.getMessage should fullyMatch regex
+        s"""${sparkExc.getMessage}\n( )*at ${this.getClass.getSimpleName}.scala:(\\d)+"""
+    }
 
     it("should work as spark raise_error function") {
       import java.lang.{RuntimeException => exception}
@@ -30,7 +38,23 @@ class StringColumns31Spec
         df.select(f.raise_error(f.col("errorMsg"))).collect()
       }
 
-      doricErr.getMessage shouldBe sparkErr.getMessage
+      validateExceptions(doricErr, sparkErr)
+    }
+
+    it("should be available for strings") {
+      import java.lang.{RuntimeException => exception}
+
+      val doricErr = intercept[exception] {
+        val res = df.select(raiseError(errorMsg))
+
+        res.schema.head.dataType shouldBe NullType
+        res.collect()
+      }
+      val sparkErr = intercept[exception] {
+        df.select(f.raise_error(f.col("errorMsg"))).collect()
+      }
+
+      validateExceptions(doricErr, sparkErr)
     }
   }