Skip to content
Browse files

Reduce memory used by TAR export

  • Loading branch information...
1 parent 63c400f commit 40c61f6cfc25ad5cdfe088d4525e39bb5640b97c @vrana committed Apr 29, 2013
Showing with 7 additions and 4 deletions.
  1. +1 −1 adminer/dump.inc.php
  2. +5 −2 adminer/include/editing.inc.php
  3. +1 −1 todo.txt
View
2 adminer/dump.inc.php
@@ -84,7 +84,7 @@
echo "\nDELIMITER ;;\n$triggers\nDELIMITER ;\n";
}
if ($ext == "tar") {
- echo tar_file((DB != "" ? "" : "$db/") . "$name.csv", ob_get_clean());
+ tar_file((DB != "" ? "" : "$db/") . "$name.csv", ob_get_clean());
} elseif ($is_sql) {
echo "\n";
}
View
7 adminer/include/editing.inc.php
@@ -412,7 +412,7 @@ function remove_definer($query) {
/** Get string to add a file in TAR
* @param string
* @param string
-* @return string
+* @return null prints the output
*/
function tar_file($filename, $contents) {
$return = pack("a100a8a8a8a12a12", $filename, 644, 0, 0, decoct(strlen($contents)), decoct(time()));
@@ -421,7 +421,10 @@ function tar_file($filename, $contents) {
$checksum += ord($return[$i]);
}
$return .= sprintf("%06o", $checksum) . "\0 ";
- return $return . str_repeat("\0", 512 - strlen($return)) . $contents . str_repeat("\0", 511 - (strlen($contents) + 511) % 512);
+ echo $return;
+ echo str_repeat("\0", 512 - strlen($return));
+ echo $contents;
+ echo str_repeat("\0", 511 - (strlen($contents) + 511) % 512);
}
/** Get INI bytes value
View
2 todo.txt
@@ -4,7 +4,7 @@ Variables editation
Blob download and image display in edit form (important for Editor with hidden fields in select and SQL command)
Add title to Logout, edit (in select) and select (in menu) for style "hever"
Export by GET parameters
-Files are missing in TAR
+Files are missing in TAR due to exhausted memory - can be fixed by creating a temporary file
Draggable columns in alter table (thanks to Michal Manak)
<option class> for system databases and schemas - information_schema and driver-specific (thanks to Vaclav Novotny)
Define foreign keys name - http://forum.zdrojak.root.cz/index.php?topic=185.msg1255#msg1255

0 comments on commit 40c61f6

Please sign in to comment.
Something went wrong with that request. Please try again.