Author: uwendel
Date: 2007-09-10 17:36:42 +0200 (Mon, 10 Sep 2007)
New Revision: 1007
Modified:
trunk/tests/ext/mysqli/mysqli_get_client_stats.phpt
Log:
Update to reflect latest changes to function.
Modified: trunk/tests/ext/mysqli/mysqli_get_client_stats.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_get_client_stats.phpt 2007-09-10 15:04:37 UTC (rev 1006)
+++ trunk/tests/ext/mysqli/mysqli_get_client_stats.phpt 2007-09-10 15:36:42 UTC (rev 1007)
@@ -150,9 +150,9 @@
++$test_counter, mysqli_errno($link), mysqli_error($link));
$expected['rows_fetched_from_server_normal'] =
(string)($expected['rows_fetched_from_server_normal'] + 1);
- $expected['rows_fetched_from_client_normal_buffered'] =
(string)($expected['rows_fetched_from_client_normal_buffered'] + 1);
$expected['buffered_sets'] = (string)($expected['buffered_sets'] + 1);
$expected['result_set_queries'] = (string)($expected['result_set_queries'] + 1);
+ $expected['rows_buffered_from_client_normal'] =
(string)($expected['rows_buffered_from_client_normal'] + 1);
if (!is_array($info = mysqli_get_client_stats()) || empty($info))
@@ -163,18 +163,22 @@
mysqli_get_client_stats_assert_eq('rows_fetched_from_client_normal_buffered', $info,
$expected, $test_counter);
mysqli_get_client_stats_assert_eq('buffered_sets', $info, $expected, $test_counter);
mysqli_get_client_stats_assert_eq('result_set_queries', $info, $expected,
$test_counter);
+ mysqli_get_client_stats_assert_eq('rows_buffered_from_client_normal', $info, $expected,
$test_counter);
/* no change to rows_fetched_from_client_normal_buffered! */
if (!$row = mysqli_fetch_assoc($res))
printf("[%03d] fetch_assoc - SELECT COUNT() FROM test failed, [%d] %s\n",
++$test_counter, mysqli_errno($link), mysqli_error($link));
+ $expected['rows_fetched_from_client_normal_buffered'] =
(string)($expected['rows_fetched_from_client_normal_buffered'] + 1);
+
if (!is_array($info = mysqli_get_client_stats()) || empty($info))
printf("[%03d] Expecting array/any_non_empty, got %s/%s\n",
++$test_counter, gettype($info), $info);
mysqli_get_client_stats_assert_eq('rows_fetched_from_server_normal', $info, $expected,
$test_counter);
mysqli_get_client_stats_assert_eq('rows_fetched_from_client_normal_buffered', $info,
$expected, $test_counter);
+ mysqli_get_client_stats_assert_eq('rows_buffered_from_client_normal', $info, $expected,
$test_counter);
$num_rows = $row['_num'];
mysqli_free_result($res);
@@ -191,7 +195,7 @@
++$test_counter, gettype($info), $info);
$expected['rows_fetched_from_server_normal'] =
(string)($expected['rows_fetched_from_server_normal'] + $num_rows);
- $expected['rows_fetched_from_client_normal_buffered'] =
(string)($expected['rows_fetched_from_client_normal_buffered'] + $num_rows);
+ $expected['rows_buffered_from_client_normal'] =
(string)($expected['rows_buffered_from_client_normal'] + $num_rows);
$expected['buffered_sets'] = (string)($expected['buffered_sets'] + 1);
$expected['result_set_queries'] = (string)($expected['result_set_queries'] + 1);
@@ -199,6 +203,8 @@
mysqli_get_client_stats_assert_eq('rows_fetched_from_client_normal_buffered', $info,
$expected, $test_counter);
mysqli_get_client_stats_assert_eq('buffered_sets', $info, $expected, $test_counter);
mysqli_get_client_stats_assert_eq('result_set_queries', $info, $expected,
$test_counter);
+ mysqli_get_client_stats_assert_eq('rows_buffered_from_client_normal', $info, $expected,
$test_counter);
+ mysqli_get_client_stats_assert_eq('rows_buffered_from_client_normal', $info, $expected,
$test_counter);
/* fetching none, but stats should not be affected - current implementation */
mysqli_free_result($res);
@@ -297,9 +303,9 @@
mysqli_stmt_free_result($stmt);
$expected['rows_fetched_from_server_ps'] =
(string)($expected['rows_fetched_from_server_ps'] + $num_rows);
- $expected['rows_fetched_from_client_ps_buffered'] =
(string)($expected['rows_fetched_from_client_ps_buffered'] + $num_rows);
$expected['result_set_queries'] = (string)($expected['result_set_queries'] + 1);
$expected['ps_buffered_sets'] = (string)($expected['ps_buffered_sets'] + 1);
+ $expected['rows_buffered_from_client_ps'] =
(string)($expected['rows_buffered_from_client_ps'] + $num_rows);
if (!is_array($info = mysqli_get_client_stats()) || empty($info))
@@ -310,6 +316,7 @@
mysqli_get_client_stats_assert_eq('rows_fetched_from_client_ps_buffered', $info,
$expected, $test_counter);
mysqli_get_client_stats_assert_eq('result_set_queries', $info, $expected,
$test_counter);
mysqli_get_client_stats_assert_eq('ps_buffered_sets', $info, $expected, $test_counter);
+ mysqli_get_client_stats_assert_eq('rows_buffered_from_client_ps', $info, $expected,
$test_counter);
print "Testing buffered Prepared Statements... - fetching all\n";
@@ -334,6 +341,7 @@
$expected['rows_fetched_from_client_ps_buffered'] =
(string)($expected['rows_fetched_from_client_ps_buffered'] + $num_rows);
$expected['result_set_queries'] = (string)($expected['result_set_queries'] + 1);
$expected['ps_buffered_sets'] = (string)($expected['ps_buffered_sets'] + 1);
+ $expected['rows_buffered_from_client_ps'] =
(string)($expected['rows_buffered_from_client_ps'] + $num_rows);
if (!is_array($info = mysqli_get_client_stats()) || empty($info))
printf("[%03d] Expecting array/any_non_empty, got %s/%s\n",
@@ -343,6 +351,7 @@
mysqli_get_client_stats_assert_eq('rows_fetched_from_client_ps_buffered', $info,
$expected, $test_counter);
mysqli_get_client_stats_assert_eq('result_set_queries', $info, $expected,
$test_counter);
mysqli_get_client_stats_assert_eq('ps_buffered_sets', $info, $expected, $test_counter);
+ mysqli_get_client_stats_assert_eq('rows_buffered_from_client_ps', $info, $expected,
$test_counter);
mysqli_stmt_free_result($stmt);
@@ -366,9 +375,10 @@
mysqli_stmt_fetch($stmt);
$expected['rows_fetched_from_server_ps'] =
(string)($expected['rows_fetched_from_server_ps'] + $num_rows);
- $expected['rows_fetched_from_client_ps_buffered'] =
(string)($expected['rows_fetched_from_client_ps_buffered'] + $num_rows);
+ $expected['rows_fetched_from_client_ps_buffered'] =
(string)($expected['rows_fetched_from_client_ps_buffered'] + $num_rows - 1);
$expected['result_set_queries'] = (string)($expected['result_set_queries'] + 1);
$expected['ps_buffered_sets'] = (string)($expected['ps_buffered_sets'] + 1);
+ $expected['rows_buffered_from_client_ps'] =
(string)($expected['rows_buffered_from_client_ps'] + $num_rows);
if (!is_array($info = mysqli_get_client_stats()) || empty($info))
printf("[%03d] Expecting array/any_non_empty, got %s/%s\n",
@@ -378,6 +388,7 @@
mysqli_get_client_stats_assert_eq('rows_fetched_from_client_ps_buffered', $info,
$expected, $test_counter);
mysqli_get_client_stats_assert_eq('result_set_queries', $info, $expected,
$test_counter);
mysqli_get_client_stats_assert_eq('ps_buffered_sets', $info, $expected, $test_counter);
+ mysqli_get_client_stats_assert_eq('rows_buffered_from_client_ps', $info, $expected,
$test_counter);
$expected['rows_skipped_ps'] = $info['rows_skipped_ps'];
mysqli_stmt_free_result($stmt);
@@ -401,8 +412,10 @@
printf("[%03d] bind_result failed, [%d] %s\n",
++$test_counter, mysqli_stmt_errno($stmt), mysqli_stmt_error($stmt));
+ $i = 0;
while (mysqli_stmt_fetch($stmt))
- ;
+ $i++;
+ assert($num_rows = $i);
$expected['rows_fetched_from_server_ps'] =
(string)($expected['rows_fetched_from_server_ps'] + $num_rows);
$expected['rows_fetched_from_client_ps_unbuffered'] =
(string)($expected['rows_fetched_from_client_ps_unbuffered'] + $num_rows);
@@ -417,6 +430,7 @@
mysqli_get_client_stats_assert_eq('rows_fetched_from_client_ps_unbuffered', $info,
$expected, $test_counter);
mysqli_get_client_stats_assert_eq('result_set_queries', $info, $expected,
$test_counter);
mysqli_get_client_stats_assert_eq('ps_unbuffered_sets', $info, $expected,
$test_counter);
+ mysqli_get_client_stats_assert_eq('rows_buffered_from_client_ps', $info, $expected,
$test_counter);
mysqli_stmt_free_result($stmt);
@@ -448,10 +462,12 @@
mysqli_get_client_stats_assert_eq('rows_fetched_from_client_ps_unbuffered', $info,
$expected, $test_counter);
mysqli_get_client_stats_assert_eq('result_set_queries', $info, $expected,
$test_counter);
mysqli_get_client_stats_assert_eq('ps_unbuffered_sets', $info, $expected,
$test_counter);
+ mysqli_get_client_stats_assert_eq('rows_buffered_from_client_ps', $info, $expected,
$test_counter);
- $expected['rows_skipped_ps'] = $info['rows_skipped_ps'] + 1;
+ mysqli_stmt_free_result($stmt);
+ $expected['rows_skipped_ps'] = (string)($expected['rows_skipped_ps'] + 1);
$expected['flushed_ps_sets'] = (string)($expected['flushed_ps_sets'] + 1);
- mysqli_stmt_free_result($stmt);
+ $expected['rows_fetched_from_server_ps'] =
(string)($expected['rows_fetched_from_server_ps'] + 1);
if (!is_array($info = mysqli_get_client_stats()) || empty($info))
printf("[%03d] Expecting array/any_non_empty, got %s/%s\n",
@@ -459,14 +475,14 @@
mysqli_get_client_stats_assert_eq('rows_skipped_ps', $info, $expected, $test_counter);
mysqli_get_client_stats_assert_eq('flushed_ps_sets', $info, $expected, $test_counter);
+ mysqli_get_client_stats_assert_eq('rows_fetched_from_server_ps', $info, $expected,
$test_counter);
-/*
+ /*
print "Checking for normal buffered side effects...\n";
foreach ($info as $k => $v)
if ($info[$k] != $expected[$k])
printf("$k - $v != %s\n", $expected[$k]);
-*/
-
+ */
print "... done with fetch statistics\n";
if (!is_array($info = mysqli_get_client_stats()) || empty($info))
@@ -1107,4 +1123,4 @@
Testing unbuffered Prepared Statements... - fetching all
Testing unbuffered Prepared Statements... - fetching all but one
... done with fetch statistics
-done!
+done!
\ No newline at end of file
| Thread |
|---|
| • PHP mysqlnd svn commit: r1007 - trunk/tests/ext/mysqli | uwendel | 10 Sep |
