nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #1970836 [parser] SQL parser is slow, thanks to Christian Schmidt

Browse Source
This commit is contained in:
Marc Delisle
2008-07-11 13:33:31 +00:00
parent bb2c1fbb8d
commit 403b59f8f0
3 changed files with 38 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -64,6 +64,7 @@ danbarry
- patch #2007196, Typos in comments, thanks to knittl - knittl - patch #2007196, Typos in comments, thanks to knittl - knittl
- bug #1982315 [GUI] Comma and quote in ENUM, thanks to Joshua Hogendorn - bug #1982315 [GUI] Comma and quote in ENUM, thanks to Joshua Hogendorn
+ [GUI] Color picker (work in progress, now just for original theme) + [GUI] Color picker (work in progress, now just for original theme)
- bug #1970836 [parser] SQL parser is slow, thanks to Christian Schmidt
2.11.8.0 (not yet released) 2.11.8.0 (not yet released)
- patch #1987593 [interface] Table list pagination in navi, - patch #1987593 [interface] Table list pagination in navi,

42
libraries/sqlparser.lib.php
View File

@@ -261,7 +261,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
$this_was_quote = false; $this_was_quote = false;
while ($count2 < $len) { while ($count2 < $len) {
$c = PMA_substr($sql, $count2, 1); $c = $GLOBALS['PMA_substr']($sql, $count2, 1);
$count1 = $count2; $count1 = $count2;
$previous_was_space = $this_was_space; $previous_was_space = $this_was_space;
@@ -283,7 +283,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
} }
// Checks for white space // Checks for white space
if (PMA_STR_isSpace($c)) { if ($GLOBALS['PMA_STR_isSpace']($c)) {
$this_was_space = true; $this_was_space = true;
$count2++; $count2++;
continue; continue;
@@ -294,9 +294,9 @@ if (! defined('PMA_MINIMUM_COMMON')) {
// C style /* */ // C style /* */
// ANSI style -- // ANSI style --
if (($c == '#') if (($c == '#')
|| (($count2 + 1 < $len) && ($c == '/') && (PMA_substr($sql, $count2 + 1, 1) == '*')) || (($count2 + 1 < $len) && ($c == '/') && ($GLOBALS['PMA_substr']($sql, $count2 + 1, 1) == '*'))
|| (($count2 + 2 == $len) && ($c == '-') && (PMA_substr($sql, $count2 + 1, 1) == '-')) || (($count2 + 2 == $len) && ($c == '-') && ($GLOBALS['PMA_substr']($sql, $count2 + 1, 1) == '-'))
|| (($count2 + 2 < $len) && ($c == '-') && (PMA_substr($sql, $count2 + 1, 1) == '-') && ((PMA_substr($sql, $count2 + 2, 1) <= ' ')))) { || (($count2 + 2 < $len) && ($c == '-') && ($GLOBALS['PMA_substr']($sql, $count2 + 1, 1) == '-') && (($GLOBALS['PMA_substr']($sql, $count2 + 2, 1) <= ' ')))) {
$count2++; $count2++;
$pos = 0; $pos = 0;
$type = 'bad'; $type = 'bad';
@@ -316,7 +316,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
break; break;
} // end switch } // end switch
$count2 = ($pos < $count2) ? $len : $pos; $count2 = ($pos < $count2) ? $len : $pos;
$str = PMA_substr($sql, $count1, $count2 - $count1); $str = $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1);
PMA_SQP_arrayAdd($sql_array, 'comment_' . $type, $str, $arraysize); PMA_SQP_arrayAdd($sql_array, 'comment_' . $type, $str, $arraysize);
continue; continue;
} // end if } // end if
@@ -352,7 +352,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
if (($pos < $len) && PMA_STR_charIsEscaped($sql, $pos)) { if (($pos < $len) && PMA_STR_charIsEscaped($sql, $pos)) {
$pos ++; $pos ++;
continue; continue;
} elseif (($pos + 1 < $len) && (PMA_substr($sql, $pos, 1) == $quotetype) && (PMA_substr($sql, $pos + 1, 1) == $quotetype)) { } elseif (($pos + 1 < $len) && ($GLOBALS['PMA_substr']($sql, $pos, 1) == $quotetype) && ($GLOBALS['PMA_substr']($sql, $pos + 1, 1) == $quotetype)) {
$pos = $pos + 2; $pos = $pos + 2;
continue; continue;
} else { } else {
@@ -379,7 +379,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
default: default:
break; break;
} // end switch } // end switch
$data = PMA_substr($sql, $count1, $count2 - $count1); $data = $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1);
PMA_SQP_arrayAdd($sql_array, $type, $data, $arraysize); PMA_SQP_arrayAdd($sql_array, $type, $data, $arraysize);
continue; continue;
} }
@@ -426,7 +426,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
if (PMA_STR_isSqlIdentifier($c, false) if (PMA_STR_isSqlIdentifier($c, false)
|| $c == '@' || $c == '@'
|| ($c == '.' || ($c == '.'
&& PMA_STR_isDigit(PMA_substr($sql, $count2 + 1, 1)) && $GLOBALS['PMA_STR_isDigit']($GLOBALS['PMA_substr']($sql, $count2 + 1, 1))
&& ($previous_was_space || $previous_was_bracket || $previous_was_listsep))) { && ($previous_was_space || $previous_was_bracket || $previous_was_listsep))) {
/* DEBUG /* DEBUG
@@ -444,8 +444,8 @@ if (! defined('PMA_MINIMUM_COMMON')) {
$is_identifier = $previous_was_punct; $is_identifier = $previous_was_punct;
$is_sql_variable = $c == '@' && ! $previous_was_quote; $is_sql_variable = $c == '@' && ! $previous_was_quote;
$is_user = $c == '@' && $previous_was_quote; $is_user = $c == '@' && $previous_was_quote;
$is_digit = !$is_identifier && !$is_sql_variable && PMA_STR_isDigit($c); $is_digit = !$is_identifier && !$is_sql_variable && $GLOBALS['PMA_STR_isDigit']($c);
$is_hex_digit = $is_digit && $c == '0' && $count2 < $len && PMA_substr($sql, $count2, 1) == 'x'; $is_hex_digit = $is_digit && $c == '0' && $count2 < $len && $GLOBALS['PMA_substr']($sql, $count2, 1) == 'x';
$is_float_digit = $c == '.'; $is_float_digit = $c == '.';
$is_float_digit_exponent = FALSE; $is_float_digit_exponent = FALSE;
@@ -474,8 +474,8 @@ if (! defined('PMA_MINIMUM_COMMON')) {
unset($pos); unset($pos);
} }
while (($count2 < $len) && PMA_STR_isSqlIdentifier(PMA_substr($sql, $count2, 1), ($is_sql_variable || $is_digit))) { while (($count2 < $len) && PMA_STR_isSqlIdentifier($GLOBALS['PMA_substr']($sql, $count2, 1), ($is_sql_variable || $is_digit))) {
$c2 = PMA_substr($sql, $count2, 1); $c2 = $GLOBALS['PMA_substr']($sql, $count2, 1);
if ($is_sql_variable && ($c2 == '.')) { if ($is_sql_variable && ($c2 == '.')) {
$count2++; $count2++;
continue; continue;
@@ -503,7 +503,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
$is_float_digit = FALSE; $is_float_digit = FALSE;
} }
} }
if (($is_hex_digit && PMA_STR_isHexDigit($c2)) || ($is_digit && PMA_STR_isDigit($c2))) { if (($is_hex_digit && PMA_STR_isHexDigit($c2)) || ($is_digit && $GLOBALS['PMA_STR_isDigit']($c2))) {
$count2++; $count2++;
continue; continue;
} else { } else {
@@ -515,7 +515,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
} // end while } // end while
$l = $count2 - $count1; $l = $count2 - $count1;
$str = PMA_substr($sql, $count1, $l); $str = $GLOBALS['PMA_substr']($sql, $count1, $l);
$type = ''; $type = '';
if ($is_digit || $is_float_digit || $is_hex_digit) { if ($is_digit || $is_float_digit || $is_hex_digit) {
@@ -541,14 +541,14 @@ if (! defined('PMA_MINIMUM_COMMON')) {
// Checks for punct // Checks for punct
if (PMA_STR_strInStr($c, $allpunct_list)) { if (PMA_STR_strInStr($c, $allpunct_list)) {
while (($count2 < $len) && PMA_STR_strInStr(PMA_substr($sql, $count2, 1), $allpunct_list)) { while (($count2 < $len) && PMA_STR_strInStr($GLOBALS['PMA_substr']($sql, $count2, 1), $allpunct_list)) {
$count2++; $count2++;
} }
$l = $count2 - $count1; $l = $count2 - $count1;
if ($l == 1) { if ($l == 1) {
$punct_data = $c; $punct_data = $c;
} else { } else {
$punct_data = PMA_substr($sql, $count1, $l); $punct_data = $GLOBALS['PMA_substr']($sql, $count1, $l);
} }
// Special case, sometimes, althought two characters are // Special case, sometimes, althought two characters are
@@ -590,12 +590,12 @@ if (! defined('PMA_MINIMUM_COMMON')) {
if (($first == ',') || ($first == ';') || ($first == '.') || ($first == '*')) { if (($first == ',') || ($first == ';') || ($first == '.') || ($first == '*')) {
$count2 = $count1 + 1; $count2 = $count1 + 1;
$punct_data = $first; $punct_data = $first;
} elseif (($last2 == '/*') || (($last2 == '--') && ($count2 == $len || PMA_substr($sql, $count2, 1) <= ' '))) { } elseif (($last2 == '/*') || (($last2 == '--') && ($count2 == $len || $GLOBALS['PMA_substr']($sql, $count2, 1) <= ' '))) {
$count2 -= 2; $count2 -= 2;
$punct_data = PMA_substr($sql, $count1, $count2 - $count1); $punct_data = $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1);
} elseif (($last == '-') || ($last == '+') || ($last == '!')) { } elseif (($last == '-') || ($last == '+') || ($last == '!')) {
$count2--; $count2--;
$punct_data = PMA_substr($sql, $count1, $count2 - $count1); $punct_data = $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1);
/** /**
* @todo for negation operator, split in 2 tokens ? * @todo for negation operator, split in 2 tokens ?
* "select x&~1 from t" * "select x&~1 from t"
@@ -618,7 +618,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
$count2++; $count2++;
$debugstr = 'C1 C2 LEN: ' . $count1 . ' ' . $count2 . ' ' . $len . "\n" $debugstr = 'C1 C2 LEN: ' . $count1 . ' ' . $count2 . ' ' . $len . "\n"
. 'STR: ' . PMA_substr($sql, $count1, $count2 - $count1) . "\n"; . 'STR: ' . $GLOBALS['PMA_substr']($sql, $count1, $count2 - $count1) . "\n";
PMA_SQP_bug($debugstr, $sql); PMA_SQP_bug($debugstr, $sql);
return $sql; return $sql;

45
libraries/string.lib.php
View File

@@ -39,9 +39,17 @@ if ($GLOBALS['PMA_allow_mbstr']) {
// This is for handling input better // This is for handling input better
if (defined('PMA_MULTIBYTE_ENCODING') || $GLOBALS['PMA_allow_mbstr']) { if (defined('PMA_MULTIBYTE_ENCODING') || $GLOBALS['PMA_allow_mbstr']) {
$GLOBALS['PMA_strpos'] = 'mb_strpos'; $GLOBALS['PMA_strpos'] = 'mb_strpos';
$GLOBALS['PMA_substr'] = 'mb_substr';
$GLOBALS['PMA_STR_isAlnum'] = 'ctype_alnum';
$GLOBALS['PMA_STR_isDigit'] = 'ctype_digit';
$GLOBALS['PMA_STR_isSpace'] = 'ctype_space';
require './libraries/string_mb.lib.php'; require './libraries/string_mb.lib.php';
} else { } else {
$GLOBALS['PMA_strpos'] = 'strpos'; $GLOBALS['PMA_strpos'] = 'strpos';
$GLOBALS['PMA_substr'] = 'substr';
$GLOBALS['PMA_STR_isAlnum'] = 'PMA_STR_isAlnum';
$GLOBALS['PMA_STR_isDigit'] = 'PMA_STR_isDigit';
$GLOBALS['PMA_STR_isSpace'] = 'PMA_STR_isSpace';
require './libraries/string_native.lib.php'; require './libraries/string_native.lib.php';
} }
@@ -67,9 +75,7 @@ if (@extension_loaded('ctype')) {
*/ */
function PMA_STR_strInStr($needle, $haystack) function PMA_STR_strInStr($needle, $haystack)
{ {
// PMA_STR_pos($haystack, $needle) !== false return $GLOBALS['PMA_strpos']($haystack, $needle) !== false;
// return (is_integer(PMA_STR_pos($haystack, $needle)));
return (bool) PMA_STR_pos(' ' . $haystack, $needle);
} // end of the "PMA_STR_strInStr()" function } // end of the "PMA_STR_strInStr()" function
/** /**
@@ -120,35 +126,6 @@ function PMA_STR_numberInRangeInclusive($num, $lower, $upper)
return ($num >= $lower && $num <= $upper); return ($num >= $lower && $num <= $upper);
} // end of the "PMA_STR_numberInRangeInclusive()" function } // end of the "PMA_STR_numberInRangeInclusive()" function
/**
* Checks if a character is an accented character
*
* Presently this only works for some character sets. More work may be needed
* to fix it.
*
* @uses PMA_STR_numberInRangeInclusive()
* @uses ord()
* @param string character to check for
* @return boolean whether the character is an accented one or not
*/
function PMA_STR_isAccented($c)
{
$ord_min1 = 192; //ord('A');
$ord_max1 = 214; //ord('Z');
$ord_min2 = 216; //ord('A');
$ord_max2 = 246; //ord('Z');
$ord_min3 = 248; //ord('A');
$ord_max3 = 255; //ord('Z');
$ord_c = ord($c);
return PMA_STR_numberInRangeInclusive($ord_c, $ord_min1, $ord_max1)
|| PMA_STR_numberInRangeInclusive($ord_c, $ord_min2, $ord_max2)
|| PMA_STR_numberInRangeInclusive($ord_c, $ord_min2, $ord_max2);
} // end of the "PMA_STR_isAccented()" function
/** /**
* Checks if a character is an SQL identifier * Checks if a character is an SQL identifier
* *
@@ -160,8 +137,8 @@ function PMA_STR_isAccented($c)
*/ */
function PMA_STR_isSqlIdentifier($c, $dot_is_valid = false) function PMA_STR_isSqlIdentifier($c, $dot_is_valid = false)
{ {
return (PMA_STR_isAlnum($c) return ($GLOBALS['PMA_STR_isAlnum']($c)
|| PMA_STR_isAccented($c) || ($ord_c = ord($c)) && $ord_c >= 192 && $ord_c != 215 && $ord_c != 249
|| $c == '_' || $c == '_'
|| $c == '$' || $c == '$'
|| ($dot_is_valid != false && $c == '.')); || ($dot_is_valid != false && $c == '.'));