address comments

apache · Sep 20, 2023 · 844cb8b · 844cb8b
1 parent f271173
commit 844cb8b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/...ions/src/test/java/org/apache/iceberg/spark/extensions/TestRewriteDataFilesProcedure.java b/...ions/src/test/java/org/apache/iceberg/spark/extensions/TestRewriteDataFilesProcedure.java
@@ -844,7 +844,7 @@ public void testRewriteWithUntranslatedOrUnconvertedFilter() {
                 sql(
                     "CALL %s.system.rewrite_data_files(table => '%s', where => 'substr(c2, 2) = \"fo\"')",
                     catalogName, tableIdent))
-        .isInstanceOf(AssertionError.class)
+        .isInstanceOf(IllegalArgumentException.class)
         .hasMessageContaining("Cannot convert Spark filter");
   }
 

diff --git a/...est/java/org/apache/iceberg/spark/extensions/TestRewritePositionDeleteFilesProcedure.java b/...est/java/org/apache/iceberg/spark/extensions/TestRewritePositionDeleteFilesProcedure.java
@@ -219,7 +219,7 @@ public void testRewriteWithUntranslatedOrUnconvertedFilter() throws Exception {
                 sql(
                     "CALL %s.system.rewrite_position_delete_files(table => '%s', where => 'substr(data, 2) = \"fo\"')",
                     catalogName, tableIdent))
-        .isInstanceOf(AssertionError.class)
+        .isInstanceOf(IllegalArgumentException.class)
         .hasMessageContaining("Cannot convert Spark filter");
   }
 

diff --git a/.../src/main/scala/org/apache/spark/sql/execution/datasources/SparkExpressionConverter.scala b/.../src/main/scala/org/apache/spark/sql/execution/datasources/SparkExpressionConverter.scala
@@ -39,7 +39,10 @@ object SparkExpressionConverter {
     DataSourceV2Strategy.translateFilterV2(sparkExpression) match {
       case Some(filter) =>
         val converted = SparkV2Filters.convert(filter)
-        assert(converted != null, s"Cannot convert Spark filter: $filter to Iceberg expression")
+        if (converted == null) {
+          throw new IllegalArgumentException(s"Cannot convert Spark filter: $filter to Iceberg expression")
+        }
+
         converted
       case _ =>
         throw new IllegalArgumentException(s"Cannot translate Spark expression: $sparkExpression to data source filter")