Unverified Commit a2784abf authored by Hannah Howard's avatar Hannah Howard Committed by GitHub

Merge pull request #95 from ipfs/release/v0.1.2

Release/v0.1.2
parents 29acd2c0 f940d777
...@@ -147,6 +147,22 @@ Minor fix for alternate persistence stores and deduplication ...@@ -147,6 +147,22 @@ Minor fix for alternate persistence stores and deduplication
|-------------|---------|---------|---------------| |-------------|---------|---------|---------------|
| Hannah Howard | 1 | +316/-7 | 10 | | Hannah Howard | 1 | +316/-7 | 10 |
# go-graphsync 0.1.2
Minor release with initial benchmarks
### Changelog
- github.com/ipfs/go-graphsync:
- Benchmark framework + First memory fixes (#89) ([ipfs/go-graphsync#89](https://github.com/ipfs/go-graphsync/pull/89))
- docs(CHANGELOG): update for v0.1.1 ([ipfs/go-graphsync#85](https://github.com/ipfs/go-graphsync/pull/85))
### Contributors
| Contributor | Commits | Lines ± | Files Changed |
|-------------|---------|---------|---------------|
| Hannah Howard | 1 | +1055/-39 | 17 |
### 🙌🏽 Want to contribute? ### 🙌🏽 Want to contribute?
Would you like to contribute to this repo and don’t know how? Here are a few places you can get started: Would you like to contribute to this repo and don’t know how? Here are a few places you can get started:
......
...@@ -16,8 +16,6 @@ import ( ...@@ -16,8 +16,6 @@ import (
"github.com/ipfs/go-blockservice" "github.com/ipfs/go-blockservice"
"github.com/ipfs/go-cid" "github.com/ipfs/go-cid"
"github.com/ipfs/go-graphsync/benchmarks/testinstance"
tn "github.com/ipfs/go-graphsync/benchmarks/testnet"
blockstore "github.com/ipfs/go-ipfs-blockstore" blockstore "github.com/ipfs/go-ipfs-blockstore"
chunker "github.com/ipfs/go-ipfs-chunker" chunker "github.com/ipfs/go-ipfs-chunker"
delay "github.com/ipfs/go-ipfs-delay" delay "github.com/ipfs/go-ipfs-delay"
...@@ -33,6 +31,9 @@ import ( ...@@ -33,6 +31,9 @@ import (
"github.com/ipld/go-ipld-prime/traversal/selector/builder" "github.com/ipld/go-ipld-prime/traversal/selector/builder"
mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/ipfs/go-graphsync/benchmarks/testinstance"
tn "github.com/ipfs/go-graphsync/benchmarks/testnet"
) )
const stdBlockSize = 8000 const stdBlockSize = 8000
......
...@@ -8,17 +8,18 @@ import ( ...@@ -8,17 +8,18 @@ import (
ds "github.com/ipfs/go-datastore" ds "github.com/ipfs/go-datastore"
"github.com/ipfs/go-datastore/delayed" "github.com/ipfs/go-datastore/delayed"
ds_sync "github.com/ipfs/go-datastore/sync" ds_sync "github.com/ipfs/go-datastore/sync"
graphsync "github.com/ipfs/go-graphsync"
tn "github.com/ipfs/go-graphsync/benchmarks/testnet"
gsimpl "github.com/ipfs/go-graphsync/impl"
gsnet "github.com/ipfs/go-graphsync/network"
"github.com/ipfs/go-graphsync/storeutil"
blockstore "github.com/ipfs/go-ipfs-blockstore" blockstore "github.com/ipfs/go-ipfs-blockstore"
delay "github.com/ipfs/go-ipfs-delay" delay "github.com/ipfs/go-ipfs-delay"
"github.com/ipld/go-ipld-prime" "github.com/ipld/go-ipld-prime"
peer "github.com/libp2p/go-libp2p-core/peer" peer "github.com/libp2p/go-libp2p-core/peer"
p2ptestutil "github.com/libp2p/go-libp2p-netutil" p2ptestutil "github.com/libp2p/go-libp2p-netutil"
tnet "github.com/libp2p/go-libp2p-testing/net" tnet "github.com/libp2p/go-libp2p-testing/net"
graphsync "github.com/ipfs/go-graphsync"
tn "github.com/ipfs/go-graphsync/benchmarks/testnet"
gsimpl "github.com/ipfs/go-graphsync/impl"
gsnet "github.com/ipfs/go-graphsync/network"
"github.com/ipfs/go-graphsync/storeutil"
) )
// TempDirGenerator is any interface that can generate temporary directories // TempDirGenerator is any interface that can generate temporary directories
......
package testnet package testnet
import ( import (
gsnet "github.com/ipfs/go-graphsync/network"
"github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/peer"
tnet "github.com/libp2p/go-libp2p-testing/net" tnet "github.com/libp2p/go-libp2p-testing/net"
gsnet "github.com/ipfs/go-graphsync/network"
) )
// Network is an interface for generating graphsync network interfaces // Network is an interface for generating graphsync network interfaces
...@@ -13,4 +13,3 @@ type Network interface { ...@@ -13,4 +13,3 @@ type Network interface {
Adapter(tnet.Identity) gsnet.GraphSyncNetwork Adapter(tnet.Identity) gsnet.GraphSyncNetwork
HasPeer(peer.ID) bool HasPeer(peer.ID) bool
} }
...@@ -6,8 +6,9 @@ import ( ...@@ -6,8 +6,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/ipfs/go-graphsync/benchmarks/testnet"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/ipfs/go-graphsync/benchmarks/testnet"
) )
const testSeed = 99 const testSeed = 99
......
...@@ -6,13 +6,13 @@ import ( ...@@ -6,13 +6,13 @@ import (
"testing" "testing"
blocks "github.com/ipfs/go-block-format" blocks "github.com/ipfs/go-block-format"
"github.com/ipfs/go-graphsync/benchmarks/testnet"
gsmsg "github.com/ipfs/go-graphsync/message"
gsnet "github.com/ipfs/go-graphsync/network"
delay "github.com/ipfs/go-ipfs-delay" delay "github.com/ipfs/go-ipfs-delay"
"github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/peer"
tnet "github.com/libp2p/go-libp2p-testing/net" tnet "github.com/libp2p/go-libp2p-testing/net"
"github.com/ipfs/go-graphsync/benchmarks/testnet"
gsmsg "github.com/ipfs/go-graphsync/message"
gsnet "github.com/ipfs/go-graphsync/network"
) )
func TestSendMessageAsyncButWaitForResponse(t *testing.T) { func TestSendMessageAsyncButWaitForResponse(t *testing.T) {
......
...@@ -7,15 +7,14 @@ import ( ...@@ -7,15 +7,14 @@ import (
"sync" "sync"
"time" "time"
gsmsg "github.com/ipfs/go-graphsync/message"
gsnet "github.com/ipfs/go-graphsync/network"
delay "github.com/ipfs/go-ipfs-delay" delay "github.com/ipfs/go-ipfs-delay"
mockrouting "github.com/ipfs/go-ipfs-routing/mock" mockrouting "github.com/ipfs/go-ipfs-routing/mock"
"github.com/libp2p/go-libp2p-core/peer" "github.com/libp2p/go-libp2p-core/peer"
tnet "github.com/libp2p/go-libp2p-testing/net" tnet "github.com/libp2p/go-libp2p-testing/net"
mocknet "github.com/libp2p/go-libp2p/p2p/net/mock" mocknet "github.com/libp2p/go-libp2p/p2p/net/mock"
gsmsg "github.com/ipfs/go-graphsync/message"
gsnet "github.com/ipfs/go-graphsync/network"
) )
// VirtualNetwork generates a new testnet instance - a fake network that // VirtualNetwork generates a new testnet instance - a fake network that
......
...@@ -117,11 +117,7 @@ func (al *AsyncLoader) AsyncLoad(requestID graphsync.RequestID, link ipld.Link) ...@@ -117,11 +117,7 @@ func (al *AsyncLoader) AsyncLoad(requestID graphsync.RequestID, link ipld.Link)
resultChan := make(chan types.AsyncLoadResult, 1) resultChan := make(chan types.AsyncLoadResult, 1)
response := make(chan error, 1) response := make(chan error, 1)
lr := loadattemptqueue.NewLoadRequest(requestID, link, resultChan) lr := loadattemptqueue.NewLoadRequest(requestID, link, resultChan)
err := al.sendSyncMessage(&loadRequestMessage{response, requestID, lr}, response) _ = al.sendSyncMessage(&loadRequestMessage{response, requestID, lr}, response)
if err != nil {
resultChan <- types.AsyncLoadResult{Data: nil, Err: err}
close(resultChan)
}
return resultChan return resultChan
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment