Merge pull request #1039 from JuliaRobotics/23Q3/fix/mergeBlobEntries

Fix mergeBlobEntries!
JuliaRobotics · Aug 18, 2023 · 2c1b25c · 2c1b25c
2 parents c0f1719 + b0d00d0
commit 2c1b25c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/DataBlobs/services/BlobEntry.jl b/src/DataBlobs/services/BlobEntry.jl
@@ -370,14 +370,11 @@ function mergeBlobEntries!(
 )
     des = listBlobEntries(src, slbl)
     # don't add data entries that already exist 
-    dde = listBlobEntries(dst, dlbl)
-        # HACK, verb list should just return vector of Symbol. NCE36
-        _getid(s) = s
-        _getid(s::BlobEntry) = s.id    
-    uids = _getid.(dde) # (s->s.id).(dde)
-    filter!(s -> !(_getid(s) in uids), des)
+    uids = listBlobEntries(dst, dlbl)
+    # verb list should just return vector of Symbol. NCE36
+    filter!(s -> !(s in uids), des)
     if 0  < length(des)
-        union(((s->mergeBlobEntries!(dst, dlbl, src, slbl, s.id)).(des))...)
+        union(((s->mergeBlobEntries!(dst, dlbl, src, slbl, s)).(des))...)
     end
 end
 

diff --git a/src/DistributedFactorGraphs.jl b/src/DistributedFactorGraphs.jl
@@ -233,7 +233,6 @@ export getBlobEntries, listDataEntries, hasDataEntry, hasDataEntry
 export getBlobEntriesVariables
 export listDataEntrySequence
 # convenience wrappers
-export mergeDataEntries!
 # aliases
 export addBlob!
 export packBlob, unpackBlob