sql/colfetcher: remove catalog.TableColMap from cFetcherTableArgs
#148612
Conversation
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
![blathers[crl]](https://avatars.githubusercontent.com/in/59700?s=40&u=95b789b1d594ac6b74f377aa7555d8d98d63240d&v=4){kind=avatar}
|
It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR? 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
|
This change is |
mgartner
force-pushed
the
remove-cfetcher-colidxmap
branch
from
f9383ec to
6ce8e04
Compare
mgartner
force-pushed
the
remove-cfetcher-colidxmap
branch
from
6ce8e04 to
3e66f7e
Compare
|
Before/after of the newly added benchmark: |
yuzefovich
approved these changes
Jun 23, 2025
There was a problem hiding this comment.
Nice find!
Reviewed 1 of 1 files at r1, 2 of 2 files at r2, all commit messages.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @michae2)
-- commits line 10 at r2:
nit: might be nice to mention explicitly that we're trading incurring an allocation for using a binary search, which seems beneficial according to the microbenchmark.
pkg/sql/colfetcher/cfetcher.go line 1160 at r2 (raw file):
for _, f := range table.spec.FamilyDefaultColumns { if f.FamilyID == familyID { defaultColumnIdx = table.orderedColIdxMap.Get(f.DefaultColumnID)
nit: should we remove found in favor of initializing defaultColumnIdx := -1 which will allow us to check the int being non-negative, which will also cover the case where this Get call returns -1?
michae2
approved these changes
Jun 23, 2025
There was a problem hiding this comment.
Reviewed 1 of 1 files at r1, 2 of 2 files at r2, all commit messages.
Reviewable status:
|
Previously, yuzefovich (Yahor Yuzefovich) wrote…
I don't think so. The index being That's a valid case that should not cause an internal error—it should just not unmarshal the value and continue on. However, if a family with the given |
Previously, yuzefovich (Yahor Yuzefovich) wrote…
Agreed. I should probably run some other benchmarks too to make sure there isn't a regression with a smaller number of columns. |
yuzefovich
reviewed
Jun 24, 2025
There was a problem hiding this comment.
Reviewable status:
pkg/sql/colfetcher/cfetcher.go line 1160 at r2 (raw file):
Previously, mgartner (Marcus Gartner) wrote…
I don't think so. The index being
-1maps to the previous logic inprocessValueSinglerelated to the comment:// No need to unmarshal the column value. Either the column was part of // the index key or it isn't needed.That's a valid case that should not cause an internal error—it should just not unmarshal the value and continue on. However, if a family with the given
familyIDcannot be found in the spec, that is unexpected and should result in an internal error.
Yeah, I was mostly thinking about familyID not being found in the spec: with the current version we will return scrub.WrapError explicitly, whereas with the new version Get will return -1 with found=true, so we'll call processValueSingle with defaultColumnIdx = -1 which will effectively be no-op, so we'll swallow an error. Does this make sense?
|
Previously, yuzefovich (Yahor Yuzefovich) wrote…
If the family isn't in the spec, then |
yuzefovich
approved these changes
Jun 26, 2025
There was a problem hiding this comment.
Reviewable status:
pkg/sql/colfetcher/cfetcher.go line 1160 at r2 (raw file):
Previously, mgartner (Marcus Gartner) wrote…
If the family isn't in the spec, then
foundwill remainfalseand we'll return the scrub error.
Ah, yes, nvm, carry on.
|
Release note: None
mgartner
force-pushed
the
remove-cfetcher-colidxmap
branch
from
3e66f7e to
f2a55e4
Compare
The `catalog.TableColMap` in `cFetcherTableArgs` has been removed. Information in `IndexFetchSpec` and `cTableInfo` is used instead. Release note: None
mgartner
force-pushed
the
remove-cfetcher-colidxmap
branch
from
f2a55e4 to
9a05848
Compare
|
TFTRs! bors r+ |
|
Build succeeded: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The
catalog.TableColMapincFetcherTableArgshas been removed.Information in
IndexFetchSpecandcTableInfois used instead.Release note: None