Paths

Table of Contentst

Differential D15781

Support query timeouts with mysqli on the client side
ClosedPublic
Actions

Authored by epriestley on Apr 21 2016, 11:18 PM.

Tags

None

Referenced Files

	F14077686: D15781.diff
	Fri, Nov 22, 12:54 AM

	Unknown Object (File)
	Mon, Nov 18, 12:45 PM

	Unknown Object (File)
	Thu, Nov 14, 3:33 AM

	Unknown Object (File)
	Wed, Nov 13, 4:39 PM

	Unknown Object (File)
	Sun, Nov 10, 5:41 AM

	Unknown Object (File)
	Tue, Nov 5, 8:47 PM

	Unknown Object (File)
	Tue, Nov 5, 6:43 AM

	Unknown Object (File)
	Tue, Nov 5, 4:40 AM

Subscribers

None

Details

Reviewers

Maniphest Tasks

T10849: Support query timeouts via `max_statement_time` or MYSLQI_ASYNC

Commits

rPHU139d316c4484: Support query timeouts with mysqli on the client side

Summary

Ref T10849. I'm going to wait for the release cut to pursue this since it's the kind of change that could cause weird stuff to happen, but it appears to work properly.

To execute a query with a timeout, we use the MySQLi "async" API, and just resolve the query synchronously inline. This lets us throw if too much time has passed.

Test Plan

Added a SELECT SLEEP(10) on the home page.
Set a 3 second query timeout.
Saw the query abort properly after a few seconds.
Browsed around normally to test SELECT, etc.
Created some objects to test INSERT, UPDATE, etc.

Diff Detail

Repository

Branch

timeout1

Lint

Lint Errors

Severity	Location	Code	Message
Error	src/aphront/storage/connection/mysql/AphrontMySQLiDatabaseConnection.php:91	XHP45	PHP Compatibility
Error	src/aphront/storage/connection/mysql/AphrontMySQLiDatabaseConnection.php:172	XHP45	PHP Compatibility

Unit

Tests Passed

Build Status

Buildable 11891
Build 14935: Run Core Tests
Build 14934: arc lint + arc unit

Event Timeline

epriestley updated this revision to Diff 38020.Apr 21 2016, 11:18 PM

epriestley retitled this revision from to Support query timeouts with mysqli on the client side.

epriestley updated this object.

epriestley edited the test plan for this revision. (Show Details)

epriestley added a reviewer: chad.

epriestley added a task: T10849: Support query timeouts via `max_statement_time` or MYSLQI_ASYNC.

epriestley mentioned this in T10849: Support query timeouts via `max_statement_time` or MYSLQI_ASYNC.Apr 21 2016, 11:18 PM

(This change also does nothing on its own, it needs a corresponding change to Phabricator to call setQueryTimeout(...) before it activates.)

chad accepted this revision.Apr 22 2016, 12:41 AM

chad edited edge metadata.

This revision is now accepted and ready to land.Apr 22 2016, 12:41 AM

Closed by commit rPHU139d316c4484: Support query timeouts with mysqli on the client side (authored by epriestley, committed by epriestley). · Explain WhyApr 25 2016, 6:19 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

src/

__phutil_library_map__.php

2 lines

aphront/

storage/

connection/

AphrontDatabaseConnection.php

10 lines

mysql/

AphrontMySQLiDatabaseConnection.php

32 lines

exception/

AphrontQueryTimeoutQueryException.php

4 lines

Diff 38020

src/__phutil_library_map__.php

Loading...

src/aphront/storage/connection/AphrontDatabaseConnection.php

Loading...

src/aphront/storage/connection/mysql/AphrontMySQLiDatabaseConnection.php

Loading...

src/aphront/storage/exception/AphrontQueryTimeoutQueryException.php

Loading...