Execute, Query, Request timeout tweaks #1667
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@mauri870 -- feel free to ask me why I am making these changes. |
otoolep
commented
Feb 3, 2024
| @@ -23,7 +23,7 @@ message Statement { | |||
| message Request { | |||
| bool transaction = 1; | |||
| repeated Statement statements = 2; | |||
| int64 DBTimeout = 3; | |||
| int64 dbTimeout = 3; | |||
There was a problem hiding this comment.
While Go style requires DB, protos do not. But the generated code will not be quite good Go style. That's OK.
| @@ -876,6 +876,18 @@ func (db *DB) RequestStringStmts(stmts []string) ([]*command.ExecuteQueryRespons | |||
| return db.Request(req, false) | |||
| } | |||
|
|
|||
| // RequestStringStmtsWithTimeout processes a request that can contain both executes and queries. | |||
| func (db *DB) RequestStringStmtsWithTimeout(stmts []string, timeout time.Duration) ([]*command.ExecuteQueryResponse, error) { | |||
There was a problem hiding this comment.
This was missed in the first change.
| @@ -1044,7 +1044,19 @@ func Test_ExecShouldTimeout(t *testing.T) { | |||
| INSERT INTO test_table (key1, key_id, key2, key3, key4, key5, key6, data) | |||
| SELECT t1.key1 || t2.key1, t1.key_id || t2.key_id, t1.key2 || t2.key2, t1.key3 || t2.key3, t1.key4 || t2.key4, t1.key5 || t2.key5, t1.key6 || t2.key6, t1.data || t2.data | |||
| FROM test_table t1 LEFT OUTER JOIN test_table t2` | |||
| assertExecTimeoutReached(t, db, q, 1*time.Millisecond) | |||
There was a problem hiding this comment.
Since this function was only used once, it's just clearer to inline it.
| @@ -1082,19 +1090,26 @@ func assertExecTimeoutReached(t *testing.T, db *DB, stmt string, timeout time.Du | |||
| } | |||
| } | |||
|
|
|||
| func assertQueryTimeoutReached(t *testing.T, db *DB, stmt string, timeout time.Duration) { | |||
| @@ -1082,19 +1090,26 @@ func assertExecTimeoutReached(t *testing.T, db *DB, stmt string, timeout time.Du | |||
| } | |||
| } | |||
|
|
|||
| func assertQueryTimeoutReached(t *testing.T, db *DB, stmt string, timeout time.Duration) { | |||
| r, err := db.QueryStringStmtWithTimeout(stmt, timeout) | |||
| func Test_RequestShouldTimeout(t *testing.T) { | |||
There was a problem hiding this comment.
Unit was missed first time round.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some follow up to #1666