Merge pull request #1003 from JuliaRobotics/23Q1/maint/hasblob

test hasBlob and rm deprecations and some [Packed]Variable BlobEntry functions

Author: Affie

src/DataBlobs/services/BlobEntry.jl

@@ -79,6 +79,13 @@ function getBlobEntry(var::AbstractDFGVariable, key::Symbol)
     return var.dataDict[key]
 end
 
+function getBlobEntry(var::PackedVariable, key::Symbol)   
+    if !hasBlobEntry(var, key)
+        throw(KeyError("No dataEntry label $(key) found in variable $(getLabel(var)). Available keys: $(keys(var.dataDict))"))
+    end    
+    return var.blobEntries[findfirst(x->x.label == key, var.blobEntries)]
+end
+
 function getBlobEntry(var::AbstractDFGVariable, blobId::UUID)
     for (k,v) in var.dataDict
         if blobId in [v.originId, v.blobId]
@@ -90,8 +97,6 @@ function getBlobEntry(var::AbstractDFGVariable, blobId::UUID)
     )
 end
 
-@deprecate getBlobEntry(var::AbstractDFGVariable, key::Regex) getBlobEntryFirst(var, key)
-
 """
     $(SIGNATURES)
 Finds and returns the first blob entry that matches the regex.
@@ -206,6 +211,9 @@ Does a blob entry (element) exist with `blobLabel`.
 """
 hasBlobEntry(var::AbstractDFGVariable, blobLabel::Symbol) = haskey(var.dataDict, blobLabel)
 
+function hasBlobEntry(var::PackedVariable, label::Symbol)
+    return label in getproperty.(var.blobEntries, :label)
+end
 
 """
     $(SIGNATURES)
@@ -273,6 +281,10 @@ function listBlobEntries(var::AbstractDFGVariable)
     collect(keys(var.dataDict))
 end
 
+function listBlobEntries(var::PackedVariable)
+    return getproperty.(var.blobEntries, :label)
+end
+
 function listBlobEntries(dfg::AbstractDFG, label::Symbol)
     # !isVariable(dfg, label) && return nothing
     listBlobEntries(getVariable(dfg, label))

src/DataBlobs/services/BlobStores.jl

@@ -278,6 +278,7 @@ end
 
 hasBlob(store::InMemoryBlobStore, blobId::UUID) = haskey(store.blobs, blobId)
 
+listBlobs(store::InMemoryBlobStore) = collect(keys(store.blobs))
 
 ##==============================================================================
 ## LinkStore Link blobId to a existing local folder

src/Deprecated.jl

@@ -1,3 +1,8 @@
+## ================================================================================
+## Remove in v0.22
+##=================================================================================
+
+@deprecate getBlobEntry(var::AbstractDFGVariable, key::Regex) getBlobEntryFirst(var, key)
 
 ## ================================================================================
 ## Remove in v0.21
@@ -87,23 +92,4 @@ abstract type AbstractBlobEntry end
 #     return de=>db
 # end
 
-## ================================================================================
-## Add @deprecate in v0.19, remove after v0.20
-##=================================================================================
-
-function Base.convert(::Type{String}, v::VersionNumber)
-    @warn "Artificial conversion of VersionNumber to String will be deprected in future versions of DFG" maxlog=50
-    string(v)
-end
-
-# TODO ADD DEPRECATION
-@deprecate packVariable(::AbstractDFG, v::DFGVariable) packVariable(v) 
-
-## ================================================================================
-## Deprecate before v0.20
-##=================================================================================
-
-export DefaultDFG
-
-const DefaultDFG = GraphsDFG
 

src/DistributedFactorGraphs.jl

@@ -291,7 +291,7 @@ export printFactor, printVariable, printNode
 export InMemoryBlobStore
 export FolderStore
 export BlobEntry
-export getBlob, addBlob!, updateBlob!, deleteBlob!, listBlobEntries
+export getBlob, addBlob!, updateBlob!, deleteBlob!, hasBlob, listBlobEntries
 export listBlobs
 export BlobEntry
 # export copyStore

test/consol_DataEntryBlobTests.jl

@@ -97,6 +97,8 @@ _,_ = getData(dfg, :x1, "random")
 _,_ = getData(dfg, :x1, r"rando")
 gde,gdb = getData(dfg, :x1, :random)
 
+@test hasBlob(dfg, ade)
+
 @show gde
 
 @test incrDataLabelSuffix(dfg,:x1,:random) == :random_1
@@ -142,6 +144,11 @@ dde,ddb = deleteData!(dfg, :x1, :random)
 ade2 = addData!(dfg, :x2, deepcopy(ade), dataset1)
 # ade3,adb3 = updateBlob!(dfg, :x2, deepcopy(ade), dataset1)
 
+@test hasBlob(dfg, ade2)
+@test hasBlob(ds, ade2.blobId)
+
+@test length(listBlobs(ds)) == 1
+
 @test ade == ade2# == ade3
 # @test adb == adb2# == adb3
 
@@ -159,18 +166,6 @@ store = TestStore{Int}()
 @test_throws ErrorException updateBlob!(store,  ade, 1)
 @test_throws ErrorException deleteBlob!(store, ade)
 @test_throws ErrorException listBlobs(store)
+@test_throws ErrorException hasBlob(store, uuid4())
 
 
-# Dropping use of AbstractDataEntry
-# ##==============================================================================
-# ## Unimplemented Entry Blob Crud
-# ##==============================================================================
-# struct NotImplementedDE <: AbstractDataEntry end
-
-# nde = NotImplementedDE()
-
-# @test_throws ErrorException getBlobBlob(dfg, nde)
-# @test_throws ErrorException addBlob!(dfg, nde, 1)
-# @test_throws ErrorException updateBlob!(dfg,  nde, 1)
-# @test_throws ErrorException deleteBlob!(dfg, nde)
-# @test_throws ErrorException listBlobs(dfg)

test/testBlocks.jl

@@ -943,6 +943,16 @@ function  DataEntriesTestBlock!(fg, v2)
     @test deleteBlobEntry!(fg, :a, :key2) == de2_update
     @test listBlobEntries(v1) == Symbol[]
     deleteBlobEntry!(fg, :b, :key2)
+
+    # packed variable data entries
+    pacv = packVariable(v1)
+    @test addBlobEntry!(pacv, de1) == de1
+    @test hasBlobEntry(pacv, :key1)
+    @test deepcopy(de1) == getBlobEntry(pacv, :key1)
+    @test getBlobEntries(pacv) == [deepcopy(de1)]
+    @test issetequal(listBlobEntries(pacv), [:key1])
+    # @test deleteBlobEntry!(pacv, de1) == de1
+
 end
 
 function blobsStoresTestBlock!(fg)