Skip to content

Commit e3eb5f0

Browse files
craig[bot]jbowens
craig[bot]
and
jbowens
committed
Merge #144344
144344: go.mod: bump Pebble to bf1dcd085694 r=sumeerbhola a=jbowens Changes: * [`bf1dcd08`](cockroachdb/pebble@bf1dcd08) db: enable columnar blocks by default * [`8e863788`](cockroachdb/pebble@8e863788) db: respect EnableColumnarBlocks option on recent FMVs * [`28fcae5e`](cockroachdb/pebble@28fcae5e) db: allow loose excised table bounds when using DB.Excise() * [`d343bc4b`](cockroachdb/pebble@d343bc4b) db: fix virtual table race * [`9b5d34ba`](cockroachdb/pebble@9b5d34ba) manifest: minor cleanup of init backing methods * [`2f8f1c8e`](cockroachdb/pebble@2f8f1c8e) virtual: move IsSharedIngested to ReadEnv * [`4aeacab9`](cockroachdb/pebble@4aeacab9) virtual: remove Size and BackingSize from VirtualReaderParams * [`c1d56c35`](cockroachdb/pebble@c1d56c35) options: don't tolerate invalid KeySchema in MakeWriterOptions * [`8273c9c6`](cockroachdb/pebble@8273c9c6) sstable: use CommonProperties when Properties is unnecessary * [`e6a84593`](cockroachdb/pebble@e6a84593) db: rename LevelMetrics table fields * [`abc4ac21`](cockroachdb/pebble@abc4ac21) sstable: avoid double compression with noop compressor * [`a7c09544`](cockroachdb/pebble@a7c09544) sstable: remove VirtualReader and CommonReader * [`0c0e65f0`](cockroachdb/pebble@0c0e65f0) block: fix linter failure when CGO is disabled * [`3958d451`](cockroachdb/pebble@3958d451) db: add excise_bound tests * [`8701e527`](cockroachdb/pebble@8701e527) db: move excise tests * [`52f3c677`](cockroachdb/pebble@52f3c677) db: add method to get remote table size, count * [`dc2d326e`](cockroachdb/pebble@dc2d326e) db: add counts for local tables * [`ae4d7e20`](cockroachdb/pebble@ae4d7e20) sstable: add Compressor to column writer * [`24dc1355`](cockroachdb/pebble@24dc1355) record: add a bitflip check to WAL corruption * [`1e3ee7bd`](cockroachdb/pebble@1e3ee7bd) sstable: refactor prop block load * [`aa61b6fe`](cockroachdb/pebble@aa61b6fe) rowblk: move 64-bit tests build flag * [`5242eb16`](cockroachdb/pebble@5242eb16) colblk: use key value columnar block for properties * [`825c04c1`](cockroachdb/pebble@825c04c1) db: rework logAndApply * [`dbc7e3bb`](cockroachdb/pebble@dbc7e3bb) db: check problem spans when picking auto compactions * [`f551b59c`](cockroachdb/pebble@f551b59c) problemspans: add data structure * [`38199b56`](cockroachdb/pebble@38199b56) db: fix data_test build error due to merge skew * [`d8b52a2b`](cockroachdb/pebble@d8b52a2b) *: add errcheck linter and fix all reported cases * [`bd64a1e3`](cockroachdb/pebble@bd64a1e3) sstable: fix inline blob handles in layout describe * [`b34bbcbd`](cockroachdb/pebble@b34bbcbd) sstable: use blobtest * [`aea58868`](cockroachdb/pebble@aea58868) blobtest: don't depend on manifest * [`567a8d3e`](cockroachdb/pebble@567a8d3e) db: use ParseTestSST in TestIngestExternal * [`6956f7ed`](cockroachdb/pebble@6956f7ed) record: change WriteWALSyncOffsets to respect runtime format ratcheting Release note: none. Epic: none. Co-authored-by: Jackson Owens <[email protected]>
2 parents 13866fc + 1e45578 commit e3eb5f0

File tree

11 files changed

+60
-45
lines changed

11 files changed

+60
-45
lines changed

‎DEPS.bzl‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1895,10 +1895,10 @@ def go_deps():
18951895
patches = [
18961896
"@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch",
18971897
],
1898-
sha256 = "35742402ba6ca70d76fb64293d58fe4837d01620aa68a339cb157c540f909597",
1899-
strip_prefix = "github.com/cockroachdb/[email protected]20250408215241-4d38942f0ce0",
1898+
sha256 = "b8b78da44b535acb000e9cdacc4a5d2b65a59874d989b2ebe15c574347970f2a",
1899+
strip_prefix = "github.com/cockroachdb/[email protected]20250412125957-bf1dcd085694",
19001900
urls = [
1901-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250408215241-4d38942f0ce0.zip",
1901+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250412125957-bf1dcd085694.zip",
19021902
],
19031903
)
19041904
go_repository(
@@ -4160,10 +4160,10 @@ def go_deps():
41604160
name = "com_github_google_btree",
41614161
build_file_proto_mode = "disable_global",
41624162
importpath = "github.com/google/btree",
4163-
sha256 = "9b9f66ca4eb36bb1867b5ff9134fb2eb9fe9717d44e28836f2e977f9c03b4128",
4164-
strip_prefix = "github.com/google/btree@v1.0.1",
4163+
sha256 = "11b736bc8252b52fecdf346d3707ccf3a2b6d458ba21b4f843616fc12eeb30b2",
4164+
strip_prefix = "github.com/google/btree@v1.1.3",
41654165
urls = [
4166-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/google/btree/com_github_google_btree-v1.0.1.zip",
4166+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/google/btree/com_github_google_btree-v1.1.3.zip",
41674167
],
41684168
)
41694169
go_repository(
@@ -7962,6 +7962,16 @@ def go_deps():
79627962
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/PuerkitoBio/urlesc/com_github_puerkitobio_urlesc-v0.0.0-20170810143723-de5bf2ad4578.zip",
79637963
],
79647964
)
7965+
go_repository(
7966+
name = "com_github_raduberinde_axisds",
7967+
build_file_proto_mode = "disable_global",
7968+
importpath = "github.com/RaduBerinde/axisds",
7969+
sha256 = "53a2821f7d7cc76e91278e457d5f58bc5a856c7968d4170435dac86f2d003a87",
7970+
strip_prefix = "github.com/RaduBerinde/[email protected]",
7971+
urls = [
7972+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/RaduBerinde/axisds/com_github_raduberinde_axisds-v0.0.0-20250405232732-ecb85bedf677.zip",
7973+
],
7974+
)
79657975
go_repository(
79667976
name = "com_github_rcrowley_go_metrics",
79677977
build_file_proto_mode = "disable_global",

‎build/bazelutil/distdir_files.bzl‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ DISTDIR_FILES = {
205205
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/PuerkitoBio/goquery/com_github_puerkitobio_goquery-v1.5.1.zip": "9d5bbc466dc4fac7ad872f69eeb9dcf6ddfd925821c4699226fbdeae117839a2",
206206
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/PuerkitoBio/purell/com_github_puerkitobio_purell-v1.1.1.zip": "59e636760d7f2ab41c2f80c1784b1c73d381d44888d1999228dedd634ddcf5ed",
207207
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/PuerkitoBio/urlesc/com_github_puerkitobio_urlesc-v0.0.0-20170810143723-de5bf2ad4578.zip": "1793124273dd94e7089e95716d40529bcf70b9e87162d60218f68dde4d6aeb9d",
208+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/RaduBerinde/axisds/com_github_raduberinde_axisds-v0.0.0-20250405232732-ecb85bedf677.zip": "53a2821f7d7cc76e91278e457d5f58bc5a856c7968d4170435dac86f2d003a87",
208209
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/SAP/go-hdb/com_github_sap_go_hdb-v0.14.1.zip": "273de28a254c39e9f24293b864c1d664488e4a5d44d535755a5e5b68ae7eed8d",
209210
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/Shopify/goreferrer/com_github_shopify_goreferrer-v0.0.0-20220729165902-8cddb4f5de06.zip": "280a2f55812e8b475cfd9d467a3b3d5859315788e68592a8fc5d6cedadc0503f",
210211
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/Shopify/logrus-bugsnag/com_github_shopify_logrus_bugsnag-v0.0.0-20171204204709-577dee27f20d.zip": "a4cc3fa4b7b493b36b96ea035caa7afcf7307b0c4efc5e523a46597e171b95ce",
@@ -361,7 +362,7 @@ DISTDIR_FILES = {
361362
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e",
362363
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20241215232642-bb51bb14a506.zip": "920068af09e3846d9ebb4e4a7787ff1dd10f3989c5f940ad861b0f6a9f824f6e",
363364
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea",
364-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250408215241-4d38942f0ce0.zip": "35742402ba6ca70d76fb64293d58fe4837d01620aa68a339cb157c540f909597",
365+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20250412125957-bf1dcd085694.zip": "b8b78da44b535acb000e9cdacc4a5d2b65a59874d989b2ebe15c574347970f2a",
365366
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.6.zip": "018eccb5fb9ca52d43ec9eaf213539d01c1f2b94e0e822406ebfb2e9321ef6cf",
366367
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b",
367368
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/stress/com_github_cockroachdb_stress-v0.0.0-20220803192808-1806698b1b7b.zip": "3fda531795c600daf25532a4f98be2a1335cd1e5e182c72789bca79f5f69fcc1",
@@ -582,7 +583,7 @@ DISTDIR_FILES = {
582583
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/gonum/internal/com_github_gonum_internal-v0.0.0-20181124074243-f884aa714029.zip": "e7f40a97eee3574c826a1e75f80ecd94c27853feaab5c43fde7dd95ba516c9dc",
583584
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/gonum/lapack/com_github_gonum_lapack-v0.0.0-20181123203213-e4cdc5a0bff9.zip": "f38b72e072728121b9acf5ae26d947aacc0024dddc09d19e382bacd8669f5997",
584585
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/gonum/matrix/com_github_gonum_matrix-v0.0.0-20181209220409-c518dec07be9.zip": "9cea355e35e3f5718b2c69f65712b2c08a1bec13b3cfadf168d98b41b043dd63",
585-
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/google/btree/com_github_google_btree-v1.0.1.zip": "9b9f66ca4eb36bb1867b5ff9134fb2eb9fe9717d44e28836f2e977f9c03b4128",
586+
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/google/btree/com_github_google_btree-v1.1.3.zip": "11b736bc8252b52fecdf346d3707ccf3a2b6d458ba21b4f843616fc12eeb30b2",
586587
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/google/flatbuffers/com_github_google_flatbuffers-v23.1.21+incompatible.zip": "2b66a7cfcf2feb5ead4a9399782e4665a02475b66077ab50d299bbd6eafbf526",
587588
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/google/go-cmp/com_github_google_go_cmp-v0.6.0.zip": "4b4e9bf6c48211080651b491dfb48d68b736c66a305bcf94605606e1ba2eaa4a",
588589
"https://storage.googleapis.com/cockroach-godeps/gomod/github.com/google/go-github/com_github_google_go_github-v17.0.0+incompatible.zip": "9831222a466bec73a21627e0c3525da9cadd969468e31d10ecae8580b0568d0e",

‎go.mod‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ require (
3434
github.com/golang/mock v1.6.0
3535
github.com/golang/protobuf v1.5.4
3636
github.com/golang/snappy v0.0.5-0.20231225225746-43d5d4cd4e0e
37-
github.com/google/btree v1.0.1
37+
github.com/google/btree v1.1.3
3838
github.com/google/pprof v0.0.0-20240227163752-401108e1b7e7
3939
github.com/google/uuid v1.6.0 // indirect
4040
google.golang.org/api v0.114.0
@@ -136,7 +136,7 @@ require (
136136
github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55
137137
github.com/cockroachdb/gostdlib v1.19.0
138138
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506
139-
github.com/cockroachdb/pebble v0.0.0-20250408215241-4d38942f0ce0
139+
github.com/cockroachdb/pebble v0.0.0-20250412125957-bf1dcd085694
140140
github.com/cockroachdb/redact v1.1.6
141141
github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd
142142
github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b
@@ -287,6 +287,7 @@ require (
287287
github.com/Masterminds/semver v1.5.0 // indirect
288288
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
289289
github.com/Microsoft/go-winio v0.5.2 // indirect
290+
github.com/RaduBerinde/axisds v0.0.0-20250405232732-ecb85bedf677 // indirect
290291
github.com/abbot/go-http-auth v0.4.1-0.20181019201920-860ed7f246ff // indirect
291292
github.com/aclements/go-moremath v0.0.0-20210112150236-f10218a38794 // indirect
292293
github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b // indirect

‎go.sum‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,8 @@ github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt
262262
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
263263
github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
264264
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
265+
github.com/RaduBerinde/axisds v0.0.0-20250405232732-ecb85bedf677 h1:NofOMIO/Z3301wDc9gIM/M0/+YjvOYSvUe7+30bkxkA=
266+
github.com/RaduBerinde/axisds v0.0.0-20250405232732-ecb85bedf677/go.mod h1:YO26VdZg1RVVjEhjmeEJE/4bLnD2mowj5eDiZQSLtlE=
265267
github.com/SAP/go-hdb v0.14.1/go.mod h1:7fdQLVC2lER3urZLjZCm0AuMQfApof92n3aylBPEkMo=
266268
github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
267269
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
@@ -585,8 +587,8 @@ github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 h1:ASDL+UJcILM
585587
github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506/go.mod h1:Mw7HqKr2kdtu6aYGn3tPmAftiP3QPX63LdK/zcariIo=
586588
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA=
587589
github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA=
588-
github.com/cockroachdb/pebble v0.0.0-20250408215241-4d38942f0ce0 h1:wvgval0GOfox72ywnQ8cO4rNqAGyX+IRRBrA4d4+DoQ=
589-
github.com/cockroachdb/pebble v0.0.0-20250408215241-4d38942f0ce0/go.mod h1:G8p2xxp/wrtUS3QXSSm7tUzyAIqL2SzAPnKhOAt3Hys=
590+
github.com/cockroachdb/pebble v0.0.0-20250412125957-bf1dcd085694 h1:V9IJvnoQ9nBMGSayyGD9rcSrv5umENBf2Ttz0x1mYMM=
591+
github.com/cockroachdb/pebble v0.0.0-20250412125957-bf1dcd085694/go.mod h1:ONMS0WzY11hEvOyO3Cl6fyfaDduyiz42cYeQAcqHRNQ=
590592
github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
591593
github.com/cockroachdb/redact v1.1.6 h1:zXJBwDZ84xJNlHl1rMyCojqyIxv+7YUpQiJLQ7n4314=
592594
github.com/cockroachdb/redact v1.1.6/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
@@ -1234,8 +1236,9 @@ github.com/gonum/lapack v0.0.0-20181123203213-e4cdc5a0bff9/go.mod h1:XA3DeT6rxh2
12341236
github.com/gonum/matrix v0.0.0-20181209220409-c518dec07be9/go.mod h1:0EXg4mc1CNP0HCqCz+K4ts155PXIlUywf0wqN+GfPZw=
12351237
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
12361238
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
1237-
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
12381239
github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
1240+
github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
1241+
github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
12391242
github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
12401243
github.com/google/flatbuffers v2.0.0+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
12411244
github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=

‎pkg/kv/kvserver/metrics.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3935,7 +3935,7 @@ func (sm *StoreMetrics) updateEngineMetrics(m storage.Metrics) {
39353935
sm.SecondaryCacheEvictions.Update(m.SecondaryCacheMetrics.Evictions)
39363936
sm.SecondaryCacheWriteBackFails.Update(m.SecondaryCacheMetrics.WriteBackFailures)
39373937
sm.RdbL0Sublevels.Update(int64(m.Levels[0].Sublevels))
3938-
sm.RdbL0NumFiles.Update(m.Levels[0].NumFiles)
3938+
sm.RdbL0NumFiles.Update(m.Levels[0].TablesCount)
39393939
sm.RdbL0BytesFlushed.Update(int64(m.Levels[0].BytesFlushed))
39403940
sm.FlushableIngestCount.Update(int64(m.Flush.AsIngestCount))
39413941
sm.FlushableIngestTableCount.Update(int64(m.Flush.AsIngestTableCount))
@@ -3968,7 +3968,7 @@ func (sm *StoreMetrics) updateEngineMetrics(m storage.Metrics) {
39683968
totalWriteAmp := float64(0)
39693969
for level, stats := range m.Levels {
39703970
sm.RdbBytesIngested[level].Update(int64(stats.BytesIngested))
3971-
sm.RdbLevelSize[level].Update(stats.Size)
3971+
sm.RdbLevelSize[level].Update(stats.TablesSize)
39723972
sm.RdbLevelScore[level].Update(stats.Score)
39733973
totalWriteAmp += stats.WriteAmp()
39743974
}

‎pkg/storage/engine.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,7 +1333,7 @@ type MetricsForInterval struct {
13331333
func (m *Metrics) NumSSTables() int64 {
13341334
var num int64
13351335
for _, lm := range m.Metrics.Levels {
1336-
num += lm.NumFiles
1336+
num += lm.TablesCount
13371337
}
13381338
return num
13391339
}
@@ -1397,13 +1397,13 @@ func (m *Metrics) AsStoreStatsEvent() eventpb.StoreStats {
13971397
RangeKeySetsCount: m.Keys.RangeKeySetsCount,
13981398
}
13991399
for i, l := range m.Levels {
1400-
if l.NumFiles == 0 {
1400+
if l.TablesCount == 0 {
14011401
continue
14021402
}
14031403
e.Levels = append(e.Levels, eventpb.LevelStats{
14041404
Level: uint32(i),
1405-
NumFiles: l.NumFiles,
1406-
SizeBytes: l.Size,
1405+
NumFiles: l.TablesCount,
1406+
SizeBytes: l.TablesSize,
14071407
Score: float32(l.Score),
14081408
BytesIn: l.BytesIn,
14091409
BytesIngested: l.BytesIngested,
@@ -1764,7 +1764,7 @@ func preIngestDelay(ctx context.Context, eng Engine, settings *cluster.Settings)
17641764
return
17651765
}
17661766
log.VEventf(ctx, 2, "delaying SST ingestion %s. %d L0 files, %d L0 Sublevels",
1767-
targetDelay, metrics.Levels[0].NumFiles, metrics.Levels[0].Sublevels)
1767+
targetDelay, metrics.Levels[0].TablesCount, metrics.Levels[0].Sublevels)
17681768

17691769
select {
17701770
case <-time.After(targetDelay):
@@ -1777,7 +1777,7 @@ func calculatePreIngestDelay(settings *cluster.Settings, metrics *pebble.Metrics
17771777
l0ReadAmpLimit := ingestDelayL0Threshold.Get(&settings.SV)
17781778

17791779
const ramp = 10
1780-
l0ReadAmp := metrics.Levels[0].NumFiles
1780+
l0ReadAmp := metrics.Levels[0].TablesCount
17811781
if metrics.Levels[0].Sublevels >= 0 {
17821782
l0ReadAmp = int64(metrics.Levels[0].Sublevels)
17831783
}

‎pkg/storage/engine_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,7 @@ func TestIngestDelayLimit(t *testing.T) {
12051205
{max, 55, -1},
12061206
} {
12071207
var m pebble.Metrics
1208-
m.Levels[0].NumFiles = tc.fileCount
1208+
m.Levels[0].TablesCount = tc.fileCount
12091209
m.Levels[0].Sublevels = tc.sublevelCount
12101210
require.Equal(t, tc.exp, calculatePreIngestDelay(s, &m))
12111211
}

‎pkg/storage/pebble.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1780,8 +1780,8 @@ func (p *Pebble) GetEnvStats() (*fs.EnvStats, error) {
17801780
stats.TotalFiles += uint64(m.WAL.Files + m.Table.ZombieCount + m.WAL.ObsoleteFiles + m.Table.ObsoleteCount)
17811781
stats.TotalBytes = m.WAL.Size + m.Table.ZombieSize + m.Table.ObsoleteSize
17821782
for _, l := range m.Levels {
1783-
stats.TotalFiles += uint64(l.NumFiles)
1784-
stats.TotalBytes += uint64(l.Size)
1783+
stats.TotalFiles += uint64(l.TablesCount)
1784+
stats.TotalBytes += uint64(l.TablesSize)
17851785
}
17861786

17871787
sstSizes := make(map[pebble.FileNum]uint64)

‎pkg/testutils/storageutils/sst.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func ReportSSTEntries(buf *redact.StringBuilder, name string, sst []byte) error
166166
}
167167

168168
// Dump rangedels.
169-
if rdIter, err := r.NewRawRangeDelIter(context.Background(), block.NoFragmentTransforms, block.NoReadEnv); err != nil {
169+
if rdIter, err := r.NewRawRangeDelIter(context.Background(), block.NoFragmentTransforms, sstable.NoReadEnv); err != nil {
170170
return err
171171
} else if rdIter != nil {
172172
defer rdIter.Close()
@@ -191,7 +191,7 @@ func ReportSSTEntries(buf *redact.StringBuilder, name string, sst []byte) error
191191
}
192192

193193
// Dump range keys.
194-
if rkIter, err := r.NewRawRangeKeyIter(context.Background(), block.NoFragmentTransforms, block.NoReadEnv); err != nil {
194+
if rkIter, err := r.NewRawRangeKeyIter(context.Background(), block.NoFragmentTransforms, sstable.NoReadEnv); err != nil {
195195
return err
196196
} else if rkIter != nil {
197197
defer rkIter.Close()

‎pkg/util/admission/io_load_listener.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ func computeCumStoreCompactionStats(m *pebble.Metrics) cumStoreCompactionStats {
307307
baseLevel := -1
308308
for i := range m.Levels {
309309
compactedWriteBytes += m.Levels[i].BytesCompacted
310-
if i > 0 && m.Levels[i].Size > 0 && baseLevel < 0 {
310+
if i > 0 && m.Levels[i].TablesSize > 0 && baseLevel < 0 {
311311
baseLevel = i
312312
}
313313
}
@@ -546,7 +546,7 @@ func (io *ioLoadListener) pebbleMetricsTick(ctx context.Context, metrics StoreMe
546546
io.adjustTokensResult = adjustTokensResult{
547547
ioLoadListenerState: ioLoadListenerState{
548548
cumL0AddedBytes: m.Levels[0].BytesFlushed + m.Levels[0].BytesIngested,
549-
curL0Bytes: m.Levels[0].Size,
549+
curL0Bytes: m.Levels[0].TablesSize,
550550
cumWriteStallCount: metrics.WriteStallCount,
551551
cumFlushWriteThroughput: m.Flush.WriteThroughput,
552552
cumCompactionStats: computeCumStoreCompactionStats(m),
@@ -564,9 +564,9 @@ func (io *ioLoadListener) pebbleMetricsTick(ctx context.Context, metrics StoreMe
564564
ioThreshold: &admissionpb.IOThreshold{
565565
L0NumSubLevels: int64(m.Levels[0].Sublevels),
566566
L0NumSubLevelsThreshold: math.MaxInt64,
567-
L0NumFiles: m.Levels[0].NumFiles,
567+
L0NumFiles: m.Levels[0].TablesCount,
568568
L0NumFilesThreshold: math.MaxInt64,
569-
L0Size: m.Levels[0].Size,
569+
L0Size: m.Levels[0].TablesSize,
570570
L0MinimumSizePerSubLevel: 0,
571571
},
572572
}
@@ -831,11 +831,11 @@ func (io *ioLoadListener) adjustTokensInner(
831831
memTableSizeForStopWrites uint64,
832832
) adjustTokensResult {
833833
ioThreshold := &admissionpb.IOThreshold{
834-
L0NumFiles: l0Metrics.NumFiles,
834+
L0NumFiles: l0Metrics.TablesCount,
835835
L0NumFilesThreshold: threshNumFiles,
836836
L0NumSubLevels: int64(l0Metrics.Sublevels),
837837
L0NumSubLevelsThreshold: threshNumSublevels,
838-
L0Size: l0Metrics.Size,
838+
L0Size: l0Metrics.TablesSize,
839839
L0MinimumSizePerSubLevel: l0MinSizePerSubLevel,
840840
}
841841
unflushedMemTableTooLarge := memTableSize > memTableSizeForStopWrites
@@ -845,7 +845,7 @@ func (io *ioLoadListener) adjustTokensInner(
845845
// history.
846846
recentUnflushedMemTableTooLarge := unflushedMemTableTooLarge || io.unflushedMemTableTooLarge
847847

848-
curL0Bytes := l0Metrics.Size
848+
curL0Bytes := l0Metrics.TablesSize
849849
cumL0AddedBytes := l0Metrics.BytesFlushed + l0Metrics.BytesIngested
850850
// L0 growth over the last interval.
851851
intL0AddedBytes := int64(cumL0AddedBytes) - int64(prev.cumL0AddedBytes)

0 commit comments

Comments
 (0)