Skip to content

Commit

Permalink
adjust the clean command to use the new db structure and code base
Browse files Browse the repository at this point in the history 
Signed-off-by: Florian Steffens <florian.steffens@nextcloud.com>
  • Loading branch information
Florian Steffens committed Jan 12, 2024
1 parent 9be4cc0 commit 205ad21
Show file tree
Hide file tree
Showing 3 changed files with 60 additions and 26 deletions.
55 changes: 29 additions & 26 deletions lib/Command/Clean.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,15 @@

namespace OCA\Tables\Command;

use OCA\Tables\Db\LegacyRow;
use OCA\Tables\Db\LegacyRowMapper;
use Exception;
use OCA\Tables\Db\Row2;
use OCA\Tables\Db\Row2Mapper;
use OCA\Tables\Errors\InternalError;
use OCA\Tables\Errors\NotFoundError;
use OCA\Tables\Errors\PermissionError;
use OCA\Tables\Service\ColumnService;
use OCA\Tables\Service\RowService;
use OCA\Tables\Service\TableService;
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Db\MultipleObjectsReturnedException;
use OCP\DB\Exception;
use Psr\Log\LoggerInterface;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputInterface;
Expand All @@ -56,7 +53,7 @@ class Clean extends Command {
private bool $dry = false;
private int $truncateLength = 20;

private ?LegacyRow $row = null;
private ?Row2 $row = null;
private int $offset = -1;

private OutputInterface $output;
Expand Down Expand Up @@ -107,16 +104,21 @@ protected function execute(InputInterface $input, OutputInterface $output): int

private function getNextRow():void {
try {
$this->row = $this->rowMapper->findNext($this->offset);
$nextRowId = $this->rowMapper->findNextId($this->offset);
if ($nextRowId === null) {
$this->print("");
$this->print("No more rows found.", self::PRINT_LEVEL_INFO);
$this->print("");
$this->row = null;
return;
}
$tableId = $this->rowMapper->getTableIdForRow($nextRowId);
$columns = $this->columnService->findAllByTable($tableId, null, '');
$this->row = $this->rowMapper->find($nextRowId, $columns);
$this->offset = $this->row->getId();
} catch (MultipleObjectsReturnedException|Exception $e) {
} catch (Exception $e) {
$this->print('Error while fetching row', self::PRINT_LEVEL_ERROR);
$this->logger->error('Following error occurred during executing occ command "'.self::class.'"', ['exception' => $e]);
} catch (DoesNotExistException $e) {
$this->print("");
$this->print("No more rows found.", self::PRINT_LEVEL_INFO);
$this->print("");
$this->row = null;
}
}

Expand All @@ -142,14 +144,14 @@ private function checkIfColumnsForRowsExists(): void {
}

private function checkColumns(): void {
$data = json_decode($this->row->getData());
foreach ($data as $date) {
$suffix = strlen($date->value) > $this->truncateLength ? "...": "";
foreach ($this->row->getData() as $date) {
$valueAsString = is_string($date['value']) ? $date['value'] : json_encode($date['value']);
$suffix = strlen($valueAsString) > $this->truncateLength ? "...": "";
$this->print("");
$this->print("columnId: " . $date->columnId . " -> " . substr($date->value, 0, $this->truncateLength) . $suffix, self::PRINT_LEVEL_INFO);
$this->print("columnId: " . $date['columnId'] . " -> " . substr($valueAsString, 0, $this->truncateLength) . $suffix, self::PRINT_LEVEL_INFO);

try {
$this->columnService->find($date->columnId, '');
$this->columnService->find($date['columnId'], '');
if($this->output->isVerbose()) {
$this->print("column found", self::PRINT_LEVEL_SUCCESS);
}
Expand All @@ -160,10 +162,10 @@ private function checkColumns(): void {
if($this->output->isVerbose()) {
$this->print("corresponding column not found.", self::PRINT_LEVEL_ERROR);
} else {
$this->print("columnId: " . $date->columnId . " not found, but needed by row ".$this->row->getId(), self::PRINT_LEVEL_WARNING);
$this->print("columnId: " . $date['columnId'] . " not found, but needed by row ".$this->row->getId(), self::PRINT_LEVEL_WARNING);
}
// if the corresponding column is not found, lets delete the data from the row.
$this->deleteDataFromRow($date->columnId);
$this->deleteDataFromRow($date['columnId']);
} catch (PermissionError $e) {
$this->print("😱️ permission error while looking for column", self::PRINT_LEVEL_ERROR);
$this->logger->error('Following error occurred during executing occ command "'.self::class.'"', ['exception' => $e]);
Expand All @@ -183,17 +185,18 @@ private function deleteDataFromRow(int $columnId): void {
}

$this->print("DANGER, start deleting", self::PRINT_LEVEL_WARNING);
$data = json_decode($this->row->getData(), true);
$data = $this->row->getData();

// $this->print("Data before: \t".json_encode(array_values($data), 0), self::PRINT_LEVEL_INFO);
$this->print("Data before: \t".json_encode(array_values($data)), self::PRINT_LEVEL_INFO);
$key = array_search($columnId, array_column($data, 'columnId'));
unset($data[$key]);
// $this->print("Data after: \t".json_encode(array_values($data), 0), self::PRINT_LEVEL_INFO);
$this->row->setDataArray(array_values($data));
$this->print("Data after: \t".json_encode(array_values($data)), self::PRINT_LEVEL_INFO);
$this->row->setData(array_values($data));

try {
$this->rowMapper->update($this->row);
$this->rowMapper->update($this->row, $this->columnService->findAllByTable($this->row->getTableId()));
$this->print("Row successfully updated", self::PRINT_LEVEL_SUCCESS);
} catch (Exception $e) {
} catch (InternalError|PermissionError $e) {
$this->print("Error while updating row to db.", self::PRINT_LEVEL_ERROR);
$this->logger->error('Following error occurred during executing occ command "'.self::class.'"', ['exception' => $e]);
}
Expand Down
15 changes: 15 additions & 0 deletions lib/Db/Row2Mapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,21 @@ public function find(int $id, array $columns): Row2 {
}
}

/**
* @throws InternalError
*/
public function findNextId(int $offsetId = -1): ?int {
try {
$rowSleeve = $this->rowSleeveMapper->findNext($offsetId);
} catch (MultipleObjectsReturnedException|Exception $e) {
$this->logger->error($e->getMessage(), ['exception' => $e]);
throw new InternalError(get_class($this) . ' - ' . __FUNCTION__ . ': '.$e->getMessage());
} catch (DoesNotExistException $e) {
return null;
}
return $rowSleeve->getId();
}

/**
* @throws DoesNotExistException
* @throws MultipleObjectsReturnedException
Expand Down
16 changes: 16 additions & 0 deletions lib/Db/RowSleeveMapper.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,22 @@ public function findMultiple(array $ids): array {
return $this->findEntities($qb);
}

/**
* @throws MultipleObjectsReturnedException
* @throws DoesNotExistException
* @throws Exception
*/
public function findNext(int $offsetId = -1): RowSleeve {
$qb = $this->db->getQueryBuilder();
$qb->select('*')
->from($this->table)
->where($qb->expr()->gt('id', $qb->createNamedParameter($offsetId)))
->setMaxResults(1)
->orderBy('id', 'ASC');

return $this->findEntity($qb);
}

/**
* @param int $sleeveId
* @throws Exception
Expand Down

0 comments on commit 205ad21

Please sign in to comment.