Refactored Cache cleaners commands to sync with new Common Cache Providers.
This commit is contained in:
parent
00321e8f70
commit
1fb213760b
@ -1,7 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
/*
|
/*
|
||||||
* $Id$
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
@ -31,7 +29,6 @@ use Symfony\Component\Console\Input\InputArgument,
|
|||||||
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
|
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
|
||||||
* @link www.doctrine-project.org
|
* @link www.doctrine-project.org
|
||||||
* @since 2.0
|
* @since 2.0
|
||||||
* @version $Revision$
|
|
||||||
* @author Benjamin Eberlei <kontakt@beberlei.de>
|
* @author Benjamin Eberlei <kontakt@beberlei.de>
|
||||||
* @author Guilherme Blanco <guilhermeblanco@hotmail.com>
|
* @author Guilherme Blanco <guilhermeblanco@hotmail.com>
|
||||||
* @author Jonathan Wage <jonwage@gmail.com>
|
* @author Jonathan Wage <jonwage@gmail.com>
|
||||||
@ -47,9 +44,30 @@ class MetadataCommand extends Console\Command\Command
|
|||||||
$this
|
$this
|
||||||
->setName('orm:clear-cache:metadata')
|
->setName('orm:clear-cache:metadata')
|
||||||
->setDescription('Clear all metadata cache of the various cache drivers.')
|
->setDescription('Clear all metadata cache of the various cache drivers.')
|
||||||
->setDefinition(array())
|
->setDefinition(array(
|
||||||
->setHelp(<<<EOT
|
new InputOption(
|
||||||
Clear all metadata cache of the various cache drivers.
|
'flush', null, InputOption::VALUE_NONE,
|
||||||
|
'If defined, cache entries will be flushed instead of deleted/invalidated.'
|
||||||
|
)
|
||||||
|
));
|
||||||
|
|
||||||
|
$fullName = $this->getName();
|
||||||
|
$this->setHelp(<<<EOT
|
||||||
|
The <info>$fullName</info> command is meant to clear the metadata cache of associated Entity Manager.
|
||||||
|
It is possible to invalidate all cache entries at once - called delete -, or flushes the cache provider
|
||||||
|
instance completely.
|
||||||
|
|
||||||
|
The execution type differ on how you execute the command.
|
||||||
|
If you want to invalidate the entries (and not delete from cache instance), this command would do the work:
|
||||||
|
|
||||||
|
<info>$fullName</info>
|
||||||
|
|
||||||
|
Alternatively, if you want to flush the cache provider using this command:
|
||||||
|
|
||||||
|
<info>$fullName --flush</info>
|
||||||
|
|
||||||
|
Finally, be aware that if <info>--flush</info> option is passed, not all cache providers are able to flush entries,
|
||||||
|
because of a limitation of its execution nature.
|
||||||
EOT
|
EOT
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -66,20 +84,16 @@ EOT
|
|||||||
throw new \InvalidArgumentException('No Metadata cache driver is configured on given EntityManager.');
|
throw new \InvalidArgumentException('No Metadata cache driver is configured on given EntityManager.');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($cacheDriver instanceof \Doctrine\Common\Cache\ApcCache) {
|
|
||||||
throw new \LogicException("Cannot clear APC Cache from Console, its shared in the Webserver memory and not accessible from the CLI.");
|
|
||||||
}
|
|
||||||
|
|
||||||
$output->write('Clearing ALL Metadata cache entries' . PHP_EOL);
|
$output->write('Clearing ALL Metadata cache entries' . PHP_EOL);
|
||||||
|
|
||||||
$cacheIds = $cacheDriver->deleteAll();
|
$result = $cacheDriver->deleteAll();
|
||||||
|
$message = ($result) ? 'Successfully deleted cache entries.' : 'No cache entries were deleted.';
|
||||||
|
|
||||||
if ($cacheIds) {
|
if (true === $input->getOption('flush')) {
|
||||||
foreach ($cacheIds as $cacheId) {
|
$result = $cacheDriver->flushAll();
|
||||||
$output->write(' - ' . $cacheId . PHP_EOL);
|
$message = ($result) ? 'Successfully flushed cache entries.' : $message;
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$output->write('No entries to be deleted.' . PHP_EOL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$output->write($message . PHP_EOL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
/*
|
/*
|
||||||
* $Id$
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
@ -31,7 +29,6 @@ use Symfony\Component\Console\Input\InputArgument,
|
|||||||
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
|
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
|
||||||
* @link www.doctrine-project.org
|
* @link www.doctrine-project.org
|
||||||
* @since 2.0
|
* @since 2.0
|
||||||
* @version $Revision$
|
|
||||||
* @author Benjamin Eberlei <kontakt@beberlei.de>
|
* @author Benjamin Eberlei <kontakt@beberlei.de>
|
||||||
* @author Guilherme Blanco <guilhermeblanco@hotmail.com>
|
* @author Guilherme Blanco <guilhermeblanco@hotmail.com>
|
||||||
* @author Jonathan Wage <jonwage@gmail.com>
|
* @author Jonathan Wage <jonwage@gmail.com>
|
||||||
@ -47,9 +44,30 @@ class QueryCommand extends Console\Command\Command
|
|||||||
$this
|
$this
|
||||||
->setName('orm:clear-cache:query')
|
->setName('orm:clear-cache:query')
|
||||||
->setDescription('Clear all query cache of the various cache drivers.')
|
->setDescription('Clear all query cache of the various cache drivers.')
|
||||||
->setDefinition(array())
|
->setDefinition(array(
|
||||||
->setHelp(<<<EOT
|
new InputOption(
|
||||||
Clear all query cache of the various cache drivers.
|
'flush', null, InputOption::VALUE_NONE,
|
||||||
|
'If defined, cache entries will be flushed instead of deleted/invalidated.'
|
||||||
|
)
|
||||||
|
));
|
||||||
|
|
||||||
|
$fullName = $this->getName();
|
||||||
|
$this->setHelp(<<<EOT
|
||||||
|
The <info>$fullName</info> command is meant to clear the query cache of associated Entity Manager.
|
||||||
|
It is possible to invalidate all cache entries at once - called delete -, or flushes the cache provider
|
||||||
|
instance completely.
|
||||||
|
|
||||||
|
The execution type differ on how you execute the command.
|
||||||
|
If you want to invalidate the entries (and not delete from cache instance), this command would do the work:
|
||||||
|
|
||||||
|
<info>$fullName</info>
|
||||||
|
|
||||||
|
Alternatively, if you want to flush the cache provider using this command:
|
||||||
|
|
||||||
|
<info>$fullName --flush</info>
|
||||||
|
|
||||||
|
Finally, be aware that if <info>--flush</info> option is passed, not all cache providers are able to flush entries,
|
||||||
|
because of a limitation of its execution nature.
|
||||||
EOT
|
EOT
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -66,20 +84,16 @@ EOT
|
|||||||
throw new \InvalidArgumentException('No Query cache driver is configured on given EntityManager.');
|
throw new \InvalidArgumentException('No Query cache driver is configured on given EntityManager.');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($cacheDriver instanceof \Doctrine\Common\Cache\ApcCache) {
|
|
||||||
throw new \LogicException("Cannot clear APC Cache from Console, its shared in the Webserver memory and not accessible from the CLI.");
|
|
||||||
}
|
|
||||||
|
|
||||||
$output->write('Clearing ALL Query cache entries' . PHP_EOL);
|
$output->write('Clearing ALL Query cache entries' . PHP_EOL);
|
||||||
|
|
||||||
$cacheIds = $cacheDriver->deleteAll();
|
$result = $cacheDriver->deleteAll();
|
||||||
|
$message = ($result) ? 'Successfully deleted cache entries.' : 'No cache entries were deleted.';
|
||||||
|
|
||||||
if ($cacheIds) {
|
if (true === $input->getOption('flush')) {
|
||||||
foreach ($cacheIds as $cacheId) {
|
$result = $cacheDriver->flushAll();
|
||||||
$output->write(' - ' . $cacheId . PHP_EOL);
|
$message = ($result) ? 'Successfully flushed cache entries.' : $message;
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$output->write('No entries to be deleted.' . PHP_EOL);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$output->write($message . PHP_EOL);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
/*
|
/*
|
||||||
* $Id$
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
@ -26,12 +24,11 @@ use Symfony\Component\Console\Input\InputArgument,
|
|||||||
Symfony\Component\Console;
|
Symfony\Component\Console;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Command to clear the result cache of the various cache drivers.
|
* Command to clear the query cache of the various cache drivers.
|
||||||
*
|
*
|
||||||
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
|
* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
|
||||||
* @link www.doctrine-project.org
|
* @link www.doctrine-project.org
|
||||||
* @since 2.0
|
* @since 2.0
|
||||||
* @version $Revision$
|
|
||||||
* @author Benjamin Eberlei <kontakt@beberlei.de>
|
* @author Benjamin Eberlei <kontakt@beberlei.de>
|
||||||
* @author Guilherme Blanco <guilhermeblanco@hotmail.com>
|
* @author Guilherme Blanco <guilhermeblanco@hotmail.com>
|
||||||
* @author Jonathan Wage <jonwage@gmail.com>
|
* @author Jonathan Wage <jonwage@gmail.com>
|
||||||
@ -45,29 +42,32 @@ class ResultCommand extends Console\Command\Command
|
|||||||
protected function configure()
|
protected function configure()
|
||||||
{
|
{
|
||||||
$this
|
$this
|
||||||
->setName('orm:clear-cache:result')
|
->setName('orm:clear-cache:query')
|
||||||
->setDescription('Clear result cache of the various cache drivers.')
|
->setDescription('Clear all result cache of the various cache drivers.')
|
||||||
->setDefinition(array(
|
->setDefinition(array(
|
||||||
new InputOption(
|
new InputOption(
|
||||||
'id', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
|
'flush', null, InputOption::VALUE_NONE,
|
||||||
'ID(s) of the cache entry to delete (accepts * wildcards).', array()
|
'If defined, cache entries will be flushed instead of deleted/invalidated.'
|
||||||
),
|
)
|
||||||
new InputOption(
|
));
|
||||||
'regex', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
|
|
||||||
'Delete cache entries that match the given regular expression(s).', array()
|
$fullName = $this->getName();
|
||||||
),
|
$this->setHelp(<<<EOT
|
||||||
new InputOption(
|
The <info>$fullName</info> command is meant to clear the result cache of associated Entity Manager.
|
||||||
'prefix', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
|
It is possible to invalidate all cache entries at once - called delete -, or flushes the cache provider
|
||||||
'Delete cache entries that have the given prefix(es).', array()
|
instance completely.
|
||||||
),
|
|
||||||
new InputOption(
|
The execution type differ on how you execute the command.
|
||||||
'suffix', null, InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
|
If you want to invalidate the entries (and not delete from cache instance), this command would do the work:
|
||||||
'Delete cache entries that have the given suffix(es).', array()
|
|
||||||
),
|
<info>$fullName</info>
|
||||||
))
|
|
||||||
->setHelp(<<<EOT
|
Alternatively, if you want to flush the cache provider using this command:
|
||||||
Clear result cache of the various cache drivers.
|
|
||||||
If none of the options are defined, all cache entries will be removed.
|
<info>$fullName --flush</info>
|
||||||
|
|
||||||
|
Finally, be aware that if <info>--flush</info> option is passed, not all cache providers are able to flush entries,
|
||||||
|
because of a limitation of its execution nature.
|
||||||
EOT
|
EOT
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -78,91 +78,22 @@ EOT
|
|||||||
protected function execute(Console\Input\InputInterface $input, Console\Output\OutputInterface $output)
|
protected function execute(Console\Input\InputInterface $input, Console\Output\OutputInterface $output)
|
||||||
{
|
{
|
||||||
$em = $this->getHelper('em')->getEntityManager();
|
$em = $this->getHelper('em')->getEntityManager();
|
||||||
$cacheDriver = $em->getConfiguration()->getResultCacheImpl();
|
$cacheDriver = $em->getConfiguration()->getQueryCacheImpl();
|
||||||
|
|
||||||
if ( ! $cacheDriver) {
|
if ( ! $cacheDriver) {
|
||||||
throw new \InvalidArgumentException('No Result cache driver is configured on given EntityManager.');
|
throw new \InvalidArgumentException('No Result cache driver is configured on given EntityManager.');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($cacheDriver instanceof \Doctrine\Common\Cache\ApcCache) {
|
$output->write('Clearing ALL Query cache entries' . PHP_EOL);
|
||||||
throw new \LogicException("Cannot clear APC Cache from Console, its shared in the Webserver memory and not accessible from the CLI.");
|
|
||||||
|
$result = $cacheDriver->deleteAll();
|
||||||
|
$message = ($result) ? 'Successfully deleted cache entries.' : 'No cache entries were deleted.';
|
||||||
|
|
||||||
|
if (true === $input->getOption('flush')) {
|
||||||
|
$result = $cacheDriver->flushAll();
|
||||||
|
$message = ($result) ? 'Successfully flushed cache entries.' : $message;
|
||||||
}
|
}
|
||||||
|
|
||||||
$outputed = false;
|
$output->write($message . PHP_EOL);
|
||||||
|
|
||||||
// Removing based on --id
|
|
||||||
if (($ids = $input->getOption('id')) !== null && $ids) {
|
|
||||||
foreach ($ids as $id) {
|
|
||||||
$output->write($outputed ? PHP_EOL : '');
|
|
||||||
$output->write(sprintf('Clearing Result cache entries that match the id "<info>%s</info>"', $id) . PHP_EOL);
|
|
||||||
|
|
||||||
$deleted = $cacheDriver->delete($id);
|
|
||||||
|
|
||||||
if (is_array($deleted)) {
|
|
||||||
$this->_printDeleted($output, $deleted);
|
|
||||||
} else if (is_bool($deleted) && $deleted) {
|
|
||||||
$this->_printDeleted($output, array($id));
|
|
||||||
}
|
|
||||||
|
|
||||||
$outputed = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Removing based on --regex
|
|
||||||
if (($regexps = $input->getOption('regex')) !== null && $regexps) {
|
|
||||||
foreach($regexps as $regex) {
|
|
||||||
$output->write($outputed ? PHP_EOL : '');
|
|
||||||
$output->write(sprintf('Clearing Result cache entries that match the regular expression "<info>%s</info>"', $regex) . PHP_EOL);
|
|
||||||
|
|
||||||
$this->_printDeleted($output, $cacheDriver->deleteByRegex('/' . $regex. '/'));
|
|
||||||
|
|
||||||
$outputed = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Removing based on --prefix
|
|
||||||
if (($prefixes = $input->getOption('prefix')) !== null & $prefixes) {
|
|
||||||
foreach ($prefixes as $prefix) {
|
|
||||||
$output->write($outputed ? PHP_EOL : '');
|
|
||||||
$output->write(sprintf('Clearing Result cache entries that have the prefix "<info>%s</info>"', $prefix) . PHP_EOL);
|
|
||||||
|
|
||||||
$this->_printDeleted($output, $cacheDriver->deleteByPrefix($prefix));
|
|
||||||
|
|
||||||
$outputed = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Removing based on --suffix
|
|
||||||
if (($suffixes = $input->getOption('suffix')) !== null && $suffixes) {
|
|
||||||
foreach ($suffixes as $suffix) {
|
|
||||||
$output->write($outputed ? PHP_EOL : '');
|
|
||||||
$output->write(sprintf('Clearing Result cache entries that have the suffix "<info>%s</info>"', $suffix) . PHP_EOL);
|
|
||||||
|
|
||||||
$this->_printDeleted($output, $cacheDriver->deleteBySuffix($suffix));
|
|
||||||
|
|
||||||
$outputed = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Removing ALL entries
|
|
||||||
if ( ! $ids && ! $regexps && ! $prefixes && ! $suffixes) {
|
|
||||||
$output->write($outputed ? PHP_EOL : '');
|
|
||||||
$output->write('Clearing ALL Result cache entries' . PHP_EOL);
|
|
||||||
|
|
||||||
$this->_printDeleted($output, $cacheDriver->deleteAll());
|
|
||||||
|
|
||||||
$outputed = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private function _printDeleted(Console\Output\OutputInterface $output, array $items)
|
|
||||||
{
|
|
||||||
if ($items) {
|
|
||||||
foreach ($items as $item) {
|
|
||||||
$output->write(' - ' . $item . PHP_EOL);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
$output->write('No entries to be deleted.' . PHP_EOL);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user