-
Notifications
You must be signed in to change notification settings - Fork 3.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
schemachanger: port over MR zone config helpers #141386
base: master
Are you sure you want to change the base?
Conversation
Your pull request contains more than 1000 changes. It is strongly encouraged to split big PRs into smaller chunks. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf. |
3d13e50
to
82b34b9
Compare
82b34b9
to
7d6d787
Compare
⚪ Sysbench [SQL, 3node, oltp_read_write]
Reproducebenchdiff binaries: mkdir -p benchdiff/7d6d787/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/7d6d787c7f43c40fd0b1825a93cfd0141f5188c8/bin/pkg_sql_tests benchdiff/7d6d787/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/7d6d787/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
mkdir -p benchdiff/09d4505/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/09d4505340c8e8399bade0da777dd1d4ae0ebc62/bin/pkg_sql_tests benchdiff/09d4505/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/09d4505/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests benchdiff command: benchdiff --run=^BenchmarkSysbench/SQL/3node/oltp_read_write$ --old=09d4505 --new=7d6d787 ./pkg/sql/tests ⚪ Sysbench [KV, 1node, local, oltp_read_only]
Reproducebenchdiff binaries: mkdir -p benchdiff/7d6d787/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/7d6d787c7f43c40fd0b1825a93cfd0141f5188c8/bin/pkg_sql_tests benchdiff/7d6d787/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/7d6d787/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
mkdir -p benchdiff/09d4505/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/09d4505340c8e8399bade0da777dd1d4ae0ebc62/bin/pkg_sql_tests benchdiff/09d4505/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/09d4505/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests benchdiff command: benchdiff --run=^BenchmarkSysbench/KV/1node_local/oltp_read_only$ --old=09d4505 --new=7d6d787 ./pkg/sql/tests ⚪ Sysbench [KV, 1node, local, oltp_write_only]
Reproducebenchdiff binaries: mkdir -p benchdiff/7d6d787/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/7d6d787c7f43c40fd0b1825a93cfd0141f5188c8/bin/pkg_sql_tests benchdiff/7d6d787/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/7d6d787/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
mkdir -p benchdiff/09d4505/bin/1058449141
gcloud storage cp gs://cockroach-microbench-ci/builds/09d4505340c8e8399bade0da777dd1d4ae0ebc62/bin/pkg_sql_tests benchdiff/09d4505/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests
chmod +x benchdiff/09d4505/bin/1058449141/cockroachdb_cockroach_pkg_sql_tests benchdiff command: benchdiff --run=^BenchmarkSysbench/KV/1node_local/oltp_write_only$ --old=09d4505 --new=7d6d787 ./pkg/sql/tests Artifactsdownload: mkdir -p new
gcloud storage cp gs://cockroach-microbench-ci/artifacts/7d6d787c7f43c40fd0b1825a93cfd0141f5188c8/13462004557-1/\* new/
mkdir -p old
gcloud storage cp gs://cockroach-microbench-ci/artifacts/09d4505340c8e8399bade0da777dd1d4ae0ebc62/13462004557-1/\* old/ Legend
No regressions detected! built with commit: 7d6d787c7f43c40fd0b1825a93cfd0141f5188c8 |
pkg/sql/schemachanger/scbuild/internal/scbuildstmt/zone_config_helpers.go
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 6 of 7 files at r1, all commit messages.
Reviewable status:complete! 0 of 0 LGTMs obtained (waiting on @annrpom and @rafiss)
pkg/sql/schemachanger/scbuild/internal/scbuildstmt/zone_config_helpers.go
line 1260 at r1 (raw file):
return b.QueryByID(tableID).FilterTemporaryIndex(). Filter(func(_ scpb.Status, _ scpb.TargetStatus, e *scpb.TemporaryIndex) bool { return e.IndexID == indexID+1
Could we also lookup by checking e.SourceIndexID
? That should be set for the index this temporary index was created for.
pkg/sql/regions/region_util.go
line 0 at r1 (raw file):
Is this just a straight copy and rename from the pkg/sql/region_util.go? Or were there any logic changes?
Mechanical changes (copy/paste) to avoid some cyclic deps once these are needed in DSC. Epic: none Informs: cockroachdb#80545 Release note: None
Some precursor work to remove RBR fallbacks for ADD COLUMN. Epic: CRDB-31282 Informs: cockroachdb#80545 Release note: None
7d6d787
to
db829f3
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewable status:
complete! 0 of 0 LGTMs obtained (waiting on @rafiss and @spilchen)
pkg/sql/regions/region_util.go
line at r1 (raw file):
Previously, spilchen wrote…
Is this just a straight copy and rename from the pkg/sql/region_util.go? Or were there any logic changes?
straight copy and rename! done to resolve some dependency cycles; i just moved these to a new commit in this PR
pkg/sql/schemachanger/scbuild/internal/scbuildstmt/zone_config_helpers.go
line 1260 at r1 (raw file):
Previously, spilchen wrote…
Could we also lookup by checking
e.SourceIndexID
? That should be set for the index this temporary index was created for.
done
pkg/sql/schemachanger/scbuild/internal/scbuildstmt/zone_config_helpers.go
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed 2 of 2 files at r2, 1 of 2 files at r3, all commit messages.
Reviewable status:complete! 0 of 0 LGTMs obtained (waiting on @rafiss)
pkg/sql/schemachanger/scbuild/internal/scbuildstmt/zone_config_helpers.go
line 1394 at r3 (raw file):
// ApplyZoneConfigForMultiRegionTable applies zone config settings based // on the options provided and adds the scpb.TableZoneConfig to our builder. func ApplyZoneConfigForMultiRegionTable(
nit: Maybe this will make sense in a follow-on PR, but will we need to export this function out of this package?
pkg/sql/schemachanger/scbuild/internal/scbuildstmt/zone_config_helpers.go
line 1482 at r3 (raw file):
newZoneConfig.SubzoneSpans = nil } if newZoneConfig.IsSubzonePlaceholder() && len(newZoneConfig.Subzones) == 0 {
Is the placeholder subzone never materialized in the scpb elements?
pkg/sql/schemachanger/scbuild/internal/scbuildstmt/zone_config_helpers.go
line 1486 at r3 (raw file):
} tzc := &scpb.TableZoneConfig{TableID: tableID, ZoneConfig: &newZoneConfig, SeqNum: 1} b.Add(tzc)
Do we need to delete the old table zone config? Or will that be handled by the caller in another PR.
Some precursor work to remove RBR fallbacks for ADD COLUMN.
Epic: CRDB-31282
Informs: #80545
Release note: None