This commit is contained in:
Ian Gulliver
2023-05-15 21:50:26 -07:00
parent ae6f84c405
commit 819e5abea8
4 changed files with 20 additions and 320 deletions

View File

@@ -1,280 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>storebus: Go Coverage Report</title>
<style>
body {
background: black;
color: rgb(80, 80, 80);
}
body, pre, #legend span {
font-family: Menlo, monospace;
font-weight: bold;
}
#topbar {
background: black;
position: fixed;
top: 0; left: 0; right: 0;
height: 42px;
border-bottom: 1px solid rgb(80, 80, 80);
}
#content {
margin-top: 50px;
}
#nav, #legend {
float: left;
margin-left: 10px;
}
#legend {
margin-top: 12px;
}
#nav {
margin-top: 10px;
}
#legend span {
margin: 0 5px;
}
.cov0 { color: rgb(192, 0, 0) }
.cov1 { color: rgb(128, 128, 128) }
.cov2 { color: rgb(116, 140, 131) }
.cov3 { color: rgb(104, 152, 134) }
.cov4 { color: rgb(92, 164, 137) }
.cov5 { color: rgb(80, 176, 140) }
.cov6 { color: rgb(68, 188, 143) }
.cov7 { color: rgb(56, 200, 146) }
.cov8 { color: rgb(44, 212, 149) }
.cov9 { color: rgb(32, 224, 152) }
.cov10 { color: rgb(20, 236, 155) }
</style>
</head>
<body>
<div id="topbar">
<div id="nav">
<select id="files">
<option value="file0">github.com/gopatchy/storebus/storebus.go (85.5%)</option>
</select>
</div>
<div id="legend">
<span>not tracked</span>
<span class="cov0">no coverage</span>
<span class="cov1">low coverage</span>
<span class="cov2">*</span>
<span class="cov3">*</span>
<span class="cov4">*</span>
<span class="cov5">*</span>
<span class="cov6">*</span>
<span class="cov7">*</span>
<span class="cov8">*</span>
<span class="cov9">*</span>
<span class="cov10">high coverage</span>
</div>
</div>
<div id="content">
<pre class="file" id="file0" style="display: none">package storebus
import (
"context"
"crypto/sha256"
"encoding/json"
"fmt"
"sync"
"github.com/gopatchy/bus"
"github.com/gopatchy/jsrest"
"github.com/gopatchy/metadata"
"github.com/gopatchy/store"
)
type StoreBus struct {
store *store.Store
bus *bus.Bus
// This lock ensures that no writes interleave with read/subscribe pairs
orderMu sync.RWMutex
chanMap map[&lt;-chan []any]&lt;-chan any
chanMapMu sync.Mutex
}
func NewStoreBus(dbname string) (*StoreBus, error) <span class="cov5" title="2">{
st, err := store.NewStore(dbname)
if err != nil </span><span class="cov0" title="0">{
return nil, err
}</span>
<span class="cov5" title="2">return &amp;StoreBus{
store: st,
bus: bus.NewBus(),
chanMap: map[&lt;-chan []any]&lt;-chan any{},
}, nil</span>
}
func (sb *StoreBus) Close() <span class="cov5" title="2">{
sb.store.Close()
}</span>
func (sb *StoreBus) Write(ctx context.Context, t string, obj any) error <span class="cov10" title="4">{
sb.orderMu.Lock()
defer sb.orderMu.Unlock()
if err := UpdateHash(obj); err != nil </span><span class="cov0" title="0">{
return jsrest.Errorf(jsrest.ErrInternalServerError, "hash update failed (%w)", err)
}</span>
<span class="cov10" title="4">if err := sb.store.Write(ctx, t, obj); err != nil </span><span class="cov0" title="0">{
return jsrest.Errorf(jsrest.ErrInternalServerError, "write failed (%w)", err)
}</span>
<span class="cov10" title="4">sb.bus.Announce(t, obj)
return nil</span>
}
func (sb *StoreBus) Delete(ctx context.Context, t, id string) error <span class="cov1" title="1">{
sb.orderMu.Lock()
defer sb.orderMu.Unlock()
if err := sb.store.Delete(ctx, t, id); err != nil </span><span class="cov0" title="0">{
return jsrest.Errorf(jsrest.ErrInternalServerError, "delete failed (%w)", err)
}</span>
<span class="cov1" title="1">sb.bus.Delete(t, id)
return nil</span>
}
func (sb *StoreBus) Read(ctx context.Context, t, id string, factory func() any) (any, error) <span class="cov1" title="1">{
return sb.store.Read(ctx, t, id, factory)
}</span>
func (sb *StoreBus) ReadStream(ctx context.Context, t, id string, factory func() any) (&lt;-chan any, error) <span class="cov5" title="2">{
sb.orderMu.RLock()
defer sb.orderMu.RUnlock()
initial, err := sb.store.Read(ctx, t, id, factory)
if err != nil </span><span class="cov0" title="0">{
return nil, jsrest.Errorf(jsrest.ErrInternalServerError, "read failed (%w)", err)
}</span>
<span class="cov5" title="2">c := sb.bus.SubscribeKey(t, id, initial)
return c, nil</span>
}
func (sb *StoreBus) CloseReadStream(t, id string, c &lt;-chan any) <span class="cov5" title="2">{
sb.bus.UnsubscribeKey(t, id, c)
}</span>
func (sb *StoreBus) List(ctx context.Context, t string, factory func() any) ([]any, error) <span class="cov5" title="2">{
return sb.store.List(ctx, t, factory)
}</span>
func (sb *StoreBus) ListStream(ctx context.Context, t string, factory func() any) (&lt;-chan []any, error) <span class="cov1" title="1">{
sb.orderMu.RLock()
defer sb.orderMu.RUnlock()
initial, err := sb.store.List(ctx, t, factory)
if err != nil </span><span class="cov0" title="0">{
return nil, jsrest.Errorf(jsrest.ErrInternalServerError, "list failed (%w)", err)
}</span>
<span class="cov1" title="1">c := sb.bus.SubscribeType(t, initial)
ret := make(chan []any, 100)
sb.registerChan(c, ret)
go func() </span><span class="cov1" title="1">{
defer close(ret)
for range c </span><span class="cov8" title="3">{
// List() results are always at least (but not exactly) as new as the write that triggered it
l, err := sb.store.List(ctx, t, factory)
if err != nil </span><span class="cov0" title="0">{
break</span>
}
<span class="cov8" title="3">select </span>{
case ret &lt;- l:<span class="cov8" title="3"></span>
default:<span class="cov0" title="0">
break</span>
}
}
}()
<span class="cov1" title="1">return ret, nil</span>
}
func (sb *StoreBus) CloseListStream(t string, c &lt;-chan []any) <span class="cov1" title="1">{
sb.chanMapMu.Lock()
defer sb.chanMapMu.Unlock()
sb.bus.UnsubscribeType(t, sb.chanMap[c])
delete(sb.chanMap, c)
}</span>
func (sb *StoreBus) registerChan(in &lt;-chan any, out &lt;-chan []any) <span class="cov1" title="1">{
sb.chanMapMu.Lock()
defer sb.chanMapMu.Unlock()
sb.chanMap[out] = in
}</span>
func UpdateHash(obj any) error <span class="cov10" title="4">{
m := *metadata.GetMetadata(obj)
metadata.ClearMetadata(obj)
defer metadata.SetMetadata(obj, &amp;m)
hash := sha256.New()
enc := json.NewEncoder(hash)
if err := enc.Encode(obj); err != nil </span><span class="cov0" title="0">{
return jsrest.Errorf(jsrest.ErrInternalServerError, "JSON encode failed (%w)", err)
}</span>
<span class="cov10" title="4">m.ETag = fmt.Sprintf("etag:%x", hash.Sum(nil))
return nil</span>
}
</pre>
</div>
</body>
<script>
(function() {
var files = document.getElementById('files');
var visible;
files.addEventListener('change', onChange, false);
function select(part) {
if (visible)
visible.style.display = 'none';
visible = document.getElementById(part);
if (!visible)
return;
files.value = part;
visible.style.display = 'block';
location.hash = part;
}
function onChange() {
select(files.value);
window.scrollTo(0, 0);
}
if (location.hash != "") {
select(location.hash.substr(1));
}
if (!visible) {
select("file0");
}
})();
</script>
</html>

View File

@@ -1,34 +0,0 @@
mode: atomic
github.com/gopatchy/storebus/storebus.go:27.52,29.16 2 2
github.com/gopatchy/storebus/storebus.go:29.16,31.3 1 0
github.com/gopatchy/storebus/storebus.go:33.2,37.8 1 2
github.com/gopatchy/storebus/storebus.go:40.29,42.2 1 2
github.com/gopatchy/storebus/storebus.go:44.73,48.40 3 4
github.com/gopatchy/storebus/storebus.go:48.40,50.3 1 0
github.com/gopatchy/storebus/storebus.go:52.2,52.52 1 4
github.com/gopatchy/storebus/storebus.go:52.52,54.3 1 0
github.com/gopatchy/storebus/storebus.go:56.2,58.12 2 4
github.com/gopatchy/storebus/storebus.go:61.69,65.52 3 1
github.com/gopatchy/storebus/storebus.go:65.52,67.3 1 0
github.com/gopatchy/storebus/storebus.go:69.2,71.12 2 1
github.com/gopatchy/storebus/storebus.go:74.94,76.2 1 1
github.com/gopatchy/storebus/storebus.go:78.107,83.16 4 2
github.com/gopatchy/storebus/storebus.go:83.16,85.3 1 0
github.com/gopatchy/storebus/storebus.go:87.2,89.15 2 2
github.com/gopatchy/storebus/storebus.go:92.65,94.2 1 2
github.com/gopatchy/storebus/storebus.go:96.92,98.2 1 2
github.com/gopatchy/storebus/storebus.go:100.105,105.16 4 1
github.com/gopatchy/storebus/storebus.go:105.16,107.3 1 0
github.com/gopatchy/storebus/storebus.go:109.2,115.12 4 1
github.com/gopatchy/storebus/storebus.go:115.12,118.15 2 1
github.com/gopatchy/storebus/storebus.go:118.15,121.18 2 3
github.com/gopatchy/storebus/storebus.go:121.18,122.10 1 0
github.com/gopatchy/storebus/storebus.go:125.4,125.11 1 3
github.com/gopatchy/storebus/storebus.go:126.18,126.18 0 3
github.com/gopatchy/storebus/storebus.go:127.12,128.10 1 0
github.com/gopatchy/storebus/storebus.go:133.2,133.17 1 1
github.com/gopatchy/storebus/storebus.go:136.63,143.2 4 1
github.com/gopatchy/storebus/storebus.go:145.67,150.2 3 1
github.com/gopatchy/storebus/storebus.go:152.32,161.40 6 4
github.com/gopatchy/storebus/storebus.go:161.40,163.3 1 0
github.com/gopatchy/storebus/storebus.go:165.2,167.12 2 4

8
go.mod
View File

@@ -4,10 +4,10 @@ go 1.19
require (
github.com/dchest/uniuri v1.2.0
github.com/gopatchy/bus v0.0.0-20230424233749-c395ddbca3df
github.com/gopatchy/jsrest v0.0.0-20230511133808-abcf8276d1ad
github.com/gopatchy/metadata v0.0.0-20230424223338-33e58fee42bf
github.com/gopatchy/store v0.0.0-20230424234123-d35f011d4f0f
github.com/gopatchy/bus v0.0.0-20230516044949-c7eca23ba608
github.com/gopatchy/jsrest v0.0.0-20230516044950-1c6d15dad16a
github.com/gopatchy/metadata v0.0.0-20230516044939-eed23a0903d5
github.com/gopatchy/store v0.0.0-20230516045007-b2385cdea3a9
github.com/stretchr/testify v1.8.2
go.uber.org/goleak v1.2.1
)

18
go.sum
View File

@@ -5,14 +5,28 @@ github.com/dchest/uniuri v1.2.0 h1:koIcOUdrTIivZgSLhHQvKgqdWZq5d7KdMEWF1Ud6+5g=
github.com/dchest/uniuri v1.2.0/go.mod h1:fSzm4SLHzNZvWLvWJew423PhAzkpNQYq+uNLq4kxhkY=
github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
github.com/gopatchy/bus v0.0.0-20230424233749-c395ddbca3df h1:3sBy+B3e+oLPtbk35aHZby412zbtDF2rbiuoS+UQLN4=
github.com/gopatchy/bus v0.0.0-20230424233749-c395ddbca3df/go.mod h1:Dkr9lxuxCUgZNA6b+ODThSpYoqiMN9Nyz6LOEN5BGxw=
github.com/gopatchy/bus v0.0.0-20230516041300-8fb78dfa36a3 h1:lMyoE3JWPwrkd6Fh5srO+gWe5GHkukPbfAd32UFpVOA=
github.com/gopatchy/bus v0.0.0-20230516041300-8fb78dfa36a3/go.mod h1:Dkr9lxuxCUgZNA6b+ODThSpYoqiMN9Nyz6LOEN5BGxw=
github.com/gopatchy/bus v0.0.0-20230516044819-2912cf0ea53c h1:81CkG7flwK1/sOFKsOuzkaobvrhopUzWJwkvy1dpPdY=
github.com/gopatchy/bus v0.0.0-20230516044819-2912cf0ea53c/go.mod h1:Lc5GDOZLIp0oTvg0rRC7T6PegRZA3+qzO+6hxzDxutQ=
github.com/gopatchy/bus v0.0.0-20230516044949-c7eca23ba608 h1:h8wzQOD6Jp0AzBdJJVJdS0mFUTYFrkNSJ22TPxZttG0=
github.com/gopatchy/bus v0.0.0-20230516044949-c7eca23ba608/go.mod h1:6tafVYwVvUBHnH9thjDDc08De2pTbW5YC9cB5rWoKSs=
github.com/gopatchy/jsrest v0.0.0-20230511133808-abcf8276d1ad h1:UKIRgnQNkQ7qkMDcaWmp+cV4qYieZXtMVrgyVfS89u4=
github.com/gopatchy/jsrest v0.0.0-20230511133808-abcf8276d1ad/go.mod h1:77Kp7hFjygVlnDH48qO917da0gyKNR2XG8mZtaAEL9w=
github.com/gopatchy/jsrest v0.0.0-20230516044821-deb630cd744b h1:fnoLhs0kk7rc/hdk1vn8lzJ9uiq1ANr3klSUwbze1ys=
github.com/gopatchy/jsrest v0.0.0-20230516044821-deb630cd744b/go.mod h1:MQBtK0M/Uota4CpW5NbsjDqWuoQyYjS70PJSxWf3nLE=
github.com/gopatchy/jsrest v0.0.0-20230516044950-1c6d15dad16a h1:ehV4YITvldTIuTMAq7kk0RcrBE7m3WQKFzFl/jOqh7w=
github.com/gopatchy/jsrest v0.0.0-20230516044950-1c6d15dad16a/go.mod h1:TVfwj+gk7iCGJRrVYR+0ovXhOc90UXPrBCOGPLE8Fsw=
github.com/gopatchy/metadata v0.0.0-20230424223338-33e58fee42bf h1:HKCbhVEpC3++ydeapSJN2DGs9KGWMvOLpcZrwKkrXQs=
github.com/gopatchy/metadata v0.0.0-20230424223338-33e58fee42bf/go.mod h1:VgD33raUShjDePCDBo55aj+eSXFtUEpMzs+Ie39g2zo=
github.com/gopatchy/metadata v0.0.0-20230516041300-fc49e5f775fe h1:xPnlis/qCAYoxHx9tow1P4pO17c8JH/Hs/lHDmZej/Q=
github.com/gopatchy/metadata v0.0.0-20230516041300-fc49e5f775fe/go.mod h1:VgD33raUShjDePCDBo55aj+eSXFtUEpMzs+Ie39g2zo=
github.com/gopatchy/metadata v0.0.0-20230516044939-eed23a0903d5 h1:b66b4DOGTqDuw4hbxHSp0WbhXr/xAMaiFkU6iCi4nDg=
github.com/gopatchy/metadata v0.0.0-20230516044939-eed23a0903d5/go.mod h1:VgD33raUShjDePCDBo55aj+eSXFtUEpMzs+Ie39g2zo=
github.com/gopatchy/store v0.0.0-20230424234123-d35f011d4f0f h1:YFUPQfPf4dhGJr1cx/LPqTCCBPUep80FtruksX6kEAU=
github.com/gopatchy/store v0.0.0-20230424234123-d35f011d4f0f/go.mod h1:BPofgH+GHFCHnT0mAqd7hH/LTJg76Qqpgm7pOzZfeMA=
github.com/gopatchy/store v0.0.0-20230516045007-b2385cdea3a9 h1:v2QP2a+3M8eHSs9olyonrunj0xrWhjYXnYqqeRYzRrQ=
github.com/gopatchy/store v0.0.0-20230516045007-b2385cdea3a9/go.mod h1:+P5l86yQMEhP3uRO0GYSirP9w1/QC1SrJbRuSCyeeMI=
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=