storage: improve mvcc benchmarks under -short

[RaduBerinde]

storage: improve mvcc benchmarks under -short

Many of the MVCC benchmarks have too many variants and are completely
sipped when using the -short flag (which is used for the weekly
microbenchmarks job). Conversely, other benchmarks are not skipped but
still have quite a few variants.

In this commit we change relevant tests to run a small set of
configurations under -short. We also fix a few smaller issues, for
example we remove some bogus empty acquire lock benchmarks with
heldOtherTxn=true/heldSameTxn=true.

Fixes #115794
Release note: None

storage: remove batch=true variants of BenchmarkMVCCPut

This benchmark has batching variants but the batch size is b.N which
can hit the 4GB batch limit.

Given that we already have a separate MVCCBatchPut which has
reasonable batch sizes, we are removing the batched variants of
BenchmarkMVCCPut.

Fixes: #115811
Release note: None

[cockroach-teamcity]

This change is 

[RaduBerinde]

Reviewable status: complete! 0 of 0 LGTMs obtained (waiting on @jbowens and @sumeerbhola)

---

pkg/storage/bench_pebble_test.go line 330 at r1 (raw file):

	var testCases []testCase
	for _, batch := range []bool{false, true} {
		for _, numVersions := range []int{1, 10, 100} {

Note: here I am restoring the variants which were removed in #99726

[RaduBerinde]

Added a commit that fixes #115811.

[jbowens]

Reviewed 4 of 4 files at r4, 2 of 2 files at r5, all commit messages.
Reviewable status: complete! 1 of 0 LGTMs obtained (waiting on @nvanbenschoten, @RaduBerinde, and @sumeerbhola)

---

-- commits line 5 at r4:
nit: "skipped when"

---

pkg/storage/bench_pebble_test.go line 330 at r1 (raw file):

Previously, RaduBerinde wrote…

Note: here I am restoring the variants which were removed in #99726

Oops, thanks

[RaduBerinde]

TFTR!

Reviewable status: complete! 0 of 0 LGTMs obtained (and 1 stale) (waiting on @jbowens, @nvanbenschoten, and @sumeerbhola)

---

-- commits line 5 at r4:

Previously, jbowens (Jackson Owens) wrote…

nit: "skipped when"

Haha, I like to sip my benchmarks. Fixed.

[RaduBerinde]

bors r+

[craig]

Build succeeded:

• Bazel Essential CI (Cockroach)

[blathers-crl]

Encountered an error creating backports. Some common things that can go wrong:

1. The backport branch might have already existed.
2. There was a merge conflict.
3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.

---

error creating merge commit from 5ec3a5a to blathers/backport-release-23.2-115810: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.2.x failed. See errors above.

---

error creating merge commit from 5ec3a5a to blathers/backport-release-23.2.0-rc-115810: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.2.0-rc failed. See errors above.

---

_{🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.}