From 8f8cc70d3849f155986c8b179b9e7c33ff809b45 Mon Sep 17 00:00:00 2001 From: Matthew Todd Date: Mon, 28 Nov 2022 10:09:02 -0500 Subject: [PATCH] sqlstats: add rows_written to node_statement_statistics Fixes #91042 Release note: None --- pkg/ccl/logictestccl/testdata/logic_test/crdb_internal_tenant | 4 ++-- pkg/sql/crdb_internal.go | 4 ++++ pkg/sql/logictest/testdata/logic_test/crdb_internal | 4 ++-- pkg/sql/logictest/testdata/logic_test/create_statements | 4 ++++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkg/ccl/logictestccl/testdata/logic_test/crdb_internal_tenant b/pkg/ccl/logictestccl/testdata/logic_test/crdb_internal_tenant index d698f254b36c..40f83cf33925 100644 --- a/pkg/ccl/logictestccl/testdata/logic_test/crdb_internal_tenant +++ b/pkg/ccl/logictestccl/testdata/logic_test/crdb_internal_tenant @@ -185,10 +185,10 @@ SELECT * FROM crdb_internal.leases WHERE node_id < 0 ---- node_id table_id name parent_id expiration deleted -query ITTTTTIIITRRRRRRRRRRRRRRRRRRRRRRRRRRRRBBTTTTT colnames +query ITTTTTIIITRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRBBTTTTT colnames SELECT * FROM crdb_internal.node_statement_statistics WHERE node_id < 0 ---- -node_id application_name flags statement_id key anonymized count first_attempt_count max_retries last_error rows_avg rows_var idle_lat_avg idle_lat_var parse_lat_avg parse_lat_var plan_lat_avg plan_lat_var run_lat_avg run_lat_var service_lat_avg service_lat_var overhead_lat_avg overhead_lat_var bytes_read_avg bytes_read_var rows_read_avg rows_read_var network_bytes_avg network_bytes_var network_msgs_avg network_msgs_var max_mem_usage_avg max_mem_usage_var max_disk_usage_avg max_disk_usage_var contention_time_avg contention_time_var implicit_txn full_scan sample_plan database_name exec_node_ids txn_fingerprint_id index_recommendations +node_id application_name flags statement_id key anonymized count first_attempt_count max_retries last_error rows_avg rows_var idle_lat_avg idle_lat_var parse_lat_avg parse_lat_var plan_lat_avg plan_lat_var run_lat_avg run_lat_var service_lat_avg service_lat_var overhead_lat_avg overhead_lat_var bytes_read_avg bytes_read_var rows_read_avg rows_read_var rows_written_avg rows_written_var network_bytes_avg network_bytes_var network_msgs_avg network_msgs_var max_mem_usage_avg max_mem_usage_var max_disk_usage_avg max_disk_usage_var contention_time_avg contention_time_var implicit_txn full_scan sample_plan database_name exec_node_ids txn_fingerprint_id index_recommendations query ITTTIIRRRRRRRRRRRRRRRRRR colnames SELECT * FROM crdb_internal.node_transaction_statistics WHERE node_id < 0 diff --git a/pkg/sql/crdb_internal.go b/pkg/sql/crdb_internal.go index d453adbc33da..faac944fabea 100644 --- a/pkg/sql/crdb_internal.go +++ b/pkg/sql/crdb_internal.go @@ -1198,6 +1198,8 @@ CREATE TABLE crdb_internal.node_statement_statistics ( bytes_read_var FLOAT NOT NULL, rows_read_avg FLOAT NOT NULL, rows_read_var FLOAT NOT NULL, + rows_written_avg FLOAT NOT NULL, + rows_written_var FLOAT NOT NULL, network_bytes_avg FLOAT, network_bytes_var FLOAT, network_msgs_avg FLOAT, @@ -1303,6 +1305,8 @@ CREATE TABLE crdb_internal.node_statement_statistics ( tree.NewDFloat(tree.DFloat(stats.Stats.BytesRead.GetVariance(stats.Stats.Count))), // bytes_read_var tree.NewDFloat(tree.DFloat(stats.Stats.RowsRead.Mean)), // rows_read_avg tree.NewDFloat(tree.DFloat(stats.Stats.RowsRead.GetVariance(stats.Stats.Count))), // rows_read_var + tree.NewDFloat(tree.DFloat(stats.Stats.RowsWritten.Mean)), // rows_written_avg + tree.NewDFloat(tree.DFloat(stats.Stats.RowsWritten.GetVariance(stats.Stats.Count))), // rows_written_var execStatAvg(stats.Stats.ExecStats.Count, stats.Stats.ExecStats.NetworkBytes), // network_bytes_avg execStatVar(stats.Stats.ExecStats.Count, stats.Stats.ExecStats.NetworkBytes), // network_bytes_var execStatAvg(stats.Stats.ExecStats.Count, stats.Stats.ExecStats.NetworkMessages), // network_msgs_avg diff --git a/pkg/sql/logictest/testdata/logic_test/crdb_internal b/pkg/sql/logictest/testdata/logic_test/crdb_internal index c6b102e7ca4b..cf2dd27203f0 100644 --- a/pkg/sql/logictest/testdata/logic_test/crdb_internal +++ b/pkg/sql/logictest/testdata/logic_test/crdb_internal @@ -317,10 +317,10 @@ SELECT * FROM crdb_internal.leases WHERE node_id < 0 ---- node_id table_id name parent_id expiration deleted -query ITTTTTIIITRRRRRRRRRRRRRRRRRRRRRRRRRRRRBBTTTTT colnames +query ITTTTTIIITRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRBBTTTTT colnames SELECT * FROM crdb_internal.node_statement_statistics WHERE node_id < 0 ---- -node_id application_name flags statement_id key anonymized count first_attempt_count max_retries last_error rows_avg rows_var idle_lat_avg idle_lat_var parse_lat_avg parse_lat_var plan_lat_avg plan_lat_var run_lat_avg run_lat_var service_lat_avg service_lat_var overhead_lat_avg overhead_lat_var bytes_read_avg bytes_read_var rows_read_avg rows_read_var network_bytes_avg network_bytes_var network_msgs_avg network_msgs_var max_mem_usage_avg max_mem_usage_var max_disk_usage_avg max_disk_usage_var contention_time_avg contention_time_var implicit_txn full_scan sample_plan database_name exec_node_ids txn_fingerprint_id index_recommendations +node_id application_name flags statement_id key anonymized count first_attempt_count max_retries last_error rows_avg rows_var idle_lat_avg idle_lat_var parse_lat_avg parse_lat_var plan_lat_avg plan_lat_var run_lat_avg run_lat_var service_lat_avg service_lat_var overhead_lat_avg overhead_lat_var bytes_read_avg bytes_read_var rows_read_avg rows_read_var rows_written_avg rows_written_var network_bytes_avg network_bytes_var network_msgs_avg network_msgs_var max_mem_usage_avg max_mem_usage_var max_disk_usage_avg max_disk_usage_var contention_time_avg contention_time_var implicit_txn full_scan sample_plan database_name exec_node_ids txn_fingerprint_id index_recommendations query ITTTIIRRRRRRRRRRRRRRRRRR colnames SELECT * FROM crdb_internal.node_transaction_statistics WHERE node_id < 0 diff --git a/pkg/sql/logictest/testdata/logic_test/create_statements b/pkg/sql/logictest/testdata/logic_test/create_statements index 2d4e92c4cab8..ab9270d2f4d3 100644 --- a/pkg/sql/logictest/testdata/logic_test/create_statements +++ b/pkg/sql/logictest/testdata/logic_test/create_statements @@ -1166,6 +1166,8 @@ CREATE TABLE crdb_internal.node_statement_statistics ( bytes_read_var FLOAT8 NOT NULL, rows_read_avg FLOAT8 NOT NULL, rows_read_var FLOAT8 NOT NULL, + rows_written_avg FLOAT8 NOT NULL, + rows_written_var FLOAT8 NOT NULL, network_bytes_avg FLOAT8 NULL, network_bytes_var FLOAT8 NULL, network_msgs_avg FLOAT8 NULL, @@ -1212,6 +1214,8 @@ CREATE TABLE crdb_internal.node_statement_statistics ( bytes_read_var FLOAT8 NOT NULL, rows_read_avg FLOAT8 NOT NULL, rows_read_var FLOAT8 NOT NULL, + rows_written_avg FLOAT8 NOT NULL, + rows_written_var FLOAT8 NOT NULL, network_bytes_avg FLOAT8 NULL, network_bytes_var FLOAT8 NULL, network_msgs_avg FLOAT8 NULL,