From 7340c62c474f9224da681c3e742b5e8a008af9f8 Mon Sep 17 00:00:00 2001 From: Aleksey Kosov Date: Fri, 13 Sep 2024 16:53:04 +0300 Subject: [PATCH] changing FindEntry error handling in cassandra store (#6015) --- weed/filer/cassandra/cassandra_store.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/weed/filer/cassandra/cassandra_store.go b/weed/filer/cassandra/cassandra_store.go index b13a50fd3..6ced58776 100644 --- a/weed/filer/cassandra/cassandra_store.go +++ b/weed/filer/cassandra/cassandra_store.go @@ -2,6 +2,7 @@ package cassandra import ( "context" + "errors" "fmt" "github.com/gocql/gocql" "time" @@ -129,13 +130,10 @@ func (store *CassandraStore) FindEntry(ctx context.Context, fullpath util.FullPa if err := store.session.Query( "SELECT meta FROM filemeta WHERE directory=? AND name=?", dir, name).Scan(&data); err != nil { - if err != gocql.ErrNotFound { + if errors.Is(err, gocql.ErrNotFound) { return nil, filer_pb.ErrNotFound } - } - - if len(data) == 0 { - return nil, filer_pb.ErrNotFound + return nil, err } entry = &filer.Entry{