Replace the rest of thirdparty/datastore2 with go-datastore
License: MIT Signed-off-by: Hector Sanjuan <hector@protocol.ai>
Hector Sanjuan committed
Feb 27, 2018 at 22:07 UTC
30cf14ef9edc9565b41e687c15b61491543269e6
8 files changed
+23
-78
core/core_test.go
+5
-3
@@ -7,7 +7,9 @@ import (
7
8
"github.com/ipfs/go-ipfs/repo"
9
config "github.com/ipfs/go-ipfs/repo/config"
10
- ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
10
+
11
+ datastore "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore"
12
+ syncds "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore/sync"
13
)
14
15
func TestInitialization(t *testing.T) {
@@ -39,7 +41,7 @@ func TestInitialization(t *testing.T) {
41
for i, c := range good {
42
r := &repo.Mock{
43
C: *c,
42
- D: ds2.ThreadSafeCloserMapDatastore(),
44
+ D: syncds.MutexWrap(datastore.NewMapDatastore()),
45
}
46
n, err := NewNode(ctx, &BuildCfg{Repo: r})
47
if n == nil || err != nil {
@@ -50,7 +52,7 @@ func TestInitialization(t *testing.T) {
52
for i, c := range bad {
53
r := &repo.Mock{
54
C: *c,
53
- D: ds2.ThreadSafeCloserMapDatastore(),
55
+ D: syncds.MutexWrap(datastore.NewMapDatastore()),
56
}
57
n, err := NewNode(ctx, &BuildCfg{Repo: r})
58
if n != nil || err == nil {
core/coreapi/unixfs_test.go
+3
-2
@@ -17,10 +17,11 @@ import (
17
mdag "github.com/ipfs/go-ipfs/merkledag"
18
repo "github.com/ipfs/go-ipfs/repo"
19
config "github.com/ipfs/go-ipfs/repo/config"
20
- ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
20
unixfs "github.com/ipfs/go-ipfs/unixfs"
21
22
cbor "gx/ipfs/QmNRz7BDWfdFNVLt7AVvmRefkrURD25EeoipcXqo6yoXU1/go-ipld-cbor"
23
+ datastore "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore"
24
+ syncds "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore/sync"
25
peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
26
ci "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto"
27
)
@@ -69,7 +70,7 @@ func makeAPIIdent(ctx context.Context, fullIdentity bool) (*core.IpfsNode, corei
70
C: config.Config{
71
Identity: ident,
72
},
72
- D: ds2.ThreadSafeCloserMapDatastore(),
73
+ D: syncds.MutexWrap(datastore.NewMapDatastore()),
74
K: keystore.NewMemKeystore(),
75
}
76
node, err := core.NewNode(ctx, &core.BuildCfg{Repo: r})
core/corehttp/gateway_test.go
+3
-2
@@ -18,9 +18,10 @@ import (
18
path "github.com/ipfs/go-ipfs/path"
19
repo "github.com/ipfs/go-ipfs/repo"
20
config "github.com/ipfs/go-ipfs/repo/config"
21
- ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
21
22
id "gx/ipfs/QmNh1kGFFdsPu79KNSaL4NUKUPb4Eiz4KHdMtFY6664RDp/go-libp2p/p2p/protocol/identify"
23
+ datastore "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore"
24
+ syncds "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore/sync"
25
ci "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto"
26
)
27
@@ -57,7 +58,7 @@ func newNodeWithMockNamesys(ns mockNamesys) (*core.IpfsNode, error) {
58
}
59
r := &repo.Mock{
60
C: c,
60
- D: ds2.ThreadSafeCloserMapDatastore(),
61
+ D: syncds.MutexWrap(datastore.NewMapDatastore()),
62
}
63
n, err := core.NewNode(context.Background(), &core.BuildCfg{Repo: r})
64
if err != nil {
core/coreunix/add_test.go
+5
-4
@@ -16,8 +16,9 @@ import (
16
"github.com/ipfs/go-ipfs/pin/gc"
17
"github.com/ipfs/go-ipfs/repo"
18
"github.com/ipfs/go-ipfs/repo/config"
19
- ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
19
20
+ datastore "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore"
21
+ syncds "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore/sync"
22
blockstore "gx/ipfs/QmaG4DZ4JaqEfvPWt5nPPgoTzhc1tr1T3f4Nu9Jpdm8ymY/go-ipfs-blockstore"
23
pi "gx/ipfs/Qmb3jLEFAQrqdVgWUajqEyuuDoavkSq1XQXz6tWdFWF995/go-ipfs-posinfo"
24
cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
@@ -34,7 +35,7 @@ func TestAddRecursive(t *testing.T) {
35
PeerID: testPeerID, // required by offline node
36
},
37
},
37
- D: ds2.ThreadSafeCloserMapDatastore(),
38
+ D: syncds.MutexWrap(datastore.NewMapDatastore()),
39
}
40
node, err := core.NewNode(context.Background(), &core.BuildCfg{Repo: r})
41
if err != nil {
@@ -54,7 +55,7 @@ func TestAddGCLive(t *testing.T) {
55
PeerID: testPeerID, // required by offline node
56
},
57
},
57
- D: ds2.ThreadSafeCloserMapDatastore(),
58
+ D: syncds.MutexWrap(datastore.NewMapDatastore()),
59
}
60
node, err := core.NewNode(context.Background(), &core.BuildCfg{Repo: r})
61
if err != nil {
@@ -163,7 +164,7 @@ func testAddWPosInfo(t *testing.T, rawLeaves bool) {
164
PeerID: testPeerID, // required by offline node
165
},
166
},
166
- D: ds2.ThreadSafeCloserMapDatastore(),
167
+ D: syncds.MutexWrap(datastore.NewMapDatastore()),
168
}
169
node, err := core.NewNode(context.Background(), &core.BuildCfg{Repo: r})
170
if err != nil {
core/mock/mock.go
+5
-3
@@ -4,15 +4,17 @@ import (
4
"context"
5
"net"
6
7
+ testutil "gx/ipfs/QmVvkK7s5imCiq3JVbL3pGfnhcCnf3LrFJPF4GE2sAoGZf/go-testutil"
8
+
9
commands "github.com/ipfs/go-ipfs/commands"
10
core "github.com/ipfs/go-ipfs/core"
11
"github.com/ipfs/go-ipfs/repo"
12
config "github.com/ipfs/go-ipfs/repo/config"
11
- ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
12
- testutil "gx/ipfs/QmVvkK7s5imCiq3JVbL3pGfnhcCnf3LrFJPF4GE2sAoGZf/go-testutil"
13
14
mocknet "gx/ipfs/QmNh1kGFFdsPu79KNSaL4NUKUPb4Eiz4KHdMtFY6664RDp/go-libp2p/p2p/net/mock"
15
host "gx/ipfs/QmNmJZL7FQySMtE2BQuLMuZg2EB2CLEunJJUSVSc9YnnbV/go-libp2p-host"
16
+ datastore "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore"
17
+ syncds "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore/sync"
18
pstore "gx/ipfs/QmXauCuJzmzapetmC6W4TuDJLL1yFFrVzSHoWv8YdbmnxH/go-libp2p-peerstore"
19
smux "gx/ipfs/QmY9JXR3FupnYAYJWK9aMr9bCpqWKcToQ1tz8DVGTrHpHw/go-stream-muxer"
20
ipnet "gx/ipfs/QmZPrWxuM8GHr4cGKbyF5CCT11sFUP9hgqpeUHALvx2nUr/go-libp2p-interface-pnet"
@@ -52,7 +54,7 @@ func MockCmdsCtx() (commands.Context, error) {
54
}
55
56
r := &repo.Mock{
55
- D: ds2.ThreadSafeCloserMapDatastore(),
57
+ D: syncds.MutexWrap(datastore.NewMapDatastore()),
58
C: conf,
59
}
60
repo/fsrepo/config_test.go
+2
-2
@@ -99,8 +99,8 @@ func TestDefaultDatastoreConfig(t *testing.T) {
99
t.Fatal(err)
100
}
101
102
- if typ := reflect.TypeOf(ds).String(); typ != "*syncmount.Datastore" {
103
- t.Errorf("expected '*syncmount.Datastore' got '%s'", typ)
102
+ if typ := reflect.TypeOf(ds).String(); typ != "*mount.Datastore" {
103
+ t.Errorf("expected '*mount.Datastore' got '%s'", typ)
104
}
105
}
106
thirdparty/datastore2/datastore_closer.go
deleted
-40
@@ -1,40 +0,0 @@
1
-package datastore2
2
-
3
-import (
4
- "io"
5
-
6
- "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore"
7
- syncds "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore/sync"
8
-)
9
-
10
-type ThreadSafeDatastoreCloser interface {
11
- datastore.ThreadSafeDatastore
12
- io.Closer
13
-
14
- Batch() (datastore.Batch, error)
15
-}
16
-
17
-func CloserWrap(ds datastore.ThreadSafeDatastore) ThreadSafeDatastoreCloser {
18
- return &datastoreCloserWrapper{ds}
19
-}
20
-
21
-func ThreadSafeCloserMapDatastore() ThreadSafeDatastoreCloser {
22
- return CloserWrap(syncds.MutexWrap(datastore.NewMapDatastore()))
23
-}
24
-
25
-type datastoreCloserWrapper struct {
26
- datastore.ThreadSafeDatastore
27
-}
28
-
29
-func (w *datastoreCloserWrapper) Close() error {
30
- return nil // no-op
31
-}
32
-
33
-func (w *datastoreCloserWrapper) Batch() (datastore.Batch, error) {
34
- bds, ok := w.ThreadSafeDatastore.(datastore.Batching)
35
- if !ok {
36
- return nil, datastore.ErrBatchUnsupported
37
- }
38
-
39
- return bds.Batch()
40
-}
thirdparty/datastore2/threadsafe.go
deleted
-22
@@ -1,22 +0,0 @@
1
-package datastore2
2
-
3
-import (
4
- "io"
5
-
6
- "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore"
7
-)
8
-
9
-// ClaimThreadSafe claims that a Datastore is threadsafe, even when
10
-// it's type does not guarantee this. Use carefully.
11
-type ClaimThreadSafe struct {
12
- datastore.Batching
13
-}
14
-
15
-var _ datastore.ThreadSafeDatastore = ClaimThreadSafe{}
16
-
17
-func (ClaimThreadSafe) IsThreadSafe() {}
18
-
19
-// TEMP UNTIL dev0.4.0 merges and solves this ugly interface stuff
20
-func (c ClaimThreadSafe) Close() error {
21
- return c.Batching.(io.Closer).Close()
22
-}