mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-31 11:39:37 +02:00
Code Issues Releases Wiki Activity

begin working on getting this thing a bit faster. I need to finish the other calls, this commit actually will break the diff engine and the updater. The speed increase noticed is from 89 seconds to 22 seconds as well as saving a lot of memory.

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@6692 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-11-28 16:34:28 +00:00
parent ff2b4e4e8f
commit 149f928963
3 changed files with 55 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/includes/diff/diff.php
View File

@ -46,10 +46,17 @@ class diff
* @param array $from_lines An array of strings. Typically these are lines from a file.
* @param array $to_lines An array of strings.
*/
function diff($from_lines, $to_lines)
function diff(&$from_content, &$to_content)
{
$diff_engine = &new diff_engine();
$this->_edits = call_user_func_array(array($diff_engine, 'diff'), array($from_lines, $to_lines));
$match = array('#\r\n?#', "#([\n]+){2,}#u");
$replace = array("\n", "\n");
$from_content = preg_replace($match, $replace, $from_content);
$to_content = preg_replace($match, $replace, $to_content);
$this->_edits = call_user_func_array(array($diff_engine, 'diff'), array(explode("\n", $from_content), explode("\n", $to_content)));
}
/**

5
phpBB/includes/diff/engine.php
View File

@ -49,8 +49,9 @@ class diff_engine
{
function diff($from_lines, $to_lines)
{
array_walk($from_lines, array('diff', 'trim_newlines'));
array_walk($to_lines, array('diff', 'trim_newlines'));
// Remove empty lines...
// array_walk($from_lines, array('diff', 'trim_newlines'));
// array_walk($to_lines, array('diff', 'trim_newlines'));
$n_from = sizeof($from_lines);
$n_to = sizeof($to_lines);

55
phpBB/install/install_update.php
View File

@ -862,11 +862,19 @@ class install_update extends module
// Check for this circumstance, the new file need to be up-to-date with the current file then...
if (!file_exists($this->old_location . $original_file) && file_exists($this->new_location . $original_file) && file_exists($phpbb_root_path . $file))
{
$tmp = array(
'file1' => file_get_contents($this->new_location . $original_file),
'file2' => file_get_contents($phpbb_root_path . $file),
);
// We need to diff the contents here to make sure the file is really the one we expect
$diff = &new diff(file($this->new_location . $original_file), file($phpbb_root_path . $file));
$diff = &new diff($tmp['file1'], $tmp['file2']);
$empty = $diff->is_empty();
unset($tmp, $diff);
// if there are no differences we have an up-to-date file...
if ($diff->is_empty())
if ($empty)
{
$update_list['up_to_date'][] = $update_ary;
return;
@ -883,16 +891,34 @@ class install_update extends module
trigger_error($user->lang['INCOMPLETE_UPDATE_FILES'], E_USER_ERROR);
}
$diff = &new diff(file($this->old_location . $original_file), file($phpbb_root_path . $file));
$tmp = array(
'file1' => file_get_contents($this->old_location . $original_file),
'file2' => file_get_contents($phpbb_root_path . $file),
);
// We need to diff the contents here to make sure the file is really the one we expect
$diff = &new diff($tmp['file1'], $tmp['file2']);
$empty_1 = $diff->is_empty();
unset($tmp, $diff);
$tmp = array(
'file1' => file_get_contents($this->new_location . $original_file),
'file2' => file_get_contents($phpbb_root_path . $file),
);
// We need to diff the contents here to make sure the file is really the one we expect
$diff = &new diff($tmp['file1'], $tmp['file2']);
$empty_2 = $diff->is_empty();
unset($tmp, $diff);
// If the file is not modified we are finished here...
if ($diff->is_empty())
if ($empty_1)
{
// Further check if it is already up to date - it could happen that non-modified files
// slip through
$diff = &new diff(file($this->new_location . $original_file), file($phpbb_root_path . $file));
if ($diff->is_empty())
if ($empty_2)
{
$update_list['up_to_date'][] = $update_ary;
return;
@ -903,10 +929,9 @@ class install_update extends module
}
// If the file had been modified then we need to check if it is already up to date
$diff = &new diff(file($this->new_location . $original_file), file($phpbb_root_path . $file));
// if there are no differences we have an up-to-date file...
if ($diff->is_empty())
if ($empty_2)
{
$update_list['up_to_date'][] = $update_ary;
return;
@ -922,10 +947,16 @@ class install_update extends module
return;
}
// now compare the merged output with the original file to see if the modified file is up to date
$diff = &new diff(file($phpbb_root_path . $file), $diff->merged_output());
$tmp = array(
'file1' => file_get_contents($phpbb_root_path . $file),
'file2' => implode("\n", $diff->merged_output()),
);
if ($diff->is_empty())
// now compare the merged output with the original file to see if the modified file is up to date
$diff = &new diff($tmp['file1'], $tmp['file2']);
$empty = $diff->is_empty();
if ($empty)
{
$update_list['up_to_date'][] = $update_ary;
return;