sql: fix nil-pointer error in local retry #111713
Conversation
|
This change is |
There was a problem hiding this comment.
Reviewed 2 of 2 files at r1, 2 of 2 files at r2, all commit messages.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @DrewKimball and @msirek)
-- commits line 14 at r2:
nit: seems like a line is missing here.
There was a problem hiding this comment.
Reviewable status:
-- commits line 23 at r2:
I think you meant #111327 here.
There was a problem hiding this comment.
Reviewable status:
|
@DrewKimball You still planning on getting this merged? FYI you linked #105451 above, but that's a PR not an issue. |
There was a problem hiding this comment.
Yeah, it should be
I think you meant #111327 here.
Reviewable status:
yuzefovich
added
the
backport-23.2.x
DrewKimball
force-pushed
the
apply-nil
branch
from
b122d9d
to
6031d6a
Compare
There was a problem hiding this comment.
TFTRs! Sorry for the delay.
Reviewable status:
Previously, yuzefovich (Yahor Yuzefovich) wrote…
nit: seems like a line is missing here.
Done.
Previously, yuzefovich (Yahor Yuzefovich) wrote…
I think you meant #111327 here.
Done.
DrewKimball
force-pushed
the
apply-nil
branch
from
6031d6a
to
5a97e1f
Compare
|
The commit and PR title still says "Fixes #105451". |
DrewKimball
force-pushed
the
apply-nil
branch
from
5a97e1f
to
ad5a4c3
Compare
There was a problem hiding this comment.
Sorry for all that, I'm not sure what was wrong before.
Reviewable status:
DrewKimball
force-pushed
the
apply-nil
branch
from
ad5a4c3
to
291378e
Compare
This patch changes the error returned upon failing to parse a PG_LSN value to match postgres. Previously, the error was an internal error. Informs cockroachdb#111327 Release note: None
In cockroachdb#105451, we added logic to locally retry a distributed query after an error. However, the retry logic unconditionally updated a field of `DistSQLReceiver` that may be nil, which could cause a nil-pointer error in some code paths (e.g. apply-join). This patch adds a check that the field is non-nil, as is done for other places where it is updated. There is no release note because the change has not yet made it into a release. Fixes cockroachdb#111327 Release note: None
DrewKimball
force-pushed
the
apply-nil
branch
from
291378e
to
939f66d
Compare
|
TFTRs! bors r+ |
|
Build succeeded: |
tree: return correct parse error for pg_lsn
This patch changes the error returned upon failing to parse a PG_LSN
value to match postgres. Previously, the error was an internal error.
Informs #111327
Release note: None
sql: fix nil-pointer error in local retry
In #105451, we added logic to locally retry a distributed query
after an error. However, the retry logic unconditionally updated a
field of
DistSQLReceiverthat may be nil, which could cause anil-pointer error in some code paths (e.g. apply-join). This patch
adds a check that the field is non-nil, as is done for other places
where it is updated.
There is no release note because the change has not yet made it into
a release.
Fixes #111327
Release note: None