ChronosXYZ/go-gun
1
0
Fork 0
mirror of https://github.com/ChronosX88/go-gun.git synced 2024-11-23 10:52:19 +00:00
Code Issues Projects Releases Wiki Activity

Do eager storage of puts

Browse Source
This commit is contained in:
Chad Retz 2019-02-26 01:10:13 -06:00
parent 3a0fa8ce14
commit 1d987a5e79
3 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gun/gun.go
View File

@ -211,17 +211,32 @@ func (g *Gun) startReceiving(peer *Peer) {
} }
func (g *Gun) onPeerMessage(ctx context.Context, msg *messageReceived) { func (g *Gun) onPeerMessage(ctx context.Context, msg *messageReceived) {
// If we're tracking everything, persist all puts here. // TODO:
if g.tracking == TrackingEverything { // * if message-acks are not considered part of a store-all server's storage, then use msg.Ack
// to determine whether we even put here instead of how we do it now.
// * handle gets
// If we're tracking anything, we try to put it (may only be if exists)
if g.tracking != TrackingNothing {
// If we're tracking everything, we persist everything. Otherwise if we're
// only tracking requested, we persist only if it already exists.
putOnlyIfExists := g.tracking == TrackingRequested
for parentSoul, node := range msg.Put { for parentSoul, node := range msg.Put {
for field, value := range node.Values { for field, value := range node.Values {
if state, ok := node.Metadata.State[field]; ok { if state, ok := node.Metadata.State[field]; ok {
// TODO: warn on error or something // TODO: warn on other error or something
g.storage.Put(ctx, parentSoul, field, value, state, false) _, err := g.storage.Put(ctx, parentSoul, field, value, state, putOnlyIfExists)
if err == nil {
if msg.storedPuts == nil {
msg.storedPuts = map[string][]string{}
}
msg.storedPuts[parentSoul] = append(msg.storedPuts[parentSoul], field)
}
} }
} }
} }
} }
// If there is a listener for this message, use it // If there is a listener for this message, use it
if msg.Ack != "" { if msg.Ack != "" {
g.messageIDListenersLock.RLock() g.messageIDListenersLock.RLock()
@ -232,6 +247,7 @@ func (g *Gun) onPeerMessage(ctx context.Context, msg *messageReceived) {
return return
} }
} }
// DAM messages are either requests for our ID or setting of theirs // DAM messages are either requests for our ID or setting of theirs
if msg.DAM != "" { if msg.DAM != "" {
if msg.PID == "" { if msg.PID == "" {
@ -249,6 +265,7 @@ func (g *Gun) onPeerMessage(ctx context.Context, msg *messageReceived) {
} }
return return
} }
// Unhandled message means rebroadcast // Unhandled message means rebroadcast
g.send(ctx, msg.Message, msg.peer) g.send(ctx, msg.Message, msg.peer)
} }

4
gun/message.go
View File

@ -24,6 +24,6 @@ type MessageGetRequest struct {
type messageReceived struct { type messageReceived struct {
*Message *Message
peer *Peer peer *Peer
stored bool storedPuts map[string][]string
} }

12
gun/scoped_fetch.go
View File

@ -137,7 +137,17 @@ func (s *Scoped) fetchRemote(ctx context.Context, ch chan *FetchResult) {
// and only send result if it was an update. Otherwise only do it if we would have done one. // and only send result if it was an update. Otherwise only do it if we would have done one.
confRes := ConflictResolutionNeverSeenUpdate confRes := ConflictResolutionNeverSeenUpdate
if s.gun.tracking == TrackingRequested { if s.gun.tracking == TrackingRequested {
confRes, r.Err = s.gun.storage.Put(ctx, parentSoul, s.field, newVal, newState, false) // Wait, wait, we may have already stored this
alreadyStored := false
for _, storedField := range msg.storedPuts[parentSoul] {
if storedField == s.field {
alreadyStored = true
break
}
}
if !alreadyStored {
confRes, r.Err = s.gun.storage.Put(ctx, parentSoul, s.field, newVal, newState, false)
}
} else if lastSeenState > 0 { } else if lastSeenState > 0 {
confRes = ConflictResolve(lastSeenValue, lastSeenState, newVal, newState, StateNow()) confRes = ConflictResolve(lastSeenValue, lastSeenState, newVal, newState, StateNow())
} }