oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-07-22 17:18:37 +00:00
Code Wiki Activity

Improve storage module

Browse source
This commit is contained in:
Frédéric Guillot 2019-10-29 22:48:07 -07:00
parent e38333e272
commit d3883126bf
13 changed files with 505 additions and 317 deletions
Download patch file Download diff file Expand all files Collapse all files

8
storage/entry_query_builder.go
View file

@ -12,7 +12,6 @@ import (
"github.com/lib/pq"
"miniflux.app/model"
"miniflux.app/timer"
"miniflux.app/timezone"
)
@ -158,8 +157,6 @@ func (e *EntryQueryBuilder) CountEntries() (count int, err error) {
query := `SELECT count(*) FROM entries e LEFT JOIN feeds f ON f.id=e.feed_id WHERE %s`
condition := e.buildCondition()
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[EntryQueryBuilder:CountEntries] %s, args=%v", condition, e.args))
err = e.store.db.QueryRow(fmt.Sprintf(query, condition), e.args...).Scan(&count)
if err != nil {
return 0, fmt.Errorf("unable to count entries: %v", err)
@ -210,8 +207,6 @@ func (e *EntryQueryBuilder) GetEntries() (model.Entries, error) {
sorting := e.buildSorting()
query = fmt.Sprintf(query, condition, sorting)
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[EntryQueryBuilder:GetEntries] %s, args=%v, sorting=%s", condition, e.args, sorting))
rows, err := e.store.db.Query(query, e.args...)
if err != nil {
return nil, fmt.Errorf("unable to get entries: %v", err)
@ -285,9 +280,6 @@ func (e *EntryQueryBuilder) GetEntryIDs() ([]int64, error) {
condition := e.buildCondition()
query = fmt.Sprintf(query, condition, e.buildSorting())
// log.Println(query)
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[EntryQueryBuilder:GetEntryIDs] condition=%s, args=%v", condition, e.args))
rows, err := e.store.db.Query(query, e.args...)
if err != nil {