archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove a function that has no usage. The zval cache was disabled/removed

Browse source 
in 5.3.0-RC3.
This commit is contained in:
Andrey Hristov 2010-05-26 13:30:19 +00:00
parent 16c90b0a2d
commit f9ad56eab9
5 changed files with 0 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ext/mysqli/mysqli_fe.c
View file

@ -91,7 +91,6 @@ const zend_function_entry mysqli_functions[] = {
PHP_FE(mysqli_field_tell, NULL) PHP_FE(mysqli_field_tell, NULL)
PHP_FE(mysqli_free_result, NULL) PHP_FE(mysqli_free_result, NULL)
#if defined(MYSQLI_USE_MYSQLND) #if defined(MYSQLI_USE_MYSQLND)
PHP_FE(mysqli_get_cache_stats, NULL)
PHP_FE(mysqli_get_connection_stats, NULL) PHP_FE(mysqli_get_connection_stats, NULL)
PHP_FE(mysqli_get_client_stats, NULL) PHP_FE(mysqli_get_client_stats, NULL)
#endif #endif

12
ext/mysqli/mysqli_nonapi.c
View file

@ -383,18 +383,6 @@ PHP_FUNCTION(mysqli_fetch_all)
/* }}} */ /* }}} */
/* {{{ proto array mysqli_cache_stats(void) U
Returns statistics about the zval cache */
PHP_FUNCTION(mysqli_get_cache_stats)
{
if (zend_parse_parameters_none() == FAILURE) {
return;
}
array_init(return_value);
}
/* }}} */
/* {{{ proto array mysqli_get_client_stats(void) /* {{{ proto array mysqli_get_client_stats(void)
Returns statistics about the zval cache */ Returns statistics about the zval cache */
PHP_FUNCTION(mysqli_get_client_stats) PHP_FUNCTION(mysqli_get_client_stats)

2
ext/mysqli/php_mysqli_structs.h
View file

@ -391,7 +391,6 @@ ZEND_BEGIN_MODULE_GLOBALS(mysqli)
long num_inactive_persistent; long num_inactive_persistent;
long max_persistent; long max_persistent;
long allow_persistent; long allow_persistent;
long cache_size;
unsigned long default_port; unsigned long default_port;
char *default_host; char *default_host;
char *default_user; char *default_user;
@ -456,7 +455,6 @@ PHP_FUNCTION(mysqli_field_count);
PHP_FUNCTION(mysqli_field_seek); PHP_FUNCTION(mysqli_field_seek);
PHP_FUNCTION(mysqli_field_tell); PHP_FUNCTION(mysqli_field_tell);
PHP_FUNCTION(mysqli_free_result); PHP_FUNCTION(mysqli_free_result);
PHP_FUNCTION(mysqli_get_cache_stats);
PHP_FUNCTION(mysqli_get_client_stats); PHP_FUNCTION(mysqli_get_client_stats);
PHP_FUNCTION(mysqli_get_connection_stats); PHP_FUNCTION(mysqli_get_connection_stats);
PHP_FUNCTION(mysqli_get_charset); PHP_FUNCTION(mysqli_get_charset);

1
ext/mysqli/tests/mysqli_class_mysqli_interface.phpt
View file

@ -59,7 +59,6 @@ require_once('skipifconnectfailure.inc');
); );
if ($IS_MYSQLND) { if ($IS_MYSQLND) {
// mysqlnd only // mysqlnd only
/* $expected_methods['get_cache_stats'] = true; */
/* $expected_methods['get_client_stats'] = true; */ /* $expected_methods['get_client_stats'] = true; */
$expected_methods['get_connection_stats'] = true; $expected_methods['get_connection_stats'] = true;
$expected_methods['poll'] = true; $expected_methods['poll'] = true;

64
ext/mysqli/tests/mysqli_get_cache_stats_off.phpt
View file

@ -1,64 +0,0 @@
--TEST--
mysqli_get_cache_stats() - disabled via php.ini
--INI--
mysqlnd.collect_statistics="0"
mysqlnd.collect_memory_statistics="0"
--SKIPIF--
<?PHP
require_once('skipif.inc');
require_once('skipifemb.inc');
require_once('skipifconnectfailure.inc');
if (!function_exists('mysqli_get_cache_stats')) {
die("skip only available with mysqlnd");
}
?>
--FILE--
<?php
$before = mysqli_get_cache_stats();
if (!is_array($before) || empty($before)) {
printf("[001] Expecting non-empty array, got %s.\n", gettype($before));
var_dump($before);
}
require_once('table.inc');
if (!$res = mysqli_query($link, "SELECT id, label FROM test")) {
printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
}
while ($row = mysqli_fetch_assoc($res))
;
if (!$res = mysqli_query($link, "SELECT id, label FROM test")) {
printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
}
while ($row = mysqli_fetch_assoc($res))
;
$after = mysqli_get_cache_stats();
/* references has to be maintained - it is used for memory management */
$ignore = array('references' => true);
foreach ($before as $k => $v) {
if (isset($ignore[$k]))
continue;
if ($before[$k] != $after[$k])
printf("[004] Statistics have changed - %s: %s => %s\n", $
$k, $before[$k], $after[$k]);
}
$ignore = array("size" => true, "free_items" => true, "references" => true);
foreach ($after as $k => $v) {
if ($v != 0 && !isset($ignore[$k])) {
printf("[005] Field %s should not have any other value but 0, got %s.\n",
$k, $v);
}
}
mysqli_close($link);
print "done!";
?>
--CLEAN--
<?php
require_once("clean_table.inc");
?>
--EXPECTF--
done!