@@ -5,6 +5,7 @@ package tarantool
5
5
import (
6
6
"bufio"
7
7
"bytes"
8
+ "context"
8
9
"errors"
9
10
"fmt"
10
11
"io"
@@ -125,8 +126,11 @@ type Connection struct {
125
126
c net.Conn
126
127
mutex sync.Mutex
127
128
// Schema contains schema loaded on connection.
128
- Schema * Schema
129
+ Schema * Schema
130
+ // requestId contains the last request ID for requests with nil context.
129
131
requestId uint32
132
+ // contextRequestId contains the last request ID for requests with context.
133
+ contextRequestId uint32
130
134
// Greeting contains first message sent by Tarantool.
131
135
Greeting * Greeting
132
136
@@ -143,16 +147,57 @@ type Connection struct {
143
147
144
148
var _ = Connector (& Connection {}) // Check compatibility with connector interface.
145
149
150
+ type futureList struct {
151
+ first * Future
152
+ last * * Future
153
+ }
154
+
155
+ func (list * futureList ) findFuture (reqid uint32 , fetch bool ) * Future {
156
+ root := & list .first
157
+ for {
158
+ fut := * root
159
+ if fut == nil {
160
+ return nil
161
+ }
162
+ if fut .requestId == reqid {
163
+ if fetch {
164
+ * root = fut .next
165
+ if fut .next == nil {
166
+ list .last = root
167
+ } else {
168
+ fut .next = nil
169
+ }
170
+ }
171
+ return fut
172
+ }
173
+ root = & fut .next
174
+ }
175
+ }
176
+
177
+ func (list * futureList ) addFuture (fut * Future ) {
178
+ * list .last = fut
179
+ list .last = & fut .next
180
+ }
181
+
182
+ func (list * futureList ) clear (err error , conn * Connection ) {
183
+ fut := list .first
184
+ list .first = nil
185
+ list .last = & list .first
186
+ for fut != nil {
187
+ fut .SetError (err )
188
+ conn .markDone (fut )
189
+ fut , fut .next = fut .next , nil
190
+ }
191
+ }
192
+
146
193
type connShard struct {
147
- rmut sync.Mutex
148
- requests [requestsMap ]struct {
149
- first * Future
150
- last * * Future
151
- }
152
- bufmut sync.Mutex
153
- buf smallWBuf
154
- enc * msgpack.Encoder
155
- _pad [16 ]uint64 //nolint: unused,structcheck
194
+ rmut sync.Mutex
195
+ requests [requestsMap ]futureList
196
+ requestsWithCtx [requestsMap ]futureList
197
+ bufmut sync.Mutex
198
+ buf smallWBuf
199
+ enc * msgpack.Encoder
200
+ _pad [16 ]uint64 //nolint: unused,structcheck
156
201
}
157
202
158
203
// Greeting is a message sent by Tarantool on connect.
@@ -262,12 +307,13 @@ type SslOpts struct {
262
307
// and will not finish to make attempts on authorization failures.
263
308
func Connect (addr string , opts Opts ) (conn * Connection , err error ) {
264
309
conn = & Connection {
265
- addr : addr ,
266
- requestId : 0 ,
267
- Greeting : & Greeting {},
268
- control : make (chan struct {}),
269
- opts : opts ,
270
- dec : msgpack .NewDecoder (& smallBuf {}),
310
+ addr : addr ,
311
+ requestId : 0 ,
312
+ contextRequestId : 1 ,
313
+ Greeting : & Greeting {},
314
+ control : make (chan struct {}),
315
+ opts : opts ,
316
+ dec : msgpack .NewDecoder (& smallBuf {}),
271
317
}
272
318
maxprocs := uint32 (runtime .GOMAXPROCS (- 1 ))
273
319
if conn .opts .Concurrency == 0 || conn .opts .Concurrency > maxprocs * 128 {
@@ -283,8 +329,11 @@ func Connect(addr string, opts Opts) (conn *Connection, err error) {
283
329
conn .shard = make ([]connShard , conn .opts .Concurrency )
284
330
for i := range conn .shard {
285
331
shard := & conn .shard [i ]
286
- for j := range shard .requests {
287
- shard .requests [j ].last = & shard .requests [j ].first
332
+ requestsLists := []* [requestsMap ]futureList {& shard .requests , & shard .requestsWithCtx }
333
+ for _ , requests := range requestsLists {
334
+ for j := range requests {
335
+ shard .requests [j ].last = & shard .requests [j ].first
336
+ }
288
337
}
289
338
}
290
339
@@ -387,6 +436,14 @@ func (conn *Connection) Handle() interface{} {
387
436
return conn .opts .Handle
388
437
}
389
438
439
+ func (conn * Connection ) cancelFuture (fut * Future , err error ) error {
440
+ if fut = conn .fetchFuture (fut .requestId ); fut != nil {
441
+ fut .SetError (err )
442
+ conn .markDone (fut )
443
+ }
444
+ return nil
445
+ }
446
+
390
447
func (conn * Connection ) dial () (err error ) {
391
448
var connection net.Conn
392
449
network := "tcp"
@@ -580,15 +637,10 @@ func (conn *Connection) closeConnection(neterr error, forever bool) (err error)
580
637
}
581
638
for i := range conn .shard {
582
639
conn .shard [i ].buf .Reset ()
583
- requests := & conn .shard [i ].requests
584
- for pos := range requests {
585
- fut := requests [pos ].first
586
- requests [pos ].first = nil
587
- requests [pos ].last = & requests [pos ].first
588
- for fut != nil {
589
- fut .SetError (neterr )
590
- conn .markDone (fut )
591
- fut , fut .next = fut .next , nil
640
+ requestsLists := []* [requestsMap ]futureList {& conn .shard [i ].requests , & conn .shard [i ].requestsWithCtx }
641
+ for _ , requests := range requestsLists {
642
+ for pos := range requests {
643
+ requests [pos ].clear (neterr , conn )
592
644
}
593
645
}
594
646
}
@@ -721,7 +773,7 @@ func (conn *Connection) reader(r *bufio.Reader, c net.Conn) {
721
773
}
722
774
}
723
775
724
- func (conn * Connection ) newFuture () (fut * Future ) {
776
+ func (conn * Connection ) newFuture (ctx context. Context ) (fut * Future ) {
725
777
fut = NewFuture ()
726
778
if conn .rlimit != nil && conn .opts .RLimitAction == RLimitDrop {
727
779
select {
@@ -736,7 +788,7 @@ func (conn *Connection) newFuture() (fut *Future) {
736
788
return
737
789
}
738
790
}
739
- fut .requestId = conn .nextRequestId ()
791
+ fut .requestId = conn .nextRequestId (ctx != nil )
740
792
shardn := fut .requestId & (conn .opts .Concurrency - 1 )
741
793
shard := & conn .shard [shardn ]
742
794
shard .rmut .Lock ()
@@ -761,11 +813,20 @@ func (conn *Connection) newFuture() (fut *Future) {
761
813
return
762
814
}
763
815
pos := (fut .requestId / conn .opts .Concurrency ) & (requestsMap - 1 )
764
- pair := & shard .requests [pos ]
765
- * pair .last = fut
766
- pair .last = & fut .next
767
- if conn .opts .Timeout > 0 {
768
- fut .timeout = time .Since (epoch ) + conn .opts .Timeout
816
+ if ctx != nil {
817
+ select {
818
+ case <- ctx .Done ():
819
+ fut .SetError (fmt .Errorf ("context is done" ))
820
+ shard .rmut .Unlock ()
821
+ return
822
+ default :
823
+ }
824
+ shard .requestsWithCtx [pos ].addFuture (fut )
825
+ } else {
826
+ shard .requests [pos ].addFuture (fut )
827
+ if conn .opts .Timeout > 0 {
828
+ fut .timeout = time .Since (epoch ) + conn .opts .Timeout
829
+ }
769
830
}
770
831
shard .rmut .Unlock ()
771
832
if conn .rlimit != nil && conn .opts .RLimitAction == RLimitWait {
@@ -785,12 +846,40 @@ func (conn *Connection) newFuture() (fut *Future) {
785
846
return
786
847
}
787
848
849
+ func (conn * Connection ) contextWatchdog (fut * Future , ctx context.Context ) {
850
+ select {
851
+ case <- fut .done :
852
+ default :
853
+ select {
854
+ case <- ctx .Done ():
855
+ conn .cancelFuture (fut , fmt .Errorf ("context is done" ))
856
+ default :
857
+ select {
858
+ case <- fut .done :
859
+ case <- ctx .Done ():
860
+ conn .cancelFuture (fut , fmt .Errorf ("context is done" ))
861
+ }
862
+ }
863
+ }
864
+ }
865
+
788
866
func (conn * Connection ) send (req Request ) * Future {
789
- fut := conn .newFuture ()
867
+ fut := conn .newFuture (req . Ctx () )
790
868
if fut .ready == nil {
791
869
return fut
792
870
}
871
+ if req .Ctx () != nil {
872
+ select {
873
+ case <- req .Ctx ().Done ():
874
+ conn .cancelFuture (fut , fmt .Errorf ("context is done" ))
875
+ return fut
876
+ default :
877
+ }
878
+ }
793
879
conn .putFuture (fut , req )
880
+ if req .Ctx () != nil {
881
+ go conn .contextWatchdog (fut , req .Ctx ())
882
+ }
794
883
return fut
795
884
}
796
885
@@ -877,25 +966,10 @@ func (conn *Connection) fetchFuture(reqid uint32) (fut *Future) {
877
966
func (conn * Connection ) getFutureImp (reqid uint32 , fetch bool ) * Future {
878
967
shard := & conn .shard [reqid & (conn .opts .Concurrency - 1 )]
879
968
pos := (reqid / conn .opts .Concurrency ) & (requestsMap - 1 )
880
- pair := & shard .requests [pos ]
881
- root := & pair .first
882
- for {
883
- fut := * root
884
- if fut == nil {
885
- return nil
886
- }
887
- if fut .requestId == reqid {
888
- if fetch {
889
- * root = fut .next
890
- if fut .next == nil {
891
- pair .last = root
892
- } else {
893
- fut .next = nil
894
- }
895
- }
896
- return fut
897
- }
898
- root = & fut .next
969
+ if reqid % 2 == 0 {
970
+ return shard .requests [pos ].findFuture (reqid , fetch )
971
+ } else {
972
+ return shard .requestsWithCtx [pos ].findFuture (reqid , fetch )
899
973
}
900
974
}
901
975
@@ -984,8 +1058,12 @@ func (conn *Connection) read(r io.Reader) (response []byte, err error) {
984
1058
return
985
1059
}
986
1060
987
- func (conn * Connection ) nextRequestId () (requestId uint32 ) {
988
- return atomic .AddUint32 (& conn .requestId , 1 )
1061
+ func (conn * Connection ) nextRequestId (context bool ) (requestId uint32 ) {
1062
+ if context {
1063
+ return atomic .AddUint32 (& conn .contextRequestId , 2 )
1064
+ } else {
1065
+ return atomic .AddUint32 (& conn .requestId , 2 )
1066
+ }
989
1067
}
990
1068
991
1069
// Do performs a request asynchronously on the connection.
@@ -1000,6 +1078,15 @@ func (conn *Connection) Do(req Request) *Future {
1000
1078
return fut
1001
1079
}
1002
1080
}
1081
+ if req .Ctx () != nil {
1082
+ select {
1083
+ case <- req .Ctx ().Done ():
1084
+ fut := NewFuture ()
1085
+ fut .SetError (fmt .Errorf ("context is done" ))
1086
+ return fut
1087
+ default :
1088
+ }
1089
+ }
1003
1090
return conn .send (req )
1004
1091
}
1005
1092
0 commit comments