Small fixes and tests

Author: Affie

src/DataBlobs/services/FileDataEntryBlob.jl

@@ -72,12 +72,12 @@ end
 function updateDataBlob!(dfg::AbstractDFG, entry::FileDataEntry, data::Vector{UInt8})
     if !isfile(blobfilename(entry))
         @warn "Entry '$(entry.id)' does not exist, adding."
-        return addDataBlob!(entry, data)
+        return addDataBlob!(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!(entry::AbstractDataEntry)
-        return addDataBlob!(entry, data)
+        deleteDataBlob!(dfg, entry)
+        return addDataBlob!(dfg, entry, data)
     end
 end
 

src/DataBlobs/services/InMemoryDataEntryBlob.jl

@@ -29,14 +29,14 @@ getDataBlob(dfg::AbstractDFG, entry::InMemoryDataEntry) = entry.data
 # updateDataBlob!(dfg::AbstractDFG, entry::InMemoryDataEntry, blob) = error("Not suported")#entry.blob
 deleteDataBlob!(dfg::AbstractDFG, entry::InMemoryDataEntry) = entry.data
 
-function addData!(dfg::AbstractDFG, label::Symbol, entry::AbstractDataEntry; hashfunction = sha256)
+function addData!(dfg::AbstractDFG, label::Symbol, entry::InMemoryDataEntry; hashfunction = sha256)
     # assertHash(entry, entry.data, hashfunction=hashfunction)
     de = addDataEntry!(dfg, label, entry)
     db = getDataBlob(dfg, entry)
     return de=>db
 end
 
-function updateData!(dfg::AbstractDFG, label::Symbol,  entry::AbstractDataEntry)
+function updateData!(dfg::AbstractDFG, label::Symbol, entry::InMemoryDataEntry)
     # assertHash(entry, entry.data, hashfunction=hashfunction)
     de = updateDataEntry!(dfg, label, entry)
     db = getDataBlob(dfg, entry)

src/services/Serialization.jl

@@ -75,7 +75,7 @@ function unpackVariable(dfg::G,
         for (k,bdeInter) in dataIntermed
             fullVal = JSON2.read(bdeInter, getfield(DistributedFactorGraphs, dataElemTypes[k]))
             variable.dataDict[k] = fullVal
-    end
+        end
     end
 
     return variable

test/consol_DataEntryBlobTests.jl

@@ -37,6 +37,16 @@ dde,ddb = deleteData!(dfg, :x1, :random)
 @test ade == gde == dde
 @test adb == gdb == ddb
 
+# @test_throws ErrorException addData!(dfg, :x2, deepcopy(ade), dataset2)
+ade2,adb2 = addData!(dfg, :x2, deepcopy(ade))
+
+ade3,adb3 = updateData!(dfg, :x2, deepcopy(ade))
+
+@test ade == ade2 == ade3
+@test adb == adb2 == adb3
+
+deleteData!(dfg, :x2, :random)
+
 ##==============================================================================
 ## FileDataEntry
 ##==============================================================================
@@ -47,6 +57,17 @@ dde,ddb = deleteData!(dfg, :x1, :random)
 @test ade == gde == dde
 @test adb == gdb == ddb
 
+
+@test_throws ErrorException addData!(dfg, :x2, deepcopy(ade), dataset2)
+
+ade2,adb2 = addData!(dfg, :x2, deepcopy(ade), dataset1)
+ade3,adb3  = updateData!(dfg, :x2, deepcopy(ade), dataset1)
+
+@test ade == ade2 == ade3
+@test adb == adb2 == adb3
+
+deleteData!(dfg, :x2, :random)
+
 ##==============================================================================
 ## FolderStore
 ##==============================================================================
@@ -62,6 +83,13 @@ dde,ddb = deleteData!(dfg, :x1, :random)
 @test ade == gde == dde
 @test adb == gdb == ddb
 
+ade2,adb2 = addData!(dfg, :x2, deepcopy(ade), dataset1)
+# ade3,adb3 = updateData!(dfg, :x2, deepcopy(ade), dataset1)
+
+@test ade == ade2# == ade3
+@test adb == adb2# == adb3
+
+deleteData!(dfg, :x2, :random)
 ##==============================================================================
 ## Unimplemented store
 ##==============================================================================
@@ -74,3 +102,17 @@ store = TestStore{Int}()
 @test_throws ErrorException updateDataBlob!(store,  ade, 1)
 @test_throws ErrorException deleteDataBlob!(store, ade)
 @test_throws ErrorException listDataBlobs(store)
+
+
+##==============================================================================
+## Unimplemented Entry Blob Crud
+##==============================================================================
+struct NotImplementedDE <: AbstractDataEntry end
+
+nde = NotImplementedDE()
+
+@test_throws ErrorException getDataBlob(dfg, nde)
+@test_throws ErrorException addDataBlob!(dfg, nde, 1)
+@test_throws ErrorException updateDataBlob!(dfg,  nde, 1)
+@test_throws ErrorException deleteDataBlob!(dfg, nde)
+@test_throws ErrorException listDataBlobs(dfg)

test/testBlocks.jl

@@ -778,6 +778,11 @@ function  DataEntriesTestBlock!(fg, v2)
     # listDataEntries
     # emptyDataEntries
     # mergeDataEntries
+    storeEntry = BlobStoreEntry(:a,uuid4(), :b, "","","","",now(localzone()))
+    getLabel(storeEntry) = storeEntry.label
+    getId(storeEntry) = storeEntry.id
+    getHash(storeEntry) = hex2bytes(storeEntry.hash)
+    getCreatedTimestamp(storeEntry) = storeEntry.createdTimestamp
 
     oid = zeros(UInt8,12); oid[12] = 0x01
     de1 = MongodbDataEntry(:key1, uuid4(), NTuple{12,UInt8}(oid), "", now(localzone()))
@@ -816,7 +821,7 @@ function  DataEntriesTestBlock!(fg, v2)
     @test listDataEntries(fg, :b) == Symbol[:key2]
 
     #delete
-    @test deleteDataEntry!(v1, :key1) == de1
+    @test deleteDataEntry!(v1, de1) == de1
     @test listDataEntries(v1) == Symbol[:key2]
     #delete from dfg
     @test deleteDataEntry!(fg, :a, :key2) == de2_update