From be7fa572aaf642af98fef9239fd1699f4ac48a40 Mon Sep 17 00:00:00 2001 From: bel Date: Sun, 5 Nov 2023 13:53:18 -0700 Subject: [PATCH] map passes driver test --- replicator/driver.go | 8 ++++++++ replicator/map.go | 32 +++++++++++++++++++++++++++++--- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/replicator/driver.go b/replicator/driver.go index 7f8f03d..c25551d 100644 --- a/replicator/driver.go +++ b/replicator/driver.go @@ -50,3 +50,11 @@ func NewDriver(ctx context.Context, driver url.URL) (Driver, error) { return nil, fmt.Errorf("unknown driver spec %s", driver.String()) } } + +func (version Version) ToTime() (time.Time, error) { + panic(nil) +} + +func VersionFromTime(t time.Time) Version { + panic(nil) +} diff --git a/replicator/map.go b/replicator/map.go index 0ce4366..e210b3c 100644 --- a/replicator/map.go +++ b/replicator/map.go @@ -2,7 +2,6 @@ package replicator import ( "context" - "io" "sync" "time" ) @@ -41,12 +40,24 @@ func (m Map) KeysSince(ctx context.Context, t time.Time) (chan KeyVersion, *erro func (m Map) Get(_ context.Context, k Key) (ValueVersion, error) { m.lock.RLock() defer m.lock.RUnlock() - return ValueVersion{}, io.EOF + return m.m[k], nil } func (m Map) Set(_ context.Context, key Key, value Value, version Version) error { m.lock.Lock() defer m.lock.Unlock() + + if version != nil { + if was, ok := m.m[key]; !ok { + } else if wasVersion, err := was.Version.ToTime(); err != nil { + return err + } else if wantVersion, err := version.ToTime(); err != nil { + return err + } else if wantVersion.Before(wasVersion) { + return nil // conflict + } + } + m.m[key] = ValueVersion{Value: value, Version: version} return nil } @@ -54,5 +65,20 @@ func (m Map) Set(_ context.Context, key Key, value Value, version Version) error func (m Map) Del(_ context.Context, k Key, v Version) error { m.lock.Lock() defer m.lock.Unlock() - return io.EOF + + if v != nil { + if was, ok := m.m[k]; !ok { + return nil + } else if wasVersion, err := was.Version.ToTime(); err != nil { + return err + } else if wantVersion, err := v.ToTime(); err != nil { + return err + } else if wantVersion.Before(wasVersion) { + return nil // conflict + } + } + + delete(m.m, k) + + return nil }