diff --git a/src/DataBlobs/entities/BlobEntry.jl b/src/DataBlobs/entities/BlobEntry.jl index 4ab8b60d..aa3af34b 100644 --- a/src/DataBlobs/entities/BlobEntry.jl +++ b/src/DataBlobs/entities/BlobEntry.jl @@ -17,19 +17,19 @@ Base.@kwdef struct BlobEntry """ Remotely assigned and globally unique identifier for the `BlobEntry` itself (not the `.blobId`). """ id::Union{UUID, Nothing} = nothing """ Machine friendly and globally unique identifier of the 'Blob', usually assigned from a common point in the system. This can be used to guarantee unique retrieval of the large data blob. """ - blobId::Union{UUID, Nothing} = nothing + blobId::Union{UUID, Nothing} = uuid4() #Deprecated in v0.25 TODO remove union, blobId is mandatory """ Machine friendly and locally assigned identifier of the 'Blob'. `.originId`s are mandatory upon first creation at the origin regardless of network access. Separate from `.blobId` since some architectures do not allow edge processes to assign a uuid4 to data store elements. """ - originId::Union{UUID, Nothing} = nothing + originId::Union{UUID, Nothing} = blobId #Deprecated in v0.25 TODO remove union or remove originId completely """ Human friendly label of the `Blob` and also used as unique identifier per node on which a `BlobEntry` is added. E.g. do "LEFTCAM_1", "LEFTCAM_2", ... of you need to repeat a label on the same variable. """ label::Symbol """ A hint about where the `Blob` itself might be stored. Remember that a Blob may be duplicated over multiple blobstores. """ - blobstore::Symbol + blobstore::Symbol = :default """ A hash value to ensure data consistency which must correspond to the stored hash upon retrieval. Use `bytes2hex(sha256(blob))`. [Legacy: some usage functions allow the check to be skipped if needed.] """ - hash::String # Probably https://docs.julialang.org/en/v1/stdlib/SHA + hash::String = ""# Probably https://docs.julialang.org/en/v1/stdlib/SHA """ Context from which a BlobEntry=>Blob was first created. E.g. user|robot|session|varlabel. """ - origin::String - """ number of bytes in blob """ - size::Union{Int, Nothing} = nothing + origin::String = "" + """ number of bytes in blob as a string""" + size::Union{String, Nothing} = "" #TODO remove union, use "" as nothing """ Additional information that can help a different user of the Blob. """ description::String = "" """ MIME description describing the format of binary data in the `Blob`, e.g. 'image/png' or 'application/json; _type=CameraModel'. """ diff --git a/src/DataBlobs/services/HelpersDataWrapEntryBlob.jl b/src/DataBlobs/services/HelpersDataWrapEntryBlob.jl index 58b323a0..133ac468 100644 --- a/src/DataBlobs/services/HelpersDataWrapEntryBlob.jl +++ b/src/DataBlobs/services/HelpersDataWrapEntryBlob.jl @@ -49,7 +49,7 @@ function BlobEntry( label::Symbol = entry.label, blobstore::Symbol = entry.blobstore, hash::String = entry.hash, - size::Union{Int, Nothing} = entry.size, + size::Union{String, Int, Nothing} = entry.size, origin::String = entry.origin, description::String = entry.description, mimeType::String = entry.mimeType, @@ -67,7 +67,7 @@ function BlobEntry( blobstore, hash, origin, - size, + size = string(size), description, mimeType, metadata, diff --git a/src/DistributedFactorGraphs.jl b/src/DistributedFactorGraphs.jl index f483a88d..0a14fdd9 100644 --- a/src/DistributedFactorGraphs.jl +++ b/src/DistributedFactorGraphs.jl @@ -139,7 +139,7 @@ export DFGNode, AbstractDFGVariable, AbstractDFGFactor export DFGVariable, DFGVariableSummary, SkeletonDFGVariable, PackedVariable # Factors -export DFGFactor, DFGFactorSummary, SkeletonDFGFactor, PackedFactor +export DFGFactor, DFGFactorSummary, SkeletonDFGFactor, PackedFactor, Factor # Common export getSolvable, setSolvable!, isSolvable diff --git a/src/entities/DFGFactor.jl b/src/entities/DFGFactor.jl index 74777cf2..2d4b0bcd 100644 --- a/src/entities/DFGFactor.jl +++ b/src/entities/DFGFactor.jl @@ -398,6 +398,7 @@ function SkeletonDFGFactor( label::Symbol, variableOrderSymbols::Vector{Symbol} = Symbol[], ) + @warn "SkeletonDFGFactor(id::Union{UUID, Nothing}...) is deprecated, use SkeletonDFGFactor(label, variableOrderSymbols) instead" return SkeletonDFGFactor(id, label, Set{Symbol}(), variableOrderSymbols) end function SkeletonDFGFactor( diff --git a/test/data/0_25_0.tar.gz b/test/data/0_25_0.tar.gz new file mode 100644 index 00000000..aec2edec Binary files /dev/null and b/test/data/0_25_0.tar.gz differ diff --git a/test/data/0_25_0_meta.tar.gz b/test/data/0_25_0_meta.tar.gz new file mode 100644 index 00000000..5ea61182 Binary files /dev/null and b/test/data/0_25_0_meta.tar.gz differ diff --git a/test/data/0_23_0.tar.gz b/test/data/archive/0_23_0.tar.gz similarity index 100% rename from test/data/0_23_0.tar.gz rename to test/data/archive/0_23_0.tar.gz diff --git a/test/data/0_23_0_meta.tar.gz b/test/data/archive/0_23_0_meta.tar.gz similarity index 100% rename from test/data/0_23_0_meta.tar.gz rename to test/data/archive/0_23_0_meta.tar.gz