From fbe307d76da00642c87e61eaa17ae8a2792e31ec Mon Sep 17 00:00:00 2001 From: ucwong Date: Thu, 14 Sep 2023 18:35:39 +0800 Subject: [PATCH] deps --- go.mod | 6 +++--- go.sum | 12 ++++++------ .../objstorageprovider/remoteobjcat/version_edit.go | 13 +++++++++---- vendor/modules.txt | 6 +++--- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index aff3d4b500..12de0b4855 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.1 github.com/CortexFoundation/inference v1.0.2-0.20230307032835-9197d586a4e8 github.com/CortexFoundation/statik v0.0.0-20210315012922-8bb8a7b5dc66 - github.com/CortexFoundation/torrentfs v1.0.54-0.20230913182816-d7428d1e9e55 + github.com/CortexFoundation/torrentfs v1.0.54-0.20230914082442-9fa79908ebeb github.com/VictoriaMetrics/fastcache v1.12.1 github.com/arsham/figurine v1.3.0 github.com/aws/aws-sdk-go-v2 v1.19.0 @@ -17,7 +17,7 @@ require ( github.com/cespare/cp v1.1.1 github.com/charmbracelet/bubbletea v0.24.2 github.com/cloudflare/cloudflare-go v0.57.1 - github.com/cockroachdb/pebble v0.0.0-20230908235124-1efa535da006 + github.com/cockroachdb/pebble v0.0.0-20230913170726-3db8edc31693 github.com/consensys/gnark-crypto v0.11.1 github.com/crate-crypto/go-kzg-4844 v0.3.0 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc @@ -219,7 +219,7 @@ require ( github.com/tklauser/numcpus v0.6.1 // indirect github.com/ucwong/filecache v1.0.6-0.20230405163841-810d53ced4bd // indirect github.com/ucwong/go-ttlmap v1.0.2-0.20221020173635-331e7ddde2bb // indirect - github.com/ucwong/golang-kv v1.0.23-0.20230910073758-76abee7ccfea // indirect + github.com/ucwong/golang-kv v1.0.23-0.20230914080359-4f6598d896b9 // indirect github.com/ucwong/shard v1.0.1-0.20230902205521-676c0c9c1dd2 // indirect github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect github.com/xujiajun/mmap-go v1.0.1 // indirect diff --git a/go.sum b/go.sum index b693a486fe..bb23ae046e 100644 --- a/go.sum +++ b/go.sum @@ -67,8 +67,8 @@ github.com/CortexFoundation/statik v0.0.0-20210315012922-8bb8a7b5dc66/go.mod h1: github.com/CortexFoundation/torrentfs v1.0.13-0.20200623060705-ce027f43f2f8/go.mod h1:Ma+tGhPPvz4CEZHaqEJQMOEGOfHeQBiAoNd1zyc/w3Q= github.com/CortexFoundation/torrentfs v1.0.14-0.20200703071639-3fcabcabf274/go.mod h1:qnb3YlIJmuetVBtC6Lsejr0Xru+1DNmDCdTqnwy7lhk= github.com/CortexFoundation/torrentfs v1.0.20-0.20200810031954-d36d26f82fcc/go.mod h1:N5BsicP5ynjXIi/Npl/SRzlJ630n1PJV2sRj0Z0t2HA= -github.com/CortexFoundation/torrentfs v1.0.54-0.20230913182816-d7428d1e9e55 h1:4/07+pA4e0L/aZjc4T+Nb8AwscefGI8MuigkLDbAqT0= -github.com/CortexFoundation/torrentfs v1.0.54-0.20230913182816-d7428d1e9e55/go.mod h1:Yt+umO4vwCdBhCrbu2Osemd0tsfgdrzv4mHLwn7n7Pw= +github.com/CortexFoundation/torrentfs v1.0.54-0.20230914082442-9fa79908ebeb h1:nuUQp2+9zp42pueAKLN39yV6gnBR1/T+BokRlWb5z1s= +github.com/CortexFoundation/torrentfs v1.0.54-0.20230914082442-9fa79908ebeb/go.mod h1:i9gUHtZjrjBA9GIVTdShbNICjUcc25yKVc4gIM/3Vco= github.com/CortexFoundation/wormhole v0.0.0-20230908085523-44aea02f16f8 h1:Cvtqm62iaQx0KBC2ZuEseIsuBh3v1BvIpcHvwIe4yq8= github.com/CortexFoundation/wormhole v0.0.0-20230908085523-44aea02f16f8/go.mod h1:62dTMtfdf0W71ZfM7xDFJTFdzMfaKeYUrx7fB5/iQ1s= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= @@ -348,8 +348,8 @@ github.com/cockroachdb/errors v1.10.0 h1:lfxS8zZz1+OjtV4MtNWgboi/W5tyLEB6VQZBXN+ github.com/cockroachdb/errors v1.10.0/go.mod h1:lknhIsEVQ9Ss/qKDBQS/UqFSvPQjOwNq2qyKAxtHRqE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= -github.com/cockroachdb/pebble v0.0.0-20230908235124-1efa535da006 h1:2OpMG/IkDFFeJPrVqeR4BDLyt1QjCXCVqHj+7+ooJ8g= -github.com/cockroachdb/pebble v0.0.0-20230908235124-1efa535da006/go.mod h1:nindLFinxeDPjP4qI9LtVHAwDef57/0s5KMfWgdktQc= +github.com/cockroachdb/pebble v0.0.0-20230913170726-3db8edc31693 h1:538FMQLRjL4Q+hLIFkmCEnw56JRAD7grMpK/UJ1b/Nc= +github.com/cockroachdb/pebble v0.0.0-20230913170726-3db8edc31693/go.mod h1:nindLFinxeDPjP4qI9LtVHAwDef57/0s5KMfWgdktQc= github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30= github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= @@ -1255,8 +1255,8 @@ github.com/ucwong/filecache v1.0.6-0.20230405163841-810d53ced4bd h1:gBtlvLAsgLk+ github.com/ucwong/filecache v1.0.6-0.20230405163841-810d53ced4bd/go.mod h1:ddwX+NCjMZPdpzcGh1fcEbNTUTCtKgt2hC2rqvmLKgA= github.com/ucwong/go-ttlmap v1.0.2-0.20221020173635-331e7ddde2bb h1:dVZH3AH9f7zB3VBmsjn25B7lfcAyMP4QxdFYTrfj7tg= github.com/ucwong/go-ttlmap v1.0.2-0.20221020173635-331e7ddde2bb/go.mod h1:3yswsBsVuwsOjDvFfC5Na9XSEf4HC7mj3W3g6jvSY/s= -github.com/ucwong/golang-kv v1.0.23-0.20230910073758-76abee7ccfea h1:26OAXrVl68qtdaBnfs0fseU5ytITUKzlqZpCObVXSI4= -github.com/ucwong/golang-kv v1.0.23-0.20230910073758-76abee7ccfea/go.mod h1:1xvYw7cu/g2l2hIcAqjnuV6hxzb57gDJT6Bs2IgVnEg= +github.com/ucwong/golang-kv v1.0.23-0.20230914080359-4f6598d896b9 h1:79AxVXG4Y/wbFXyXZYNkwoM4uhVvdXK1631iqx9gFRM= +github.com/ucwong/golang-kv v1.0.23-0.20230914080359-4f6598d896b9/go.mod h1:xg9ilaeJDxhh39RW7VZgYNzEos5gfA/g6RplnKMLOfQ= github.com/ucwong/golang-set v1.8.1-0.20200419153428-d7b0b1ac2d43/go.mod h1:xu0FaiQFGbBcFZj2o7udZ5rbA8jRTsv47hkPoG5qQNM= github.com/ucwong/goleveldb v1.0.3-0.20200508074755-578cba616f37/go.mod h1:dgJUTtDxq/ne6/JzZhHzF24OL/uqILz9IWk8HmT4V2g= github.com/ucwong/goleveldb v1.0.3-0.20200618184106-f1c6bc3a428b/go.mod h1:7Sq6w7AfEZuB/a6mrlvHCSXCSkqojCMMrM3Ei12QAT0= diff --git a/vendor/github.com/cockroachdb/pebble/objstorage/objstorageprovider/remoteobjcat/version_edit.go b/vendor/github.com/cockroachdb/pebble/objstorage/objstorageprovider/remoteobjcat/version_edit.go index a9044b7806..44552f5b69 100644 --- a/vendor/github.com/cockroachdb/pebble/objstorage/objstorageprovider/remoteobjcat/version_edit.go +++ b/vendor/github.com/cockroachdb/pebble/objstorage/objstorageprovider/remoteobjcat/version_edit.go @@ -11,6 +11,7 @@ import ( "github.com/cockroachdb/errors" "github.com/cockroachdb/pebble/internal/base" + "github.com/cockroachdb/pebble/internal/invariants" "github.com/cockroachdb/pebble/objstorage" "github.com/cockroachdb/pebble/objstorage/remote" ) @@ -234,14 +235,18 @@ func (v *VersionEdit) Apply( *creatorID = v.CreatorID } for _, meta := range v.NewObjects { - if _, exists := objects[meta.FileNum]; exists { - return errors.AssertionFailedf("version edit adds existing object %s", meta.FileNum) + if invariants.Enabled { + if _, exists := objects[meta.FileNum]; exists { + return errors.AssertionFailedf("version edit adds existing object %s", meta.FileNum) + } } objects[meta.FileNum] = meta } for _, fileNum := range v.DeletedObjects { - if _, exists := objects[fileNum]; !exists { - return errors.AssertionFailedf("version edit deletes non-existent object %s", fileNum) + if invariants.Enabled { + if _, exists := objects[fileNum]; !exists { + return errors.AssertionFailedf("version edit deletes non-existent object %s", fileNum) + } } delete(objects, fileNum) } diff --git a/vendor/modules.txt b/vendor/modules.txt index d17048c0e6..46d7176ffd 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -43,7 +43,7 @@ github.com/CortexFoundation/robot/backend # github.com/CortexFoundation/statik v0.0.0-20210315012922-8bb8a7b5dc66 ## explicit; go 1.16 github.com/CortexFoundation/statik -# github.com/CortexFoundation/torrentfs v1.0.54-0.20230913182816-d7428d1e9e55 +# github.com/CortexFoundation/torrentfs v1.0.54-0.20230914082442-9fa79908ebeb ## explicit; go 1.21 github.com/CortexFoundation/torrentfs github.com/CortexFoundation/torrentfs/backend @@ -338,7 +338,7 @@ github.com/cockroachdb/errors/withstack # github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b ## explicit; go 1.16 github.com/cockroachdb/logtags -# github.com/cockroachdb/pebble v0.0.0-20230908235124-1efa535da006 +# github.com/cockroachdb/pebble v0.0.0-20230913170726-3db8edc31693 ## explicit; go 1.19 github.com/cockroachdb/pebble github.com/cockroachdb/pebble/bloom @@ -972,7 +972,7 @@ github.com/ucwong/filecache # github.com/ucwong/go-ttlmap v1.0.2-0.20221020173635-331e7ddde2bb ## explicit; go 1.19 github.com/ucwong/go-ttlmap -# github.com/ucwong/golang-kv v1.0.23-0.20230910073758-76abee7ccfea +# github.com/ucwong/golang-kv v1.0.23-0.20230914080359-4f6598d896b9 ## explicit; go 1.20 github.com/ucwong/golang-kv github.com/ucwong/golang-kv/badger