Skip to content

Remove duplicated SKIP checks to improve performance #7858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 2, 2022
Merged

Remove duplicated SKIP checks to improve performance #7858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions ext/mysqli/tests/014.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,18 @@ mysqli autocommit/commit/rollback
mysqli
--SKIPIF--
<?php
require_once('skipifconnectfailure.inc');
require_once("connect.inc");

$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
if (!$link)
die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
require_once "connect.inc";
if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
}

if (!have_innodb($link))
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
if (!have_innodb($link)) {
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
}
?>
--FILE--
<?php
require_once("connect.inc");
require_once "connect.inc";
$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);

if (!mysqli_autocommit($link, TRUE))
Expand Down Expand Up @@ -79,7 +78,7 @@ mysqli
?>
--CLEAN--
<?php
require_once("clean_table.inc");
require_once "clean_table.inc";
?>
--EXPECT--
Num_of_rows=1
Expand Down
18 changes: 9 additions & 9 deletions ext/mysqli/tests/015.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ mysqli autocommit/commit/rollback with innodb
mysqli
--SKIPIF--
<?php
require_once('skipifconnectfailure.inc');

require_once('connect.inc');
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die(sprintf("skip Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
require_once "connect.inc";
if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
}

if (!have_innodb($link))
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
if (!have_innodb($link)) {
die(sprintf("skip Needs InnoDB support, [%d] %s", $link->errno, $link->error));
}
?>
--FILE--
<?php
require_once("connect.inc");
require_once "connect.inc";

$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
if (!$link)
Expand Down Expand Up @@ -77,7 +77,7 @@ mysqli
?>
--CLEAN--
<?php
require_once("clean_table.inc");
require_once "clean_table.inc";
?>
--EXPECT--
array(2) {
Expand Down
5 changes: 2 additions & 3 deletions ext/mysqli/tests/045.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ mysqli_stmt_bind_result (SHOW)
mysqli
--SKIPIF--
<?php
require_once('skipifconnectfailure.inc');
require_once 'skipifconnectfailure.inc';

require_once("connect.inc");
$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);

$stmt = mysqli_prepare($link, "SHOW VARIABLES LIKE 'port'");
Expand All @@ -20,7 +19,7 @@ mysqli
?>
--FILE--
<?php
require_once("connect.inc");
require_once "connect.inc";

/*** test mysqli_connect 127.0.0.1 ***/
$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
Expand Down
11 changes: 5 additions & 6 deletions ext/mysqli/tests/067.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ function test: nested selects (cursors)
mysqli
--SKIPIF--
<?php
require_once('skipifconnectfailure.inc');
require_once("connect.inc");
require_once "connect.inc";

if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die("skip Cannot connect to check required version");
if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));

/* skip cursor test for server versions < 50009 */
if (mysqli_get_server_version($link) < 50009) {
Expand All @@ -29,7 +28,7 @@ mysqli
return $stmt;
}

require_once("connect.inc");
require_once "connect.inc";
$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);

if (mysqli_get_server_version($mysql) < 50009) {
Expand Down Expand Up @@ -65,7 +64,7 @@ mysqli
?>
--CLEAN--
<?php
require_once("connect.inc");
require_once "connect.inc";
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());

Expand Down
9 changes: 4 additions & 5 deletions ext/mysqli/tests/bug42548.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ Bug #42548 PROCEDURE xxx can't return a result set in the given context (works i
mysqli
--SKIPIF--
<?php
require_once('skipifconnectfailure.inc');
require_once('connect.inc');
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
require_once 'connect.inc';
if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
}
if (mysqli_get_server_version($link) <= 50000) {
Expand All @@ -15,7 +14,7 @@ if (mysqli_get_server_version($link) <= 50000) {
?>
--FILE--
<?php
require_once('connect.inc');
require_once 'connect.inc';

$mysqli = mysqli_init();
$mysqli->real_connect($host, $user, $passwd, $db, $port, $socket);
Expand Down Expand Up @@ -53,7 +52,7 @@ print "done!";
?>
--CLEAN--
<?php
require_once("connect.inc");
require_once "connect.inc";
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
printf("[c001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());

Expand Down
12 changes: 6 additions & 6 deletions ext/mysqli/tests/bug44897.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ Bug #44879 (failed to prepare statement)
mysqli
--SKIPIF--
<?php
if (!stristr(mysqli_get_client_info(), 'mysqlnd'))
die("skip: only available in mysqlnd");
require_once 'connect.inc';

require_once('skipifconnectfailure.inc');
require_once('connect.inc');
if (!$IS_MYSQLND) {
die("skip: only available in mysqlnd");
}

if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
die(sprintf('skip Cannot connect to MySQL, [%d] %s.', mysqli_connect_errno(), mysqli_connect_error()));
if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
}
if (mysqli_get_server_version($link) <= 50000) {
die(sprintf('skip Needs MySQL 5.0+, found version %d.', mysqli_get_server_version($link)));
Expand Down
12 changes: 6 additions & 6 deletions ext/mysqli/tests/bug49442.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ Bug #49422 (mysqlnd: mysqli_real_connect() and LOAD DATA INFILE crash)
mysqli
--SKIPIF--
<?php
require_once('skipifconnectfailure.inc');
require_once 'connect.inc';

$link = mysqli_init();
if (!my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) {
die(sprintf("skip Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error()));
if (!@my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) {
die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
}

include_once("local_infile_tools.inc");
include_once "local_infile_tools.inc";
if ($msg = check_local_infile_support($link, $engine))
die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

Expand All @@ -23,7 +23,7 @@ mysqli.allow_persistent=1
mysqli.max_persistent=1
--FILE--
<?php
include ("connect.inc");
include "connect.inc";

$link = mysqli_init();
if (!my_mysqli_real_connect($link, $host, $user, $passwd, $db, $port, $socket)) {
Expand Down Expand Up @@ -107,7 +107,7 @@ mysqli.max_persistent=1
?>
--CLEAN--
<?php
require_once("clean_table.inc");
require_once "clean_table.inc";
?>
--EXPECT--
array(2) {
Expand Down
5 changes: 2 additions & 3 deletions ext/mysqli/tests/bug51647.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ Bug #51647 (Certificate file without private key (pk in another file) doesn't wo
mysqli
--SKIPIF--
<?php
require_once('skipifconnectfailure.inc');
require_once("connect.inc");
require_once "connect.inc";

if (!defined('MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT'))
die("skip Requires MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT");
Expand Down Expand Up @@ -43,7 +42,7 @@ $link->close();
?>
--FILE--
<?php
include ("connect.inc");
include "connect.inc";

if (!is_object($link = mysqli_init()))
printf("[001] Cannot create link\n");
Expand Down
14 changes: 7 additions & 7 deletions ext/mysqli/tests/bug53503.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@ Bug #53503 (mysqli::query returns false after successful LOAD DATA query)
mysqli
--SKIPIF--
<?php
require_once('skipifconnectfailure.inc');
require_once 'connect.inc';

if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die("skip Cannot connect to MySQL");
if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
}

include_once("local_infile_tools.inc");
include_once "local_infile_tools.inc";
if ($msg = check_local_infile_support($link, $engine))
die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

mysqli_close($link);

?>
--INI--
mysqli.allow_local_infile=1
--FILE--
<?php
require_once("connect.inc");
require_once "connect.inc";

if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
printf("[001] Connect failed, [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
Expand Down Expand Up @@ -50,7 +50,7 @@ mysqli.allow_local_infile=1
?>
--CLEAN--
<?php
require_once('connect.inc');
require_once 'connect.inc';

if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
printf("[clean] Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
Expand Down
3 changes: 1 addition & 2 deletions ext/mysqli/tests/bug55283.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ Bug #55283 (SSL options set by mysqli_ssl_set ignored for MySQLi persistent conn
mysqli
--SKIPIF--
<?php
require_once('skipifconnectfailure.inc');
require_once("connect.inc");
require_once "connect.inc";

if (!defined('MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT'))
die("skip Requires MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT");
Expand Down
3 changes: 1 addition & 2 deletions ext/mysqli/tests/bug55582.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ Bug #55582 mysqli_num_rows() returns always 0 for unbuffered, when mysqlnd is us
mysqli
--SKIPIF--
<?php
require_once('skipifconnectfailure.inc');
require_once("connect.inc");
require_once 'skipifconnectfailure.inc';
?>
--FILE--
<?php
Expand Down
3 changes: 1 addition & 2 deletions ext/mysqli/tests/bug63398.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ Bug #63398 (Segfault when polling closed link)
mysqli
--SKIPIF--
<?php
require_once("connect.inc");
require_once "skipifconnectfailure.inc";
if (!$IS_MYSQLND) {
die("skip mysqlnd only test");
}
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
Expand Down
3 changes: 1 addition & 2 deletions ext/mysqli/tests/bug64726.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ Bug #63398 (Segfault when calling fetch_object on a use_result and DB pointer ha
mysqli
--SKIPIF--
<?php
require_once("connect.inc");
require_once "skipifconnectfailure.inc";
if (!$IS_MYSQLND) {
die("skip mysqlnd only test");
}
require_once('skipifconnectfailure.inc');
?>
--FILE--
<?php
Expand Down
9 changes: 5 additions & 4 deletions ext/mysqli/tests/bug68077.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ Bug #68077 (LOAD DATA LOCAL INFILE / open_basedir restriction)
mysqli
--SKIPIF--
<?php
require_once('skipifconnectfailure.inc');
require_once 'connect.inc';
if (!$IS_MYSQLND) {
die("skip: test applies only to mysqlnd");
}
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
die("skip Cannot connect to MySQL");
if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
}

include_once("local_infile_tools.inc");
include_once "local_infile_tools.inc";
if ($msg = check_local_infile_support($link, $engine))
die(sprintf("skip %s, [%d] %s", $msg, $link->errno, $link->error));

Expand Down
1 change: 0 additions & 1 deletion ext/mysqli/tests/bug69899.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ mysqli
--SKIPIF--
<?php
require_once __DIR__ . '/skipifconnectfailure.inc';
require_once __DIR__ . '/connect.inc';
if (!$IS_MYSQLND) {
die('skip mysqlnd only');
}
Expand Down
30 changes: 16 additions & 14 deletions ext/mysqli/tests/bug70384.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,24 @@ mysqli_float_handling - ensure 4 byte float is handled correctly
mysqli
--SKIPIF--
<?php
require_once('skipifconnectfailure.inc');
if (@$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
if ($link->server_version < 50709) {
die("skip MySQL 5.7.9+ needed. Found [".
intval(substr($link->server_version."", -5, 1)).
".".
intval(substr($link->server_version."", -4, 2)).
".".
intval(substr($link->server_version."", -2, 2)).
"]");
}
}
require_once 'connect.inc';
if (!$link = @my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
die(sprintf("skip Can't connect to MySQL Server - [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
}

if ($link->server_version < 50709) {
die("skip MySQL 5.7.9+ needed. Found [".
intval(substr($link->server_version."", -5, 1)).
".".
intval(substr($link->server_version."", -4, 2)).
".".
intval(substr($link->server_version."", -2, 2)).
"]");
}
?>
--FILE--
<?php
require('connect.inc');
require 'connect.inc';
if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
printf("[001] [%d] %s\n", mysqli_connect_errno(), mysqli_connect_error());
die();
Expand Down Expand Up @@ -56,7 +58,7 @@ mysqli
?>
--CLEAN--
<?php
require_once("clean_table.inc");
require_once "clean_table.inc";
?>
--EXPECT--
OK
Loading