@cryptotaxi247 / kubo / commits / e8addf5ee

use batching datastore for providers storage

License: MIT Signed-off-by: Jeromy <why@ipfs.io>

Jeromy committed Jul 26, 2016 at 10:48 UTC e8addf5ee389c9780305be9fa27907139dc28a7c
53 files changed +109 -113
blocks/blockstore/blockstore.go
+3 -3
@@ -10,11 +10,11 @@ import (
10 blocks "github.com/ipfs/go-ipfs/blocks"
11 key "github.com/ipfs/go-ipfs/blocks/key"
12 logging "gx/ipfs/QmNQynaz7qfriSUJkiEZUrm2Wen1u3Kj9goZzWtrPyu7XR/go-log"
13 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
14 + dsns "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/namespace"
15 + dsq "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/query"
16 mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
17 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
15 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
16 - dsns "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/namespace"
17 - dsq "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/query"
18 )
19
20 var log = logging.Logger("blockstore")
blocks/blockstore/blockstore_test.go
+3 -3
@@ -5,10 +5,10 @@ import (
5 "fmt"
6 "testing"
7
8 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
9 + dsq "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/query"
10 + ds_sync "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
11 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
10 - dsq "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/query"
11 - ds_sync "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
12
13 blocks "github.com/ipfs/go-ipfs/blocks"
14 key "github.com/ipfs/go-ipfs/blocks/key"
blocks/blockstore/bloom_cache.go
+1 -1
@@ -3,10 +3,10 @@ package blockstore
3 import (
4 "github.com/ipfs/go-ipfs/blocks"
5 key "github.com/ipfs/go-ipfs/blocks/key"
6 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
7 lru "gx/ipfs/QmVYxfoJQiZijTgPNHCHgHELvQpbsJNTg6Crmc3dQkj3yy/golang-lru"
8 bloom "gx/ipfs/QmWQ2SJisXwcCLsUXLwYCKSfyExXjFRW2WbBH5sqCUnwX5/bbloom"
9 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
10
11 "sync/atomic"
12 )
blocks/blockstore/bloom_cache_test.go
+3 -3
@@ -8,10 +8,10 @@ import (
8
9 "github.com/ipfs/go-ipfs/blocks"
10
11 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
12 + dsq "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/query"
13 + syncds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
14 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
13 - dsq "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/query"
14 - syncds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
15 )
16
17 func testBloomCached(bs GCBlockstore, ctx context.Context) (*bloomcache, error) {
blocks/key/key.go
+1 -1
@@ -5,9 +5,9 @@ import (
5 "fmt"
6
7 b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58"
8 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
9 mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
10 base32 "gx/ipfs/Qmb1DA2A9LS2wR4FFweB4uEDomFsdmnw1VLawLE1yQzudj/base32"
10 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
11 )
12
13 // Key is a string representation of multihash for use with maps.
blockservice/test/blocks_test.go
+2 -2
@@ -11,10 +11,10 @@ import (
11 key "github.com/ipfs/go-ipfs/blocks/key"
12 . "github.com/ipfs/go-ipfs/blockservice"
13 offline "github.com/ipfs/go-ipfs/exchange/offline"
14 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
15 + dssync "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
16 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
17 "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
16 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
17 - dssync "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
18 )
19
20 func TestBlocks(t *testing.T) {
core/builder.go
+2 -2
@@ -14,8 +14,8 @@ import (
14 pin "github.com/ipfs/go-ipfs/pin"
15 repo "github.com/ipfs/go-ipfs/repo"
16 cfg "github.com/ipfs/go-ipfs/repo/config"
17 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
18 - dsync "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
17 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
18 + dsync "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
19
20 pstore "gx/ipfs/QmQdnfvZQuhdT93LNc5bos52wAmdr3G2p6G8teLJMEN32P/go-libp2p-peerstore"
21 goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
core/core.go
+1 -1
@@ -23,6 +23,7 @@ import (
23 peer "gx/ipfs/QmRBqJF7hb8ZSpRcMwUt8hNhydWcxGEhtk81HKq6oUwKvs/go-libp2p-peer"
24 mamask "gx/ipfs/QmSMZwvs3n4GBikZ7hKzT17c3bk65FmyZo2JqtJ16swqCv/multiaddr-filter"
25 b58 "gx/ipfs/QmT8rehPR3F6bmwL6zjUN8XpiDBFFpMP2myPdC6ApsWfJf/go-base58"
26 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
27 ic "gx/ipfs/QmUWER4r4qMvaCnX5zREcfyiWN7cXN9g3a7fkRqNz8qWPP/go-libp2p-crypto"
28 discovery "gx/ipfs/QmVCe3SNMjkcPgnpFhZs719dheq6xE7gJwjzV7aWcUM4Ms/go-libp2p/p2p/discovery"
29 p2phost "gx/ipfs/QmVCe3SNMjkcPgnpFhZs719dheq6xE7gJwjzV7aWcUM4Ms/go-libp2p/p2p/host"
@@ -34,7 +35,6 @@ import (
35 ping "gx/ipfs/QmVCe3SNMjkcPgnpFhZs719dheq6xE7gJwjzV7aWcUM4Ms/go-libp2p/p2p/protocol/ping"
36 ma "gx/ipfs/QmYzDkkgAEmrcNzFCiYo6L1dTX4EAG1gZkbtdbd9trL4vd/go-multiaddr"
37 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
37 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
38
39 routing "github.com/ipfs/go-ipfs/routing"
40 dht "github.com/ipfs/go-ipfs/routing/dht"
core/corerouting/core.go
+1 -1
@@ -9,9 +9,9 @@ import (
9 supernode "github.com/ipfs/go-ipfs/routing/supernode"
10 gcproxy "github.com/ipfs/go-ipfs/routing/supernode/proxy"
11 pstore "gx/ipfs/QmQdnfvZQuhdT93LNc5bos52wAmdr3G2p6G8teLJMEN32P/go-libp2p-peerstore"
12 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
13 "gx/ipfs/QmVCe3SNMjkcPgnpFhZs719dheq6xE7gJwjzV7aWcUM4Ms/go-libp2p/p2p/host"
14 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
14 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
15 )
16
17 // NB: DHT option is included in the core to avoid 1) because it's a sane
core/coreunix/add.go
+2 -2
@@ -15,9 +15,9 @@ import (
15 "github.com/ipfs/go-ipfs/importer/chunk"
16 mfs "github.com/ipfs/go-ipfs/mfs"
17 "github.com/ipfs/go-ipfs/pin"
18 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
19 + syncds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
20 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
19 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
20 - syncds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
21
22 bs "github.com/ipfs/go-ipfs/blocks/blockstore"
23 "github.com/ipfs/go-ipfs/commands/files"
core/coreunix/metadata_test.go
+2 -2
@@ -5,9 +5,9 @@ import (
5 "io/ioutil"
6 "testing"
7
8 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
9 + dssync "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
10 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
9 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
10 - dssync "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
11
12 bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
13 key "github.com/ipfs/go-ipfs/blocks/key"
core/mock/mock.go
+2 -2
@@ -3,9 +3,9 @@ package coremock
3 import (
4 "net"
5
6 + "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
7 + syncds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
8 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
7 - "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
8 - syncds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
9
10 commands "github.com/ipfs/go-ipfs/commands"
11 core "github.com/ipfs/go-ipfs/core"
exchange/bitswap/decision/engine_test.go
+2 -2
@@ -13,9 +13,9 @@ import (
13 message "github.com/ipfs/go-ipfs/exchange/bitswap/message"
14 testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
15 peer "gx/ipfs/QmRBqJF7hb8ZSpRcMwUt8hNhydWcxGEhtk81HKq6oUwKvs/go-libp2p-peer"
16 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
17 + dssync "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
18 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
17 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
18 - dssync "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
19 )
20
21 type peerAndEngine struct {
exchange/bitswap/testnet/peernet.go
+1 -1
@@ -5,9 +5,9 @@ import (
5 mockrouting "github.com/ipfs/go-ipfs/routing/mock"
6 testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
7 peer "gx/ipfs/QmRBqJF7hb8ZSpRcMwUt8hNhydWcxGEhtk81HKq6oUwKvs/go-libp2p-peer"
8 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
9 mockpeernet "gx/ipfs/QmVCe3SNMjkcPgnpFhZs719dheq6xE7gJwjzV7aWcUM4Ms/go-libp2p/p2p/net/mock"
10 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
10 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
11 )
12
13 type peernet struct {
exchange/bitswap/testutils.go
+2 -2
@@ -9,10 +9,10 @@ import (
9 delay "github.com/ipfs/go-ipfs/thirdparty/delay"
10 testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
11 peer "gx/ipfs/QmRBqJF7hb8ZSpRcMwUt8hNhydWcxGEhtk81HKq6oUwKvs/go-libp2p-peer"
12 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
13 + ds_sync "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
14 p2ptestutil "gx/ipfs/QmVCe3SNMjkcPgnpFhZs719dheq6xE7gJwjzV7aWcUM4Ms/go-libp2p/p2p/test/util"
15 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
14 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
15 - ds_sync "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
16 )
17
18 // WARNING: this uses RandTestBogusIdentity DO NOT USE for NON TESTS!
exchange/offline/offline_test.go
+2 -2
@@ -7,9 +7,9 @@ import (
7 "github.com/ipfs/go-ipfs/blocks/blockstore"
8 "github.com/ipfs/go-ipfs/blocks/blocksutil"
9 key "github.com/ipfs/go-ipfs/blocks/key"
10 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
11 + ds_sync "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
12 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
12 - ds_sync "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
13 )
14
15 func TestBlockReturnsErr(t *testing.T) {
exchange/reprovide/reprovide_test.go
+2 -2
@@ -7,9 +7,9 @@ import (
7 blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
8 mock "github.com/ipfs/go-ipfs/routing/mock"
9 testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
10 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
11 + dssync "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
12 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
12 - dssync "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
13
14 . "github.com/ipfs/go-ipfs/exchange/reprovide"
15 )
merkledag/merkledag_test.go
+2 -2
@@ -21,10 +21,10 @@ import (
21 dstest "github.com/ipfs/go-ipfs/merkledag/test"
22 "github.com/ipfs/go-ipfs/pin"
23 uio "github.com/ipfs/go-ipfs/unixfs/io"
24 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
25 + dssync "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
26 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
27 "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
26 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
27 - dssync "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
28 )
29
30 type dagservAndPinner struct {
merkledag/test/utils.go
+2 -2
@@ -5,8 +5,8 @@ import (
5 bsrv "github.com/ipfs/go-ipfs/blockservice"
6 "github.com/ipfs/go-ipfs/exchange/offline"
7 dag "github.com/ipfs/go-ipfs/merkledag"
8 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
9 - dssync "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
8 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
9 + dssync "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
10 )
11
12 func Mock() dag.DAGService {
merkledag/utils/utils.go
+2 -2
@@ -3,9 +3,9 @@ package dagutils
3 import (
4 "errors"
5
6 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
7 + syncds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
8 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
7 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
8 - syncds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
9
10 bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
11 bserv "github.com/ipfs/go-ipfs/blockservice"
mfs/mfs_test.go
+2 -2
@@ -14,10 +14,10 @@ import (
14 "time"
15
16 "github.com/ipfs/go-ipfs/path"
17 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
18 + dssync "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
19 randbo "gx/ipfs/QmYvsG72GsfLgUeSojXArjnU6L4Wmwk7wuAxtNLuyXcc1T/randbo"
20 "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
19 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
20 - dssync "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
21
22 bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
23 key "github.com/ipfs/go-ipfs/blocks/key"
namesys/namesys.go
+1 -1
@@ -6,9 +6,9 @@ import (
6
7 path "github.com/ipfs/go-ipfs/path"
8 routing "github.com/ipfs/go-ipfs/routing"
9 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
10 ci "gx/ipfs/QmUWER4r4qMvaCnX5zREcfyiWN7cXN9g3a7fkRqNz8qWPP/go-libp2p-crypto"
11 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
12 )
13
14 // mpns (a multi-protocol NameSystem) implements generic IPFS naming.
namesys/publisher.go
+1 -1
@@ -6,9 +6,9 @@ import (
6 "fmt"
7 "time"
8
9 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
10 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
11 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
11 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
12
13 key "github.com/ipfs/go-ipfs/blocks/key"
14 dag "github.com/ipfs/go-ipfs/merkledag"
namesys/republisher/repub.go
+1 -1
@@ -17,9 +17,9 @@ import (
17 goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
18 gpctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
19 peer "gx/ipfs/QmRBqJF7hb8ZSpRcMwUt8hNhydWcxGEhtk81HKq6oUwKvs/go-libp2p-peer"
20 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
21 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
22 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
22 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
23 )
24
25 var errNoEntry = errors.New("no previous entry")
namesys/resolve_test.go
+2 -2
@@ -10,10 +10,10 @@ import (
10 mockrouting "github.com/ipfs/go-ipfs/routing/mock"
11 testutil "github.com/ipfs/go-ipfs/thirdparty/testutil"
12 peer "gx/ipfs/QmRBqJF7hb8ZSpRcMwUt8hNhydWcxGEhtk81HKq6oUwKvs/go-libp2p-peer"
13 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
14 + dssync "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
15 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
15 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
16 - dssync "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
17 )
18
19 func TestRoutingResolve(t *testing.T) {
package.json
+8 -2
@@ -144,9 +144,9 @@
144 },
145 {
146 "author": "jbenet",
147 - "hash": "QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o",
147 + "hash": "QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk",
148 "name": "go-datastore",
149 - "version": "0.1.2"
149 + "version": "0.2.0"
150 },
151 {
152 "author": "codahale",
@@ -183,6 +183,12 @@
183 "hash": "QmWQ2SJisXwcCLsUXLwYCKSfyExXjFRW2WbBH5sqCUnwX5",
184 "name": "bbloom",
185 "version": "0.0.2"
186 + },
187 + {
188 + "author": "whyrusleeping",
189 + "hash": "QmVvJ27GcLaLSXvcB4auk3Gn3xuWK5ti5ENkZ2pCoJEYW4",
190 + "name": "autobatch",
191 + "version": "0.2.0"
192 }
193 ],
194 "gxVersion": "0.4.0",
pin/pin.go
+1 -1
@@ -11,8 +11,8 @@ import (
11 "github.com/ipfs/go-ipfs/blocks/set"
12 mdag "github.com/ipfs/go-ipfs/merkledag"
13 logging "gx/ipfs/QmNQynaz7qfriSUJkiEZUrm2Wen1u3Kj9goZzWtrPyu7XR/go-log"
14 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
15 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
15 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
16 )
17
18 var log = logging.Logger("pin")
pin/pin_test.go
+2 -2
@@ -11,9 +11,9 @@ import (
11 bs "github.com/ipfs/go-ipfs/blockservice"
12 "github.com/ipfs/go-ipfs/exchange/offline"
13 mdag "github.com/ipfs/go-ipfs/merkledag"
14 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
15 + dssync "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
16 "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
15 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
16 - dssync "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
17 )
18
19 func randNode() (*mdag.Node, key.Key) {
pin/set_test.go
+2 -2
@@ -9,11 +9,11 @@ import (
9 "github.com/ipfs/go-ipfs/blockservice"
10 "github.com/ipfs/go-ipfs/exchange/offline"
11 "github.com/ipfs/go-ipfs/merkledag"
12 + "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
13 + dssync "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
14 mh "gx/ipfs/QmYf7ng2hG5XBtJA3tN34DQ2GUN5HNksEw1rLDkmr6vGku/go-multihash"
15 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
16 "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
15 - "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
16 - dssync "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
17 )
18
19 func ignoreKeys(key.Key) {}
repo/fsrepo/defaultds.go
+5 -5
@@ -7,12 +7,12 @@ import (
7 repo "github.com/ipfs/go-ipfs/repo"
8 config "github.com/ipfs/go-ipfs/repo/config"
9 "github.com/ipfs/go-ipfs/thirdparty/dir"
10 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
11 + "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/flatfs"
12 + levelds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/leveldb"
13 + "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/measure"
14 + mount "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/syncmount"
15 ldbopts "gx/ipfs/QmbBhyDKsY4mbY6xsKt3qu9Y7FPvMJ6qbD8AMjYYvPRw1g/goleveldb/leveldb/opt"
11 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
12 - "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/flatfs"
13 - levelds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/leveldb"
14 - "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/measure"
15 - mount "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/syncmount"
16 )
17
18 const (
repo/fsrepo/fsrepo.go
+1 -1
@@ -19,8 +19,8 @@ import (
19 serialize "github.com/ipfs/go-ipfs/repo/fsrepo/serialize"
20 dir "github.com/ipfs/go-ipfs/thirdparty/dir"
21 logging "gx/ipfs/QmNQynaz7qfriSUJkiEZUrm2Wen1u3Kj9goZzWtrPyu7XR/go-log"
22 + "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/measure"
23 util "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
23 - "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/measure"
24 )
25
26 var log = logging.Logger("fsrepo")
repo/fsrepo/fsrepo_test.go
+1 -1
@@ -9,7 +9,7 @@ import (
9
10 "github.com/ipfs/go-ipfs/repo/config"
11 "github.com/ipfs/go-ipfs/thirdparty/assert"
12 - datastore "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
12 + datastore "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
13 )
14
15 // swap arg order
repo/repo.go
+1 -1
@@ -5,7 +5,7 @@ import (
5 "io"
6
7 config "github.com/ipfs/go-ipfs/repo/config"
8 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
8 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
9 )
10
11 var (
routing/dht/dht.go
+2 -2
@@ -21,12 +21,12 @@ import (
21 goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
22 goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
23 peer "gx/ipfs/QmRBqJF7hb8ZSpRcMwUt8hNhydWcxGEhtk81HKq6oUwKvs/go-libp2p-peer"
24 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
25 ci "gx/ipfs/QmUWER4r4qMvaCnX5zREcfyiWN7cXN9g3a7fkRqNz8qWPP/go-libp2p-crypto"
26 host "gx/ipfs/QmVCe3SNMjkcPgnpFhZs719dheq6xE7gJwjzV7aWcUM4Ms/go-libp2p/p2p/host"
27 protocol "gx/ipfs/QmVCe3SNMjkcPgnpFhZs719dheq6xE7gJwjzV7aWcUM4Ms/go-libp2p/p2p/protocol"
28 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
29 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
29 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
30 )
31
32 var log = logging.Logger("dht")
@@ -65,7 +65,7 @@ type IpfsDHT struct {
65 }
66
67 // NewDHT creates a new DHT object with the given peer as the 'local' host
68 -func NewDHT(ctx context.Context, h host.Host, dstore ds.Datastore) *IpfsDHT {
68 +func NewDHT(ctx context.Context, h host.Host, dstore ds.Batching) *IpfsDHT {
69 dht := new(IpfsDHT)
70 dht.datastore = dstore
71 dht.self = h.ID()
routing/dht/dht_test.go
+2 -2
@@ -14,8 +14,8 @@ import (
14 record "github.com/ipfs/go-ipfs/routing/record"
15 ci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci"
16 travisci "github.com/ipfs/go-ipfs/thirdparty/testutil/ci/travis"
17 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
18 - dssync "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
17 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
18 + dssync "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
19
20 pstore "gx/ipfs/QmQdnfvZQuhdT93LNc5bos52wAmdr3G2p6G8teLJMEN32P/go-libp2p-peerstore"
21 peer "gx/ipfs/QmRBqJF7hb8ZSpRcMwUt8hNhydWcxGEhtk81HKq6oUwKvs/go-libp2p-peer"
routing/dht/ext_test.go
+2 -2
@@ -10,8 +10,8 @@ import (
10 routing "github.com/ipfs/go-ipfs/routing"
11 pb "github.com/ipfs/go-ipfs/routing/dht/pb"
12 record "github.com/ipfs/go-ipfs/routing/record"
13 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
14 - dssync "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
13 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
14 + dssync "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
15
16 pstore "gx/ipfs/QmQdnfvZQuhdT93LNc5bos52wAmdr3G2p6G8teLJMEN32P/go-libp2p-peerstore"
17 inet "gx/ipfs/QmVCe3SNMjkcPgnpFhZs719dheq6xE7gJwjzV7aWcUM4Ms/go-libp2p/p2p/net"
routing/dht/handlers.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 key "github.com/ipfs/go-ipfs/blocks/key"
9 pb "github.com/ipfs/go-ipfs/routing/dht/pb"
10 lgbl "github.com/ipfs/go-ipfs/thirdparty/loggables"
11 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
11 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
12
13 pstore "gx/ipfs/QmQdnfvZQuhdT93LNc5bos52wAmdr3G2p6G8teLJMEN32P/go-libp2p-peerstore"
14 peer "gx/ipfs/QmRBqJF7hb8ZSpRcMwUt8hNhydWcxGEhtk81HKq6oUwKvs/go-libp2p-peer"
routing/dht/providers/providers.go
+14 -24
@@ -10,16 +10,26 @@ import (
10 goprocess "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess"
11 goprocessctx "gx/ipfs/QmQopLATEYMNg7dVqZRNDfeE2S1yKy8zrRh5xnYiuqeZBn/goprocess/context"
12 peer "gx/ipfs/QmRBqJF7hb8ZSpRcMwUt8hNhydWcxGEhtk81HKq6oUwKvs/go-libp2p-peer"
13 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
14 + dsq "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/query"
15 lru "gx/ipfs/QmVYxfoJQiZijTgPNHCHgHELvQpbsJNTg6Crmc3dQkj3yy/golang-lru"
16 + autobatch "gx/ipfs/QmVvJ27GcLaLSXvcB4auk3Gn3xuWK5ti5ENkZ2pCoJEYW4/autobatch"
17 base32 "gx/ipfs/Qmb1DA2A9LS2wR4FFweB4uEDomFsdmnw1VLawLE1yQzudj/base32"
15 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
16 - dsq "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/query"
18
19 key "github.com/ipfs/go-ipfs/blocks/key"
20 + flags "github.com/ipfs/go-ipfs/flags"
21
22 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
23 )
24
25 +var batchBufferSize = 256
26 +
27 +func init() {
28 + if flags.LowMemMode {
29 + batchBufferSize = 8
30 + }
31 +}
32 +
33 var log = logging.Logger("providers")
34
35 var lruCacheSize = 256
@@ -30,11 +40,9 @@ type ProviderManager struct {
40 // all non channel fields are meant to be accessed only within
41 // the run method
42 providers *lru.Cache
33 - local map[key.Key]struct{}
43 lpeer peer.ID
44 dstore ds.Datastore
45
37 - getlocal chan chan []key.Key
46 newprovs chan *addProv
47 getprovs chan *getProv
48 period time.Duration
@@ -58,19 +66,17 @@ type getProv struct {
66 resp chan []peer.ID
67 }
68
61 -func NewProviderManager(ctx context.Context, local peer.ID, dstore ds.Datastore) *ProviderManager {
69 +func NewProviderManager(ctx context.Context, local peer.ID, dstore ds.Batching) *ProviderManager {
70 pm := new(ProviderManager)
71 pm.getprovs = make(chan *getProv)
72 pm.newprovs = make(chan *addProv)
65 - pm.dstore = dstore
73 + pm.dstore = autobatch.NewAutoBatching(dstore, batchBufferSize)
74 cache, err := lru.New(lruCacheSize)
75 if err != nil {
76 panic(err) //only happens if negative value is passed to lru constructor
77 }
78 pm.providers = cache
79
72 - pm.getlocal = make(chan chan []key.Key)
73 - pm.local = make(map[key.Key]struct{})
80 pm.proc = goprocessctx.WithContext(ctx)
81 pm.cleanupInterval = defaultCleanupInterval
82 pm.proc.Go(func(p goprocess.Process) { pm.run() })
@@ -251,9 +257,6 @@ func (pm *ProviderManager) run() {
257 for {
258 select {
259 case np := <-pm.newprovs:
254 - if np.val == pm.lpeer {
255 - pm.local[np.k] = struct{}{}
256 - }
260 err := pm.addProv(np.k, np.val)
261 if err != nil {
262 log.Error("error adding new providers: ", err)
@@ -265,13 +268,6 @@ func (pm *ProviderManager) run() {
268 }
269
270 gp.resp <- provs
268 - case lc := <-pm.getlocal:
269 - var keys []key.Key
270 - for k := range pm.local {
271 - keys = append(keys, k)
272 - }
273 - lc <- keys
274 -
271 case <-tick.C:
272 keys, err := pm.getAllProvKeys()
273 if err != nil {
@@ -337,12 +333,6 @@ func (pm *ProviderManager) GetProviders(ctx context.Context, k key.Key) []peer.I
333 }
334 }
335
340 -func (pm *ProviderManager) GetLocal() []key.Key {
341 - resp := make(chan []key.Key)
342 - pm.getlocal <- resp
343 - return <-resp
344 -}
345 -
336 func newProviderSet() *providerSet {
337 return &providerSet{
338 set: make(map[peer.ID]time.Time),
routing/dht/providers/providers_test.go
+1 -1
@@ -7,7 +7,7 @@ import (
7
8 key "github.com/ipfs/go-ipfs/blocks/key"
9 peer "gx/ipfs/QmRBqJF7hb8ZSpRcMwUt8hNhydWcxGEhtk81HKq6oUwKvs/go-libp2p-peer"
10 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
10 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
11
12 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
13 )
routing/mock/centralized_client.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 routing "github.com/ipfs/go-ipfs/routing"
9 dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
10 "github.com/ipfs/go-ipfs/thirdparty/testutil"
11 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
11 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
12
13 logging "gx/ipfs/QmNQynaz7qfriSUJkiEZUrm2Wen1u3Kj9goZzWtrPyu7XR/go-log"
14 pstore "gx/ipfs/QmQdnfvZQuhdT93LNc5bos52wAmdr3G2p6G8teLJMEN32P/go-libp2p-peerstore"
routing/mock/centralized_server.go
+2 -2
@@ -7,8 +7,8 @@ import (
7
8 key "github.com/ipfs/go-ipfs/blocks/key"
9 "github.com/ipfs/go-ipfs/thirdparty/testutil"
10 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
11 - dssync "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
10 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
11 + dssync "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
12
13 pstore "gx/ipfs/QmQdnfvZQuhdT93LNc5bos52wAmdr3G2p6G8teLJMEN32P/go-libp2p-peerstore"
14 peer "gx/ipfs/QmRBqJF7hb8ZSpRcMwUt8hNhydWcxGEhtk81HKq6oUwKvs/go-libp2p-peer"
routing/mock/dht.go
+2 -2
@@ -3,10 +3,10 @@ package mockrouting
3 import (
4 dht "github.com/ipfs/go-ipfs/routing/dht"
5 "github.com/ipfs/go-ipfs/thirdparty/testutil"
6 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
7 + sync "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
8 mocknet "gx/ipfs/QmVCe3SNMjkcPgnpFhZs719dheq6xE7gJwjzV7aWcUM4Ms/go-libp2p/p2p/net/mock"
9 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
8 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
9 - sync "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
10 )
11
12 type mocknetserver struct {
routing/mock/interface.go
+1 -1
@@ -11,8 +11,8 @@ import (
11 "github.com/ipfs/go-ipfs/thirdparty/testutil"
12 pstore "gx/ipfs/QmQdnfvZQuhdT93LNc5bos52wAmdr3G2p6G8teLJMEN32P/go-libp2p-peerstore"
13 peer "gx/ipfs/QmRBqJF7hb8ZSpRcMwUt8hNhydWcxGEhtk81HKq6oUwKvs/go-libp2p-peer"
14 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
15 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
15 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
16 )
17
18 // Server provides mockrouting Clients
routing/offline/offline.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 routing "github.com/ipfs/go-ipfs/routing"
9 pb "github.com/ipfs/go-ipfs/routing/dht/pb"
10 record "github.com/ipfs/go-ipfs/routing/record"
11 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
11 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
12
13 logging "gx/ipfs/QmNQynaz7qfriSUJkiEZUrm2Wen1u3Kj9goZzWtrPyu7XR/go-log"
14 pstore "gx/ipfs/QmQdnfvZQuhdT93LNc5bos52wAmdr3G2p6G8teLJMEN32P/go-libp2p-peerstore"
routing/supernode/server.go
+1 -1
@@ -8,7 +8,7 @@ import (
8 dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
9 record "github.com/ipfs/go-ipfs/routing/record"
10 proxy "github.com/ipfs/go-ipfs/routing/supernode/proxy"
11 - datastore "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
11 + datastore "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
12
13 pstore "gx/ipfs/QmQdnfvZQuhdT93LNc5bos52wAmdr3G2p6G8teLJMEN32P/go-libp2p-peerstore"
14 peer "gx/ipfs/QmRBqJF7hb8ZSpRcMwUt8hNhydWcxGEhtk81HKq6oUwKvs/go-libp2p-peer"
routing/supernode/server_test.go
+1 -1
@@ -5,7 +5,7 @@ import (
5
6 key "github.com/ipfs/go-ipfs/blocks/key"
7 dhtpb "github.com/ipfs/go-ipfs/routing/dht/pb"
8 - datastore "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
8 + datastore "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
9 )
10
11 func TestPutProviderDoesntResultInDuplicates(t *testing.T) {
test/integration/grandcentral_test.go
+2 -2
@@ -8,9 +8,9 @@ import (
8 "math"
9 "testing"
10
11 + "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
12 + syncds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
13 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
12 - "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
13 - syncds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
14
15 key "github.com/ipfs/go-ipfs/blocks/key"
16 core "github.com/ipfs/go-ipfs/core"
test/supernode_client/main.go
+2 -2
@@ -24,8 +24,8 @@ import (
24 ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
25 "github.com/ipfs/go-ipfs/thirdparty/ipfsaddr"
26 unit "github.com/ipfs/go-ipfs/thirdparty/unit"
27 - "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
28 - syncds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
27 + "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
28 + syncds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
29
30 logging "gx/ipfs/QmNQynaz7qfriSUJkiEZUrm2Wen1u3Kj9goZzWtrPyu7XR/go-log"
31 pstore "gx/ipfs/QmQdnfvZQuhdT93LNc5bos52wAmdr3G2p6G8teLJMEN32P/go-libp2p-peerstore"
thirdparty/datastore2/datastore_closer.go
+1 -1
@@ -3,7 +3,7 @@ package datastore2
3 import (
4 "io"
5
6 - "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
6 + "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
7 )
8
9 type ThreadSafeDatastoreCloser interface {
thirdparty/datastore2/delayed.go
+2 -2
@@ -1,8 +1,8 @@
1 package datastore2
2
3 import (
4 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
5 - dsq "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/query"
4 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
5 + dsq "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/query"
6
7 delay "github.com/ipfs/go-ipfs/thirdparty/delay"
8 )
thirdparty/datastore2/threadsafe.go
+1 -1
@@ -3,7 +3,7 @@ package datastore2
3 import (
4 "io"
5
6 - "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
6 + "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
7 )
8
9 // ClaimThreadSafe claims that a Datastore is threadsafe, even when
thirdparty/testutil/datastore.go
+2 -2
@@ -2,8 +2,8 @@ package testutil
2
3 import (
4 ds2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
5 - "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
6 - syncds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
5 + "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
6 + syncds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
7 )
8
9 func ThreadSafeCloserMapDatastore() ds2.ThreadSafeDatastoreCloser {
unixfs/mod/dagmodifier_test.go
+2 -2
@@ -17,11 +17,11 @@ import (
17 mdag "github.com/ipfs/go-ipfs/merkledag"
18 ft "github.com/ipfs/go-ipfs/unixfs"
19 uio "github.com/ipfs/go-ipfs/unixfs/io"
20 + "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore/sync"
21 u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
21 - "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore/sync"
22
23 + ds "gx/ipfs/QmTxLSvdhwg68WJimdS6icLPhZi28aTp6b7uihC2Yb47Xk/go-datastore"
24 context "gx/ipfs/QmZy2y8t9zQH2a1b8q2ZSLKp17ATuJoCNxxyMFG5qFExpt/go-net/context"
24 - ds "gx/ipfs/QmfQzVugPq1w5shWRcLWSeiHF4a2meBX7yVD8Vw7GWJM9o/go-datastore"
25 )
26
27 func getMockDagServ(t testing.TB) mdag.DAGService {