Merge pull request #983 from JuliaRobotics/23Q1/fix/blob_data

Sorting out blob and data naming
JuliaRobotics · Mar 10, 2023 · 3e2eca0 · 3e2eca0
2 parents 971b70f + 9770e1b
commit 3e2eca0
Show file tree

Hide file tree

Showing 15 changed files with 605 additions and 579 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,6 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - '1.6'
           - '1.8'
           - '~1.9.0-0'
           - 'nightly'

diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,13 @@
 Listing news on any major breaking changes in DFG.  For regular changes, see integrated Github.com project milestones for DFG.
 
+# v0.20
+
+- Close long running serialization redo (#590) using only JSON3.jl and StructTypes.jl going forward.
+- Standardize BlobEntry=>Blob naming of functions, and keeping convenience wrappers `{get,add,update,delete}Data[!]`.
+- Consolidate to only one `BlobEntry` definition, dropping use of `AbstractBlobEntry`.
+- Include type field `VariableNodeData.covar`.
+- Drop minimum Julia compat to 1.8.
+
 # v0.19
 
 - Add ids and metadata to data types.

diff --git a/Project.toml b/Project.toml
@@ -42,7 +42,7 @@ Requires = "1"
 StructTypes = "1"
 TensorCast = "0.3.3, 0.4"
 TimeZones = "1.3.1"
-julia = "1.6"
+julia = "1.8"
 
 [extras]
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"

diff --git a/attic/DataBlobs/FileDataEntryBlob.jl b/attic/DataBlobs/FileDataEntryBlob.jl
@@ -72,7 +72,7 @@ end
 function addData!(::Type{BlobEntry}, dfg::AbstractDFG, label::Symbol, key::Symbol, folder::String, blob::Vector{UInt8}, timestamp=now(localzone());
                   id::UUID = uuid4(), hashfunction = sha256)
     fde = BlobEntry(key, id, folder, bytes2hex(hashfunction(blob)), timestamp)
-    de = addDataEntry!(dfg, label, fde)
+    de = addBlobEntry!(dfg, label, fde)
     db = addBlob!(dfg, fde, blob)
     return de=>db
 end
diff --git a/src/DataBlobs/DataBlobs.jl b/src/DataBlobs/DataBlobs.jl
@@ -4,10 +4,9 @@ using SHA
 include("entities/BlobEntry.jl")
 include("entities/BlobStores.jl")
 
-include("services/AbstractBlobEntries.jl")
 include("services/BlobEntry.jl")
 include("services/BlobStores.jl")
-include("services/Blob.jl")
+include("services/HelpersDataWrapEntryBlob.jl")
 
 # include("services/InMemoryStore.jl")
 
@@ -22,3 +21,6 @@ export BlobEntry
 # export copyStore
 
 export getId, getHash, getTimestamp
+
+# convenience wrappers
+export getData, addData!, updateData!, deleteData!