Skip to content

Commit 3e2eca0

Browse files
authored
Merge pull request #983 from JuliaRobotics/23Q1/fix/blob_data
Sorting out blob and data naming
2 parents 971b70f + 9770e1b commit 3e2eca0

File tree

15 files changed

+605
-579
lines changed

15 files changed

+605
-579
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
version:
21-
- '1.6'
2221
- '1.8'
2322
- '~1.9.0-0'
2423
- 'nightly'

NEWS.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
Listing news on any major breaking changes in DFG. For regular changes, see integrated Github.com project milestones for DFG.
22

3+
# v0.20
4+
5+
- Close long running serialization redo (#590) using only JSON3.jl and StructTypes.jl going forward.
6+
- Standardize BlobEntry=>Blob naming of functions, and keeping convenience wrappers `{get,add,update,delete}Data[!]`.
7+
- Consolidate to only one `BlobEntry` definition, dropping use of `AbstractBlobEntry`.
8+
- Include type field `VariableNodeData.covar`.
9+
- Drop minimum Julia compat to 1.8.
10+
311
# v0.19
412

513
- Add ids and metadata to data types.

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Requires = "1"
4242
StructTypes = "1"
4343
TensorCast = "0.3.3, 0.4"
4444
TimeZones = "1.3.1"
45-
julia = "1.6"
45+
julia = "1.8"
4646

4747
[extras]
4848
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"

attic/DataBlobs/FileDataEntryBlob.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ end
7272
function addData!(::Type{BlobEntry}, dfg::AbstractDFG, label::Symbol, key::Symbol, folder::String, blob::Vector{UInt8}, timestamp=now(localzone());
7373
id::UUID = uuid4(), hashfunction = sha256)
7474
fde = BlobEntry(key, id, folder, bytes2hex(hashfunction(blob)), timestamp)
75-
de = addDataEntry!(dfg, label, fde)
75+
de = addBlobEntry!(dfg, label, fde)
7676
db = addBlob!(dfg, fde, blob)
7777
return de=>db
7878
end

src/DataBlobs/DataBlobs.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ using SHA
44
include("entities/BlobEntry.jl")
55
include("entities/BlobStores.jl")
66

7-
include("services/AbstractBlobEntries.jl")
87
include("services/BlobEntry.jl")
98
include("services/BlobStores.jl")
10-
include("services/Blob.jl")
9+
include("services/HelpersDataWrapEntryBlob.jl")
1110

1211
# include("services/InMemoryStore.jl")
1312

@@ -22,3 +21,6 @@ export BlobEntry
2221
# export copyStore
2322

2423
export getId, getHash, getTimestamp
24+
25+
# convenience wrappers
26+
export getData, addData!, updateData!, deleteData!

0 commit comments

Comments
 (0)