Skip to content

fix: solve lose uid kv when incr Sync. #976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mo3et merged 3 commits into from
Jul 4, 2025
Merged

fix: solve lose uid kv when incr Sync. #976

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67353dc
fix: solve lose uid kv when incr Sync.
mo3et Jul 3, 2025
36dd94f
Update logic.
mo3et Jul 3, 2025
af92c13
update var.
mo3et Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions pkg/syncer/version_synchronizer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ func (o *VersionSynchronizer[V, R]) IncrementalSync() error {
}
resp = o.ServerVersion()
}

delIDs := o.Delete(resp)
changes := o.Update(resp)
insert := o.Insert(resp)
Expand All @@ -84,6 +85,7 @@ func (o *VersionSynchronizer[V, R]) IncrementalSync() error {
extraData = temp
}
}

if len(delIDs) == 0 && len(changes) == 0 && len(insert) == 0 && !o.Full(resp) && extraData == nil {
log.ZDebug(o.Ctx, "no data to sync", "table", o.TableName, "entityID", o.EntityID)
return nil
Expand All @@ -102,20 +104,27 @@ func (o *VersionSynchronizer[V, R]) IncrementalSync() error {
if len(delIDs) > 0 {
lvs.UIDList = datautil.DeleteElems(lvs.UIDList, delIDs...)
}

if len(insert) > 0 {
lvs.UIDList = append(lvs.UIDList, datautil.Slice(insert, o.Key)...)
changes = append(changes, insert...)
}

if len(changes) > 0 {
changeKeys := datautil.SliceSub(lvs.UIDList, datautil.Slice(changes, o.Key))
if changeKeys != nil {
lvs.UIDList = append(lvs.UIDList, changeKeys...)
}
}

local, err := o.Local()
if err != nil {
return err
}

kv := datautil.SliceToMapAny(local, func(v V) (string, V) {
return o.Key(v), v
})

changes = append(changes, insert...)

for i, change := range changes {
key := o.Key(change)
kv[key] = changes[i]
Expand All @@ -124,6 +133,7 @@ func (o *VersionSynchronizer[V, R]) IncrementalSync() error {
for _, id := range delIDs {
delete(kv, id)
}

server := datautil.Values(kv)
if err := o.Syncer(server, local); err != nil {
return err
Expand All @@ -132,8 +142,8 @@ func (o *VersionSynchronizer[V, R]) IncrementalSync() error {
if err := o.ExtraDataProcessor(o.Ctx, extraData); err != nil {
return err
}

}

// The ordering of fullID has changed due to modifications such as group role level changes or friend list reordering.
// Therefore, it is necessary to refresh and obtain the fullID again.
if o.IDOrderChanged != nil && o.IDOrderChanged(resp) {
Expand All @@ -151,6 +161,7 @@ func (o *VersionSynchronizer[V, R]) CheckVersionSync() error {
if err != nil {
return err
}

var extraData any
resp := o.ServerVersion()
delIDs := o.Delete(resp)
Expand All @@ -163,10 +174,12 @@ func (o *VersionSynchronizer[V, R]) CheckVersionSync() error {
extraData = temp
}
}

if len(delIDs) == 0 && len(changes) == 0 && len(insert) == 0 && !o.Full(resp) && extraData == nil {
log.ZWarn(o.Ctx, "exception no data to sync", errs.New("notification no data"), "table", o.TableName, "entityID", o.EntityID)
return nil
}

log.ZDebug(o.Ctx, "check version sync", "table", o.TableName, "entityID", o.EntityID, "versionID", versionID, "localVersionID", lvs.VersionID, "version", version, "localVersion", lvs.Version)
/// If the version unique ID cannot correspond with the local version,
// it indicates that the data might have been tampered with or an exception has occurred.
Expand All @@ -176,22 +189,25 @@ func (o *VersionSynchronizer[V, R]) CheckVersionSync() error {
o.ServerVersion = nil
return o.IncrementalSync()
}

if lvs.Version+1 == version {
if len(delIDs) > 0 {
lvs.UIDList = datautil.DeleteElems(lvs.UIDList, delIDs...)
}
if len(insert) > 0 {
lvs.UIDList = append(lvs.UIDList, datautil.Slice(insert, o.Key)...)

changes = append(changes, insert...)
}

local, err := o.Local()
if err != nil {
return err
}

kv := datautil.SliceToMapAny(local, func(v V) (string, V) {
return o.Key(v), v
})
changes = append(changes, insert...)

for i, change := range changes {
key := o.Key(change)
kv[key] = changes[i]
Expand All @@ -200,6 +216,7 @@ func (o *VersionSynchronizer[V, R]) CheckVersionSync() error {
for _, id := range delIDs {
delete(kv, id)
}

server := datautil.Values(kv)
if err := o.Syncer(server, local); err != nil {
return err
Expand All @@ -210,6 +227,7 @@ func (o *VersionSynchronizer[V, R]) CheckVersionSync() error {
}

}

// The ordering of fullID has changed due to modifications such as group role level changes or friend list reordering.
// Therefore, it is necessary to refresh and obtain the fullID again.
if o.IDOrderChanged != nil && o.IDOrderChanged(resp) {
Expand Down
Loading