db and vault should treat a key's version generically #684
Conversation
|
|
||
| func (r NamespaceReads) Equals(o NamespaceReads) error { | ||
| return entriesEqual(r, o, func(v, v2 TxPosition) bool { | ||
| return v.Block == v2.Block && v.TxNum == v2.TxNum | ||
| return entriesEqual(r, o, func(v, v2 Version) bool { |
There was a problem hiding this comment.
We can also do
return entriesEqual(r, o, bytes.Equal)
platform/common/driver/vault.go
Outdated
| @@ -26,11 +27,17 @@ type VersionedRead struct { | |||
| TxNum TxNum | |||
There was a problem hiding this comment.
Maybe we should change also VersionedRead and VersionedValue to contain Version instead of block and txnum?
There was a problem hiding this comment.
We could use a type
type Version struct {
Block BlockNum
TxNum TxNum
}
func VersionFromBytes(RawVersion) Version
func (v *Version) Bytes() RawVersion
This way we still have access to the block and txnum
| MKey = string | ||
| RawValue = []byte | ||
| Metadata = map[MKey][]byte | ||
| RawVersion = []byte |
There was a problem hiding this comment.
This could be [8]byte
platform/common/driver/vault.go
Outdated
| @@ -26,11 +27,17 @@ type VersionedRead struct { | |||
| TxNum TxNum | |||
| } | |||
|
|
|||
| type VersionedMetadata struct { | |||
There was a problem hiding this comment.
We could reuse the type in driver.go
| TxNum driver.TxNum | ||
| } | ||
|
|
||
| func (v VersionedMetaData) Version() []byte { |
There was a problem hiding this comment.
We can return driver.RawVersion and re-use the code above.
| return buf | ||
| } | ||
|
|
||
| type VersionedMetaData struct { |
There was a problem hiding this comment.
We could rename this to VersionedMetadata (case)
| "github.com/hyperledger-labs/fabric-smart-client/platform/common/driver" | ||
| ) | ||
|
|
||
| var zeroVersion = []byte{0, 0, 0, 0, 0, 0, 0, 0} |
There was a problem hiding this comment.
not sure we can assume that the length will be always 8 unless we change the type. I would change the check bytes.Equal(zeroVersion, b) to collections.ContainsOnly(b, 0)
| return false | ||
| } | ||
|
|
||
| func ToBytes(Block driver.BlockNum, TxNum driver.TxNum) []byte { |
There was a problem hiding this comment.
The return type is RawVersion?
There was a problem hiding this comment.
If RawVersion is the type, this method would be called toRawVersion, I guess
adecaro
force-pushed
the
f-vault-generic-version
branch
from
a73f08c
to
706b425
Compare
| return false | ||
| } | ||
|
|
||
| func ToBytes(Block driver.BlockNum, TxNum driver.TxNum) []byte { |
There was a problem hiding this comment.
If RawVersion is the type, this method would be called toRawVersion, I guess
|
|
||
| func ToBytes(Block driver.BlockNum, TxNum driver.TxNum) []byte { | ||
| buf := make([]byte, 8) | ||
| binary.BigEndian.PutUint32(buf[:4], uint32(Block)) |
There was a problem hiding this comment.
Don't we run into issues here if fabric is used? Block height in Fabric is still uint64? I am wondering if we need to fix the version size at all?
| @@ -90,7 +91,7 @@ func (p *populator) Populate(rws *vault.ReadWriteSet, rwsetBytes []byte, namespa | |||
| bn = read.Version.BlockNum | |||
| txn = read.Version.TxNum | |||
| } | |||
| rws.ReadSet.Add(ns, read.Key, bn, txn) | |||
| rws.ReadSet.Add(ns, read.Key, fver.ToBytes(bn, txn)) | |||
There was a problem hiding this comment.
I think the Fabric Platform should provide this function not core/generic/vault as this is Fabric specific. Other platforms may implement different formats.
Signed-off-by: Angelo De Caro <[email protected]>
Signed-off-by: Angelo De Caro <[email protected]>
adecaro
force-pushed
the
f-vault-generic-version
branch
from
706b425
to
c2956ca
Compare
Signed-off-by: Angelo De Caro <[email protected]>
Signed-off-by: Angelo De Caro <[email protected]>
This PR addresses #665