Skip to content

sql: clean up dependency graph a bit#160206

Merged
craig[bot] merged 3 commits intocockroachdb:masterfrom
yuzefovich:deps
Jan 7, 2026
Merged

sql: clean up dependency graph a bit#160206
craig[bot] merged 3 commits intocockroachdb:masterfrom
yuzefovich:deps

Conversation

@yuzefovich
Copy link
Copy Markdown
Member

This PR contains a few commits that break a few dependencies to allow more parallelism during builds.

Informs: #79357.
Epic: None
Release note: None

@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Dec 26, 2025

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.

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@yuzefovich yuzefovich marked this pull request as ready for review December 26, 2025 22:50
@yuzefovich yuzefovich requested review from a team as code owners December 26, 2025 22:50
@yuzefovich yuzefovich requested review from mgartner and removed request for a team December 26, 2025 22:50
@yuzefovich yuzefovich added the backport-26.1.x Flags PRs that need to be backported to 26.1 label Jan 5, 2026
@yuzefovich yuzefovich requested a review from DrewKimball January 5, 2026 15:34
@yuzefovich
Copy link
Copy Markdown
Member Author

friendly ping @DrewKimball @mgartner - should be a quick one

Copy link
Copy Markdown
Collaborator

@DrewKimball DrewKimball left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm: Thanks for doing this!

@DrewKimball partially reviewed 16 files and all commit messages, and made 2 comments.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @mgartner and @yuzefovich).


pkg/sql/execinfra/flow_context.go line 70 at r3 (raw file):

	// above descs.Collection is non-nil. It is referenced in the eval.Context
	// in order to provide catalog access to builtins.
	EvalCatalogBuiltins evalcatalog.Builtins

Nice.

@yuzefovich
Copy link
Copy Markdown
Member Author

TFTR!

bors r+

craig bot pushed a commit that referenced this pull request Jan 7, 2026
160206: sql: clean up dependency graph a bit r=yuzefovich a=yuzefovich

This PR contains a few commits that break a few dependencies to allow more parallelism during builds.

Informs: #79357.
Epic: None
Release note: None

Co-authored-by: Yahor Yuzefovich <yahor@cockroachlabs.com>
@yuzefovich
Copy link
Copy Markdown
Member Author

bors got stuck

bors r-

@yuzefovich
Copy link
Copy Markdown
Member Author

bors r+

craig bot pushed a commit that referenced this pull request Jan 7, 2026
153361: sql: remove some EXPLAIN [ANALYZE] fields in non-VERBOSE mode r=yuzefovich a=mgartner

The output of `EXPLAIN [ANALYZE]` in non-`VERBOSE` mode is now more succinct.

In the header above the query plan the following changes have been made:

  1. "isolation level" is only shown if it is not "serializable".
  2. "priority" is only shown if it is not "normal".
  3. "quality of service" is only shown if it is not "regular".
  4. "kv cpu time" is not shown.
  5. "sql cpu time" is not shown.
  6. "DistSQL network usage" is only show if it is greater than 0.
  7. "maximum memory usage" is not shown.
  8. "cumulative time spent in KV" is not shown.
  9. "vectorized" is only shown if it is "false".
 10. "buffered writes enabled" is not shown.

In each node of the query plan the following changes have been made:

  1. "KV pairs read" is not shown.
  2. "KV bytes read" is not shown.
  3. "KV gRPC calls" is not shown.
  4. "estimated max memory allocated" is not shown.
  5. "estimated max sql temp disk usage" is not shown.
  6. "actual row count" is directly above "estimated row count".

Here's an example of what `EXPLAIN ANALYZE` looked like before:

```
planning time: 243µs
execution time: 632µs
distribution: local
vectorized: true
plan type: generic, reused
cumulative time spent in KV: 331µs
maximum memory usage: 20 KiB
DistSQL network usage: 0 B (0 messages)
regions: us-east1
sql cpu time: 20µs
estimated RUs consumed: 0
isolation level: serializable
priority: normal
quality of service: regular

• scan
  sql nodes: n1
  kv nodes: n1
  regions: us-east1
  actual row count: 0
  KV time: 331µs
  KV rows decoded: 0
  KV bytes read: 0 B
  KV gRPC calls: 1
  estimated max memory allocated: 20 KiB
  sql cpu time: 20µs
  missing stats
  table: t@t_pkey
  spans: [/0 - /0]
```

And here's the output with the same query after the changes in this commit:

```
planning time: 325µs
execution time: 974µs
distribution: local
plan type: generic, reused
regions: us-east1
estimated RUs consumed: 0

• scan
  sql nodes: n1
  kv nodes: n1
  regions: us-east1
  KV time: 610µs
  KV rows decoded: 0
  sql cpu time: 29µs
  actual row count: 0
  missing stats
  table: t@t_pkey
  spans: [/0 - /0]
```

Epic: None
Release note (sql change): The output of `EXPLAIN [ANALYZE]` in non-`VERBOSE` mode is now more succinct.

160206: sql: clean up dependency graph a bit r=yuzefovich a=yuzefovich

This PR contains a few commits that break a few dependencies to allow more parallelism during builds.

Informs: #79357.
Epic: None
Release note: None

160557: sctest: unskip multitenant for schema change tests r=rafiss a=rafiss

This fixes external process tenant startup to propagate
version settings from the parent, allowing tenants to start
when the cluster is running at an older version
(e.g., MinSupported).

We also had to pass in the SQLCodec so that the schema TestDeps
accesss the tenant correctly.

Note that MultiRegionTestClusterFactory already allowed
multitenant testing.

fixes #142814
fixes #109457
Release note: None

Co-authored-by: Marcus Gartner <marcus@cockroachlabs.com>
Co-authored-by: Yahor Yuzefovich <yahor@cockroachlabs.com>
Co-authored-by: Rafi Shamim <rafi@cockroachlabs.com>
@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jan 7, 2026

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Jan 7, 2026

@craig craig bot merged commit 073e04c into cockroachdb:master Jan 7, 2026
25 checks passed
@yuzefovich yuzefovich deleted the deps branch January 7, 2026 06:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-26.1.x Flags PRs that need to be backported to 26.1 v26.2.0-prerelease

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants