Add more structure to the database queries data.

Author: johnbillion

collectors/db_dupes.php

@@ -55,9 +55,9 @@ public function process() {
 			// Loop over each query
 			foreach ( $query_ids as $query_id ) {
 
-				if ( isset( $dbq_data->wpdb->rows[ $query_id ]['trace'] ) ) {
+				if ( isset( $dbq_data->rows[ $query_id ]['trace'] ) ) {
 					/** @var QM_Backtrace */
-					$trace = $dbq_data->wpdb->rows[ $query_id ]['trace'];
+					$trace = $dbq_data->rows[ $query_id ]['trace'];
 					$stack = array_column( $trace->get_filtered_trace(), 'id' );
 					$component = $trace->get_component();
 
@@ -69,7 +69,7 @@ public function process() {
 					}
 				} else {
 					/** @var array<int, string> */
-					$stack = $dbq_data->wpdb->rows[ $query_id ]['stack'];
+					$stack = $dbq_data->rows[ $query_id ]['stack'];
 				}
 
 				// Populate the caller counts for this query
@@ -84,9 +84,9 @@ public function process() {
 
 				// Populate the time for this query
 				if ( isset( $times[ $sql ] ) ) {
-					$times[ $sql ] += $dbq->data->wpdb->rows[ $query_id ]['ltime'];
+					$times[ $sql ] += $dbq->data->rows[ $query_id ]['ltime'];
 				} else {
-					$times[ $sql ] = $dbq->data->wpdb->rows[ $query_id ]['ltime'];
+					$times[ $sql ] = $dbq->data->rows[ $query_id ]['ltime'];
 				}
 			}
 

collectors/db_queries.php

@@ -117,7 +117,6 @@ public function process_db_object() {
 			return;
 		}
 
-		$rows = array();
 		$types = array();
 		$total_time = 0;
 		$has_result = false;
@@ -143,8 +142,6 @@ public function process_db_object() {
 		 * } $query
 		 */
 		foreach ( $wpdb->queries as $query ) {
-			$has_trace = false;
-			$has_result = false;
 			$callers = array();
 
 			if ( isset( $query['query'], $query['elapsed'], $query['debug'] ) ) {
@@ -200,27 +197,13 @@ public function process_db_object() {
 
 			$this->log_type( $type );
 			$this->log_caller( $caller_name, $ltime, $type );
-
 			$this->maybe_log_dupe( $sql, $i );
 
 			if ( $component ) {
 				$this->log_component( $component, $ltime, $type );
 			}
 
-			if ( ! isset( $types[ $type ]['total'] ) ) {
-				$types[ $type ]['total'] = 1;
-			} else {
-				$types[ $type ]['total']++;
-			}
-
-			if ( ! isset( $types[ $type ]['callers'][ $caller ] ) ) {
-				$types[ $type ]['callers'][ $caller ] = 1;
-			} else {
-				$types[ $type ]['callers'][ $caller ]++;
-			}
-
 			$is_main_query = ( $request === $sql && ( false !== strpos( $stack, ' WP->main,' ) ) );
-
 			$row = compact( 'caller', 'caller_name', 'sql', 'ltime', 'result', 'type', 'component', 'trace', 'is_main_query' );
 
 			if ( ! isset( $trace ) ) {
@@ -237,24 +220,19 @@ public function process_db_object() {
 				$this->data->expensive[] = $row;
 			}
 
-			$rows[ $i ] = $row;
+			$this->data->rows[ $i ] = $row;
 			$i++;
-
 		}
 
-		$total_qs = count( $rows );
-
-		$this->data->total_qs   += $total_qs;
-		$this->data->total_time += $total_time;
-
-		$has_main_query = wp_list_filter( $rows, array(
+		$has_main_query = wp_list_filter( $this->data->rows, array(
 			'is_main_query' => true,
 		) );
 
-		# @TODO put errors in here too:
-		# @TODO proper class instead of (object)
-		$this->data->wpdb = (object) compact( 'rows', 'types', 'has_result', 'has_trace', 'total_time', 'total_qs', 'has_main_query' );
-
+		$this->data->total_qs = count( $this->data->rows );
+		$this->data->total_time = $total_time;
+		$this->data->has_result = $has_result;
+		$this->data->has_trace = $has_trace;
+		$this->data->has_main_query = ! empty( $has_main_query );
 	}
 
 	/**

data/db_queries.php

@@ -27,9 +27,24 @@ class QM_Data_DB_Queries extends QM_Data {
 	public $expensive;
 
 	/**
-	 * @var ?stdClass
+	 * @var array<int, array<string, mixed>>
+	 */
+	public $rows;
+
+	/**
+	 * @var bool
+	 */
+	public $has_result;
+
+	/**
+	 * @var bool
+	 */
+	public $has_trace;
+
+	/**
+	 * @var bool
 	 */
-	public $wpdb;
+	public $has_main_query;
 
 	/**
 	 * @var ?array<string, array<string, mixed>>

output/html/db_callers.php

@@ -50,7 +50,7 @@ public function output() {
 			echo '<tr>';
 			echo '<th scope="col">' . esc_html__( 'Caller', 'query-monitor' ) . '</th>';
 
-			foreach ( $data->types as $type_name => $type_count ) {
+			foreach ( array_keys( $data->types ) as $type_name ) {
 				echo '<th scope="col" class="qm-num qm-ltr qm-sortable-column" role="columnheader">';
 				echo $this->build_sorter( $type_name ); // WPCS: XSS ok;
 				echo '</th>';
@@ -73,7 +73,7 @@ public function output() {
 				echo self::build_filter_trigger( 'db_queries', 'caller', $row['caller'], '<code>' . esc_html( $row['caller'] ) . '</code>' ); // WPCS: XSS ok;
 				echo '</td>';
 
-				foreach ( $data->types as $type_name => $type_count ) {
+				foreach ( array_keys( $data->types ) as $type_name ) {
 					if ( isset( $row['types'][ $type_name ] ) ) {
 						echo "<td class='qm-num'>" . esc_html( number_format_i18n( $row['types'][ $type_name ] ) ) . '</td>';
 					} else {