Fix tests.

RumbleDB · Apr 18, 2024 · 29b370b · 29b370b
1 parent e560494
commit 29b370b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 25 deletions.
diff --git a/src/main/java/org/rumbledb/api/SequenceOfItems.java b/src/main/java/org/rumbledb/api/SequenceOfItems.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.apache.spark.SparkRuntimeException;
 import org.apache.spark.api.java.JavaRDD;
 import org.apache.spark.sql.Dataset;
 import org.apache.spark.sql.Row;
@@ -207,6 +208,14 @@ public long populateListWithWarningOnlyIfCapReached(List<Item> resultList) {
                 RumbleException ex = new UnexpectedTypeException(e.getMessage(), ExceptionMetadata.EMPTY_METADATA);
                 ex.initCause(e);
                 throw ex;
+            } catch (SparkRuntimeException e) {
+                if (e.getMessage().contains("CAST_INVALID_INPUT")) {
+                    RumbleException ex = new CastException(e.getMessage(), ExceptionMetadata.EMPTY_METADATA);
+                    ex.initCause(e);
+                    throw ex;
+                } else {
+                    throw e;
+                }
             } catch (UnsupportedOperationException e) {
                 RumbleException ex = new UnexpectedTypeException(e.getMessage(), ExceptionMetadata.EMPTY_METADATA);
                 ex.initCause(e);

diff --git a/src/main/java/org/rumbledb/items/DateTimeItem.java b/src/main/java/org/rumbledb/items/DateTimeItem.java
@@ -79,7 +79,6 @@ public DateTimeItem() {
     DateTimeItem(String dateTimeString) {
         this.value = parseDateTime(dateTimeString, BuiltinTypesCatalogue.dateTimeItem);
         if (doesLexicalValueHaveNoTimeZone(dateTimeString)) {
-            System.err.println("No time zone.");
             this.hasTimeZone = false;
             this.value = this.value.withZoneRetainFields(DateTimeZone.UTC);
         }

diff --git a/src/main/java/org/rumbledb/runtime/flwor/clauses/LetClauseSparkIterator.java b/src/main/java/org/rumbledb/runtime/flwor/clauses/LetClauseSparkIterator.java
@@ -833,15 +833,6 @@ public static Dataset<Row> tryNativeQuery(
             );
         String selectSQL = FlworDataFrameUtils.getSQLColumnProjection(allColumns, true);
         String input = FlworDataFrameUtils.createTempView(dataFrame);
-        System.err.println(
-            String.format(
-                "select %s %s as `%s` from %s",
-                selectSQL,
-                nativeQuery.getResultingQuery(),
-                newVariableName,
-                input
-            )
-        );
         return dataFrame.sparkSession()
             .sql(
                 String.format(

diff --git a/src/main/java/org/rumbledb/runtime/typing/CastIterator.java b/src/main/java/org/rumbledb/runtime/typing/CastIterator.java
@@ -835,7 +835,6 @@ public NativeClauseContext generateNativeQuery(NativeClauseContext nativeClauseC
                 return NativeClauseContext.NoNativeQuery;
             }
             resultingQuery = " (CAST (" + value.getResultingQuery() + " AS " + "BOOLEAN" + ")) ";
-            System.err.println("Boolean");
         } else if (this.sequenceType.getItemType().equals(BuiltinTypesCatalogue.byteItem)) {
             if (
                 !this.children.get(0).getStaticType().getItemType().equals(BuiltinTypesCatalogue.booleanItem)
@@ -850,7 +849,6 @@ public NativeClauseContext generateNativeQuery(NativeClauseContext nativeClauseC
                 return NativeClauseContext.NoNativeQuery;
             }
             resultingQuery = " (CAST (" + value.getResultingQuery() + " AS " + "BYTE" + ")) ";
-            System.err.println("Byte");
         } else if (this.sequenceType.getItemType().equals(BuiltinTypesCatalogue.shortItem)) {
             if (
                 !this.children.get(0).getStaticType().getItemType().equals(BuiltinTypesCatalogue.booleanItem)
@@ -865,7 +863,6 @@ public NativeClauseContext generateNativeQuery(NativeClauseContext nativeClauseC
                 return NativeClauseContext.NoNativeQuery;
             }
             resultingQuery = " (CAST (" + value.getResultingQuery() + " AS " + "SHORT" + ")) ";
-            System.err.println("Short");
         } else if (this.sequenceType.getItemType().equals(BuiltinTypesCatalogue.intItem)) {
             if (
                 !this.children.get(0).getStaticType().getItemType().equals(BuiltinTypesCatalogue.booleanItem)
@@ -880,7 +877,6 @@ public NativeClauseContext generateNativeQuery(NativeClauseContext nativeClauseC
                 return NativeClauseContext.NoNativeQuery;
             }
             resultingQuery = " (CAST (" + value.getResultingQuery() + " AS " + "INT" + ")) ";
-            System.err.println("Int");
         } else if (this.sequenceType.getItemType().equals(BuiltinTypesCatalogue.longItem)) {
             if (
                 !this.children.get(0).getStaticType().getItemType().equals(BuiltinTypesCatalogue.booleanItem)
@@ -895,7 +891,6 @@ public NativeClauseContext generateNativeQuery(NativeClauseContext nativeClauseC
                 return NativeClauseContext.NoNativeQuery;
             }
             resultingQuery = " (CAST (" + value.getResultingQuery() + " AS " + "LONG" + ")) ";
-            System.err.println("Long");
         } else if (this.sequenceType.getItemType().equals(BuiltinTypesCatalogue.integerItem)) {
             if (
                 !this.children.get(0).getStaticType().getItemType().equals(BuiltinTypesCatalogue.booleanItem)
@@ -910,7 +905,6 @@ public NativeClauseContext generateNativeQuery(NativeClauseContext nativeClauseC
                 return NativeClauseContext.NoNativeQuery;
             }
             resultingQuery = " (CAST (" + value.getResultingQuery() + " AS " + "DECIMAL(38,0)" + ")) ";
-            System.err.println("Integer");
         } else if (this.sequenceType.getItemType().equals(BuiltinTypesCatalogue.decimalItem)) {
             if (
                 !this.children.get(0).getStaticType().getItemType().equals(BuiltinTypesCatalogue.booleanItem)
@@ -925,7 +919,6 @@ public NativeClauseContext generateNativeQuery(NativeClauseContext nativeClauseC
                 return NativeClauseContext.NoNativeQuery;
             }
             resultingQuery = " (CAST (" + value.getResultingQuery() + " AS " + "DECIMAL(38,19)" + ")) ";
-            System.err.println("Decimal");
         } else if (this.sequenceType.getItemType().equals(BuiltinTypesCatalogue.doubleItem)) {
             if (
                 !this.children.get(0).getStaticType().getItemType().equals(BuiltinTypesCatalogue.booleanItem)
@@ -940,7 +933,6 @@ public NativeClauseContext generateNativeQuery(NativeClauseContext nativeClauseC
                 return NativeClauseContext.NoNativeQuery;
             }
             resultingQuery = " (CAST (" + value.getResultingQuery() + " AS " + "DOUBLE" + ")) ";
-            System.err.println("Double");
         } else if (this.sequenceType.getItemType().equals(BuiltinTypesCatalogue.floatItem)) {
             if (
                 !this.children.get(0).getStaticType().getItemType().equals(BuiltinTypesCatalogue.booleanItem)
@@ -955,7 +947,6 @@ public NativeClauseContext generateNativeQuery(NativeClauseContext nativeClauseC
                 return NativeClauseContext.NoNativeQuery;
             }
             resultingQuery = " (CAST (" + value.getResultingQuery() + " AS " + "FLOAT" + ")) ";
-            System.err.println("Float");
         } else if (this.sequenceType.getItemType().equals(BuiltinTypesCatalogue.stringItem)) {
             if (this.children.get(0).getStaticType().getItemType().equals(BuiltinTypesCatalogue.dateTimeStampItem)) {
                 return NativeClauseContext.NoNativeQuery;
@@ -974,7 +965,6 @@ public NativeClauseContext generateNativeQuery(NativeClauseContext nativeClauseC
             } else {
                 resultingQuery = " (CAST (" + value.getResultingQuery() + " AS " + "STRING" + ")) ";
             }
-            System.err.println("String");
         } else if (this.sequenceType.getItemType().equals(BuiltinTypesCatalogue.anyURIItem)) {
             if (
                 !this.children.get(0).getStaticType().getItemType().equals(BuiltinTypesCatalogue.stringItem)
@@ -983,7 +973,6 @@ public NativeClauseContext generateNativeQuery(NativeClauseContext nativeClauseC
                 return NativeClauseContext.NoNativeQuery;
             }
             resultingQuery = " (CAST (" + value.getResultingQuery() + " AS " + "STRING" + ")) ";
-            System.err.println("anyURI");
         } else if (this.sequenceType.getItemType().equals(BuiltinTypesCatalogue.dateItem)) {
             if (
                 !this.children.get(0).getStaticType().getItemType().equals(BuiltinTypesCatalogue.stringItem)
@@ -1000,7 +989,6 @@ public NativeClauseContext generateNativeQuery(NativeClauseContext nativeClauseC
                 return NativeClauseContext.NoNativeQuery;
             }
             resultingQuery = " (CAST (" + value.getResultingQuery() + " AS " + "DATE" + ")) ";
-            System.err.println("Date");
         } else if (this.sequenceType.getItemType().equals(BuiltinTypesCatalogue.dateTimeStampItem)) {
             if (
                 !this.children.get(0).getStaticType().getItemType().equals(BuiltinTypesCatalogue.stringItem)
@@ -1014,7 +1002,6 @@ public NativeClauseContext generateNativeQuery(NativeClauseContext nativeClauseC
                 return NativeClauseContext.NoNativeQuery;
             }
             resultingQuery = " (CAST (" + value.getResultingQuery() + " AS " + "TIMESTAMP" + ")) ";
-            System.err.println("Timestamp");
             /*
              * } else if (this.sequenceType.getItemType().equals(BuiltinTypesCatalogue.hexBinaryItem)) {
              * resultingQuery = " (CAST (" + value.getResultingQuery() + " AS " + "BINARY" + ")) ";
@@ -1023,7 +1010,6 @@ public NativeClauseContext generateNativeQuery(NativeClauseContext nativeClauseC
         } else {
             return NativeClauseContext.NoNativeQuery;
         }
-        System.err.println("Return");
         return new NativeClauseContext(
                 nativeClauseContext,
                 resultingQuery

diff --git a/src/main/java/org/rumbledb/types/DerivedAtomicItemType.java b/src/main/java/org/rumbledb/types/DerivedAtomicItemType.java
@@ -642,7 +642,6 @@ public void write(Kryo kryo, Output output) {
         // kryo.writeObject(output, this.explicitTimezone);
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public void read(Kryo kryo, Input input) {
         this.name = kryo.readObject(input, Name.class);