anyproto/any-sync
1
0
Fork 0
mirror of https://github.com/anyproto/any-sync.git synced 2025-06-08 05:57:03 +09:00
Code Activity

Merge pull request #442 from anyproto/GO-5520-fix-misplaced-hashes

Browse source 
GO-5520: Fix misplaced hashes
This commit is contained in:
Mikhail Rakhmanov 2025-04-25 17:10:41 +02:00 • committed by GitHub
commit a88f934c45
Signed by: github
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
commonspace/headsync/statestorage/statestorage.go
View file

@ -11,7 +11,6 @@ import (
type State struct {
OldHash string
NewHash string
LegacyHash string
AclId string
SettingsId string
SpaceId string
@ -147,13 +146,21 @@ func (s *stateStorage) SettingsId() string {
}
func (s *stateStorage) stateFromDoc(doc anystore.Doc) State {
var (
oldHash = doc.Value().GetString(oldHashKey)
newHash = doc.Value().GetString(newHashKey)
)
// legacy hash is used for backward compatibility, which was due to a mistake in key names
if oldHash == "" || newHash == "" {
oldHash = doc.Value().GetString(legacyHashKey)
newHash = oldHash
}
return State{
SpaceId: doc.Value().GetString(idKey),
SettingsId: doc.Value().GetString(settingsIdKey),
AclId: doc.Value().GetString(aclIdKey),
OldHash: doc.Value().GetString(newHashKey),
NewHash: doc.Value().GetString(oldHashKey),
LegacyHash: doc.Value().GetString(legacyHashKey),
OldHash: oldHash,
NewHash: newHash,
SpaceHeader: doc.Value().GetBytes(headerKey),
}
}