Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

*: rename storage package to mvcc

Browse Source
This commit is contained in:
Anthony Romano
2016-04-25 12:32:58 -07:00
parent 1d5bfd95dc
commit b7ac758969
93 changed files with 778 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/recipes/barrier.go
View File

@@ -16,7 +16,7 @@ package recipe
import (
v3 "github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/storage/storagepb"
"github.com/coreos/etcd/mvcc/mvccpb"
"golang.org/x/net/context"
)
@@ -60,6 +60,6 @@ func (b *Barrier) Wait() error {
b.client,
b.key,
resp.Header.Revision,
[]storagepb.Event_EventType{storagepb.PUT, storagepb.DELETE})
[]mvccpb.Event_EventType{mvccpb.PUT, mvccpb.DELETE})
return err
}

2
contrib/recipes/client.go
View File

@@ -18,7 +18,7 @@ import (
"errors"
v3 "github.com/coreos/etcd/clientv3"
spb "github.com/coreos/etcd/storage/storagepb"
spb "github.com/coreos/etcd/mvcc/mvccpb"
"golang.org/x/net/context"
)

8
contrib/recipes/double_barrier.go
View File

@@ -16,7 +16,7 @@ package recipe
import (
"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/storage/storagepb"
"github.com/coreos/etcd/mvcc/mvccpb"
"golang.org/x/net/context"
)
@@ -67,7 +67,7 @@ func (b *DoubleBarrier) Enter() error {
b.client,
b.key+"/ready",
ek.Revision(),
[]storagepb.Event_EventType{storagepb.PUT})
[]mvccpb.Event_EventType{mvccpb.PUT})
return err
}
@@ -109,7 +109,7 @@ func (b *DoubleBarrier) Leave() error {
b.client,
string(highest.Key),
highest.ModRevision,
[]storagepb.Event_EventType{storagepb.DELETE})
[]mvccpb.Event_EventType{mvccpb.DELETE})
if err != nil {
return err
}
@@ -126,7 +126,7 @@ func (b *DoubleBarrier) Leave() error {
b.client,
key,
lowest.ModRevision,
[]storagepb.Event_EventType{storagepb.DELETE})
[]mvccpb.Event_EventType{mvccpb.DELETE})
if err != nil {
return err
}

4
contrib/recipes/priority_queue.go
View File

@@ -18,7 +18,7 @@ import (
"fmt"
v3 "github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/storage/storagepb"
"github.com/coreos/etcd/mvcc/mvccpb"
"golang.org/x/net/context"
)
@@ -65,7 +65,7 @@ func (q *PriorityQueue) Dequeue() (string, error) {
q.client,
q.key,
resp.Header.Revision,
[]storagepb.Event_EventType{storagepb.PUT})
[]mvccpb.Event_EventType{mvccpb.PUT})
if err != nil {
return "", err
}

4
contrib/recipes/queue.go
View File

@@ -16,7 +16,7 @@ package recipe
import (
v3 "github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/storage/storagepb"
"github.com/coreos/etcd/mvcc/mvccpb"
"golang.org/x/net/context"
)
@@ -61,7 +61,7 @@ func (q *Queue) Dequeue() (string, error) {
q.client,
q.keyPrefix,
resp.Header.Revision,
[]storagepb.Event_EventType{storagepb.PUT})
[]mvccpb.Event_EventType{mvccpb.PUT})
if err != nil {
return "", err
}

4
contrib/recipes/rwmutex.go
View File

@@ -16,7 +16,7 @@ package recipe
import (
v3 "github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/storage/storagepb"
"github.com/coreos/etcd/mvcc/mvccpb"
"golang.org/x/net/context"
)
@@ -91,7 +91,7 @@ func (rwm *RWMutex) waitOnLowest() error {
rwm.client,
string(lastKey.Kvs[0].Key),
rwm.myKey.Revision(),
[]storagepb.Event_EventType{storagepb.DELETE})
[]mvccpb.Event_EventType{mvccpb.DELETE})
return err
}

8
contrib/recipes/watch.go
View File

@@ -16,12 +16,12 @@ package recipe
import (
"github.com/coreos/etcd/clientv3"
"github.com/coreos/etcd/storage/storagepb"
"github.com/coreos/etcd/mvcc/mvccpb"
"golang.org/x/net/context"
)
// WaitEvents waits on a key until it observes the given events and returns the final one.
func WaitEvents(c *clientv3.Client, key string, rev int64, evs []storagepb.Event_EventType) (*clientv3.Event, error) {
func WaitEvents(c *clientv3.Client, key string, rev int64, evs []mvccpb.Event_EventType) (*clientv3.Event, error) {
wc := c.Watch(context.Background(), key, clientv3.WithRev(rev))
if wc == nil {
return nil, ErrNoWatcher
@@ -29,7 +29,7 @@ func WaitEvents(c *clientv3.Client, key string, rev int64, evs []storagepb.Event
return waitEvents(wc, evs), nil
}
func WaitPrefixEvents(c *clientv3.Client, prefix string, rev int64, evs []storagepb.Event_EventType) (*clientv3.Event, error) {
func WaitPrefixEvents(c *clientv3.Client, prefix string, rev int64, evs []mvccpb.Event_EventType) (*clientv3.Event, error) {
wc := c.Watch(context.Background(), prefix, clientv3.WithPrefix(), clientv3.WithRev(rev))
if wc == nil {
return nil, ErrNoWatcher
@@ -37,7 +37,7 @@ func WaitPrefixEvents(c *clientv3.Client, prefix string, rev int64, evs []storag
return waitEvents(wc, evs), nil
}
func waitEvents(wc clientv3.WatchChan, evs []storagepb.Event_EventType) *clientv3.Event {
func waitEvents(wc clientv3.WatchChan, evs []mvccpb.Event_EventType) *clientv3.Event {
i := 0
for wresp := range wc {
for _, ev := range wresp.Events {