Skip to content
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

Jump to bottom

[stable0.7] perf: Avoid extra queries to get the view ownership #1066

Merged
merged 1 commit into from
May 6, 2024
Merged

[stable0.7] perf: Avoid extra queries to get the view ownership #1066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions lib/Db/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@
* @method setFavorite(bool $favorite)
* @method getRowsCount(): int
* @method setRowsCount(int $rowCount)
* @method getOwnership(): string
* @method setOwnership(string $ownership)
* @method getOwnerDisplayName(): string
* @method setOwnerDisplayName(string $ownerDisplayName)
*/
Expand Down Expand Up @@ -122,6 +120,14 @@ private function getSharePermissions(): ?array {
return $this->getOnSharePermissions();
}

public function getOwnership(): ?string {
return $this->ownership;
}

public function setOwnership(string $ownership): void {
$this->ownership = $ownership;
}

/**
* @psalm-return TablesView
*/
Expand Down
72 changes: 16 additions & 56 deletions lib/Db/ViewMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace OCA\Tables\Db;

use OCA\Tables\Errors\InternalError;
use OCA\Tables\Helper\UserHelper;
use OCP\AppFramework\Db\DoesNotExistException;
use OCP\AppFramework\Db\MultipleObjectsReturnedException;
Expand All @@ -14,65 +13,44 @@
/** @template-extends QBMapper<View> */
class ViewMapper extends QBMapper {
protected string $table = 'tables_views';
private UserHelper $userHelper;
private TableMapper $tableMapper;

public function __construct(IDBConnection $db, TableMapper $tableMapper, UserHelper $userHelper) {
public function __construct(IDBConnection $db, private UserHelper $userHelper) {
parent::__construct($db, $this->table, View::class);
$this->tableMapper = $tableMapper;
$this->userHelper = $userHelper;
}


/**
* @param int $id
* @param bool $skipEnhancement
* @return View
* @throws DoesNotExistException
* @throws Exception
* @throws InternalError
* @throws MultipleObjectsReturnedException
*/
public function find(int $id, bool $skipEnhancement = false): View {
public function find(int $id): View {
$qb = $this->db->getQueryBuilder();
$qb->select('*')
->from($this->table)
->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
$view = $this->findEntity($qb);
if(!$skipEnhancement) {
$this->enhanceOwnership($view);
}
return $view;
$qb->select('v.*', 't.ownership')
->from($this->table, 'v')
->innerJoin('v', 'tables_tables', 't', 't.id = v.table_id')
->where($qb->expr()->eq('v.id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
return $this->findEntity($qb);
}

/**
* @param int|null $tableId
* @return View[]
* @throws Exception
* @throws InternalError
*/
public function findAll(?int $tableId = null): array {
$qb = $this->db->getQueryBuilder();
$qb->select('*')
->from($this->table);
$qb->select('v.*', 't.ownership')
->from($this->table, 'v')
->innerJoin('v', 'tables_tables', 't', 't.id = v.table_id');

if ($tableId !== null) {
$qb->where($qb->expr()->eq('table_id', $qb->createNamedParameter($tableId, IQueryBuilder::PARAM_INT)));
}
$views = $this->findEntities($qb);
foreach($views as $view) {
$this->enhanceOwnership($view);
$qb->where($qb->expr()->eq('v.table_id', $qb->createNamedParameter($tableId, IQueryBuilder::PARAM_INT)));
}
return $views;
return $this->findEntities($qb);
}

/**
* @param string|null $term
* @param string|null $userId
* @param int|null $limit
* @param int|null $offset
* @return array
* @return View[]
* @throws Exception
* @throws InternalError
*/
public function search(string $term = null, ?string $userId = null, ?int $limit = null, ?int $offset = null): array {
$qb = $this->db->getQueryBuilder();
Expand Down Expand Up @@ -104,7 +82,7 @@ public function search(string $term = null, ?string $userId = null, ?int $limit
->andWhere($qb->expr()->eq('receiver', $qb->createNamedParameter($userId, IQueryBuilder::PARAM_STR)));
}

$qb->select('v.*')
$qb->select('v.*', 't.ownership')
->from($this->table, 'v')
->leftJoin('v', 'tables_tables', 't', 't.id = v.table_id');

Expand Down Expand Up @@ -133,24 +111,6 @@ public function search(string $term = null, ?string $userId = null, ?int $limit
$qb->setFirstResult($offset);
}

$views = $this->findEntities($qb);
foreach($views as $view) {
$this->enhanceOwnership($view);
}
return $views;
}

/**
* @param View $view
* @return void
* @throws InternalError
*/
private function enhanceOwnership(View $view): void {
try {
$view->setOwnership($this->tableMapper->findOwnership($view->getTableId()));
} catch (Exception $e) {
throw new InternalError('Could not find ownership of table');
}
$view->resetUpdatedFields();
return $this->findEntities($qb);
}
}
Loading