mirrors/stfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Enable computation of last known record and block based on lastknownrecord and lastknownblock even if last changes are updates

Browse Source
This commit is contained in:
Felicitas Pojtinger
2021-12-06 23:55:31 +01:00
parent ee5d3c72d9
commit 943d92d052
17 changed files with 203 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/inventory/find.go
View File

@@ -42,7 +42,7 @@ func Find(
return []*tar.Header{}, err
}
if err := formatting.PrintCSV(formatting.GetTARHeaderAsCSV(dbhdr.Record, dbhdr.Block, hdr)); err != nil {
if err := formatting.PrintCSV(formatting.GetTARHeaderAsCSV(dbhdr.Record, dbhdr.Lastknownrecord, dbhdr.Block, dbhdr.Lastknownblock, hdr)); err != nil {
return []*tar.Header{}, err
}

2
pkg/inventory/list.go
View File

@@ -37,7 +37,7 @@ func List(
return []*tar.Header{}, err
}
if err := formatting.PrintCSV(formatting.GetTARHeaderAsCSV(dbhdr.Record, dbhdr.Block, hdr)); err != nil {
if err := formatting.PrintCSV(formatting.GetTARHeaderAsCSV(dbhdr.Record, dbhdr.Lastknownrecord, dbhdr.Block, dbhdr.Lastknownblock, hdr)); err != nil {
return []*tar.Header{}, err
}

2
pkg/recovery/fetch.go
View File

@@ -77,7 +77,7 @@ func Fetch(
return err
}
if err := formatting.PrintCSV(formatting.GetTARHeaderAsCSV(int64(record), int64(block), hdr)); err != nil {
if err := formatting.PrintCSV(formatting.GetTARHeaderAsCSV(int64(record), -1, int64(block), -1, hdr)); err != nil {
return err
}
}

8
pkg/recovery/index.go
View File

@@ -279,7 +279,7 @@ func indexHeader(
hdr.Name = newName
}
if err := formatting.PrintCSV(formatting.GetTARHeaderAsCSV(record, block, hdr)); err != nil {
if err := formatting.PrintCSV(formatting.GetTARHeaderAsCSV(record, -1, block, -1, hdr)); err != nil {
return err
}
@@ -297,7 +297,7 @@ func indexHeader(
switch stfsAction {
case pax.STFSRecordActionCreate:
dbhdr, err := converters.TarHeaderToDBHeader(record, block, hdr)
dbhdr, err := converters.TarHeaderToDBHeader(record, record, block, block, hdr)
if err != nil {
return err
}
@@ -320,7 +320,7 @@ func indexHeader(
var newHdr *models.Header
if replacesContent, ok := hdr.PAXRecords[pax.STFSRecordReplacesContent]; ok && replacesContent == pax.STFSRecordReplacesContentTrue {
// Content & metadata update; use the new record & block
h, err := converters.TarHeaderToDBHeader(record, block, hdr)
h, err := converters.TarHeaderToDBHeader(record, record, block, block, hdr)
if err != nil {
return err
}
@@ -333,7 +333,7 @@ func indexHeader(
return err
}
h, err := converters.TarHeaderToDBHeader(oldHdr.Record, oldHdr.Block, hdr)
h, err := converters.TarHeaderToDBHeader(oldHdr.Record, record, oldHdr.Block, block, hdr)
if err != nil {
return err
}

4
pkg/recovery/query.go
View File

@@ -107,7 +107,7 @@ func Query(
}
}
if err := formatting.PrintCSV(formatting.GetTARHeaderAsCSV(record, block, hdr)); err != nil {
if err := formatting.PrintCSV(formatting.GetTARHeaderAsCSV(record, -1, block, -1, hdr)); err != nil {
return []*tar.Header{}, err
}
@@ -196,7 +196,7 @@ func Query(
}
}
if err := formatting.PrintCSV(formatting.GetTARHeaderAsCSV(record, block, hdr)); err != nil {
if err := formatting.PrintCSV(formatting.GetTARHeaderAsCSV(record, -1, block, -1, hdr)); err != nil {
return []*tar.Header{}, err
}