Small blob fixes

Author: Affie

src/DataBlobs/services/BlobStores.jl

@@ -226,7 +226,7 @@ end
 function deleteBlob!(store::FolderStore{T}, blobId::UUID) where {T}
     blobfilename = joinpath(store.folder, "$blobId.dat")
 
-    data = getBlob(store, entry)
+    data = getBlob(store, blobId)
     rm(blobfilename)
     return data
 end
@@ -261,7 +261,7 @@ function addBlob!(store::InMemoryBlobStore{T}, blobId::UUID, data::T) where {T}
         error("Key '$blobId' blob already exists.")
     end
     store.blobs[blobId] = data
-    return UUIDblobId
+    return blobId
 end
 
 function updateBlob!(store::InMemoryBlobStore{T}, blobId::UUID, data::T) where {T}

src/DataBlobs/services/HelpersDataWrapEntryBlob.jl

@@ -117,8 +117,8 @@ function addData!(
 )
     checkhash && assertHash(entry, blob, hashfunction=hashfunction)
     blobId = addBlob!(dfg, entry, blob) |> UUID
-    newEntry = BlobEntry(entry; id=blobId, blobId) #, size=length(blob))
-    addBlobEntry!(dfg, label, newEntry; blobSize=length(blob))
+    newEntry = BlobEntry(entry; blobId) #, size=length(blob))
+    addBlobEntry!(dfg, label, newEntry)
 end
 
 function addData!(
@@ -132,8 +132,8 @@ function addData!(
 )
     checkhash && assertHash(entry, blob; hashfunction)
     blobId = addBlob!(blobstore, entry, blob) |> UUID
-    newEntry = BlobEntry(entry; id=blobId, blobId) #, size=length(blob))
-    addBlobEntry!(dfg, label, newEntry; blobSize=length(blob))
+    newEntry = BlobEntry(entry; blobId) #, size=length(blob))
+    addBlobEntry!(dfg, label, newEntry)
 end
 
 

src/GraphsDFG/entities/GraphsDFG.jl

@@ -18,7 +18,7 @@ mutable struct GraphsDFG{T <: AbstractParams, V <: AbstractDFGVariable, F <:Abst
     sessionData::Dict{Symbol, String}
     addHistory::Vector{Symbol} #TODO: Discuss more - is this an audit trail?
     solverParams::T # Solver parameters
-    blobStores::OrderedDict{Symbol, <:AbstractBlobStore}
+    blobStores::Dict{Symbol, <:AbstractBlobStore}
 end
 
 """