Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PutBlobIfNotExists does check THEN insert if not exists #658

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −14
Open

PutBlobIfNotExists does check THEN insert if not exists #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions snapshot/backup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,9 +478,7 @@ func (snap *Snapshot) Backup(imp importer.Importer, options *BackupOptions) erro
return
}
csum = snap.repository.ComputeMAC(serialized)
if !snap.BlobExists(resources.RT_ERROR_ENTRY, csum) {
err = snap.PutBlob(resources.RT_ERROR_ENTRY, csum, serialized)
}
err = snap.PutBlobIfNotExists(resources.RT_ERROR_ENTRY, csum, serialized)
return
})
if err != nil {
Expand Down Expand Up @@ -628,9 +626,7 @@ func (snap *Snapshot) Backup(imp importer.Importer, options *BackupOptions) erro
return
}
csum = snap.repository.ComputeMAC(serialized)
if !snap.BlobExists(resources.RT_VFS_ENTRY, csum) {
err = snap.PutBlob(resources.RT_VFS_ENTRY, csum, serialized)
}
err = snap.PutBlobIfNotExists(resources.RT_VFS_ENTRY, csum, serialized)
return
})
if err != nil {
Expand All @@ -643,9 +639,7 @@ func (snap *Snapshot) Backup(imp importer.Importer, options *BackupOptions) erro
return
}
csum = snap.repository.ComputeMAC(serialized)
if !snap.BlobExists(resources.RT_XATTR_ENTRY, csum) {
err = snap.PutBlob(resources.RT_XATTR_ENTRY, csum, serialized)
}
err = snap.PutBlobIfNotExists(resources.RT_XATTR_ENTRY, csum, serialized)
return
})
if err != nil {
Expand Down Expand Up @@ -795,10 +789,7 @@ func (snap *Snapshot) chunkify(imp importer.Importer, cf *classifier.Classifier,
totalEntropy += chunk.Entropy * float64(len(data))
totalDataSize += uint64(len(data))

if !snap.BlobExists(resources.RT_CHUNK, chunk.ContentMAC) {
return snap.PutBlob(resources.RT_CHUNK, chunk.ContentMAC, data)
}
return nil
return snap.PutBlobIfNotExists(resources.RT_CHUNK, chunk.ContentMAC, data)
}

if record.FileInfo.Size() == 0 {
Expand Down
11 changes: 10 additions & 1 deletion snapshot/packer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ package snapshot

import (
"bytes"
"golang.org/x/sync/errgroup"
"hash"
"io"
"runtime"
"time"

"golang.org/x/sync/errgroup"

"github.com/PlakarKorp/plakar/objects"
"github.com/PlakarKorp/plakar/packfile"
"github.com/PlakarKorp/plakar/resources"
Expand Down Expand Up @@ -163,3 +164,11 @@ func (snap *Snapshot) BlobExists(Type resources.Type, mac [32]byte) bool {
return snap.repository.BlobExists(Type, mac)
}
}

func (snap *Snapshot) PutBlobIfNotExists(Type resources.Type, mac [32]byte, data []byte) error {
snap.Logger().Trace("snapshot", "%x: PutBlobIfNotExists(%s, %064x) len=%d", snap.Header.GetIndexShortID(), Type, mac, len(data))
if snap.BlobExists(Type, mac) {
return nil
}
return snap.PutBlob(Type, mac, data)
}