VOL-1173 : Removed hash based storage; replaced with per device protobuf
- Ensured proxies issue callbacks instead of forcing with goroutines
- Fixed mutex issue with proxy component
Change-Id: Idabd3257c6d264c0f607ee228e406810304dab43
diff --git a/db/model/non_persisted_revision.go b/db/model/non_persisted_revision.go
index 811e35d..e93d0ff 100644
--- a/db/model/non_persisted_revision.go
+++ b/db/model/non_persisted_revision.go
@@ -15,7 +15,6 @@
*/
package model
-import "C"
import (
"bytes"
"crypto/md5"
@@ -57,7 +56,6 @@
r.Branch = branch
r.Config = NewDataRevision(root, data)
r.Children = children
- r.Finalize()
return r
}
@@ -130,7 +128,7 @@
return npr.Branch.Node
}
-func (npr *NonPersistedRevision) Finalize() {
+func (npr *NonPersistedRevision) Finalize(skipOnExist bool) {
GetRevCache().Lock()
defer GetRevCache().Unlock()
@@ -244,7 +242,7 @@
newRev.Children[entryName] = append(newRev.Children[entryName], childrenEntry...)
}
- newRev.Finalize()
+ newRev.Finalize(false)
return &newRev
}
@@ -266,7 +264,7 @@
newRev.Config = NewDataRevision(npr.Root, npr.Config.Data)
newRev.Hash = npr.Hash
newRev.Branch = branch
- newRev.Finalize()
+ newRev.Finalize(false)
return &newRev
}
@@ -284,7 +282,7 @@
newRev.Children[entryName] = make([]Revision, len(childrenEntry))
copy(newRev.Children[entryName], childrenEntry)
}
- newRev.Finalize()
+ newRev.Finalize(false)
return newRev
}
@@ -301,3 +299,7 @@
}
delete(GetRevCache().Cache, npr.Hash)
}
+
+func (npr *NonPersistedRevision) LoadFromPersistence(path string, txid string) []Revision {
+ return nil
+}