Skip to content

Commit

Permalink
Merge pull request cockroachdb#62956 from jordanlewis/backport21.1-62910
Browse files Browse the repository at this point in the history 
release-21.1: sql: s/tuples/rows/ in vectorized stats
  • Loading branch information
@jordanlewis
jordanlewis authored Apr 9, 2021
2 parents 69122e0 + ee1b3af commit b21840a
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 44 deletions.
14 changes: 7 additions & 7 deletions pkg/sql/execinfrapb/component_stats.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func (s *ComponentStats) formatStats(fn func(suffix string, value interface{}))
fn("deserialization time", humanizeutil.Duration(s.NetRx.DeserializationTime.Value()))
}
if s.NetRx.TuplesReceived.HasValue() {
fn("network tuples received", humanizeutil.Count(s.NetRx.TuplesReceived.Value()))
fn("network rows received", humanizeutil.Count(s.NetRx.TuplesReceived.Value()))
}
if s.NetRx.BytesReceived.HasValue() {
fn("network bytes received", humanize.IBytes(s.NetRx.BytesReceived.Value()))
Expand All @@ -101,7 +101,7 @@ func (s *ComponentStats) formatStats(fn func(suffix string, value interface{}))

// Network Tx stats.
if s.NetTx.TuplesSent.HasValue() {
fn("network tuples sent", humanizeutil.Count(s.NetTx.TuplesSent.Value()))
fn("network rows sent", humanizeutil.Count(s.NetTx.TuplesSent.Value()))
}
if s.NetTx.BytesSent.HasValue() {
fn("network bytes sent", humanize.IBytes(s.NetTx.BytesSent.Value()))
Expand All @@ -114,21 +114,21 @@ func (s *ComponentStats) formatStats(fn func(suffix string, value interface{}))
switch len(s.Inputs) {
case 1:
if s.Inputs[0].NumTuples.HasValue() {
fn("input tuples", humanizeutil.Count(s.Inputs[0].NumTuples.Value()))
fn("input rows", humanizeutil.Count(s.Inputs[0].NumTuples.Value()))
}
if s.Inputs[0].WaitTime.HasValue() {
fn("input stall time", humanizeutil.Duration(s.Inputs[0].WaitTime.Value()))
}

case 2:
if s.Inputs[0].NumTuples.HasValue() {
fn("left tuples", humanizeutil.Count(s.Inputs[0].NumTuples.Value()))
fn("left rows", humanizeutil.Count(s.Inputs[0].NumTuples.Value()))
}
if s.Inputs[0].WaitTime.HasValue() {
fn("left stall time", humanizeutil.Duration(s.Inputs[0].WaitTime.Value()))
}
if s.Inputs[1].NumTuples.HasValue() {
fn("right tuples", humanizeutil.Count(s.Inputs[1].NumTuples.Value()))
fn("right rows", humanizeutil.Count(s.Inputs[1].NumTuples.Value()))
}
if s.Inputs[1].WaitTime.HasValue() {
fn("right stall time", humanizeutil.Duration(s.Inputs[1].WaitTime.Value()))
Expand All @@ -143,7 +143,7 @@ func (s *ComponentStats) formatStats(fn func(suffix string, value interface{}))
fn("KV contention time", humanizeutil.Duration(s.KV.ContentionTime.Value()))
}
if s.KV.TuplesRead.HasValue() {
fn("KV tuples read", humanizeutil.Count(s.KV.TuplesRead.Value()))
fn("KV rows read", humanizeutil.Count(s.KV.TuplesRead.Value()))
}
if s.KV.BytesRead.HasValue() {
fn("KV bytes read", humanize.IBytes(s.KV.BytesRead.Value()))
Expand All @@ -165,7 +165,7 @@ func (s *ComponentStats) formatStats(fn func(suffix string, value interface{}))
fn("batches output", humanizeutil.Count(s.Output.NumBatches.Value()))
}
if s.Output.NumTuples.HasValue() {
fn("tuples output", humanizeutil.Count(s.Output.NumTuples.Value()))
fn("rows output", humanizeutil.Count(s.Output.NumTuples.Value()))
}
}

Expand Down
40 changes: 20 additions & 20 deletions pkg/sql/execinfrapb/component_stats_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func TestComponentStatsMakeDeterminstic(t *testing.T) {
network latency: 0µs
network wait time: 0µs
deserialization time: 0µs
network tuples received: 10
network rows received: 10
network bytes received: 80 B`,
},
{ // 2
Expand All @@ -53,7 +53,7 @@ network bytes received: 80 B`,
},
},
expected: `
network tuples sent: 10
network rows sent: 10
network bytes sent: 80 B`,
},
{ // 3
Expand All @@ -66,7 +66,7 @@ network bytes sent: 80 B`,
},
expected: `
KV time: 0µs
KV tuples read: 10
KV rows read: 10
KV bytes read: 80 B`,
},
{ // 4
Expand All @@ -91,7 +91,7 @@ max scratch disk allocated: 0 B`,
},
expected: `
batches output: 0
tuples output: 100`,
rows output: 100`,
},
{ // 6
stats: ComponentStats{
Expand All @@ -101,7 +101,7 @@ tuples output: 100`,
}},
},
expected: `
input tuples: 100
input rows: 100
input stall time: 0µs`,
},
}
Expand Down Expand Up @@ -174,20 +174,20 @@ func TestComponentStatsUnion(t *testing.T) {
network latency: 1s
network wait time: 1s
deserialization time: 1s
network tuples received: 10
network rows received: 10
network bytes received: 12 KiB
network tuples sent: 10
network rows sent: 10
network bytes sent: 12 KiB
input tuples: 100
input rows: 100
input stall time: 1s
KV time: 1s
KV tuples read: 10
KV rows read: 10
KV bytes read: 12 KiB
execution time: 1s
max memory allocated: 1.0 KiB
max scratch disk allocated: 1.0 KiB
batches output: 10
tuples output: 100`,
rows output: 100`,
},
{ // 2
a: ComponentStats{},
Expand Down Expand Up @@ -226,20 +226,20 @@ tuples output: 100`,
network latency: 1s
network wait time: 1s
deserialization time: 1s
network tuples received: 10
network rows received: 10
network bytes received: 12 KiB
network tuples sent: 10
network rows sent: 10
network bytes sent: 12 KiB
input tuples: 100
input rows: 100
input stall time: 1s
KV time: 1s
KV tuples read: 10
KV rows read: 10
KV bytes read: 12 KiB
execution time: 1s
max memory allocated: 1.0 KiB
max scratch disk allocated: 1.0 KiB
batches output: 10
tuples output: 100`,
rows output: 100`,
},
{ // 3
a: ComponentStats{
Expand Down Expand Up @@ -294,20 +294,20 @@ tuples output: 100`,
network latency: 1s
network wait time: 1s
deserialization time: 1s
network tuples received: 10
network rows received: 10
network bytes received: 12 KiB
network tuples sent: 10
network rows sent: 10
network bytes sent: 12 KiB
input tuples: 100
input rows: 100
input stall time: 1s
KV time: 1s
KV tuples read: 10
KV rows read: 10
KV bytes read: 12 KiB
execution time: 1s
max memory allocated: 1.0 KiB
max scratch disk allocated: 1.0 KiB
batches output: 10
tuples output: 100`,
rows output: 100`,
},
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/sql/logictest/testdata/logic_test/dist_vectorize
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ network usage: <hidden>
table: kv@primary
spans: FULL SCAN
·
Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsVd1u00wQvf-eYjVX7aeN_Js29VWhKlIFTVCSwgWKqq09MladXbO7bhuiPBYvwJMh23GIk2C7QihE9HJnfDxzzpndmYP6EoMHo8t3lxdj4ouU66P_j8mb4eCa3D8ABS4C7LMpKvA-gQUUbKDgAAUXKHRhQiGRwkelhMw-meeAq-AJPJNCxJNUZ-EJBV9IBG8OOtIxggdjdhfjEFmA0jCBQoCaRXFe5v7hPJHRlMkZUBgljCuPdIys8CDVHukLjkDh7Qeioyl6xPz-TRVnX3CNXEeCb6V0msSoiEQWeMQqYnczvQr1yGugcMe0_xkVEalOslJZY0tkGbJgsqBQnJbUlGYhgmctaHv6r8JQYsi0kEa3yv5icNMf3w4HH0dHx0ABn9BPtyn9Vqf2Lzv92WDKhQxQYlDpbrKo52JtWDm6ub696o-Pzq0_xcWpcLHaD53VPHSG3TGcwxq7BgHWrDrZ89jZ7a2yW1jldAz3sKxqEGDNqtM9W-W0t8ppYZXbyd-8A7KqQYA1q3p7tsptb5Xbwqpu57CMaqC_ZtTZX7R1d3Q6RJUIrnBj--7-s5ltZQxCLFa4Eqn08b0Ufl6mOA5yXB4IUOkiaxWHK16ksgbXwVYt2K6ArU2wXV-5obRTi3brwe5z-s5VzAUFjvpRyHsSM43cn61sL-OPLNLVgQhQoYxYHH1l29NSwla3wMfoAZc3oUyW16HMFVeizE5RKRZWPjCfMYdVWbq1spzUa3ryoukuTU9rZenVa9p70XSXpmf1L4fZ8GjVP3n_jqqTxX8_AgAA__8wvk4O
Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsVd1u00wQvf-eYjVX7aeN_Js29VWhKlIFTVCSwgWKqq09MlacXbO7ThqiPBYvwJMh2zHESbGNEAoRvdwZH8-cc2Z3VqA-xeDB6PrN9dWY-CLl-uT_U_JqOLgl0zlQ4CLAPpuhAu8DWEDBBgoOUHCBQhcmFBIpfFRKyOyTVQ64CR7BMylEPEl1Fp5Q8IVE8FagIx0jeDBmDzEOkQUoDRMoBKhZFOdlpvPLREYzJpdAYZQwrjzSMbLCg1R7pC84AoXX74iOZugR8-sXVZx9wTVyHQm-l5JioYhEFnjEKiIPS41lqEdeAoUHpv2PqIhIdZIVytrKcWXAgsmaQnHa0FKahQietabtqb8IQ4kh00Ia3Srzq8Fdf3w_HLwfnZwCBXxEP92n8xt92j_t80d7KRcyQIlBpbfJup6JtWPi6O72_qY_Prm0_gwTp8LEaj9sVvOwGXbHcI5n3BrIb5l0dtBxs9ubZLcwyekY7vGY1EB-y6Tzg5rktDfJaWGS28nfuCMxqYH8lkm9g5rktjfJbWFSt3M8FjVQ37Lo4q_ZrU_0OUSVCK5wZ8c-_Wcz270YhFgsaiVS6eNbKfy8THEc5Lg8EKDSRdYqDje8SGUNboOtWrBdAVu7YLu-ckNppxbt1oPdX-k7VzEXFDjqhZBTEjON3F9-N72ML1ikq-MQoEIZsTj6zPZnpYRt5t_HaI6bO1CmyotQ5orLUGZnqBQLKx-YrWewKkm3VpKzej3PnvXcleS8VpJevZ69Zz13Jbmofy3Mhoeq_pn7NxSdrP_7FgAA__9xHjpe

query T
EXPLAIN ANALYZE (DISTSQL) SELECT * FROM kv JOIN kw ON kv.k = kw.k
Expand Down Expand Up @@ -110,7 +110,7 @@ network usage: <hidden>
table: kw@primary
spans: FULL SCAN
·
Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsmt9u2zYUxu_3FMS52la5MiU7TQQUMDZ0QLo1HtJiN4MvGOnMFixLHknH8YI81l5gTzbImtP6DyVZWEPK9F0kipbOj985-sScRxB_JhDAx3e_vPvxE_me_HQ7_ECm9-T98PqGTJdkeEOm96-n5C2ZLl9PwYE0i_CGzVBA8DtQcMADB3xwoAcO9GHkwJxnIQqR8fySx_WE6-gBgq4DcTpfyPz0yIEw4wjBI8hYJggBfGJ3Cd4ii5C7XXAgQsniZH2b6f1gzuMZ4ytw4OOcpSIgHTe_8c-_ERnPMCDdf_4WxXGYpRJTGWfp3pBczBMUhCOLAkKLc3cr-XzqkvwADtwxGU5QkGwh5wsZkPxh_pu5OUVh9ORAcVREuYnibkUmTEy2n3-QXz9yQEg2Rgjok9MMy8UOluU-Fpe2GIynBPP5dzIeIcdo93de5TeuddUBxh-Qj_F9FqfIXbqjvQT_kN8O6Kvv3vJ4PCn-BAeGebQD6gw8Z-A7g1z8-IDhYh_vjD2QGc4yviIsSbKQSYwC0l0TzcdEyHOuJIrFdP-KBsw_8_Rr8Fykh1gdxHSTdbK5S_vbgBRh13jwvvLBe1sPTutnCK0uHK7Xcf22ZghtCuZNjdLRZjCeEswLlg56qqXDqy80r0YG-h2311ah0aZgLmtkYJvBeEowL5iB3qlmoF9faH6NDOx13H5bhUabgrmqkYFtBuMpwbxgBvqnmoG9-kLr1cjAfqetMqNNsfSr86_jUsLSiFCSyQnytiLylIheMBN7p5qJFTsmtyjmWSpw54P28C93c4wYjbFYHJEteIi_8ixc36Y4HK7nrb8qIhSyGPWKg-t0MyQkk2UfxF8dX7dQTv0QLpQhpCiXGZ-ShElMw9VzDJvzSxbL7egiFMhjlsR_sf3QN9OeszPE-H4d2xeDmzR9HlvHvRmdoRBsvDf5a2C50o6FlmC5_J-w0GOxULXirZYL7dvKhR5RID0zC2R5CBfKEKxe2SvtWDQVyHIsVK14q-WyUyAt4uLtcul-ycXffm_sTvZLJ9Pt2tQ1s7z2GlroE9dFORa1LW_Nyuq30EaurL0WuoKLfgutyVH0G1roE5dLORa1LTeoQJaHoN9CG7my9lroCi76LbSmAnlxjIW2B8ubs7E-lEXlWKzd7y7HojbrBr1Oy0MwwFgbWQgMMNaaJH95NtbHY7F2v7sci9qsG1Qgy0MwwFhrKpAVXPQba02Svzob64P_4mna9XHicqngot9am6kXazfCK7iUGHaD3qlVQVjrrmnT1g-7uej317qqpOkNJWbqpcS1m1Qlz-0fCjBH9X9YVA32WlsM89hmctHvsXXlUTkXez12ORcDNsUNBaP27Sa9Vo9pnrPJSx7TPWeT2zimJe_MxaCdcUPBqH27SVVyr3HGUo89evrm3wAAAP__lg_s3A==
Diagram: https://cockroachdb.github.io/distsqlplan/decode.html#eJzsmt1u2zYUx-_3FMS52la5MiU7TQQUMDZ0QLo1HtJiN4MvGOnMFmyLHknH8YI81l5gTzbImtv6Q5_IQsr0XSSKls6P_3P0F3MeQf45gwA-vvvl3Y-fyPfkp9vhBzK9J--H1zdkuiLDGzK9fz0lb8l09XoKDiQ8whs2RwnB70DBAQ8c8MGBHjjQh5EDC8FDlJKL9JLHzYTr6AGCrgNxsliq9PTIgZALhOARVKxmCAF8YnczvEUWoXC74ECEisWzzW2m94OFiOdMrMGBjwuWyIB03PTGP_9GVDzHgHT_-VtmxyFPFCYq5snBkOArSQSyKCA0O3O3Vrg9dUl-AAfumAonKAlfqsVSBSR9lM287QkKoycHsqMswm0Ed2syYXKy--yD9PqRA1KxMUJAn5xmSC72kKwOkbi0pVC8XChffoeLCAVG-7_zKr1xpauO8P2AYozveZygcOme5mb4h_p2QF9991bE40n2JzgwTKMdUGfgOQPfGaSixwcMl4do5-yBzHHOxZqw2YyHTGEUkO6GZzomQ5FSJVEsp4dX1Cb-haZfgeYyOUbqKKQb3uELl_Z38eQEXfrY_dzH7u08Nq2eGbS8WLhex_XbmBm0KZQ3FcpFW6F4uVBesFzQ0ywXXnWJeRXyzu-4vTZKjDaFclkh79oKxcuF8oJ5551m3vnVJeZXyLtex-23UWK0KZSrCnnXViheLpQXzDv_NPOuV11ivQp51--0UWC0KZJ-edZ1XEpYEhFKuJqgaCMeLxfPC-Zf7zTzr2QH5BblgicS9z5Tj_9yN4WI0RizpZF8KUL8VfBwc5vscLiZt_lqiFCqbNTLDq6T7ZBUTBV95v7P8LqZaqoHcJEbQIJqxcWUzJjCJFx_jmB7fsVitRtbhBJFzGbxX-ww8O20_7IyxPh-E9dXQ9v0_Dy2iXk7Okcp2Rj3Jz8_kivNSGgBkstnQULrIqH5OrdWJrRvIxNaoxx6JpbD4gAucgOwdk2vNCPRUg6LkdB8nVsrk71yaAkTb59J92sm_u4bYn-yXziZ7taironFtNfQHJ-wIoqR5NvtlqypbnNs4JraaY5LmOg2x1pcQ7-hOT5hmRQjybfbxpTD4gB0m2MD19ROc1zCRLc51lIOL-qYYzuQvDkb5npIrNyfLkaSb8GNeWkWB6DdMBuY-toNsxahX54Ncz0kVu5PFyPJt-DGlMPiALQbZi3lsISJbsOsRehXZ8N88E-Hpv0XJyyTEia6LbOJOrFy27qESYENN-bNWRaCla6ZNm3CsJeJbt-spyaa3dhhok4KvLg5NfHciHEESq1ODEvy_6DBxCjvbCIT3d5ZT-4UM7HTOxcz0b6FbSSUfDduzsuzTsuaLT6xTs-aLX6iThvcmYkR-9hGQsl34-bUxIPmFQu98-jpm38DAAD___I9hlI=

# Verify execution.
statement ok
Expand Down
Loading

0 comments on commit b21840a

Please sign in to comment.