diff --git a/.github/workflows/check-pebble-dep.yml b/.github/workflows/check-pebble-dep.yml new file mode 100644 index 000000000000..a109deebbe6f --- /dev/null +++ b/.github/workflows/check-pebble-dep.yml @@ -0,0 +1,16 @@ +name: Check Pebble dep +on: + schedule: + - cron: '0 8 * * 0,3' # Every Sun and Wed at 8:00 UTC + +jobs: + check-pebble-dep: + runs-on: ubuntu-latest + env: + GH_TOKEN: ${{ github.token }} + steps: + - uses: actions/checkout@v3 + + - name: Check Pebble deps + shell: bash + run: scripts/check-pebble-dep.sh diff --git a/DEPS.bzl b/DEPS.bzl index 46463d4eac3b..cfae566249e2 100644 --- a/DEPS.bzl +++ b/DEPS.bzl @@ -1683,10 +1683,10 @@ def go_deps(): patches = [ "@com_github_cockroachdb_cockroach//build/patches:com_github_cockroachdb_pebble.patch", ], - sha256 = "7724a8c27e86c0afd6b15322fec97b0b0fd3c04d142468a19ebad33ffe4db4d4", - strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20240620170852-1b880b3441f2", + sha256 = "979d7861efb7dfd0e769f3f18da9856e6480505208cd50fe25b0f1c2d125d167", + strip_prefix = "github.com/cockroachdb/pebble@v0.0.0-20240625162254-24750442d372", urls = [ - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240620170852-1b880b3441f2.zip", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240625162254-24750442d372.zip", ], ) go_repository( diff --git a/build/bazelutil/distdir_files.bzl b/build/bazelutil/distdir_files.bzl index b0e4335eea0d..501536e068cf 100644 --- a/build/bazelutil/distdir_files.bzl +++ b/build/bazelutil/distdir_files.bzl @@ -330,7 +330,7 @@ DISTDIR_FILES = { "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/gostdlib/com_github_cockroachdb_gostdlib-v1.19.0.zip": "c4d516bcfe8c07b6fc09b8a9a07a95065b36c2855627cb3514e40c98f872b69e", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/logtags/com_github_cockroachdb_logtags-v0.0.0-20230118201751-21c54148d20b.zip": "ca7776f47e5fecb4c495490a679036bfc29d95bd7625290cfdb9abb0baf97476", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/metamorphic/com_github_cockroachdb_metamorphic-v0.0.0-20231108215700-4ba948b56895.zip": "28c8cf42192951b69378cf537be5a9a43f2aeb35542908cc4fe5f689505853ea", - "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240620170852-1b880b3441f2.zip": "7724a8c27e86c0afd6b15322fec97b0b0fd3c04d142468a19ebad33ffe4db4d4", + "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/pebble/com_github_cockroachdb_pebble-v0.0.0-20240625162254-24750442d372.zip": "979d7861efb7dfd0e769f3f18da9856e6480505208cd50fe25b0f1c2d125d167", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/redact/com_github_cockroachdb_redact-v1.1.5.zip": "11b30528eb0dafc8bc1a5ba39d81277c257cbe6946a7564402f588357c164560", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/returncheck/com_github_cockroachdb_returncheck-v0.0.0-20200612231554-92cdbca611dd.zip": "ce92ba4352deec995b1f2eecf16eba7f5d51f5aa245a1c362dfe24c83d31f82b", "https://storage.googleapis.com/cockroach-godeps/gomod/github.com/cockroachdb/stress/com_github_cockroachdb_stress-v0.0.0-20220803192808-1806698b1b7b.zip": "3fda531795c600daf25532a4f98be2a1335cd1e5e182c72789bca79f5f69fcc1", diff --git a/go.mod b/go.mod index 8c8f666ad8fc..1f6e928cbb83 100644 --- a/go.mod +++ b/go.mod @@ -125,7 +125,7 @@ require ( github.com/cockroachdb/go-test-teamcity v0.0.0-20191211140407-cff980ad0a55 github.com/cockroachdb/gostdlib v1.19.0 github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b - github.com/cockroachdb/pebble v0.0.0-20240620170852-1b880b3441f2 + github.com/cockroachdb/pebble v0.0.0-20240625162254-24750442d372 github.com/cockroachdb/redact v1.1.5 github.com/cockroachdb/returncheck v0.0.0-20200612231554-92cdbca611dd github.com/cockroachdb/stress v0.0.0-20220803192808-1806698b1b7b diff --git a/go.sum b/go.sum index 529017d96a30..1148e85aa9de 100644 --- a/go.sum +++ b/go.sum @@ -509,8 +509,8 @@ github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZe github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895 h1:XANOgPYtvELQ/h4IrmPAohXqe2pWA8Bwhejr3VQoZsA= github.com/cockroachdb/metamorphic v0.0.0-20231108215700-4ba948b56895/go.mod h1:aPd7gM9ov9M8v32Yy5NJrDyOcD8z642dqs+F0CeNXfA= -github.com/cockroachdb/pebble v0.0.0-20240620170852-1b880b3441f2 h1:5YX3cWPwlHiD1IaKnqI21NJ79W3DXl6+Wo/rgaEoSdk= -github.com/cockroachdb/pebble v0.0.0-20240620170852-1b880b3441f2/go.mod h1:6JguuJ0y0eK70b9ElngP0M8VVoFsCeEQIOpl7Cjgb+U= +github.com/cockroachdb/pebble v0.0.0-20240625162254-24750442d372 h1:uJVO+xiFyll8iwhJM9315FAIQTFYXWHYMko3sdolUco= +github.com/cockroachdb/pebble v0.0.0-20240625162254-24750442d372/go.mod h1:6JguuJ0y0eK70b9ElngP0M8VVoFsCeEQIOpl7Cjgb+U= github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= diff --git a/pkg/build/version.txt b/pkg/build/version.txt index ea967014c5bf..5c74a9c5ca97 100644 --- a/pkg/build/version.txt +++ b/pkg/build/version.txt @@ -1 +1 @@ -v24.2.0-alpha.00000000 +v24.2.0-alpha.1 diff --git a/pkg/ccl/storageccl/engineccl/shared_storage.go b/pkg/ccl/storageccl/engineccl/shared_storage.go index ae5d414496e0..5394a75b0efa 100644 --- a/pkg/ccl/storageccl/engineccl/shared_storage.go +++ b/pkg/ccl/storageccl/engineccl/shared_storage.go @@ -47,7 +47,7 @@ func iterateReplicaKeySpansShared( _ uuid.UUID, reader storage.Reader, visitPoint func(key *pebble.InternalKey, val pebble.LazyValue, info pebble.IteratorLevel) error, - visitRangeDel func(start, end []byte, seqNum uint64) error, + visitRangeDel func(start, end []byte, seqNum pebble.SeqNum) error, visitRangeKey func(start, end []byte, keys []rangekey.Key) error, visitSharedFile func(sst *pebble.SharedSSTMeta) error, visitExternalFile func(sst *pebble.ExternalFile) error, diff --git a/pkg/kv/kvserver/rditer/replica_data_iter.go b/pkg/kv/kvserver/rditer/replica_data_iter.go index 0d7de48f5289..9dbedf688194 100644 --- a/pkg/kv/kvserver/rditer/replica_data_iter.go +++ b/pkg/kv/kvserver/rditer/replica_data_iter.go @@ -463,7 +463,7 @@ var IterateReplicaKeySpansShared func( clusterID uuid.UUID, reader storage.Reader, visitPoint func(key *pebble.InternalKey, val pebble.LazyValue, info pebble.IteratorLevel) error, - visitRangeDel func(start, end []byte, seqNum uint64) error, + visitRangeDel func(start, end []byte, seqNum pebble.SeqNum) error, visitRangeKey func(start, end []byte, keys []rangekey.Key) error, visitSharedFile func(sst *pebble.SharedSSTMeta) error, visitExternalFile func(sst *pebble.ExternalFile) error, diff --git a/pkg/kv/kvserver/spanset/batch.go b/pkg/kv/kvserver/spanset/batch.go index 987ecca40c4c..0e6835a52c26 100644 --- a/pkg/kv/kvserver/spanset/batch.go +++ b/pkg/kv/kvserver/spanset/batch.go @@ -450,7 +450,7 @@ func (s spanSetReader) ScanInternal( ctx context.Context, lower, upper roachpb.Key, visitPointKey func(key *pebble.InternalKey, value pebble.LazyValue, info pebble.IteratorLevel) error, - visitRangeDel func(start []byte, end []byte, seqNum uint64) error, + visitRangeDel func(start []byte, end []byte, seqNum pebble.SeqNum) error, visitRangeKey func(start []byte, end []byte, keys []rangekey.Key) error, visitSharedFile func(sst *pebble.SharedSSTMeta) error, visitExternalFile func(sst *pebble.ExternalFile) error, @@ -787,7 +787,7 @@ func (s spanSetBatch) ScanInternal( ctx context.Context, lower, upper roachpb.Key, visitPointKey func(key *pebble.InternalKey, value pebble.LazyValue, info pebble.IteratorLevel) error, - visitRangeDel func(start []byte, end []byte, seqNum uint64) error, + visitRangeDel func(start []byte, end []byte, seqNum pebble.SeqNum) error, visitRangeKey func(start []byte, end []byte, keys []rangekey.Key) error, visitSharedFile func(sst *pebble.SharedSSTMeta) error, visitExternalFile func(sst *pebble.ExternalFile) error, diff --git a/pkg/kv/kvserver/store_snapshot.go b/pkg/kv/kvserver/store_snapshot.go index de96c8f0fec3..ef003a649219 100644 --- a/pkg/kv/kvserver/store_snapshot.go +++ b/pkg/kv/kvserver/store_snapshot.go @@ -634,14 +634,17 @@ func (kvSS *kvBatchSnapshotStrategy) Receive( if len(req.SharedTables) > 0 && doExcise { for i := range req.SharedTables { sst := req.SharedTables[i] + pbToInternalKey := func(k *kvserverpb.SnapshotRequest_SharedTable_InternalKey) pebble.InternalKey { + return pebble.InternalKey{UserKey: k.UserKey, Trailer: pebble.InternalKeyTrailer(k.Trailer)} + } sharedSSTs = append(sharedSSTs, pebble.SharedSSTMeta{ Backing: stubBackingHandle{sst.Backing}, - Smallest: pebble.InternalKey{UserKey: sst.Smallest.UserKey, Trailer: sst.Smallest.Trailer}, - Largest: pebble.InternalKey{UserKey: sst.Largest.UserKey, Trailer: sst.Largest.Trailer}, - SmallestRangeKey: pebble.InternalKey{UserKey: sst.SmallestRangeKey.UserKey, Trailer: sst.SmallestRangeKey.Trailer}, - LargestRangeKey: pebble.InternalKey{UserKey: sst.LargestRangeKey.UserKey, Trailer: sst.LargestRangeKey.Trailer}, - SmallestPointKey: pebble.InternalKey{UserKey: sst.SmallestPointKey.UserKey, Trailer: sst.SmallestPointKey.Trailer}, - LargestPointKey: pebble.InternalKey{UserKey: sst.LargestPointKey.UserKey, Trailer: sst.LargestPointKey.Trailer}, + Smallest: pbToInternalKey(sst.Smallest), + Largest: pbToInternalKey(sst.Largest), + SmallestRangeKey: pbToInternalKey(sst.SmallestRangeKey), + LargestRangeKey: pbToInternalKey(sst.LargestRangeKey), + SmallestPointKey: pbToInternalKey(sst.SmallestPointKey), + LargestPointKey: pbToInternalKey(sst.LargestPointKey), Level: uint8(sst.Level), Size: sst.Size_, }) @@ -868,7 +871,7 @@ func (kvSS *kvBatchSnapshotStrategy) Send( ikeyToPb := func(ik pebble.InternalKey) *kvserverpb.SnapshotRequest_SharedTable_InternalKey { return &kvserverpb.SnapshotRequest_SharedTable_InternalKey{ UserKey: ik.UserKey, - Trailer: ik.Trailer, + Trailer: uint64(ik.Trailer), } } sharedSSTs = append(sharedSSTs, kvserverpb.SnapshotRequest_SharedTable{ @@ -927,7 +930,7 @@ func (kvSS *kvBatchSnapshotStrategy) Send( return err } return maybeFlushBatch() - }, func(start, end []byte, seqNum uint64) error { + }, func(start, end []byte, seqNum pebble.SeqNum) error { kvs++ if b == nil { b = kvSS.newWriteBatch() diff --git a/pkg/sql/logictest/testdata/logic_test/notice b/pkg/sql/logictest/testdata/logic_test/notice index 385f17142cec..6385d0c63a44 100644 --- a/pkg/sql/logictest/testdata/logic_test/notice +++ b/pkg/sql/logictest/testdata/logic_test/notice @@ -63,5 +63,5 @@ UNLISTEN temp ---- NOTICE: unimplemented: CRDB does not support LISTEN, making UNLISTEN a no-op HINT: You have attempted to use a feature that is not yet implemented. -See: https://go.crdb.dev/issue-v/41522/dev +See: https://go.crdb.dev/issue-v/41522/v24.2 SQLSTATE: 0A000 diff --git a/pkg/sql/pgwire/testdata/pgtest/multiple_active_portals b/pkg/sql/pgwire/testdata/pgtest/multiple_active_portals index 28be155f3cb0..fb14f52c4ed4 100644 --- a/pkg/sql/pgwire/testdata/pgtest/multiple_active_portals +++ b/pkg/sql/pgwire/testdata/pgtest/multiple_active_portals @@ -457,7 +457,7 @@ ReadyForQuery {"Type":"PortalSuspended"} {"Type":"DataRow","Values":[{"text":"2"}]} {"Type":"PortalSuspended"} -{"Type":"ErrorResponse","Code":"0A000","Message":"unimplemented: the statement for a pausable portal must be a read-only SELECT query with no sub-queries or post-queries","Detail":"cannot execute a portal while a different one is open","Hint":"You have attempted to use a feature that is not yet implemented.\nSee: https://go.crdb.dev/issue-v/98911/dev"} +{"Type":"ErrorResponse","Code":"0A000","Message":"unimplemented: the statement for a pausable portal must be a read-only SELECT query with no sub-queries or post-queries","Detail":"cannot execute a portal while a different one is open","Hint":"You have attempted to use a feature that is not yet implemented.\nSee: https://go.crdb.dev/issue-v/98911/v24.2"} {"Type":"ReadyForQuery","TxStatus":"E"} send crdb_only @@ -504,7 +504,7 @@ ReadyForQuery {"Type":"BindComplete"} {"Type":"DataRow","Values":[{"text":"f"}]} {"Type":"PortalSuspended"} -{"Type":"ErrorResponse","Code":"0A000","Message":"unimplemented: the statement for a pausable portal must be a read-only SELECT query with no sub-queries or post-queries","Detail":"cannot execute a portal while a different one is open","Hint":"You have attempted to use a feature that is not yet implemented.\nSee: https://go.crdb.dev/issue-v/98911/dev"} +{"Type":"ErrorResponse","Code":"0A000","Message":"unimplemented: the statement for a pausable portal must be a read-only SELECT query with no sub-queries or post-queries","Detail":"cannot execute a portal while a different one is open","Hint":"You have attempted to use a feature that is not yet implemented.\nSee: https://go.crdb.dev/issue-v/98911/v24.2"} {"Type":"ReadyForQuery","TxStatus":"E"} send crdb_only @@ -553,7 +553,7 @@ ReadyForQuery {"Type":"BindComplete"} {"Type":"DataRow","Values":[{"text":"10"}]} {"Type":"PortalSuspended"} -{"Type":"ErrorResponse","Code":"0A000","Message":"unimplemented: the statement for a pausable portal must be a read-only SELECT query with no sub-queries or post-queries","Detail":"cannot execute a portal while a different one is open","Hint":"You have attempted to use a feature that is not yet implemented.\nSee: https://go.crdb.dev/issue-v/98911/dev"} +{"Type":"ErrorResponse","Code":"0A000","Message":"unimplemented: the statement for a pausable portal must be a read-only SELECT query with no sub-queries or post-queries","Detail":"cannot execute a portal while a different one is open","Hint":"You have attempted to use a feature that is not yet implemented.\nSee: https://go.crdb.dev/issue-v/98911/v24.2"} {"Type":"ReadyForQuery","TxStatus":"E"} send crdb_only @@ -602,7 +602,7 @@ ReadyForQuery {"Type":"BindComplete"} {"Type":"DataRow","Values":[{"text":"1"}]} {"Type":"PortalSuspended"} -{"Type":"ErrorResponse","Code":"0A000","Message":"unimplemented: the statement for a pausable portal must be a read-only SELECT query with no sub-queries or post-queries","Detail":"cannot execute a portal while a different one is open","Hint":"You have attempted to use a feature that is not yet implemented.\nSee: https://go.crdb.dev/issue-v/98911/dev"} +{"Type":"ErrorResponse","Code":"0A000","Message":"unimplemented: the statement for a pausable portal must be a read-only SELECT query with no sub-queries or post-queries","Detail":"cannot execute a portal while a different one is open","Hint":"You have attempted to use a feature that is not yet implemented.\nSee: https://go.crdb.dev/issue-v/98911/v24.2"} {"Type":"ReadyForQuery","TxStatus":"E"} send crdb_only @@ -946,7 +946,7 @@ ReadyForQuery {"Type":"PortalSuspended"} {"Type":"DataRow","Values":[{"text":"10"}]} {"Type":"PortalSuspended"} -{"Type":"ErrorResponse","Code":"0A000","Message":"unimplemented: the statement for a pausable portal must be a read-only SELECT query with no sub-queries or post-queries","Detail":"cannot execute a portal while a different one is open","Hint":"You have attempted to use a feature that is not yet implemented.\nSee: https://go.crdb.dev/issue-v/98911/dev"} +{"Type":"ErrorResponse","Code":"0A000","Message":"unimplemented: the statement for a pausable portal must be a read-only SELECT query with no sub-queries or post-queries","Detail":"cannot execute a portal while a different one is open","Hint":"You have attempted to use a feature that is not yet implemented.\nSee: https://go.crdb.dev/issue-v/98911/v24.2"} {"Type":"ReadyForQuery","TxStatus":"E"} send diff --git a/pkg/sql/pgwire/testdata/pgtest/portals_crbugs b/pkg/sql/pgwire/testdata/pgtest/portals_crbugs index 71fb2263f290..1f40954f695b 100644 --- a/pkg/sql/pgwire/testdata/pgtest/portals_crbugs +++ b/pkg/sql/pgwire/testdata/pgtest/portals_crbugs @@ -367,6 +367,6 @@ ErrorResponse {"Type":"BindComplete"} {"Type":"DataRow","Values":[{"text":"(1,1)"}]} {"Type":"PortalSuspended"} -{"Type":"ErrorResponse","Code":"0A000","Message":"unimplemented: the statement for a pausable portal must be a read-only SELECT query with no sub-queries or post-queries","Detail":"cannot execute a portal while a different one is open","Hint":"You have attempted to use a feature that is not yet implemented.\nSee: https://go.crdb.dev/issue-v/98911/dev"} +{"Type":"ErrorResponse","Code":"0A000","Message":"unimplemented: the statement for a pausable portal must be a read-only SELECT query with no sub-queries or post-queries","Detail":"cannot execute a portal while a different one is open","Hint":"You have attempted to use a feature that is not yet implemented.\nSee: https://go.crdb.dev/issue-v/98911/v24.2"} subtest end diff --git a/pkg/storage/batch.go b/pkg/storage/batch.go index 6f13537286f4..14154ca231cb 100644 --- a/pkg/storage/batch.go +++ b/pkg/storage/batch.go @@ -210,7 +210,7 @@ func (r *BatchReader) EngineRangeKeys() ([]EngineRangeKeyValue, error) { // rangeKeys decodes and returns the current Pebble range key. func (r *BatchReader) rangeKeys() (rangekey.Span, error) { - return rangekey.Decode(pebble.InternalKey{UserKey: r.key, Trailer: uint64(r.kind)}, r.value, nil) + return rangekey.Decode(pebble.MakeInternalKey(r.key, 0 /* seqNum */, r.kind), r.value, nil) } // Next advances to the next entry in the batch, returning false when the batch diff --git a/pkg/storage/bench_test.go b/pkg/storage/bench_test.go index e1eb606a4ee8..300b0e35853d 100644 --- a/pkg/storage/bench_test.go +++ b/pkg/storage/bench_test.go @@ -2125,7 +2125,7 @@ func BenchmarkMVCCScannerWithIntentsAndVersions(b *testing.B) { writer := sstable.NewWriter(objstorageprovider.NewFileWritable(sstFile), opts) for _, kv := range kvPairs { require.NoError(b, writer.Add( - pebble.InternalKey{UserKey: kv.key, Trailer: uint64(kv.kind)}, kv.value)) + pebble.MakeInternalKey(kv.key, 0 /* seqNum */, kv.kind), kv.value)) } require.NoError(b, writer.Close()) batch.Close() diff --git a/pkg/storage/engine.go b/pkg/storage/engine.go index c47e678316b8..2690263a9ffc 100644 --- a/pkg/storage/engine.go +++ b/pkg/storage/engine.go @@ -601,7 +601,7 @@ type Reader interface { ScanInternal( ctx context.Context, lower, upper roachpb.Key, visitPointKey func(key *pebble.InternalKey, value pebble.LazyValue, info pebble.IteratorLevel) error, - visitRangeDel func(start, end []byte, seqNum uint64) error, + visitRangeDel func(start, end []byte, seqNum pebble.SeqNum) error, visitRangeKey func(start, end []byte, keys []rangekey.Key) error, visitSharedFile func(sst *pebble.SharedSSTMeta) error, visitExternalFile func(sst *pebble.ExternalFile) error, diff --git a/pkg/storage/pebble.go b/pkg/storage/pebble.go index 120b5f16d52e..a997d2309abc 100644 --- a/pkg/storage/pebble.go +++ b/pkg/storage/pebble.go @@ -1791,7 +1791,7 @@ func (p *Pebble) ScanInternal( ctx context.Context, lower, upper roachpb.Key, visitPointKey func(key *pebble.InternalKey, value pebble.LazyValue, info pebble.IteratorLevel) error, - visitRangeDel func(start []byte, end []byte, seqNum uint64) error, + visitRangeDel func(start []byte, end []byte, seqNum pebble.SeqNum) error, visitRangeKey func(start []byte, end []byte, keys []rangekey.Key) error, visitSharedFile func(sst *pebble.SharedSSTMeta) error, visitExternalFile func(sst *pebble.ExternalFile) error, @@ -2972,7 +2972,7 @@ func (p *pebbleReadOnly) ScanInternal( ctx context.Context, lower, upper roachpb.Key, visitPointKey func(key *pebble.InternalKey, value pebble.LazyValue, info pebble.IteratorLevel) error, - visitRangeDel func(start []byte, end []byte, seqNum uint64) error, + visitRangeDel func(start []byte, end []byte, seqNum pebble.SeqNum) error, visitRangeKey func(start []byte, end []byte, keys []rangekey.Key) error, visitSharedFile func(sst *pebble.SharedSSTMeta) error, visitExternalFile func(sst *pebble.ExternalFile) error, @@ -3163,7 +3163,7 @@ func (p *pebbleSnapshot) ScanInternal( ctx context.Context, lower, upper roachpb.Key, visitPointKey func(key *pebble.InternalKey, value pebble.LazyValue, info pebble.IteratorLevel) error, - visitRangeDel func(start []byte, end []byte, seqNum uint64) error, + visitRangeDel func(start []byte, end []byte, seqNum pebble.SeqNum) error, visitRangeKey func(start []byte, end []byte, keys []rangekey.Key) error, visitSharedFile func(sst *pebble.SharedSSTMeta) error, visitExternalFile func(sst *pebble.ExternalFile) error, @@ -3287,7 +3287,7 @@ func (p *pebbleEFOS) ScanInternal( ctx context.Context, lower, upper roachpb.Key, visitPointKey func(key *pebble.InternalKey, value pebble.LazyValue, info pebble.IteratorLevel) error, - visitRangeDel func(start []byte, end []byte, seqNum uint64) error, + visitRangeDel func(start []byte, end []byte, seqNum pebble.SeqNum) error, visitRangeKey func(start []byte, end []byte, keys []rangekey.Key) error, visitSharedFile func(sst *pebble.SharedSSTMeta) error, visitExternalFile func(sst *pebble.ExternalFile) error, diff --git a/pkg/storage/pebble_batch.go b/pkg/storage/pebble_batch.go index de62622a537a..e1ade9bb735c 100644 --- a/pkg/storage/pebble_batch.go +++ b/pkg/storage/pebble_batch.go @@ -660,7 +660,7 @@ func (p *pebbleBatch) ScanInternal( ctx context.Context, lower, upper roachpb.Key, visitPointKey func(key *pebble.InternalKey, value pebble.LazyValue, info pebble.IteratorLevel) error, - visitRangeDel func(start []byte, end []byte, seqNum uint64) error, + visitRangeDel func(start []byte, end []byte, seqNum pebble.SeqNum) error, visitRangeKey func(start []byte, end []byte, keys []rangekey.Key) error, visitSharedFile func(sst *pebble.SharedSSTMeta) error, visitExternalFile func(sst *pebble.ExternalFile) error,