Skip to content

Commit 2c1b25c

Browse files
authored
Merge pull request #1039 from JuliaRobotics/23Q3/fix/mergeBlobEntries
Fix mergeBlobEntries!
2 parents c0f1719 + b0d00d0 commit 2c1b25c

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

src/DataBlobs/services/BlobEntry.jl

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -370,14 +370,11 @@ function mergeBlobEntries!(
370370
)
371371
des = listBlobEntries(src, slbl)
372372
# don't add data entries that already exist
373-
dde = listBlobEntries(dst, dlbl)
374-
# HACK, verb list should just return vector of Symbol. NCE36
375-
_getid(s) = s
376-
_getid(s::BlobEntry) = s.id
377-
uids = _getid.(dde) # (s->s.id).(dde)
378-
filter!(s -> !(_getid(s) in uids), des)
373+
uids = listBlobEntries(dst, dlbl)
374+
# verb list should just return vector of Symbol. NCE36
375+
filter!(s -> !(s in uids), des)
379376
if 0 < length(des)
380-
union(((s->mergeBlobEntries!(dst, dlbl, src, slbl, s.id)).(des))...)
377+
union(((s->mergeBlobEntries!(dst, dlbl, src, slbl, s)).(des))...)
381378
end
382379
end
383380

src/DistributedFactorGraphs.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@ export getBlobEntries, listDataEntries, hasDataEntry, hasDataEntry
233233
export getBlobEntriesVariables
234234
export listDataEntrySequence
235235
# convenience wrappers
236-
export mergeDataEntries!
237236
# aliases
238237
export addBlob!
239238
export packBlob, unpackBlob

0 commit comments

Comments
 (0)