Merge pull request #962 from JuliaRobotics/feature/prep_dfg20

Working through serialization and blobs for DFG 0.20

Author: dehann

Project.toml

@@ -9,8 +9,6 @@ Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
 Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
-JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
-JSON2 = "2535ab7d-5cd8-5a07-80ac-9b1792aadce3"
 JSON3 = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 ManifoldsBase = "3362f125-f0bb-47a3-aa74-596ffd7ef2fb"
@@ -22,6 +20,7 @@ Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 SHA = "ea8e919c-243c-51af-8825-aaa63cd721ce"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+StructTypes = "856f2bd8-1eba-4b0a-8007-ebc267875bd4"
 TensorCast = "02d47bb6-7ce6-556a-be16-bb1710789e2b"
 TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
@@ -32,8 +31,6 @@ Distributions = "0.23, 0.24, 0.25"
 DocStringExtensions = "0.8, 0.9"
 GraphPlot = "0.5.0"
 Graphs = "1.4"
-JSON = "0.21"
-JSON2 = "0.3.1"
 JSON3 = "1"
 ManifoldsBase = "0.12, 0.13, 0.14"
 OrderedCollections = "1.4"

src/DataBlobs/services/FileDataEntryBlob.jl renamed to attic/DataBlobs/FileDataEntryBlob.jl

@@ -1,25 +1,25 @@
 
 
-# @generated function ==(x::FileDataEntry, y::FileDataEntry)
+# @generated function ==(x::BlobEntry, y::BlobEntry)
 #     mapreduce(n -> :(x.$n == y.$n), (a,b)->:($a && $b), fieldnames(x))
 # end
 
 #
-# getHash(entry::AbstractDataEntry) = hex2bytes(entry.hash)
+# getHash(entry::AbstractBlobEntry) = hex2bytes(entry.hash)
 
 
 ##==============================================================================
-## FileDataEntry Common
+## BlobEntry Common
 ##==============================================================================
-blobfilename(entry::FileDataEntry) = joinpath(entry.folder,"$(entry.id).dat")
-entryfilename(entry::FileDataEntry) = joinpath(entry.folder,"$(entry.id).json")
+blobfilename(entry::BlobEntry) = joinpath(entry.folder,"$(entry.id).dat")
+entryfilename(entry::BlobEntry) = joinpath(entry.folder,"$(entry.id).json")
 
 
 ##==============================================================================
-## FileDataEntry Blob CRUD
+## BlobEntry Blob CRUD
 ##==============================================================================
 
-function getDataBlob(dfg::AbstractDFG, entry::FileDataEntry)
+function getBlob(dfg::AbstractDFG, entry::BlobEntry)
     if isfile(blobfilename(entry))
         open(blobfilename(entry)) do f
             return read(f)
@@ -30,7 +30,7 @@ function getDataBlob(dfg::AbstractDFG, entry::FileDataEntry)
     end
 end
 
-function addDataBlob!(dfg::AbstractDFG, entry::FileDataEntry, data::Vector{UInt8})
+function addBlob!(dfg::AbstractDFG, entry::BlobEntry, data::Vector{UInt8})
     if isfile(blobfilename(entry))
         error("Key '$(entry.id)' blob already exists.")
     elseif isfile(entryfilename(entry))
@@ -42,37 +42,37 @@ function addDataBlob!(dfg::AbstractDFG, entry::FileDataEntry, data::Vector{UInt8
         open(entryfilename(entry), "w") do f
             JSON.print(f, entry)
         end
-        return getDataBlob(dfg, entry)::Vector{UInt8}
+        return getBlob(dfg, entry)::Vector{UInt8}
     end
 end
 
-function updateDataBlob!(dfg::AbstractDFG, entry::FileDataEntry, data::Vector{UInt8})
+function updateBlob!(dfg::AbstractDFG, entry::BlobEntry, data::Vector{UInt8})
     if !isfile(blobfilename(entry))
         @warn "Entry '$(entry.id)' does not exist, adding."
-        return addDataBlob!(dfg, entry, data)
+        return addBlob!(dfg, entry, data)
     else
         # perhaps add an explicit force update flag and error otherwise
         @warn "Key '$(entry.id)' already exists, data will be overwritten."
-        deleteDataBlob!(dfg, entry)
-        return addDataBlob!(dfg, entry, data)
+        deleteBlob!(dfg, entry)
+        return addBlob!(dfg, entry, data)
     end
 end
 
-function deleteDataBlob!(dfg::AbstractDFG, entry::FileDataEntry)
-    data = getDataBlob(dfg, entry)
+function deleteBlob!(dfg::AbstractDFG, entry::BlobEntry)
+    data = getBlob(dfg, entry)
     rm(blobfilename(entry))
     rm(entryfilename(entry))
     return data
 end
 
 ##==============================================================================
-## FileDataEntry CRUD Helpers
+## BlobEntry CRUD Helpers
 ##==============================================================================
 
-function addData!(::Type{FileDataEntry}, dfg::AbstractDFG, label::Symbol, key::Symbol, folder::String, blob::Vector{UInt8}, timestamp=now(localzone());
+function addData!(::Type{BlobEntry}, dfg::AbstractDFG, label::Symbol, key::Symbol, folder::String, blob::Vector{UInt8}, timestamp=now(localzone());
                   id::UUID = uuid4(), hashfunction = sha256)
-    fde = FileDataEntry(key, id, folder, bytes2hex(hashfunction(blob)), timestamp)
+    fde = BlobEntry(key, id, folder, bytes2hex(hashfunction(blob)), timestamp)
     de = addDataEntry!(dfg, label, fde)
-    db = addDataBlob!(dfg, fde, blob)
+    db = addBlob!(dfg, fde, blob)
     return de=>db
 end