blobSize in addBlobEntry!, bump v0.20.1

Author: dehann

Project.toml

@@ -1,6 +1,6 @@
 name = "DistributedFactorGraphs"
 uuid = "b5cc3c7e-6572-11e9-2517-99fb8daf2f04"
-version = "0.20.0"
+version = "0.20.1"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

src/DataBlobs/services/BlobEntry.jl

@@ -119,14 +119,25 @@ Should be extended if DFG variable is not returned by reference.
 
 Also see: [`getBlobEntry`](@ref), [`addBlob`](@ref), [`mergeBlobEntries!`](@ref)
 """
-function addBlobEntry!(var::AbstractDFGVariable, bde::BlobEntry)
-    haskey(var.dataDict, bde.label) && error("blobEntry $(bde.label) already exists on variable $(getLabel(var))")
-    var.dataDict[bde.label] = bde
-    return bde
+function addBlobEntry!(
+    var::AbstractDFGVariable, 
+    entry::BlobEntry;
+    # see https://github.com/JuliaRobotics/DistributedFactorGraphs.jl/issues/985
+    blobId::UUID = isnothing(entry.blobId) ? entry.id : entry.blobId ,
+    blobSize::Int = hasfield(DistributedFactorGraphs.BlobEntry, :size) ? entry.size : -1 ,
+)
+    haskey(var.dataDict, entry.label) && error("blobEntry $(entry.label) already exists on variable $(getLabel(var))")
+    var.dataDict[entry.label] = entry
+    return entry
 end
 
-function addBlobEntry!(dfg::AbstractDFG, label::Symbol, bde::BlobEntry)
-    return addBlobEntry!(getVariable(dfg, label), bde)
+function addBlobEntry!(
+    dfg::AbstractDFG, 
+    vLbl::Symbol, 
+    entry::BlobEntry;
+    kw...
+)
+    return addBlobEntry!(getVariable(dfg, vLbl), entry; kw...)
 end
 
 

src/DataBlobs/services/HelpersDataWrapEntryBlob.jl

@@ -119,7 +119,7 @@ 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)
+    addBlobEntry!(dfg, label, newEntry; blobSize=length(blob))
 end
 
 function addData!(
@@ -134,7 +134,7 @@ 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)
+    addBlobEntry!(dfg, label, newEntry; blobSize=length(blob))
 end