SNOW-976500 Do not drop errors from chunk downloader starting (#994)

snowflakedb · Dec 19, 2023 · 4b69339 · 4b69339
1 parent d942efb
commit 4b69339
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/async.go b/async.go
@@ -134,12 +134,17 @@ func (sr *snowflakeRestful) getAsync(
 			if isMultiStmt(&respd.Data) {
 				if err = sc.handleMultiQuery(ctx, respd.Data, rows); err != nil {
 					rows.errChannel <- err
+					close(rows.errChannel)
 					return err
 				}
 			} else {
 				rows.addDownloader(populateChunkDownloader(ctx, sc, respd.Data))
 			}
-			rows.ChunkDownloader.start()
+			if err = rows.ChunkDownloader.start(); err != nil {
+				rows.errChannel <- err
+				close(rows.errChannel)
+				return err
+			}
 			rows.errChannel <- nil // mark query status complete
 		}
 	} else {

diff --git a/monitoring.go b/monitoring.go
@@ -265,6 +265,6 @@ func (sc *snowflakeConn) buildRowsForRunningQuery(
 	if err := sc.rowsForRunningQuery(ctx, qid, rows); err != nil {
 		return nil, err
 	}
-	rows.ChunkDownloader.start()
-	return rows, nil
+	err := rows.ChunkDownloader.start()
+	return rows, err
 }
diff --git a/rows.go b/rows.go
@@ -217,7 +217,9 @@ func (rows *snowflakeRows) NextResultSet() error {
 			return io.EOF
 		}
 		rows.ChunkDownloader = rows.ChunkDownloader.getNextChunkDownloader()
-		rows.ChunkDownloader.start()
+		if err := rows.ChunkDownloader.start(); err != nil {
+			return err
+		}
 	}
 	return rows.ChunkDownloader.nextResultSet()
 }