Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
27848: sql: quantize the statement counts reported to the reg server r=knz a=knz

Fixes #25114.

This preserves every count smaller than 10, then for larger values
bucket into buckets that are powers of 10.

Release note (sql change): CockroachDB now hides more information from
the statement statistics reported to Cockroach Labs.

28793: storage: update the tscache appropriately after a merge r=tschottdorf a=benesch

@nvanbenschoten I figured this was in your wheelhouse but feel free to defer the review to @tschottdorf!

---

When applying a merge, teach the leaseholder of the LHS range to update
its timestamp cache for the keyspace previously owned by the RHS range
appropriately.

Release note: None

28903: closedts/transport: avoid race when using stopper.RunWorker r=tschottdorf a=benesch

Stopper.RunWorker cannot be called in code which can run concurrently
with Stopper.Stop. Use Stopper.RunAsyncTask instead.

Fix #28755.

Release note: None

Co-authored-by: Raphael 'kena' Poss <[email protected]>
Co-authored-by: Nikhil Benesch <[email protected]>
  • Loading branch information
3 people committed Aug 21, 2018
4 parents 6318e9a + 1a5f82e + 8aea353 + ffa957f commit 2f20f2c
Show file tree
Hide file tree
Showing 18 changed files with 1,366 additions and 756 deletions.
58 changes: 52 additions & 6 deletions c-deps/libroach/protos/roachpb/data.pb.cc

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

59 changes: 59 additions & 0 deletions c-deps/libroach/protos/roachpb/data.pb.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkg/ccl/importccl/import_stmt.go
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,7 @@ func importPlanHook(
tableDetails = append(tableDetails, jobspb.ImportDetails_Table{Name: name})
}

telemetry.CountBucketed("import.files", len(files))
telemetry.CountBucketed("import.files", int64(len(files)))

_, errCh, err := p.ExecCfg().JobRegistry.StartJob(ctx, resultsCh, jobs.Record{
Description: jobDesc,
Expand Down Expand Up @@ -1136,9 +1136,9 @@ func (r *importResumer) OnTerminal(
}

if status == jobs.StatusSucceeded {
telemetry.CountBucketed("import.rows", int(r.res.Rows))
telemetry.CountBucketed("import.rows", r.res.Rows)
const mb = 1 << 20
telemetry.CountBucketed("import.size-mb", int(r.res.DataSize/mb))
telemetry.CountBucketed("import.size-mb", r.res.DataSize/mb)

resultsCh <- tree.Datums{
tree.NewDInt(tree.DInt(*job.ID())),
Expand Down
Loading

0 comments on commit 2f20f2c

Please sign in to comment.