From 65c9597d7705bd5cc6a3493b9795ddccdbca1d79 Mon Sep 17 00:00:00 2001
From: Jeremy Parr-Pearson <94406158+jeremyp-bq@users.noreply.github.com>
Date: Tue, 14 Dec 2021 16:26:57 -0800
Subject: [PATCH] Generated log messages without hard-coding indexes (#275)

---
 .../core/VerticaDistributedFilesystemWritePipe.scala      | 5 +++--
 .../core/VerticaDistributedFilesystemWritePipeTest.scala  | 8 +++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/connector/src/main/scala/com/vertica/spark/datasource/core/VerticaDistributedFilesystemWritePipe.scala b/connector/src/main/scala/com/vertica/spark/datasource/core/VerticaDistributedFilesystemWritePipe.scala
index 8e08e42b3..5d839d44b 100644
--- a/connector/src/main/scala/com/vertica/spark/datasource/core/VerticaDistributedFilesystemWritePipe.scala
+++ b/connector/src/main/scala/com/vertica/spark/datasource/core/VerticaDistributedFilesystemWritePipe.scala
@@ -373,9 +373,10 @@ class VerticaDistributedFilesystemWritePipe(val config: DistributedFilesystemWri
         for {
           rs <- jdbcLayer.query(rejectsDataQuery)
           _ = Try {
-            logger.error("file_name | row_number | rejected_data | rejected_reason")
+            val rsmd = rs.getMetaData
+            logger.error((1 to rsmd.getColumnCount).map(idx => rsmd.getColumnName(idx)).toList.mkString(" | "))
             while (rs.next) {
-              logger.error(s"${rs.getString(1)} | ${rs.getString(2)} | ${rs.getString(3)} | ${rs.getString(4)}")
+              logger.error((1 to rsmd.getColumnCount).map(idx => rs.getString(idx)).toList.mkString(" | "))
             }
           }
           _ = rs.close()
diff --git a/connector/src/test/scala/com/vertica/spark/datasource/core/VerticaDistributedFilesystemWritePipeTest.scala b/connector/src/test/scala/com/vertica/spark/datasource/core/VerticaDistributedFilesystemWritePipeTest.scala
index a48ee497f..6cc97abf0 100644
--- a/connector/src/test/scala/com/vertica/spark/datasource/core/VerticaDistributedFilesystemWritePipeTest.scala
+++ b/connector/src/test/scala/com/vertica/spark/datasource/core/VerticaDistributedFilesystemWritePipeTest.scala
@@ -71,10 +71,8 @@ class VerticaDistributedFilesystemWritePipeTest extends AnyFlatSpec with BeforeA
     resultSet
   }
 
-  private def getStringByIndexTableResultSet(): ResultSet = {
+  private def getClosedResultSet(): ResultSet = {
     val resultSet = mock[ResultSet]
-    (resultSet.next _).expects().returning(true)
-    (resultSet.getString(_: Int)).expects(*)
     (resultSet.close _).expects().returning(())
 
     resultSet
@@ -509,7 +507,7 @@ class VerticaDistributedFilesystemWritePipeTest extends AnyFlatSpec with BeforeA
     (jdbcLayerInterface.query _).expects(*,*).returning(Right(getEmptyResultSet))
     (jdbcLayerInterface.executeUpdate _).expects(*,*).returning(Right(100))
     (jdbcLayerInterface.query _).expects(*,*).returning(Right(getCountTableResultSet(6)))
-    (jdbcLayerInterface.query _).expects(*,*).returning(Right(getStringByIndexTableResultSet))
+    (jdbcLayerInterface.query _).expects(*,*).returning(Right(getClosedResultSet))
     (jdbcLayerInterface.close _).expects().returning(Right(()))
     (jdbcLayerInterface.rollback _).expects().returning(Right(()))
 
@@ -543,7 +541,7 @@ class VerticaDistributedFilesystemWritePipeTest extends AnyFlatSpec with BeforeA
     (jdbcLayerInterface.query _).expects(*,*).returning(Right(getEmptyResultSet))
     (jdbcLayerInterface.executeUpdate _).expects(*,*).returning(Right(100))
     (jdbcLayerInterface.query _).expects(*,*).returning(Right(getCountTableResultSet(4)))
-    (jdbcLayerInterface.query _).expects(*,*).returning(Right(getStringByIndexTableResultSet))
+    (jdbcLayerInterface.query _).expects(*,*).returning(Right(getClosedResultSet))
     (jdbcLayerInterface.close _).expects().returning(Right(()))
     (jdbcLayerInterface.commit _).expects().returning(Right(()))