TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 10:28:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve querying item results

Browse Source 
The join to retrieve the attachment count per item turned out to be
very expensive. And it is not used anymore for the result, only to
support fulltext search. It is now removed from the query. The
DISTINCT keyword is also removed, because it is not necessary and it
is expensive. With the DISTINCT removed, a new index (provided in the
previous commit) can now be used to avoid sorting items.
This commit is contained in:
eikek
2021-08-29 00:21:49 +02:00
parent a5a8c2553b
commit 733096f979
3 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
modules/backend/src/main/scala/docspell/backend/ops/OFulltext.scala
View File

@ -290,12 +290,15 @@ object OFulltext {
val qres =
for {
items <- sqlResult
ids = items.map(a => ItemId[A].itemId(a))
ids = items.map(a => ItemId[A].itemId(a))
idsNel = NonEmptyList.fromFoldable(ids)
// must find all index results involving the items.
// Currently there is one result per item + one result per
// attachment
limit = items.map(a => ItemId[A].fileCount(a)).sum + items.size
ftsQ = fq.copy(items = ids.toSet, limit = limit)
limit <- idsNel
.map(itemIds => store.transact(QItem.countAttachmentsAndItems(itemIds)))
.getOrElse(0.pure[F])
ftsQ = fq.copy(items = ids.toSet, limit = limit)
ftsR <- fts.search(ftsQ)
ftsItems = ftsR.results.groupBy(_.itemId)
res = items.collect(convert(ftsR, ftsItems))
@ -320,22 +323,19 @@ object OFulltext {
trait ItemId[A] {
def itemId(a: A): Ident
def fileCount(a: A): Int
}
object ItemId {
def apply[A](implicit ev: ItemId[A]): ItemId[A] = ev
def from[A](f: A => Ident, g: A => Int): ItemId[A] =
def from[A](f: A => Ident): ItemId[A] =
new ItemId[A] {
def itemId(a: A) = f(a)
def fileCount(a: A) = g(a)
def itemId(a: A) = f(a)
}
implicit val listItemId: ItemId[ListItem] =
ItemId.from(_.id, _.fileCount)
ItemId.from(_.id)
implicit val listItemWithTagsId: ItemId[ListItemWithTags] =
ItemId.from(_.item.id, _.item.fileCount)
ItemId.from(_.item.id)
}
}