Improve JdbcConsumer exceptions

apache · Dec 22, 2023 · 2542d45 · 2542d45
1 parent 87971df
commit 2542d45
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 3 deletions.
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/ArrowVectorIterator.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/ArrowVectorIterator.java
@@ -26,6 +26,7 @@
 
 import org.apache.arrow.adapter.jdbc.consumer.CompositeJdbcConsumer;
 import org.apache.arrow.adapter.jdbc.consumer.JdbcConsumer;
+import org.apache.arrow.adapter.jdbc.consumer.JdbcConsumerException;
 import org.apache.arrow.util.AutoCloseables;
 import org.apache.arrow.util.Preconditions;
 import org.apache.arrow.vector.FieldVector;
@@ -114,7 +115,11 @@ private void consumeData(VectorSchemaRoot root) {
       root.setRowCount(readRowCount);
     } catch (Throwable e) {
       compositeConsumer.close();
-      throw new RuntimeException("Error occurred while consuming data.", e);
+      if (e instanceof JdbcConsumerException) {
+        throw (JdbcConsumerException) e;
+      } else {
+        throw new RuntimeException("Error occurred while consuming data.", e);
+      }
     }
   }
 
@@ -178,7 +183,11 @@ public VectorSchemaRoot next() {
       return ret;
     } catch (Exception e) {
       close();
-      throw new RuntimeException("Error occurred while getting next schema root.", e);
+      if (e instanceof JdbcConsumerException) {
+        throw (JdbcConsumerException) e;
+      } else {
+        throw new RuntimeException("Error occurred while getting next schema root.", e);
+      }
     }
   }
 

diff --git a/...pter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/CompositeJdbcConsumer.java b/...pter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/CompositeJdbcConsumer.java
@@ -21,9 +21,11 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.apache.arrow.adapter.jdbc.JdbcFieldInfo;
 import org.apache.arrow.util.AutoCloseables;
 import org.apache.arrow.vector.ValueVector;
 import org.apache.arrow.vector.VectorSchemaRoot;
+import org.apache.arrow.vector.types.pojo.ArrowType;
 
 /**
  * Composite consumer which hold all consumers.
@@ -43,7 +45,18 @@ public CompositeJdbcConsumer(JdbcConsumer[] consumers) {
   @Override
   public void consume(ResultSet rs) throws SQLException, IOException {
     for (int i = 0; i < consumers.length; i++) {
-      consumers[i].consume(rs);
+      try {
+        consumers[i].consume(rs);
+      } catch (Exception e) {
+        if (consumers[i] instanceof BaseConsumer) {
+          BaseConsumer consumer = (BaseConsumer) consumers[i];
+          JdbcFieldInfo fieldInfo = new JdbcFieldInfo(rs.getMetaData(), consumer.columnIndexInResultSet);
+          ArrowType arrowType = consumer.vector.getMinorType().getType();
+          throw new JdbcConsumerException("Exception while consuming JDBC value", e, fieldInfo, arrowType);
+        } else {
+          throw e;
+        }
+      }
     }
   }
 
@@ -74,3 +87,26 @@ public void resetVectorSchemaRoot(VectorSchemaRoot root) {
     }
   }
 }
+
+/**
+ * Exception while consuming JDBC data. This exception stores the JdbcFieldInfo for the column and the
+ * ArrowType for the corresponding vector for easier debugging.
+ */
+public class JdbcConsumerException extends RuntimeException {
+  final JdbcFieldInfo fieldInfo;
+  final ArrowType arrowType;
+
+  public JdbcConsumerException(String message, Throwable cause, JdbcFieldInfo fieldInfo, ArrowType arrowType) {
+    super(message, cause);
+    this.fieldInfo = fieldInfo;
+    this.arrowType = arrowType;
+  }
+
+  public ArrowType getArrowType() {
+    return this.arrowType;
+  }
+
+  public JdbcFieldInfo getFieldInfo() {
+    return this.fieldInfo;
+  }
+}