SNOW-950923 ensuring any exception throw during file transfer provide…

…s queryid
snowflakedb · Dec 6, 2023 · b9661c9 · b9661c9
1 parent 6ca9c91
commit b9661c9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/Snowflake.Data/Client/SnowflakeDbException.cs b/Snowflake.Data/Client/SnowflakeDbException.cs
@@ -27,7 +27,7 @@ public sealed class SnowflakeDbException : DbException
 
         private int VendorCode;
 
-        public string QueryId { get; }
+        public string QueryId { get; set; }
 
         public override int ErrorCode
         {

diff --git a/Snowflake.Data/Core/FileTransfer/SFFileTransferAgent.cs b/Snowflake.Data/Core/FileTransfer/SFFileTransferAgent.cs
@@ -238,6 +238,19 @@ public void execute()
                 Logger.Error("IO operation error while transferring file(s): " + e.Message);
                 throw new SnowflakeDbException(SFError.IO_ERROR_ON_GETPUT_COMMAND, TransferMetadata.queryId, e);
             }
+            catch (Exception e)
+            {
+                Logger.Error("Error while transferring file(s): " + e.Message);
+                if (e is SnowflakeDbException snowflakeException)
+                {
+                    if (snowflakeException.QueryId == null)
+                    {
+                        snowflakeException.QueryId = TransferMetadata.queryId;
+                    }
+                    throw snowflakeException;
+                }
+                throw new SnowflakeDbException(SFError.IO_ERROR_ON_GETPUT_COMMAND, TransferMetadata.queryId, e);
+            }
 
         }
 

diff --git a/Snowflake.Data/Core/SFStatement.cs b/Snowflake.Data/Core/SFStatement.cs
@@ -356,8 +356,7 @@ internal SFBaseResultSet Execute(int timeout, string sql, Dictionary<string, Bin
                              bindings,
                              describeOnly);
 
-                    if (logger.IsDebugEnabled())
-                        logger.Debug("PUT/GET queryId: " + (response.data != null ? response.data.queryId : "Unknown"));
+                    logger.Debug("PUT/GET queryId: " + (response.data != null ? response.data.queryId : "Unknown"));
 
                     SFFileTransferAgent fileTransferAgent =
                         new SFFileTransferAgent(trimmedSql, SfSession, response.data, CancellationToken.None);