Skip to content

Commit 713316b

Browse files
laines-itoleg-jukovec
authored andcommitted
future: remove Future.ready usage
Removed unused Future.ready channel. Closes #497
1 parent e72726b commit 713316b

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Versioning](http://semver.org/spec/v2.0.0.html) except to the first release.
2222
* Removed deprecated `pool` methods, related interfaces and tests are updated (#478).
2323
* Removed deprecated `box.session.push()` support: Future.AppendPush()
2424
and Future.GetIterator() methods, ResponseIterator and TimeoutResponseIterator types,
25-
Future.pushes[] (#480).
25+
Future.pushes[], Future.ready (#480, #497).
2626
* `LogAppendPushFailed` replaced with `LogBoxSessionPushUnsupported` (#480)
2727

2828
### Fixed

connection.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,6 @@ func (conn *Connection) newFuture(req Request) (fut *Future) {
934934
ErrRateLimited,
935935
"Request is rate limited on client",
936936
}
937-
fut.ready = nil
938937
fut.done = nil
939938
return
940939
}
@@ -949,7 +948,6 @@ func (conn *Connection) newFuture(req Request) (fut *Future) {
949948
ErrConnectionClosed,
950949
"using closed connection",
951950
}
952-
fut.ready = nil
953951
fut.done = nil
954952
shard.rmut.Unlock()
955953
return
@@ -958,7 +956,6 @@ func (conn *Connection) newFuture(req Request) (fut *Future) {
958956
ErrConnectionNotReady,
959957
"client connection is not ready",
960958
}
961-
fut.ready = nil
962959
fut.done = nil
963960
shard.rmut.Unlock()
964961
return
@@ -967,7 +964,6 @@ func (conn *Connection) newFuture(req Request) (fut *Future) {
967964
ErrConnectionShutdown,
968965
"server shutdown in progress",
969966
}
970-
fut.ready = nil
971967
fut.done = nil
972968
shard.rmut.Unlock()
973969
return
@@ -1038,7 +1034,7 @@ func (conn *Connection) send(req Request, streamId uint64) *Future {
10381034
conn.incrementRequestCnt()
10391035

10401036
fut := conn.newFuture(req)
1041-
if fut.ready == nil {
1037+
if fut.done == nil {
10421038
conn.decrementRequestCnt()
10431039
return fut
10441040
}

future.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ type Future struct {
1515
mutex sync.Mutex
1616
resp Response
1717
err error
18-
ready chan struct{}
1918
done chan struct{}
2019
}
2120

@@ -41,7 +40,6 @@ func (fut *Future) isDone() bool {
4140
// NewFuture creates a new empty Future for a given Request.
4241
func NewFuture(req Request) (fut *Future) {
4342
fut = &Future{}
44-
fut.ready = make(chan struct{}, 1000000000)
4543
fut.done = make(chan struct{})
4644
fut.req = req
4745
return fut
@@ -62,7 +60,6 @@ func (fut *Future) SetResponse(header Header, body io.Reader) error {
6260
}
6361
fut.resp = resp
6462

65-
close(fut.ready)
6663
close(fut.done)
6764
return nil
6865
}
@@ -77,7 +74,6 @@ func (fut *Future) SetError(err error) {
7774
}
7875
fut.err = err
7976

80-
close(fut.ready)
8177
close(fut.done)
8278
}
8379

0 commit comments

Comments
 (0)