Skip to content

vtexplain rework and improve #3267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sougou merged 16 commits into from
Oct 12, 2017
Merged

vtexplain rework and improve #3267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
08288f0
rework the vtexplain fake tablet to return properly typed results
demmer Sep 30, 2017
142c038
rework the sandboxconn and fake healthcheck hooks for vtexplain
demmer Sep 30, 2017
f67ccd7
rework vtexplain to implement QueryService directly
demmer Sep 30, 2017
8d9db0e
add a sync2.Batcher utility for batching concurrent operations
demmer Oct 1, 2017
01aeca2
update vtexplain to simulate time passage
demmer Oct 1, 2017
8ee046a
disable tablet autocommit for vtexplain
demmer Oct 1, 2017
f643b75
improve and expand vtexplain tests
demmer Oct 1, 2017
bfce0bd
rename the vtexplain test to indicate to travis it could be flaky
demmer Oct 3, 2017
fec19ea
use time.Milliscond as suggested in PR review
demmer Oct 3, 2017
d79aca0
be more permissive when it comes to types
demmer Oct 8, 2017
3c36810
rework to use int as per PR feedback and extend test timing
demmer Oct 8, 2017
830ea81
rename the batcher test so travis treats it as flaky
demmer Oct 8, 2017
0e87ad5
update vtexplain to changed Batcher API
demmer Oct 8, 2017
c70b8b6
rename receivers from `tablet` to `t` as per PR feedback
demmer Oct 8, 2017
e89c2a8
add batchTime comment
demmer Oct 8, 2017
2839210
rework the explain tablet to avoid QueryService boilerplate
demmer Oct 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 52 additions & 8 deletions data/test/vtexplain/comments-output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,72 @@
}
],
"TabletActions": {
"ks_sharded/-80": {
"ks_sharded/-40": {
"TabletQueries": [
{
"Time": 1,
"SQL": "select * from user",
"BindVars": {}
"BindVars": {
"#maxLimit": "10001"
}
}
],
"MysqlQueries": [
"select * from user where 1 != 1",
"select * from user limit 10001"
{
"Time": 1,
"SQL": "select * from user limit 10001"
}
]
},
"ks_sharded/40-80": {
"TabletQueries": [
{
"Time": 1,
"SQL": "select * from user",
"BindVars": {
"#maxLimit": "10001"
}
}
],
"MysqlQueries": [
{
"Time": 1,
"SQL": "select * from user limit 10001"
}
]
},
"ks_sharded/80-": {
"ks_sharded/80-c0": {
"TabletQueries": [
{
"Time": 1,
"SQL": "select * from user",
"BindVars": {}
"BindVars": {
"#maxLimit": "10001"
}
}
],
"MysqlQueries": [
"select * from user where 1 != 1",
"select * from user limit 10001"
{
"Time": 1,
"SQL": "select * from user limit 10001"
}
]
},
"ks_sharded/c0-": {
"TabletQueries": [
{
"Time": 1,
"SQL": "select * from user",
"BindVars": {
"#maxLimit": "10001"
}
}
],
"MysqlQueries": [
{
"Time": 1,
"SQL": "select * from user limit 10001"
}
]
}
}
Expand Down
11 changes: 4 additions & 7 deletions data/test/vtexplain/comments-output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
----------------------------------------------------------------------
SELECT * from user

[ks_sharded/-80]:
select * from user where 1 != 1
select * from user limit 10001

[ks_sharded/80-]:
select * from user where 1 != 1
select * from user limit 10001
1 ks_sharded/-40: select * from user limit 10001
1 ks_sharded/40-80: select * from user limit 10001
1 ks_sharded/80-c0: select * from user limit 10001
1 ks_sharded/c0-: select * from user limit 10001

----------------------------------------------------------------------
258 changes: 258 additions & 0 deletions data/test/vtexplain/deletesharded-output.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,258 @@
[
{
"SQL": "delete from user where id=10",
"Plans": [
{
"Original": "delete from name_user_map where name = :name and user_id = :user_id",
"Instructions": {
"Opcode": "DeleteEqual",
"Keyspace": {
"Name": "ks_sharded",
"Sharded": true
},
"Query": "delete from name_user_map where name = :name and user_id = :user_id",
"Vindex": "md5",
"Values": [
":name"
],
"Table": "name_user_map"
}
},
{
"Original": "delete from user where id = :vtg1",
"Instructions": {
"Opcode": "DeleteEqual",
"Keyspace": {
"Name": "ks_sharded",
"Sharded": true
},
"Query": "delete from user where id = :vtg1",
"Vindex": "hash",
"Values": [
":vtg1"
],
"Table": "user",
"Subquery": "select name from user where id = :vtg1 for update"
}
}
],
"TabletActions": {
"ks_sharded/40-80": {
"TabletQueries": [
{
"Time": 1,
"SQL": "select name from user where id = :vtg1 for update",
"BindVars": {
"#maxLimit": "10001",
"vtg1": "10"
}
},
{
"Time": 3,
"SQL": "delete from user where id = :vtg1 /* vtgate:: keyspace_id:594764e1a2b2d98e */",
"BindVars": {
"#maxLimit": "10001",
"vtg1": "10"
}
}
],
"MysqlQueries": [
{
"Time": 1,
"SQL": "begin"
},
{
"Time": 1,
"SQL": "select name from user where id = 10 limit 10001 for update"
},
{
"Time": 3,
"SQL": "delete from user where id in (10) /* vtgate:: keyspace_id:594764e1a2b2d98e */"
},
{
"Time": 4,
"SQL": "commit"
}
]
},
"ks_sharded/80-c0": {
"TabletQueries": [
{
"Time": 2,
"SQL": "delete from name_user_map where name = :name and user_id = :user_id /* vtgate:: keyspace_id:a6e89b54b129c33051b76db219595660 */",
"BindVars": {
"#maxLimit": "10001",
"name": "'name_val_1'",
"user_id": "10"
}
}
],
"MysqlQueries": [
{
"Time": 2,
"SQL": "begin"
},
{
"Time": 2,
"SQL": "delete from name_user_map where (name = 'name_val_1' and user_id = 10) /* vtgate:: keyspace_id:a6e89b54b129c33051b76db219595660 */"
},
{
"Time": 5,
"SQL": "commit"
}
]
}
}
},
{
"SQL": "delete from user where name='billy'",
"Plans": [
{
"Original": "delete from name_user_map where name = :name and user_id = :user_id",
"Instructions": {
"Opcode": "DeleteEqual",
"Keyspace": {
"Name": "ks_sharded",
"Sharded": true
},
"Query": "delete from name_user_map where name = :name and user_id = :user_id",
"Vindex": "md5",
"Values": [
":name"
],
"Table": "name_user_map"
}
},
{
"Original": "select user_id from name_user_map where name = :name",
"Instructions": {
"Opcode": "SelectEqualUnique",
"Keyspace": {
"Name": "ks_sharded",
"Sharded": true
},
"Query": "select user_id from name_user_map where name = :name",
"FieldQuery": "select user_id from name_user_map where 1 != 1",
"Vindex": "md5",
"Values": [
":name"
]
}
},
{
"Original": "delete from user where name = :vtg1",
"Instructions": {
"Opcode": "DeleteEqual",
"Keyspace": {
"Name": "ks_sharded",
"Sharded": true
},
"Query": "delete from user where name = :vtg1",
"Vindex": "name_user_map",
"Values": [
":vtg1"
],
"Table": "user",
"Subquery": "select name from user where name = :vtg1 for update"
}
}
],
"TabletActions": {
"ks_sharded/-40": {
"TabletQueries": [
{
"Time": 2,
"SQL": "select name from user where name = :vtg1 for update",
"BindVars": {
"#maxLimit": "10001",
"vtg1": "'billy'"
}
},
{
"Time": 4,
"SQL": "delete from user where name = :vtg1 /* vtgate:: keyspace_id:166b40b44aba4bd6 */",
"BindVars": {
"#maxLimit": "10001",
"vtg1": "'billy'"
}
}
],
"MysqlQueries": [
{
"Time": 2,
"SQL": "begin"
},
{
"Time": 2,
"SQL": "select name from user where name = 'billy' limit 10001 for update"
},
{
"Time": 4,
"SQL": "select id from user where name = 'billy' limit 10001 for update /* vtgate:: keyspace_id:166b40b44aba4bd6 */"
},
{
"Time": 4,
"SQL": "delete from user where id in (1) /* vtgate:: keyspace_id:166b40b44aba4bd6 */"
},
{
"Time": 6,
"SQL": "commit"
}
]
},
"ks_sharded/80-c0": {
"TabletQueries": [
{
"Time": 3,
"SQL": "delete from name_user_map where name = :name and user_id = :user_id /* vtgate:: keyspace_id:a6e89b54b129c33051b76db219595660 */",
"BindVars": {
"#maxLimit": "10001",
"name": "'name_val_1'",
"user_id": "1"
}
}
],
"MysqlQueries": [
{
"Time": 3,
"SQL": "begin"
},
{
"Time": 3,
"SQL": "delete from name_user_map where (name = 'name_val_1' and user_id = 1) /* vtgate:: keyspace_id:a6e89b54b129c33051b76db219595660 */"
},
{
"Time": 7,
"SQL": "commit"
}
]
},
"ks_sharded/c0-": {
"TabletQueries": [
{
"Time": 1,
"SQL": "select user_id from name_user_map where name = :name",
"BindVars": {
"#maxLimit": "10001",
"name": "'billy'"
}
}
],
"MysqlQueries": [
{
"Time": 1,
"SQL": "begin"
},
{
"Time": 1,
"SQL": "select user_id from name_user_map where name = 'billy' limit 10001"
},
{
"Time": 5,
"SQL": "commit"
}
]
}
}
}
]
27 changes: 27 additions & 0 deletions data/test/vtexplain/deletesharded-output.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
----------------------------------------------------------------------
delete from user where id=10

1 ks_sharded/40-80: begin
1 ks_sharded/40-80: select name from user where id = 10 limit 10001 for update
2 ks_sharded/80-c0: begin
2 ks_sharded/80-c0: delete from name_user_map where (name = 'name_val_1' and user_id = 10) /* vtgate:: keyspace_id:a6e89b54b129c33051b76db219595660 */
3 ks_sharded/40-80: delete from user where id in (10) /* vtgate:: keyspace_id:594764e1a2b2d98e */
4 ks_sharded/40-80: commit
5 ks_sharded/80-c0: commit

----------------------------------------------------------------------
delete from user where name='billy'

1 ks_sharded/c0-: begin
1 ks_sharded/c0-: select user_id from name_user_map where name = 'billy' limit 10001
2 ks_sharded/-40: begin
2 ks_sharded/-40: select name from user where name = 'billy' limit 10001 for update
3 ks_sharded/80-c0: begin
3 ks_sharded/80-c0: delete from name_user_map where (name = 'name_val_1' and user_id = 1) /* vtgate:: keyspace_id:a6e89b54b129c33051b76db219595660 */
4 ks_sharded/-40: select id from user where name = 'billy' limit 10001 for update /* vtgate:: keyspace_id:166b40b44aba4bd6 */
4 ks_sharded/-40: delete from user where id in (1) /* vtgate:: keyspace_id:166b40b44aba4bd6 */
5 ks_sharded/c0-: commit
6 ks_sharded/-40: commit
7 ks_sharded/80-c0: commit

----------------------------------------------------------------------
5 changes: 5 additions & 0 deletions data/test/vtexplain/deletesharded-queries.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
delete from user where id=10;
delete from user where name='billy';

/* not supported - multi-shard delete */
--delete from user where pet='rover';
Loading