Skip to content

Commit

Permalink
Improve SQL reading.
Browse files Browse the repository at this point in the history 
Remove trace.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
  • Loading branch information
@Tithugues
Tithugues committed Oct 12, 2014
1 parent 5cfefb8 commit 3f9b63f
Showing 1 changed file with 74 additions and 59 deletions.
133 changes: 74 additions & 59 deletions libraries/plugins/import/ImportSql.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,8 @@ protected function setProperties()
private function _findDelimiter($data) {
$lengthData = mb_strlen($data);
$posInData = 0;
$d = 0;
/* while not at end of line */
while ($posInData <= $lengthData && $d++ < 100) {
while ($posInData <= $lengthData) {
if ($this->_isInString) {
//Search for closing quote
$posClosingString = mb_strpos($data, $this->_quote, $posInData);
Expand All @@ -143,6 +142,9 @@ private function _findDelimiter($data) {
if ($this->_isInComment) {
if (in_array($this->_openingComment, array('#', '-- '))) {
$posClosingComment = mb_strpos($data, "\n", $posInData);
if (false === $posClosingComment) {
return false;
}
//Move after the end of the line.
$posInData = $posClosingComment + 1;
$this->_isInComment = false;
Expand All @@ -155,6 +157,8 @@ private function _findDelimiter($data) {
}
//Move after closing comment.
$posInData = $posClosingComment + 2;
$this->_isInComment = false;
$this->_openingComment = null;
} else {
die('WHAT ?');
}
Expand Down Expand Up @@ -187,20 +191,21 @@ private function _findDelimiter($data) {
return false;
}

//If first is delimiter.
//If first char is delimiter.
if (false === $firstSearchChar || $firstSqlDelimiter < $firstSearchChar
) {
return $firstSqlDelimiter;
}

//Else first is result of preg_match.
//Else first char is result of preg_match.

//If string is opened.
if (in_array($matches[1][0], array('\'', '"', '`'))) {
$this->_isInString = true;
$this->_quote = $matches[1][0];
//Move after quote.
$posInData = $firstSearchChar + 1;
continue;
}

//If comment is opened.
Expand All @@ -209,9 +214,10 @@ private function _findDelimiter($data) {
$this->_openingComment = $matches[1][0];
//Move after quote.
$posInData = $firstSearchChar + mb_strlen($matches[1][0]);
continue;
}
}
var_dump('too many loops');
//var_dump('too many loops');
return false;
}

Expand All @@ -226,15 +232,6 @@ public function doImport(&$sql_data = array())
{
global $error, $timeout_passed;

$buffer = '';
// Defaults for parser
$sql = '';
$start_pos = 0;
$posInQueryString = 0;
$len= 0;
// include the space because it's mandatory
$length_of_delimiter_keyword = /*overload*/mb_strlen($this->_delimiter_keyword);

if (isset($_POST['sql_delimiter'])) {
$this->_delimiter = $_POST['sql_delimiter'];
} else {
Expand Down Expand Up @@ -266,50 +263,68 @@ public function doImport(&$sql_data = array())
$GLOBALS['finished'] = false;
$positionDelimiter = false;
$data = null;
$newData = null;

$c = 0;
$my = 0;

while (!$timeout_passed && $c++ < 50) {
while (!$timeout_passed && $c++ < 100) {
/*if (11 <= $c) {
die(var_dump($c, $positionDelimiter, $buffer, $data));
}*/
if (false === $positionDelimiter) {
$data = PMA_importGetNextChunk();
if ($data === false) {
$newData = PMA_importGetNextChunk();
if ($newData === false) {
die('Error while reading data.');
// subtract data we didn't handle yet and stop processing
$GLOBALS['offset'] -= /*overload*/mb_strlen($buffer);
$GLOBALS['offset'] -= /*overload*/mb_strlen($query);
break;
}

if ($data === true) {
if ($newData === true) {
die('No more data.');
$GLOBALS['finished'] = true;
break;
}

// Convert CR (but not CRLF) to LF otherwise all queries
// may not get executed on some platforms
$data = preg_replace("/\r($|[^\n])/", "\n$1", $data);
$data .= preg_replace("/\r($|[^\n])/", "\n$1", $newData);
unset($newData);
}
//Find quotes, comments, DELIMITER or delimiter.
$positionDelimiter = $this->_findDelimiter($data);
if (2 === $my) {
die(var_dump($data, $c, $positionDelimiter));
}
/*if (9 <= $c) {
die(var_dump($positionDelimiter));
}*/
//No delimiter found.
if (false === $positionDelimiter) {
continue;
}
$my++;
/*if (9 <= $c) {
die(var_dump($data, $c, $positionDelimiter));
}*/
$buffer .= /*overload*/mb_substr($data, 0, $positionDelimiter + 1);
$query = /*overload*/mb_substr($data, 0, $positionDelimiter + 1);
$data = /*overload*/mb_substr($data, $positionDelimiter + 1);
//echo 'Execute: ' . $buffer . PHP_EOL;
//After execution, $buffer can be empty.
$buffer = null;
$query = null;
}
if ($timeout_passed) {
die('timeout');
}
if (!$GLOBALS['finished']) {
die('issue 1');
}
var_dump($c);
if (true === $this->_isInComment || true === $this->_isInString) {
die('issue 2');
}
return;
Expand All @@ -320,18 +335,18 @@ public function doImport(&$sql_data = array())
$data = PMA_importGetNextChunk();
if ($data === false) {
// subtract data we didn't handle yet and stop processing
$GLOBALS['offset'] -= /*overload*/mb_strlen($buffer);
$GLOBALS['offset'] -= /*overload*/mb_strlen($query);
break;
} elseif ($data === true) {
// Handle rest of buffer
} else {
// Append new data to buffer
$buffer .= $data;
$query .= $data;
// free memory
unset($data);
// Do not parse string when we're not at the end
// and don't have ; inside
if (/*overload*/mb_strpos($buffer, $sql_delimiter, $posInQueryString) === false
if (/*overload*/mb_strpos($query, $sql_delimiter, $posInQueryString) === false
&& ! $GLOBALS['finished']
) {
continue;
Expand All @@ -340,10 +355,10 @@ public function doImport(&$sql_data = array())
// Convert CR (but not CRLF) to LF otherwise all queries
// may not get executed on some platforms
$buffer = preg_replace("/\r($|[^\n])/", "\n$1", $buffer);
$query = preg_replace("/\r($|[^\n])/", "\n$1", $query);

// Current length of our buffer
$len = /*overload*/mb_strlen($buffer);
$len = /*overload*/mb_strlen($query);

// Grab some SQL queries out of it
while ($posInQueryString < $len) {
Expand All @@ -355,7 +370,7 @@ public function doImport(&$sql_data = array())
$posPattern = /*overload*/mb_preg_strpos(
'/(\'|"|#|-- |\/\*|`|(?i)(?<![A-Z0-9_])'
. $delimiter_keyword . ')/',
$buffer,
$query,
$posInQueryString
);
if (false !== $posPattern) {
Expand All @@ -368,7 +383,7 @@ public function doImport(&$sql_data = array())

// the cost of doing this one with preg_match() would be too high
$first_sql_delimiter = /*overload*/mb_strpos(
$buffer,
$query,
$sql_delimiter,
$posInQueryString
);
Expand All @@ -390,26 +405,26 @@ public function doImport(&$sql_data = array())
break;
}
// at the end there might be some whitespace...
if (trim($buffer) == '') {
$buffer = '';
if (trim($query) == '') {
$query = '';
$len = 0;
break;
}
// We hit end of query, go there!
$posInQueryString = /*overload*/mb_strlen($buffer) - 1;
$posInQueryString = /*overload*/mb_strlen($query) - 1;
}

// Grab current character
//$ch = $buffer[$i]; //Don't use this syntax, because of UTF8 strings
$ch = /*overload*/mb_substr($buffer, $posInQueryString, 1);
$ch = /*overload*/mb_substr($query, $posInQueryString, 1);

// Quotes
if (strpos('\'"`', $ch) !== false) {
$quote = $ch;
$endq = false;
while (! $endq) {
// Find next quote
$posQuote = /*overload*/mb_strpos($buffer, $quote, $posInQueryString + 1);
$posQuote = /*overload*/mb_strpos($query, $quote, $posInQueryString + 1);
/*
* Behave same as MySQL and accept end of query as end
* of backtick.
Expand All @@ -435,7 +450,7 @@ public function doImport(&$sql_data = array())
}
// Was not the quote escaped?
$posEscape = $posQuote - 1;
while (/*overload*/mb_substr($buffer, $posEscape, 1) == '\\') {
while (/*overload*/mb_substr($query, $posEscape, 1) == '\\') {
$posEscape--;
}
// Even count means it was not escaped
Expand All @@ -462,9 +477,9 @@ public function doImport(&$sql_data = array())
// Not enough data to decide
if ((($posInQueryString == ($len - 1) && ($ch == '-' || $ch == '/'))
|| ($posInQueryString == ($len - 2) && (($ch == '-'
&& /*overload*/mb_substr($buffer, $posInQueryString + 1, 1) == '-')
&& /*overload*/mb_substr($query, $posInQueryString + 1, 1) == '-')
|| ($ch == '/'
&& /*overload*/mb_substr($buffer, $posInQueryString + 1, 1) == '*'))))
&& /*overload*/mb_substr($query, $posInQueryString + 1, 1) == '*'))))
&& ! $GLOBALS['finished']
) {
break;
Expand All @@ -473,17 +488,17 @@ public function doImport(&$sql_data = array())
// Comments
if ($ch == '#'
|| ($posInQueryString < ($len - 1) && $ch == '-'
&& /*overload*/mb_substr($buffer, $posInQueryString + 1, 1) == '-'
&& /*overload*/mb_substr($query, $posInQueryString + 1, 1) == '-'
&& (($posInQueryString < ($len - 2)
&& /*overload*/mb_substr($buffer, $posInQueryString + 2, 1) <= ' ')
&& /*overload*/mb_substr($query, $posInQueryString + 2, 1) <= ' ')
|| ($posInQueryString == ($len - 1) && $GLOBALS['finished'])))
|| ($posInQueryString < ($len - 1) && $ch == '/'
&& /*overload*/mb_substr($buffer, $posInQueryString + 1, 1) == '*')
&& /*overload*/mb_substr($query, $posInQueryString + 1, 1) == '*')
) {
// Copy current string to SQL
if ($start_pos != $posInQueryString) {
$sql .= /*overload*/mb_substr(
$buffer,
$query,
$start_pos,
$posInQueryString - $start_pos
);
Expand All @@ -493,7 +508,7 @@ public function doImport(&$sql_data = array())
// do not use PHP_EOL here instead of "\n", because the export
// file might have been produced on a different system
$posInQueryString = /*overload*/mb_strpos(
$buffer,
$query,
$ch == '/' ? '*/' : "\n",
$posInQueryString
);
Expand All @@ -514,7 +529,7 @@ public function doImport(&$sql_data = array())
// We need to send the comment part in case we are defining
// a procedure or function and comments in it are valuable
$sql .= /*overload*/mb_substr(
$buffer,
$query,
$start_of_comment,
$posInQueryString - $start_of_comment
);
Expand All @@ -531,13 +546,13 @@ public function doImport(&$sql_data = array())
// (don't send to server!)
if (($posInQueryString + $length_of_delimiter_keyword < $len)
&& /*overload*/mb_strtoupper(
/*overload*/mb_substr($buffer, $posInQueryString, $length_of_delimiter_keyword)
/*overload*/mb_substr($query, $posInQueryString, $length_of_delimiter_keyword)
) == $delimiter_keyword
) {
// look for EOL on the character immediately after 'DELIMITER '
// (see previous comment about PHP_EOL)
$new_line_pos = /*overload*/mb_strpos(
$buffer,
$query,
"\n",
$posInQueryString + $length_of_delimiter_keyword
);
Expand All @@ -546,7 +561,7 @@ public function doImport(&$sql_data = array())
$new_line_pos = $len;
}
$sql_delimiter = /*overload*/mb_substr(
$buffer,
$query,
$posInQueryString + $length_of_delimiter_keyword,
$new_line_pos - $posInQueryString - $length_of_delimiter_keyword
);
Expand All @@ -569,7 +584,7 @@ public function doImport(&$sql_data = array())
$length_to_grab++;
}
$tmp_sql .= /*overload*/mb_substr(
$buffer,
$query,
$start_pos,
$length_to_grab
);
Expand All @@ -581,26 +596,26 @@ public function doImport(&$sql_data = array())
PMA_importRunQuery(
$sql,
/*overload*/mb_substr(
$buffer,
$query,
0,
$posInQueryString + /*overload*/mb_strlen($sql_delimiter)
),
false,
$sql_data
);
$buffer = /*overload*/mb_substr(
$buffer,
$query = /*overload*/mb_substr(
$query,
$posInQueryString + /*overload*/mb_strlen($sql_delimiter)
);
// Reset parser:
$len = /*overload*/mb_strlen($buffer);
$len = /*overload*/mb_strlen($query);
$sql = '';
$posInQueryString = 0;
$start_pos = 0;
// Any chance we will get a complete query?
//if ((strpos($buffer, ';') === false)
//&& ! $GLOBALS['finished']) {
if (/*overload*/mb_strpos($buffer, $sql_delimiter) === false
if (/*overload*/mb_strpos($query, $sql_delimiter) === false
&& ! $GLOBALS['finished']
) {
break;
Expand All @@ -615,7 +630,7 @@ public function doImport(&$sql_data = array())
// Commit any possible data in buffers
PMA_importRunQuery(
'',
/*overload*/mb_substr($buffer, 0, $len),
/*overload*/mb_substr($query, 0, $len),
false,
$sql_data
);
Expand Down

0 comments on commit 3f9b63f

Please sign in to comment.