Skip to content

Add indexer console command output #25638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 21, 2019
Merged

Add indexer console command output #25638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9fc6972
Merge pull request #1 from magento/2.3-develop
brosenberger Nov 16, 2019
64482d1
add indexer id to output
brosenberger Nov 18, 2019
51526cf
fix unit test to scope with new table column
brosenberger Nov 18, 2019
e2596bb
fix code styling errors
brosenberger Nov 19, 2019
ecfc973
fix code stylings
brosenberger Nov 19, 2019
b011040
:ok_hand: adding type hints as suggested by review
rosenberger-e-conomix Nov 20, 2019
2e27790
:ok_hand: change type hint to parameter type
rosenberger-e-conomix Nov 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions app/code/Magento/Indexer/Console/Command/IndexerStatusCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
*/
namespace Magento\Indexer\Console\Command;

use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
use Magento\Framework\Indexer;
use Magento\Framework\Mview;
use Symfony\Component\Console\Helper\Table;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;

/**
* Command for displaying status of indexers.
*/
class IndexerStatusCommand extends AbstractIndexerManageCommand
{
/**
* {@inheritdoc}
* @inheritdoc
*/
protected function configure()
{
Expand All @@ -29,12 +29,14 @@ protected function configure()
}

/**
* {@inheritdoc}
* @inheritdoc
* @param InputInterface $input
* @param OutputInterface $output
*/
protected function execute(InputInterface $input, OutputInterface $output)
{
$table = new Table($output);
$table->setHeaders(['Title', 'Status', 'Update On', 'Schedule Status', 'Schedule Updated']);
$table->setHeaders(['ID', 'Title', 'Status', 'Update On', 'Schedule Status', 'Schedule Updated']);

$rows = [];

Expand All @@ -43,6 +45,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
$view = $indexer->getView();

$rowData = [
'ID' => $indexer->getId(),
'Title' => $indexer->getTitle(),
'Status' => $this->getStatus($indexer),
'Update On' => $indexer->isScheduled() ? 'Schedule' : 'Save',
Expand All @@ -59,15 +62,20 @@ protected function execute(InputInterface $input, OutputInterface $output)
$rows[] = $rowData;
}

usort($rows, function ($comp1, $comp2) {
return strcmp($comp1['Title'], $comp2['Title']);
});
usort(
$rows,
function (array $comp1, array $comp2) {
return strcmp($comp1['Title'], $comp2['Title']);
}
);

$table->addRows($rows);
$table->render();
}

/**
* Returns the current status of the indexer
*
* @param Indexer\IndexerInterface $indexer
* @return string
*/
Expand All @@ -89,6 +97,8 @@ private function getStatus(Indexer\IndexerInterface $indexer)
}

/**
* Returns the pending count of the view
*
* @param Mview\ViewInterface $view
* @return string
*/
Expand Down
56 changes: 31 additions & 25 deletions app/code/Magento/Indexer/Test/Unit/Console/Command/IndexerStatusCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,47 +96,53 @@ public function testExecuteAll(array $indexers)

$linesOutput = array_filter(explode(PHP_EOL, $commandTester->getDisplay()));

$spacer = '+----------------+------------------+-----------+-------------------------+---------------------+';
$spacer = '+-----------+----------------+------------------+-----------+-------------------------+'
. '---------------------+';

$this->assertCount(8, $linesOutput, 'There should be 8 lines output. 3 Spacers, 1 header, 4 content.');
$this->assertEquals($linesOutput[0], $spacer, "Lines 0, 2, 7 should be spacer lines");
$this->assertEquals($linesOutput[2], $spacer, "Lines 0, 2, 7 should be spacer lines");
$this->assertEquals($linesOutput[7], $spacer, "Lines 0, 2, 7 should be spacer lines");

$headerValues = array_values(array_filter(explode('|', $linesOutput[1])));
$this->assertEquals('Title', trim($headerValues[0]));
$this->assertEquals('Status', trim($headerValues[1]));
$this->assertEquals('Update On', trim($headerValues[2]));
$this->assertEquals('Schedule Status', trim($headerValues[3]));
$this->assertEquals('Schedule Updated', trim($headerValues[4]));
$this->assertEquals('ID', trim($headerValues[0]));
$this->assertEquals('Title', trim($headerValues[1]));
$this->assertEquals('Status', trim($headerValues[2]));
$this->assertEquals('Update On', trim($headerValues[3]));
$this->assertEquals('Schedule Status', trim($headerValues[4]));
$this->assertEquals('Schedule Updated', trim($headerValues[5]));

$indexer1 = array_values(array_filter(explode('|', $linesOutput[3])));
$this->assertEquals('Title_indexer1', trim($indexer1[0]));
$this->assertEquals('Ready', trim($indexer1[1]));
$this->assertEquals('Schedule', trim($indexer1[2]));
$this->assertEquals('idle (10 in backlog)', trim($indexer1[3]));
$this->assertEquals('2017-01-01 11:11:11', trim($indexer1[4]));
$this->assertEquals('indexer_1', trim($indexer1[0]));
$this->assertEquals('Title_indexer1', trim($indexer1[1]));
$this->assertEquals('Ready', trim($indexer1[2]));
$this->assertEquals('Schedule', trim($indexer1[3]));
$this->assertEquals('idle (10 in backlog)', trim($indexer1[4]));
$this->assertEquals('2017-01-01 11:11:11', trim($indexer1[5]));

$indexer2 = array_values(array_filter(explode('|', $linesOutput[4])));
$this->assertEquals('Title_indexer2', trim($indexer2[0]));
$this->assertEquals('Reindex required', trim($indexer2[1]));
$this->assertEquals('Save', trim($indexer2[2]));
$this->assertEquals('', trim($indexer2[3]));
$this->assertEquals('indexer_2', trim($indexer2[0]));
$this->assertEquals('Title_indexer2', trim($indexer2[1]));
$this->assertEquals('Reindex required', trim($indexer2[2]));
$this->assertEquals('Save', trim($indexer2[3]));
$this->assertEquals('', trim($indexer2[4]));
$this->assertEquals('', trim($indexer2[5]));

$indexer3 = array_values(array_filter(explode('|', $linesOutput[5])));
$this->assertEquals('Title_indexer3', trim($indexer3[0]));
$this->assertEquals('Processing', trim($indexer3[1]));
$this->assertEquals('Schedule', trim($indexer3[2]));
$this->assertEquals('idle (100 in backlog)', trim($indexer3[3]));
$this->assertEquals('2017-01-01 11:11:11', trim($indexer3[4]));
$this->assertEquals('indexer_3', trim($indexer3[0]));
$this->assertEquals('Title_indexer3', trim($indexer3[1]));
$this->assertEquals('Processing', trim($indexer3[2]));
$this->assertEquals('Schedule', trim($indexer3[3]));
$this->assertEquals('idle (100 in backlog)', trim($indexer3[4]));
$this->assertEquals('2017-01-01 11:11:11', trim($indexer3[5]));

$indexer4 = array_values(array_filter(explode('|', $linesOutput[6])));
$this->assertEquals('Title_indexer4', trim($indexer4[0]));
$this->assertEquals('unknown', trim($indexer4[1]));
$this->assertEquals('Schedule', trim($indexer4[2]));
$this->assertEquals('running (20 in backlog)', trim($indexer4[3]));
$this->assertEquals('2017-01-01 11:11:11', trim($indexer4[4]));
$this->assertEquals('indexer_4', trim($indexer4[0]));
$this->assertEquals('Title_indexer4', trim($indexer4[1]));
$this->assertEquals('unknown', trim($indexer4[2]));
$this->assertEquals('Schedule', trim($indexer4[3]));
$this->assertEquals('running (20 in backlog)', trim($indexer4[4]));
$this->assertEquals('2017-01-01 11:11:11', trim($indexer4[5]));
}

/**
Expand Down