Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-02-28 01:21:30 +01:00
Code Issues Packages Projects Releases Activity

Improve memory management for flex

Browse Source
This commit is contained in:
Matias Griese
2021-03-08 18:28:04 +02:00
parent 5376ce0909
commit b56ff0c31c
4 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
system/src/Grav/Common/Flex/Types/Pages/Storage/PageStorage.php
View File

@@ -110,6 +110,9 @@ class PageStorage extends FolderStorage
}
} catch (RuntimeException $e) {
$frontmatter = 'ERROR: ' . $e->getMessage();
} finally {
$file->free();
unset($file);
}
return $frontmatter;
@@ -127,6 +130,9 @@ class PageStorage extends FolderStorage
$raw = $file->raw();
} catch (RuntimeException $e) {
$raw = 'ERROR: ' . $e->getMessage();
} finally {
$file->free();
unset($file);
}
return $raw;
@@ -439,16 +445,19 @@ class PageStorage extends FolderStorage
} else {
$debugger->addMessage('Page content has not been changed, do not update the file', 'debug');
}
/** @var UniformResourceLocator $locator */
$locator = Grav::instance()['locator'];
if ($locator->isStream($newFolder)) {
$locator->clearCache();
}
} catch (RuntimeException $e) {
$name = isset($file) ? $file->filename() : $newKey;
throw new RuntimeException(sprintf('Flex saveRow(%s): %s', $name, $e->getMessage()));
} finally {
/** @var UniformResourceLocator $locator */
$locator = Grav::instance()['locator'];
$locator->clearCache();
if (isset($file)) {
$file->free();
unset($file);
}
}
$row['__META'] = $this->getObjectMeta($newKey, true);

1
system/src/Grav/Framework/Flex/Storage/FileStorage.php
View File

@@ -84,6 +84,7 @@ class FileStorage extends FolderStorage
$file = $this->getFile($path);
$file->delete();
$file->free();
unset($file);
return true;
}

67
system/src/Grav/Framework/Flex/Storage/FolderStorage.php
View File

@@ -377,13 +377,14 @@ class FolderStorage extends AbstractFilesystemStorage
$file = $this->getFile($path);
try {
$data = (array)$file->content();
$file->free();
if (isset($data[0])) {
throw new RuntimeException('Broken object file');
}
unset($file);
} catch (RuntimeException $e) {
$data = ['__ERROR' => $e->getMessage()];
} finally {
$file->free();
unset($file);
}
$data['__META'] = $this->getObjectMeta($key);
@@ -426,17 +427,19 @@ class FolderStorage extends AbstractFilesystemStorage
$file = $this->getFile($path);
$file->save($row);
$file->free();
/** @var UniformResourceLocator $locator */
$locator = Grav::instance()['locator'];
if ($locator->isStream($path)) {
$locator->clearCache();
}
} catch (RuntimeException $e) {
throw new RuntimeException(sprintf('Flex saveFile(%s): %s', $path ?? $key, $e->getMessage()));
} finally {
/** @var UniformResourceLocator $locator */
$locator = Grav::instance()['locator'];
$locator->clearCache();
if (isset($file)) {
$file->free();
unset($file);
}
}
unset($file);
$row['__META'] = $this->getObjectMeta($key, true);
@@ -455,14 +458,14 @@ class FolderStorage extends AbstractFilesystemStorage
if ($file->exists()) {
$file->delete();
}
/** @var UniformResourceLocator $locator */
$locator = Grav::instance()['locator'];
if ($locator->isStream($filename)) {
$locator->clearCache($filename);
}
} catch (RuntimeException $e) {
throw new RuntimeException(sprintf('Flex deleteFile(%s): %s', $filename, $e->getMessage()));
} finally {
/** @var UniformResourceLocator $locator */
$locator = Grav::instance()['locator'];
$locator->clearCache();
$file->free();
}
return $data;
@@ -477,14 +480,12 @@ class FolderStorage extends AbstractFilesystemStorage
{
try {
Folder::copy($this->resolvePath($src), $this->resolvePath($dst));
/** @var UniformResourceLocator $locator */
$locator = Grav::instance()['locator'];
if ($locator->isStream($src) || $locator->isStream($dst)) {
$locator->clearCache();
}
} catch (RuntimeException $e) {
throw new RuntimeException(sprintf('Flex copyFolder(%s, %s): %s', $src, $dst, $e->getMessage()));
} finally {
/** @var UniformResourceLocator $locator */
$locator = Grav::instance()['locator'];
$locator->clearCache();
}
return true;
@@ -499,14 +500,12 @@ class FolderStorage extends AbstractFilesystemStorage
{
try {
Folder::move($this->resolvePath($src), $this->resolvePath($dst));
/** @var UniformResourceLocator $locator */
$locator = Grav::instance()['locator'];
if ($locator->isStream($src) || $locator->isStream($dst)) {
$locator->clearCache();
}
} catch (RuntimeException $e) {
throw new RuntimeException(sprintf('Flex moveFolder(%s, %s): %s', $src, $dst, $e->getMessage()));
} finally {
/** @var UniformResourceLocator $locator */
$locator = Grav::instance()['locator'];
$locator->clearCache();
}
return true;
@@ -520,17 +519,13 @@ class FolderStorage extends AbstractFilesystemStorage
protected function deleteFolder(string $path, bool $include_target = false): bool
{
try {
$success = Folder::delete($this->resolvePath($path), $include_target);
/** @var UniformResourceLocator $locator */
$locator = Grav::instance()['locator'];
if ($locator->isStream($path)) {
$locator->clearCache();
}
return $success;
return Folder::delete($this->resolvePath($path), $include_target);
} catch (RuntimeException $e) {
throw new RuntimeException(sprintf('Flex deleteFolder(%s): %s', $path, $e->getMessage()));
} finally {
/** @var UniformResourceLocator $locator */
$locator = Grav::instance()['locator'];
$locator->clearCache();
}
}

1
system/src/Grav/Framework/Flex/Storage/SimpleStorage.php
View File

@@ -415,6 +415,7 @@ class SimpleStorage extends AbstractFilesystemStorage
$file->save($content);
$this->modified = (int)$file->modified(); // cast false to 0
$file->free();
unset($file);
} catch (RuntimeException $e) {
throw new RuntimeException(sprintf('Flex save(): %s', $e->getMessage()));
}