Skip to content

Commit

Permalink
Replace different attributes to account for scan error with null valu…
Browse files Browse the repository at this point in the history
…e conversion
  • Loading branch information
vkuznet committed Mar 2, 2022
1 parent 36d25ac commit 9409edb
Showing 1 changed file with 20 additions and 4 deletions.
24 changes: 20 additions & 4 deletions dbs/blockdump.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,17 @@ func getPrimaryDataset(blk string, wg *sync.WaitGroup, primaryDataset *PrimaryDa
utils.PrintSQL(stm, args, "execute")
}

var cby sql.NullString
err := DB.QueryRow(stm, args...).Scan(
&primaryDataset.PrimaryDSId,
&primaryDataset.CreateBy,
&cby,
&primaryDataset.PrimaryDSType,
&primaryDataset.PrimaryDSName,
&primaryDataset.CreationDate,
)
if cby.Valid {
primaryDataset.CreateBy = cby.String
}
if err != nil {
log.Printf("query='%s' args='%v' error=%v", stm, args, err)
return
Expand Down Expand Up @@ -142,13 +146,17 @@ func getAcquisitionEra(blk string, wg *sync.WaitGroup, acquisitionEra *Acquisiti
}

var cby, desc sql.NullString
var cdate sql.NullInt64
err := DB.QueryRow(stm, args...).Scan(
&acquisitionEra.AcquisitionEraName,
&acquisitionEra.StartDate,
&acquisitionEra.CreationDate,
&cdate,
&cby,
&desc,
)
if cdate.Valid {
acquisitionEra.CreationDate = cdate.Int64
}
if cby.Valid {
acquisitionEra.CreateBy = cby.String
}
Expand Down Expand Up @@ -184,6 +192,7 @@ func getFileList(blk string, wg *sync.WaitGroup, files *FileList) {
for rows.Next() {
file := File{}
var bhash, md5 sql.NullString
var xt sql.NullFloat64
err = rows.Scan(
&file.CheckSum,
&file.Adler32,
Expand All @@ -195,7 +204,7 @@ func getFileList(blk string, wg *sync.WaitGroup, files *FileList) {
&file.LastModificationDate,
&file.LogicalFileName,
&md5,
&file.AutoCrossSection,
&xt,
&file.IsFileValid,
)
if bhash.Valid {
Expand All @@ -204,6 +213,9 @@ func getFileList(blk string, wg *sync.WaitGroup, files *FileList) {
if md5.Valid {
file.MD5 = md5.String
}
if xt.Valid {
file.AutoCrossSection = xt.Float64
}
if err != nil {
log.Println("unable to scan rows", err)
return
Expand Down Expand Up @@ -340,17 +352,21 @@ func getFileConfigList(blk string, wg *sync.WaitGroup, fileConfigList *FileConfi
defer rows.Close()
for rows.Next() {
fileConfig := FileConfig{}
var pname sql.NullString
err = rows.Scan(
&fileConfig.ReleaseVersion,
&fileConfig.PsetHash,
&fileConfig.PsetName,
&pname,
&fileConfig.LFN,
&fileConfig.AppName,
&fileConfig.OutputModuleLabel,
&fileConfig.GlobalTag,
&fileConfig.CreateBy,
&fileConfig.CreationDate,
)
if pname.Valid {
fileConfig.PsetName = pname.String
}
if err != nil {
log.Println("unable to scan rows", err)
return
Expand Down

0 comments on commit 9409edb

Please sign in to comment.