Propagate error in TFetchResults#255
Merged
jackyhu-db merged 1 commit intodatabricks:mainfrom Mar 18, 2025
Merged
Conversation
vikrantpuppala
requested review from
andrefurlan-db,
jackyhu-db,
jadewang-db,
rcypher-databricks and
yunbodeng-db
as code owners
vikrantpuppala
force-pushed
the
fix-errors-in-fetch-results
branch
from
c7eefc1 to
3225fc0
Compare
Signed-off-by: Vikrant Puppala <vikrant.puppala@databricks.com>
vikrantpuppala
force-pushed
the
fix-errors-in-fetch-results
branch
from
3225fc0 to
ef393cd
Compare
jackyhu-db
approved these changes
Mar 13, 2025
jackyhu-db
reviewed
Mar 13, 2025
| r.RowScanner = nil | ||
| } | ||
|
|
||
| if !r.ResultPageIterator.HasNext() { |
Collaborator
There was a problem hiding this comment.
can you check the r.error and return r.error instead?
Contributor
There was a problem hiding this comment.
@jackyhu-db I think it is possible to do a check like that, but I would like to clarify what is the use of HasNext if Next itself can just return nil, io.EOF to signify an end of the stream?
My question is more structural: why the additional complexity of HasNext when Next itself can interface and encapsulate the concept of HasNext? It is possible to now check for the error in r.ResultPageIterator.err and bubble that up, but I'm afraid any divergence between Next's logic and HasNext's logic in the future can lead to similar problems
Contributor
There was a problem hiding this comment.
I think it is worth considering whether HasNext can be simply rewritten as: r.ResultPageIterator.Next() == (nil, io.EOF), and if so, it is not really useful to keep it, any consumer of ResultPageIterator can use Next for the purpose of checking whether there are any items left or not
Collaborator
Author
There was a problem hiding this comment.
@jackyhu-db, we would also need to update the function signature to return (bool, error) and also make changes to https://github.com/databricks/databricks-sql-go/blob/main/internal/rows/arrowbased/arrowRecordIterator.go#L86 to also return the error, do we want to go down that route?
jackyhu-db
approved these changes
Mar 18, 2025
Merged
mdibaiee
added a commit
to estuary/connectors
that referenced
this pull request
Mar 18, 2025
mdibaiee
added a commit
to estuary/connectors
that referenced
this pull request
Mar 18, 2025
jackyhu-db
pushed a commit
that referenced
this pull request
Mar 18, 2025
Prepare for the next release of go driver (1.6.2) which adds the following changes: - Support positional query parameters (#247) - Add custom auth headers into cloud fetch request (#249) - Security: GO-2024-2947 - Update go-retryablehttp (#251) - Security: CVE-2025-27144 - Resolve vulnerability in go-jose (#258) - Bugfix: Handle incorrect EOF in fetchResultPage when TFetchResults call fails with an error (#255) Signed-off-by: Vikrant Puppala <vikrant.puppala@databricks.com>
mdibaiee
added a commit
to estuary/connectors
that referenced
this pull request
Mar 18, 2025
mdibaiee
added a commit
to estuary/connectors
that referenced
this pull request
Mar 18, 2025
mdibaiee
added a commit
to estuary/connectors
that referenced
this pull request
Mar 18, 2025
jwhartley
pushed a commit
to jwhartley/connectors
that referenced
this pull request
Apr 1, 2025
atzoum
pushed a commit
to rudderlabs/sqlconnect-go
that referenced
this pull request
Sep 2, 2025
….6.1 to 1.8.0 (#351) Bumps [github.com/databricks/databricks-sql-go](https://github.com/databricks/databricks-sql-go) from 1.6.1 to 1.8.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/databricks/databricks-sql-go/releases">github.com/databricks/databricks-sql-go's releases</a>.</em></p> <blockquote> <h2>v1.8.0</h2> <h2>What's Changed</h2> <ul> <li>Ensure thrift field IDs stay within range by <a href="https://github.com/vikrantpuppala"><code>@vikrantpuppala</code></a> in <a href="https://redirect.github.com/databricks/databricks-sql-go/pull/276">databricks/databricks-sql-go#276</a></li> <li>Add Arrow IPC stream iterator for direct access to Arrow buffer by <a href="https://github.com/jadewang-db"><code>@jadewang-db</code></a> in <a href="https://redirect.github.com/databricks/databricks-sql-go/pull/279">databricks/databricks-sql-go#279</a></li> <li>Prepare for v1.8.0 release by <a href="https://github.com/jadewang-db"><code>@jadewang-db</code></a> in <a href="https://redirect.github.com/databricks/databricks-sql-go/pull/280">databricks/databricks-sql-go#280</a></li> </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/jadewang-db"><code>@jadewang-db</code></a> made their first contribution in <a href="https://redirect.github.com/databricks/databricks-sql-go/pull/279">databricks/databricks-sql-go#279</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/databricks/databricks-sql-go/compare/v1.7.1...v1.8.0">https://github.com/databricks/databricks-sql-go/compare/v1.7.1...v1.8.0</a></p> <h2>v1.7.1</h2> <h2>What's Changed</h2> <ul> <li>Fix critical CVE-2024-45337 by <a href="https://github.com/vikrantpuppala"><code>@vikrantpuppala</code></a> in <a href="https://redirect.github.com/databricks/databricks-sql-go/pull/264">databricks/databricks-sql-go#264</a></li> <li>Add nil handling for isStagingOperation to handle older DBR versions by <a href="https://github.com/vikrantpuppala"><code>@vikrantpuppala</code></a> in <a href="https://redirect.github.com/databricks/databricks-sql-go/pull/266">databricks/databricks-sql-go#266</a></li> <li>[PECOBLR-402] Update thrift client library after cleaning up unused fields and structs by <a href="https://github.com/gopalldb"><code>@gopalldb</code></a> in <a href="https://redirect.github.com/databricks/databricks-sql-go/pull/268">databricks/databricks-sql-go#268</a></li> <li>Add schema to ArrowBatchIterator by <a href="https://github.com/vikrantpuppala"><code>@vikrantpuppala</code></a> in <a href="https://redirect.github.com/databricks/databricks-sql-go/pull/267">databricks/databricks-sql-go#267</a></li> </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/gopalldb"><code>@gopalldb</code></a> made their first contribution in <a href="https://redirect.github.com/databricks/databricks-sql-go/pull/268">databricks/databricks-sql-go#268</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/databricks/databricks-sql-go/compare/v1.7.0...v1.7.1">https://github.com/databricks/databricks-sql-go/compare/v1.7.0...v1.7.1</a></p> <h2>v1.7.0</h2> <h2>What's Changed</h2> <ul> <li>Enable cloud fetch mode by default (<a href="https://redirect.github.com/databricks/databricks-sql-go/pull/260">databricks/databricks-sql-go#260</a> by <a href="https://github.com/shivam2680"><code>@shivam2680</code></a>)</li> <li>Handle thrift protocol version for conditional feature support (cloud fetch, LZ4 compression, Arrow support) (<a href="https://redirect.github.com/databricks/databricks-sql-go/pull/261">databricks/databricks-sql-go#261</a> by <a href="https://github.com/shivam2680"><code>@shivam2680</code></a>)</li> </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/shivam2680"><code>@shivam2680</code></a> made their first contribution in <a href="https://redirect.github.com/databricks/databricks-sql-go/pull/260">databricks/databricks-sql-go#260</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/databricks/databricks-sql-go/compare/v1.6.2...v1.7.0">https://github.com/databricks/databricks-sql-go/compare/v1.6.2...v1.7.0</a></p> <h2>v1.6.2</h2> <h2>What's Changed</h2> <ul> <li>Support positional query parameters by <a href="https://github.com/kravets-levko"><code>@kravets-levko</code></a> in <a href="https://redirect.github.com/databricks/databricks-sql-go/pull/247">databricks/databricks-sql-go#247</a></li> <li>fix: Add custom auth headers into cloud fetch request by <a href="https://github.com/jackyhu-db"><code>@jackyhu-db</code></a> in <a href="https://redirect.github.com/databricks/databricks-sql-go/pull/249">databricks/databricks-sql-go#249</a></li> <li>fix: Propagate error in TFetchResults by <a href="https://github.com/vikrantpuppala"><code>@vikrantpuppala</code></a> in <a href="https://redirect.github.com/databricks/databricks-sql-go/pull/255">databricks/databricks-sql-go#255</a></li> <li>fix(security): GO-2024-2947, update to github.com/hashicorp/go-retryablehttp@v0.7.7 (<a href="https://redirect.github.com/databricks/databricks-sql-go/issues/251">#251</a>) by <a href="https://github.com/prochac"><code>@prochac</code></a> in <a href="https://redirect.github.com/databricks/databricks-sql-go/pull/252">databricks/databricks-sql-go#252</a></li> <li>fix(security): update dependencies to fix CVE by <a href="https://github.com/vikrantpuppala"><code>@vikrantpuppala</code></a> in <a href="https://redirect.github.com/databricks/databricks-sql-go/pull/258">databricks/databricks-sql-go#258</a></li> </ul> <h2>New Contributors</h2> <ul> <li><a href="https://github.com/prochac"><code>@prochac</code></a> made their first contribution in <a href="https://redirect.github.com/databricks/databricks-sql-go/pull/252">databricks/databricks-sql-go#252</a></li> <li><a href="https://github.com/vikrantpuppala"><code>@vikrantpuppala</code></a> made their first contribution in <a href="https://redirect.github.com/databricks/databricks-sql-go/pull/258">databricks/databricks-sql-go#258</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/databricks/databricks-sql-go/compare/v1.6.1...v1.6.2">https://github.com/databricks/databricks-sql-go/compare/v1.6.1...v1.6.2</a></p> </blockquote> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/databricks/databricks-sql-go/blob/main/CHANGELOG.md">github.com/databricks/databricks-sql-go's changelog</a>.</em></p> <blockquote> <h2>v1.8.0 (2025-07-24)</h2> <ul> <li>Add Arrow IPC Iterator</li> </ul> <h2>v1.7.1 (2025-05-20)</h2> <ul> <li><code>databricks/databricks-sql-go#267</code></li> <li><code>databricks/databricks-sql-go#268</code></li> <li><code>databricks/databricks-sql-go#266</code></li> <li><code>databricks/databricks-sql-go#264</code></li> </ul> <h2>v1.7.0 (2025-04-09)</h2> <ul> <li><code>databricks/databricks-sql-go#260</code></li> <li><code>databricks/databricks-sql-go#261</code></li> </ul> <h2>v1.6.2 (2025-03-18)</h2> <ul> <li><code>databricks/databricks-sql-go#247</code></li> <li><code>databricks/databricks-sql-go#249</code></li> <li><code>databricks/databricks-sql-go#251</code></li> <li><code>databricks/databricks-sql-go#258</code></li> <li><code>databricks/databricks-sql-go#255</code></li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/databricks/databricks-sql-go/commit/529d69c5ce36b0eeaad9ec573cfd77a7342cc5ff"><code>529d69c</code></a> Prepare for v1.8.0 release (<a href="https://redirect.github.com/databricks/databricks-sql-go/issues/280">#280</a>)</li> <li><a href="https://github.com/databricks/databricks-sql-go/commit/7bde0dc3d1a27a22354d50129a59e477af17add2"><code>7bde0dc</code></a> Add Arrow IPC stream iterator for direct access to Arrow buffer (<a href="https://redirect.github.com/databricks/databricks-sql-go/issues/279">#279</a>)</li> <li><a href="https://github.com/databricks/databricks-sql-go/commit/746c05de3ec5c8f06603879998a5fb703a35d473"><code>746c05d</code></a> Ensure thrift field IDs stay within range (<a href="https://redirect.github.com/databricks/databricks-sql-go/issues/276">#276</a>)</li> <li><a href="https://github.com/databricks/databricks-sql-go/commit/039c53ab5e21dbbfae5d29aa4595d36ea7a3465e"><code>039c53a</code></a> Add test to ensure thrift field IDs stay within range</li> <li><a href="https://github.com/databricks/databricks-sql-go/commit/12d2ceda465a8296b2d2080550c91581c71b3605"><code>12d2ced</code></a> Prepare for v1.7.1 (<a href="https://redirect.github.com/databricks/databricks-sql-go/issues/271">#271</a>)</li> <li><a href="https://github.com/databricks/databricks-sql-go/commit/01cd3d122125a0ec02aa035e62823fc6ef408911"><code>01cd3d1</code></a> Update CODEOWNERS (<a href="https://redirect.github.com/databricks/databricks-sql-go/issues/272">#272</a>)</li> <li><a href="https://github.com/databricks/databricks-sql-go/commit/2361714c73a38a23aed7334bf8240238803b608d"><code>2361714</code></a> Update CODEOWNERS</li> <li><a href="https://github.com/databricks/databricks-sql-go/commit/149e1ad615c847e33895c5d7299e6031cd593ad6"><code>149e1ad</code></a> Prepare for v1.7.1</li> <li><a href="https://github.com/databricks/databricks-sql-go/commit/c29199287a059c1056d1179402088acdd30706e1"><code>c291992</code></a> Add schema to ArrowBatchIterator (<a href="https://redirect.github.com/databricks/databricks-sql-go/issues/267">#267</a>)</li> <li><a href="https://github.com/databricks/databricks-sql-go/commit/7263c534751313073578e0adc3f0e34e15f75bad"><code>7263c53</code></a> [PECOBLR-402] Update thrift client library after cleaning up unused fields an...</li> <li>Additional commits viewable in <a href="https://github.com/databricks/databricks-sql-go/compare/v1.6.1...v1.8.0">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) You can trigger a rebase of this PR by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> > **Note** > Automatic rebases have been disabled on this pull request as it has been open for over 30 days. Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Currently, an error thrown in TFetchResults within getNextPage in resultPageIterator will be swallowed and an EOF err will be returned instead. This PR solves #254