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.

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

Fix mergeBlobEntries! #1039

Merged
merged 1 commit into from
Aug 18, 2023
Merged

Fix mergeBlobEntries! #1039

merged 1 commit into from
Aug 18, 2023

Conversation

Affie
Copy link
Member

@Affie Affie commented Aug 18, 2023

No description provided.

@Affie Affie added bug fix data: entry=>blob Previously bigdata, suggested over `smalldata` labels Aug 18, 2023
@Affie Affie added this to the v0.23.2 milestone Aug 18, 2023
Comment on lines 371 to 378
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[JuliaFormatter] reported by reviewdog 🐶

Suggested change
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
des = listBlobEntries(src, slbl)
# don't add data entries that already exist
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)).(des))...)
end

@codecov
Copy link

codecov bot commented Aug 18, 2023

Codecov Report

Merging #1039 (b0d00d0) into master (c0f1719) will increase coverage by 0.10%.
The diff coverage is 0.00%.

@@            Coverage Diff             @@
##           master    #1039      +/-   ##
==========================================
+ Coverage   77.94%   78.05%   +0.10%     
==========================================
  Files          26       26              
  Lines        2181     2178       -3     
==========================================
  Hits         1700     1700              
+ Misses        481      478       -3     
Files Changed Coverage Δ
src/DataBlobs/services/BlobEntry.jl 52.00% <0.00%> (+1.01%) ⬆️
src/DistributedFactorGraphs.jl 100.00% <ø> (ø)

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@Affie Affie merged commit 2c1b25c into master Aug 18, 2023
4 of 6 checks passed
@Affie Affie deleted the 23Q3/fix/mergeBlobEntries branch October 30, 2024 13:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug fix data: entry=>blob Previously bigdata, suggested over `smalldata`
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant