PHRAS-2161_coll-id-in-log-docs_MASTER

cs
This commit is contained in:
Jean-Yves Gaulier
2018-07-31 11:25:26 +02:00
parent 02695e1006
commit 9644efef00

View File

@@ -11,12 +11,12 @@
namespace Alchemy\Phrasea\Command\Developer; namespace Alchemy\Phrasea\Command\Developer;
use Alchemy\Phrasea\Command\Command; use Alchemy\Phrasea\Command\Command;
use Doctrine\DBAL\Connection;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Helper\ProgressBar; use Symfony\Component\Console\Helper\ProgressBar;
use Doctrine\DBAL\Driver\ResultStatement;
class FixLogCollId extends Command class FixLogCollId extends Command
@@ -28,12 +28,8 @@ class FixLogCollId extends Command
private $input; private $input;
/** @var OutputInterface */ /** @var OutputInterface */
private $output; private $output;
/** @var bool */
private $argsOK;
/** @var \Databox[] */ /** @var \Databox[] */
private $databoxes; private $databoxes;
/** @var connection */
private $connection;
/** @var int */ /** @var int */
private $batchsize; private $batchsize;
@@ -66,42 +62,6 @@ class FixLogCollId extends Command
$this->setHelp("help"); $this->setHelp("help");
} }
/**
* merge options so one can mix csv-option and/or multiple options
* ex. with keepUnique = false : --opt=a,b --opt=c --opt=b ==> [a,b,c,b]
* ex. with keepUnique = true : --opt=a,b --opt=c --opt=b ==> [a,b,c]
*
* @param InputInterface $input
* @param string $optionName
* @param int $option
* @return array
*/
private function getOptionAsArray(InputInterface $input, $optionName, $option)
{
$ret = [];
foreach($input->getOption($optionName) as $v0) {
foreach(explode(',', $v0) as $v) {
$v = trim($v);
if($option & self::OPTION_ALL_VALUES || !in_array($v, $ret)) {
$ret[] = $v;
}
}
}
return $ret;
}
/**
* print a string if verbosity >= verbose (-v)
* @param string $s
*/
private function verbose($s)
{
if($this->output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
$this->output->write($s);
}
}
/** /**
* sanity check the cmd line options * sanity check the cmd line options
* *
@@ -160,7 +120,7 @@ class FixLogCollId extends Command
*/ */
protected function doExecute(InputInterface $input, OutputInterface $output) protected function doExecute(InputInterface $input, OutputInterface $output)
{ {
$time_start = new \DateTime(); // $time_start = new \DateTime();
if(!$this->sanitizeArgs($input, $output)) { if(!$this->sanitizeArgs($input, $output)) {
return -1; return -1;
@@ -179,7 +139,7 @@ class FixLogCollId extends Command
. " SUM(IF(`coll_id`=0, 1, 0)) AS `z`\n" . " SUM(IF(`coll_id`=0, 1, 0)) AS `z`\n"
. " FROM `log_docs`", . " FROM `log_docs`",
'fetch' => false, 'fetch' => false,
'code' => function($stmt) { 'code' => function(ResultStatement $stmt) {
$row = $stmt->fetch(); $row = $stmt->fetch();
if(is_null($row['n'])) { if(is_null($row['n'])) {
// no coll_id ? // no coll_id ?
@@ -197,7 +157,7 @@ class FixLogCollId extends Command
'sql' => "SELECT MIN(`id`) AS `minid`, MAX(`id`) AS `maxid` FROM\n" 'sql' => "SELECT MIN(`id`) AS `minid`, MAX(`id`) AS `maxid` FROM\n"
. " (SELECT `id` FROM `log_docs` WHERE ISNULL(`coll_id`) ORDER BY `id` DESC LIMIT " . $this->batchsize . ") AS `t", . " (SELECT `id` FROM `log_docs` WHERE ISNULL(`coll_id`) ORDER BY `id` DESC LIMIT " . $this->batchsize . ") AS `t",
'fetch' => false, 'fetch' => false,
'code' => function($stmt) { 'code' => function(ResultStatement $stmt) {
$row = $stmt->fetch(); $row = $stmt->fetch();
$this->output->writeln(""); $this->output->writeln("");
$this->output->writeln(sprintf("minid: %s ; maxid : %s\n", is_null($row['minid']) ? 'null' : $row['minid'], is_null($row['maxid']) ? 'null' : $row['maxid'])); $this->output->writeln(sprintf("minid: %s ; maxid : %s\n", is_null($row['minid']) ? 'null' : $row['minid'], is_null($row['maxid']) ? 'null' : $row['maxid']));
@@ -213,15 +173,16 @@ class FixLogCollId extends Command
'msg' => "Empty working table", 'msg' => "Empty working table",
'sql' => "TRUNCATE TABLE `tmp_colls`", 'sql' => "TRUNCATE TABLE `tmp_colls`",
'fetch' => false, 'fetch' => false,
'code' => function($row) {}, 'code' => null,
'playdry' => self::PLAYDRY_NONE, 'playdry' => self::PLAYDRY_NONE,
], ],
'offset' => [ 'offset' => [
'msg' => "Make room for \"collection_from\" actions", 'msg' => "Make room for \"collection_from\" actions",
'sql' => "UPDATE `log_docs` SET `id`=`id` * 2 WHERE `id` >= :minid AND `id` <= :maxid ORDER BY `id` DESC", 'sql' => "UPDATE `log_docs` SET `id` = `id` * 2 WHERE `id` >= :minid AND `id` <= :maxid ORDER BY `id` DESC",
'fetch' => false, 'fetch' => false,
'code' => function($stmt) { 'code' =>
function(/** @noinspection PhpUnusedParameterInspection */ $stmt) {
// fix new minmax values since id was changed // fix new minmax values since id was changed
$this->parm_v = [$this->parm_v[0] << 1, $this->parm_v[1] << 1]; $this->parm_v = [$this->parm_v[0] << 1, $this->parm_v[1] << 1];
}, },
@@ -240,7 +201,7 @@ class FixLogCollId extends Command
. " )\n" . " )\n"
. " AS `t` GROUP BY `r1_id` ORDER BY `record_id` ASC, `from_id` ASC", . " AS `t` GROUP BY `r1_id` ORDER BY `record_id` ASC, `from_id` ASC",
'fetch' => false, 'fetch' => false,
'code' => function($stmt) {}, 'code' => null,
'playdry' => self::PLAYDRY_NONE, 'playdry' => self::PLAYDRY_NONE,
], ],
@@ -252,7 +213,7 @@ class FixLogCollId extends Command
. " AND (`log_docs`.`id` < `tmp_colls`.`to_id` OR ISNULL(`tmp_colls`.`to_id`))\n" . " AND (`log_docs`.`id` < `tmp_colls`.`to_id` OR ISNULL(`tmp_colls`.`to_id`))\n"
. " SET `log_docs`.`coll_id` = `tmp_colls`.`coll_id", . " SET `log_docs`.`coll_id` = `tmp_colls`.`coll_id",
'fetch' => false, 'fetch' => false,
'code' => function($stmt) {}, 'code' => null,
'playdry' => self::PLAYDRY_NONE, 'playdry' => self::PLAYDRY_NONE,
], ],
@@ -262,19 +223,29 @@ class FixLogCollId extends Command
. " SELECT `r1`.`id`-1 AS `id`, `r1`.`log_id`, `r1`.`date`, `r1`.`record_id`, 'collection_from' AS `action`, `r1`.`final`,\n" . " SELECT `r1`.`id`-1 AS `id`, `r1`.`log_id`, `r1`.`date`, `r1`.`record_id`, 'collection_from' AS `action`, `r1`.`final`,\n"
. " SUBSTRING_INDEX(GROUP_CONCAT(`r2`.`coll_id` ORDER BY `r1`.`id` DESC), ',', 1) AS `coll_id`\n" . " SUBSTRING_INDEX(GROUP_CONCAT(`r2`.`coll_id` ORDER BY `r1`.`id` DESC), ',', 1) AS `coll_id`\n"
. " FROM `log_docs` AS `r1` LEFT JOIN `log_docs` AS `r2`\n" . " FROM `log_docs` AS `r1` LEFT JOIN `log_docs` AS `r2`\n"
. " ON `r2`.`record_id`=`r1`.`record_id` AND `r2`.`id` < `r1`.`id` AND `r2`.`action` IN('collection', 'add')\n" . " ON `r2`.`record_id` = `r1`.`record_id` AND `r2`.`id` < `r1`.`id` AND `r2`.`action` IN('collection', 'add')\n"
. " WHERE `r1`.`action` = 'collection' AND `r1`.`id` >= :minid AND `r1`.`id` <= :maxid\n" . " WHERE `r1`.`action` = 'collection' AND `r1`.`id` >= :minid AND `r1`.`id` <= :maxid\n"
. " GROUP BY `r1`.`id`", . " GROUP BY `r1`.`id`",
'fetch' => false, 'fetch' => false,
'code' => function($stmt) {}, 'code' => null,
'playdry' => self::PLAYDRY_NONE, 'playdry' => self::PLAYDRY_NONE,
], ],
'fix_unfound' => [ 'fix_unfound' => [
'msg' => "Set missing coll_id to 0", 'msg' => "Set missing coll_id to 0",
'sql' => "UPDATE `log_docs` SET `coll_id`=0 WHERE `id` >= :minid AND `id` <= :maxid AND ISNULL(`coll_id`)", 'sql' => "UPDATE `log_docs` SET `coll_id` = 0 WHERE `id` >= :minid AND `id` <= :maxid AND ISNULL(`coll_id`)",
'fetch' => false, 'fetch' => false,
'code' => function($stmt) {}, 'code' => null,
'playdry' => self::PLAYDRY_NONE,
],
'fix_view' => [
'msg' => "Fix \"log_view.coll_id\"",
'sql' => "UPDATE `tmp_colls` AS `c` INNER JOIN `log_view` AS `v`\n"
. " ON `v`.`record_id` = `c`.`record_id` AND `v`.`date` >= `c`.`from_date` AND (`v`.`date` < `c`.`to_date` OR ISNULL(`c`.`to_date`))\n"
. " SET `v`.`coll_id` = `c`.`coll_id`",
'fetch' => false,
'code' => null,
'playdry' => self::PLAYDRY_NONE, 'playdry' => self::PLAYDRY_NONE,
], ],
]; ];
@@ -333,7 +304,7 @@ class FixLogCollId extends Command
$stmt = $databox->get_connection()->prepare($sql); $stmt = $databox->get_connection()->prepare($sql);
$stmt->execute(); $stmt->execute();
} }
if(!$this->dry || ($work['playdry'] & self::PLAYDRY_CODE)) { if($work['code'] && (!$this->dry || ($work['playdry'] & self::PLAYDRY_CODE))) {
$code = $work['code']; $code = $work['code'];
$code($stmt); $code($stmt);
} }
@@ -343,12 +314,12 @@ class FixLogCollId extends Command
} }
if($this->dry) { if($this->dry) {
// since there is no change it may loop forever // since there was no changes it will loop forever
$this->again = false; $this->again = false;
} }
} }
if (!$this->keep_tmp_table) { if (!$this->keep_tmp_table) {
$this->output->writeln(sprintf("<info> ----------------- Drop working table -----------------</info>")); $this->output->writeln(sprintf("<info> ----------------- Drop working table -----------------</info>"));
$sql = "DROP TABLE `tmp_colls`"; $sql = "DROP TABLE `tmp_colls`";
@@ -366,8 +337,4 @@ class FixLogCollId extends Command
return 0; return 0;
} }
private function runSQL($work)
{
}
} }