cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

i hate this linter

Browse Source
This commit is contained in:
Shrenuj Bansal 2023-08-14 13:56:29 -04:00
parent d746d6e6df
commit e4c2bfc150
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
storage/paths/db_index.go
View File

@ -184,7 +184,7 @@ func (dbi *DBIndex) StorageAttach(ctx context.Context, si storiface.StorageInfo,
err = dbi.harmonyDB.QueryRow(ctx, err = dbi.harmonyDB.QueryRow(ctx,
"Select storage_id, urls FROM storagelocation WHERE storage_id = $1", string(si.ID)).Scan(&storageId, &urls) "Select storage_id, urls FROM storagelocation WHERE storage_id = $1", string(si.ID)).Scan(&storageId, &urls)
if err != nil && !strings.Contains(err.Error(), "no rows in result set") { if err != nil && !strings.Contains(err.Error(), "no rows in result set") {
return false, xerrors.Errorf("storage attach select fails: ", err) return false, xerrors.Errorf("storage attach select fails: %v", err)
} }
// Storage ID entry exists // Storage ID entry exists
@ -209,7 +209,7 @@ func (dbi *DBIndex) StorageAttach(ctx context.Context, si storiface.StorageInfo,
strings.Join(si.DenyTypes, ","), strings.Join(si.DenyTypes, ","),
si.ID) si.ID)
if err != nil { if err != nil {
return false, xerrors.Errorf("storage attach UPDATE fails: ", err) return false, xerrors.Errorf("storage attach UPDATE fails: %v", err)
} }
return true, nil return true, nil
@ -236,8 +236,7 @@ func (dbi *DBIndex) StorageAttach(ctx context.Context, si storiface.StorageInfo,
st.Used, st.Used,
time.Now()) time.Now())
if err != nil { if err != nil {
log.Errorf("StorageAttach insert fails: ", err) return false, xerrors.Errorf("StorageAttach insert fails: %v", err)
return false, xerrors.Errorf("StorageAttach insert fails: ", err)
} }
return true, nil return true, nil
}) })
@ -371,7 +370,7 @@ func (dbi *DBIndex) StorageDeclareSector(ctx context.Context, storageID storifac
"SELECT is_primary FROM SectorLocation WHERE miner_id=$1 and sector_num=$2 and sector_filetype=$3 and storage_id=$4", "SELECT is_primary FROM SectorLocation WHERE miner_id=$1 and sector_num=$2 and sector_filetype=$3 and storage_id=$4",
uint64(s.Miner), uint64(s.Number), int(ft), string(storageID)).Scan(&currPrimary) uint64(s.Miner), uint64(s.Number), int(ft), string(storageID)).Scan(&currPrimary)
if err != nil && !strings.Contains(err.Error(), "no rows in result set") { if err != nil && !strings.Contains(err.Error(), "no rows in result set") {
return false, xerrors.Errorf("DB SELECT fails: ", err) return false, xerrors.Errorf("DB SELECT fails: %v", err)
} }
// If storage id already exists for this sector, update primary if need be // If storage id already exists for this sector, update primary if need be
@ -381,7 +380,7 @@ func (dbi *DBIndex) StorageDeclareSector(ctx context.Context, storageID storifac
"UPDATE SectorLocation set is_primary = TRUE WHERE miner_id=$1 and sector_num=$2 and sector_filetype=$3 and storage_id=$4", "UPDATE SectorLocation set is_primary = TRUE WHERE miner_id=$1 and sector_num=$2 and sector_filetype=$3 and storage_id=$4",
s.Miner, s.Number, ft, storageID) s.Miner, s.Number, ft, storageID)
if err != nil { if err != nil {
return false, xerrors.Errorf("DB update fails: ", err) return false, xerrors.Errorf("DB update fails: %v", err)
} }
} else { } else {
log.Warnf("sector %v redeclared in %s", s, storageID) log.Warnf("sector %v redeclared in %s", s, storageID)
@ -392,7 +391,7 @@ func (dbi *DBIndex) StorageDeclareSector(ctx context.Context, storageID storifac
"values($1, $2, $3, $4, $5)", "values($1, $2, $3, $4, $5)",
s.Miner, s.Number, ft, storageID, primary) s.Miner, s.Number, ft, storageID, primary)
if err != nil { if err != nil {
return false, xerrors.Errorf("DB insert fails: ", err) return false, xerrors.Errorf("DB insert fails: %v", err)
} }
} }