File tree 2 files changed +20
-0
lines changed
2 files changed +20
-0
lines changed Original file line number Diff line number Diff line change @@ -233,13 +233,15 @@ def raise_if_timeout!
233
233
elapsed = Process . clock_gettime ( Process ::CLOCK_MONOTONIC ) - @started_at
234
234
235
235
if @query_timeout && elapsed > @query_timeout
236
+ close
236
237
raise_timeout_error!
237
238
end
238
239
239
240
if @plan_timeout && ( @results == nil || @results . columns == nil ) &&
240
241
elapsed > @plan_timeout
241
242
# @results is not set (even first faraday_get_with_retry isn't called yet) or
242
243
# result from Trino doesn't include result schema. Query planning isn't done yet.
244
+ close
243
245
raise_timeout_error!
244
246
end
245
247
end
Original file line number Diff line number Diff line change 540
540
client . advance
541
541
542
542
sleep 1
543
+
543
544
stub_request ( :get , "localhost/v1/next_uri" ) .
544
545
with ( headers : headers ) .
545
546
to_return ( body : planning_response . to_json )
547
+
548
+ cancel = stub_request ( :delete , "localhost/v1/next_uri" ) .
549
+ with ( headers : headers ) .
550
+ to_return ( status : 204 ) # NoContent
551
+
546
552
expect do
547
553
client . advance
548
554
end . to raise_error ( Trino ::Client ::TrinoQueryTimeoutError , "Query queryid timed out" )
555
+
556
+ expect ( cancel ) . to have_been_requested
557
+ expect ( client . client_error? ) . to eq true
549
558
end
550
559
551
560
it "raises TrinoQueryTimeoutError if timeout during initial resuming" do
602
611
client . advance
603
612
604
613
sleep 1
614
+
605
615
stub_request ( :get , "localhost/v1/next_uri" ) .
606
616
with ( headers : headers ) .
607
617
to_return ( body : late_running_response . to_json )
618
+
619
+ cancel = stub_request ( :delete , "localhost/v1/next_uri" ) .
620
+ with ( headers : headers ) .
621
+ to_return ( status : 204 ) # NoContent
622
+
608
623
expect do
609
624
client . advance
610
625
end . to raise_error ( Trino ::Client ::TrinoQueryTimeoutError , "Query queryid timed out" )
626
+
627
+ expect ( cancel ) . to have_been_requested
628
+ expect ( client . client_error? ) . to eq true
611
629
end
612
630
613
631
it "doesn't raise errors if query is done" do
You can’t perform that action at this time.
0 commit comments