From 6d59a974eb02a480fee0eeb959cc29212cee4a99 Mon Sep 17 00:00:00 2001 From: chrislu Date: Mon, 1 Sep 2025 00:12:18 -0700 Subject: [PATCH] address comments --- weed/filer/abstract_sql/abstract_sql_store.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/weed/filer/abstract_sql/abstract_sql_store.go b/weed/filer/abstract_sql/abstract_sql_store.go index 0f7a8b06c..e10efd8b9 100644 --- a/weed/filer/abstract_sql/abstract_sql_store.go +++ b/weed/filer/abstract_sql/abstract_sql_store.go @@ -76,12 +76,12 @@ type TxOrDB interface { Close() error } -type TxOrDbWrapper struct { +type TxOrDBWrapper struct { TxOrDBWithoutClose CloseFunc func() error } -func (t *TxOrDbWrapper) Close() error { +func (t *TxOrDBWrapper) Close() error { if t.CloseFunc == nil { return nil } @@ -118,12 +118,14 @@ func (store *AbstractSqlStore) getTxOrDB(ctx context.Context, fullpath util.Full bucket = DEFAULT_TABLE if tx, ok := ctx.Value("tx").(*sql.Tx); ok { - txOrDB = &TxOrDbWrapper{tx, nil} + txOrDB = &TxOrDBWrapper{tx, nil} } else { - txOrDB, err = store.DB.Conn(context.Background()) - if err != nil { + conn, connErr := store.DB.Conn(context.Background()) + if connErr != nil { + err = connErr return } + txOrDB = &TxOrDBWrapper{conn, conn.Close} } if !store.SupportBucketTable {