From aff5c0fc5723fcc83425989faa62bbfb420b4c1f Mon Sep 17 00:00:00 2001 From: Alan Bernstein Date: Wed, 14 Oct 2020 15:46:19 -0500 Subject: [PATCH] Skip missing directories --- go.sum | 2 -- txfactory.go | 17 +++++------------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/go.sum b/go.sum index dd7dbd434..2f6d5c213 100644 --- a/go.sum +++ b/go.sum @@ -64,8 +64,6 @@ github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31 h1:gclg6gY70GLy github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= github.com/glycerine/idem v0.0.0-20190127113923-7a8083893311 h1:AAXH0ZvYIHHqU06ASy0H2tYAkAGrQlZvEy2QZrrtt4E= github.com/glycerine/idem v0.0.0-20190127113923-7a8083893311/go.mod h1:B72P/ZM99sNiCmaQJflpmMAF5LsDzStpLdWzn0+Vr2Y= -github.com/glycerine/lmdb-go v1.9.32 h1:thLnzCykFcmn2rACYnwpR4ovYauLNKaAuk+xj7YMbS0= -github.com/glycerine/lmdb-go v1.9.32/go.mod h1:DrPeeTGooMg6B7cjNSP14perptTJzzdBy5YoosthrRs= github.com/glycerine/lmdb-go v1.9.34 h1:0lymJjpdelYnIMcNzsKROfIaApt99zhaHtjDJTHjGkE= github.com/glycerine/lmdb-go v1.9.34/go.mod h1:DrPeeTGooMg6B7cjNSP14perptTJzzdBy5YoosthrRs= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= diff --git a/txfactory.go b/txfactory.go index 4589fa10f..9f01e845a 100644 --- a/txfactory.go +++ b/txfactory.go @@ -565,18 +565,7 @@ func (f *TxFactory) DumpAll() { f.dbPerShard.DumpAll() } -func (f *TxFactory) IndexSizes() (map[string]int64, error) { - switch f.types[0] { - case roaringTxn: - return f.diskUsageFromFilesystem() - default: - return nil, errors.New("Not implemented") - } - -} - -// -func (f *TxFactory) diskUsageFromFilesystem() (index2bytes map[string]int64, err error) { +func (f *TxFactory) IndexSizes() (index2bytes map[string]int64, err error) { // Open storage directory. index2bytes = make(map[string]int64) dirName, err := expandDirName(f.holder.path) @@ -605,6 +594,10 @@ func (f *TxFactory) diskUsageFromFilesystem() (index2bytes map[string]int64, err } func directoryUsage(fname string) (int64, error) { + if !DirExists(fname) { + return 0, nil + } + var size int64 dir, err := os.Open(fname)