forks/miniflux
1
0
Fork 0
Code Releases Activity

Remove debug timer from most storage functions

Browse source
This commit is contained in:
Frédéric Guillot 2019-04-28 20:13:34 -07:00 • committed by fguillot
parent 4295a86e55
commit 0dff432337
7 changed files with 0 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
storage/category.go
View file

@ -8,16 +8,12 @@ import (
"database/sql" "database/sql"
"errors" "errors"
"fmt" "fmt"
"time"
"miniflux.app/model" "miniflux.app/model"
"miniflux.app/timer"
) )
// AnotherCategoryExists checks if another category exists with the same title. // AnotherCategoryExists checks if another category exists with the same title.
func (s *Storage) AnotherCategoryExists(userID, categoryID int64, title string) bool { func (s *Storage) AnotherCategoryExists(userID, categoryID int64, title string) bool {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:AnotherCategoryExists] userID=%d, categoryID=%d, title=%s", userID, categoryID, title))
var result int var result int
query := `SELECT count(*) as c FROM categories WHERE user_id=$1 AND id != $2 AND title=$3` query := `SELECT count(*) as c FROM categories WHERE user_id=$1 AND id != $2 AND title=$3`
s.db.QueryRow(query, userID, categoryID, title).Scan(&result) s.db.QueryRow(query, userID, categoryID, title).Scan(&result)
@ -26,8 +22,6 @@ func (s *Storage) AnotherCategoryExists(userID, categoryID int64, title string)
// CategoryExists checks if the given category exists into the database. // CategoryExists checks if the given category exists into the database.
func (s *Storage) CategoryExists(userID, categoryID int64) bool { func (s *Storage) CategoryExists(userID, categoryID int64) bool {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:CategoryExists] userID=%d, categoryID=%d", userID, categoryID))
var result int var result int
query := `SELECT count(*) as c FROM categories WHERE user_id=$1 AND id=$2` query := `SELECT count(*) as c FROM categories WHERE user_id=$1 AND id=$2`
s.db.QueryRow(query, userID, categoryID).Scan(&result) s.db.QueryRow(query, userID, categoryID).Scan(&result)
@ -36,7 +30,6 @@ func (s *Storage) CategoryExists(userID, categoryID int64) bool {
// Category returns a category from the database. // Category returns a category from the database.
func (s *Storage) Category(userID, categoryID int64) (*model.Category, error) { func (s *Storage) Category(userID, categoryID int64) (*model.Category, error) {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:Category] userID=%d, getCategory=%d", userID, categoryID))
var category model.Category var category model.Category
query := `SELECT id, user_id, title FROM categories WHERE user_id=$1 AND id=$2` query := `SELECT id, user_id, title FROM categories WHERE user_id=$1 AND id=$2`
@ -52,7 +45,6 @@ func (s *Storage) Category(userID, categoryID int64) (*model.Category, error) {
// FirstCategory returns the first category for the given user. // FirstCategory returns the first category for the given user.
func (s *Storage) FirstCategory(userID int64) (*model.Category, error) { func (s *Storage) FirstCategory(userID int64) (*model.Category, error) {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:FirstCategory] userID=%d", userID))
var category model.Category var category model.Category
query := `SELECT id, user_id, title FROM categories WHERE user_id=$1 ORDER BY title ASC LIMIT 1` query := `SELECT id, user_id, title FROM categories WHERE user_id=$1 ORDER BY title ASC LIMIT 1`
@ -68,7 +60,6 @@ func (s *Storage) FirstCategory(userID int64) (*model.Category, error) {
// CategoryByTitle finds a category by the title. // CategoryByTitle finds a category by the title.
func (s *Storage) CategoryByTitle(userID int64, title string) (*model.Category, error) { func (s *Storage) CategoryByTitle(userID int64, title string) (*model.Category, error) {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:CategoryByTitle] userID=%d, title=%s", userID, title))
var category model.Category var category model.Category
query := `SELECT id, user_id, title FROM categories WHERE user_id=$1 AND title=$2` query := `SELECT id, user_id, title FROM categories WHERE user_id=$1 AND title=$2`
@ -84,8 +75,6 @@ func (s *Storage) CategoryByTitle(userID int64, title string) (*model.Category,
// Categories returns all categories that belongs to the given user. // Categories returns all categories that belongs to the given user.
func (s *Storage) Categories(userID int64) (model.Categories, error) { func (s *Storage) Categories(userID int64) (model.Categories, error) {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:Categories] userID=%d", userID))
query := `SELECT id, user_id, title FROM categories WHERE user_id=$1 ORDER BY title ASC` query := `SELECT id, user_id, title FROM categories WHERE user_id=$1 ORDER BY title ASC`
rows, err := s.db.Query(query, userID) rows, err := s.db.Query(query, userID)
if err != nil { if err != nil {
@ -108,7 +97,6 @@ func (s *Storage) Categories(userID int64) (model.Categories, error) {
// CategoriesWithFeedCount returns all categories with the number of feeds. // CategoriesWithFeedCount returns all categories with the number of feeds.
func (s *Storage) CategoriesWithFeedCount(userID int64) (model.Categories, error) { func (s *Storage) CategoriesWithFeedCount(userID int64) (model.Categories, error) {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:CategoriesWithFeedCount] userID=%d", userID))
query := `SELECT query := `SELECT
c.id, c.user_id, c.title, c.id, c.user_id, c.title,
(SELECT count(*) FROM feeds WHERE feeds.category_id=c.id) AS count (SELECT count(*) FROM feeds WHERE feeds.category_id=c.id) AS count
@ -136,8 +124,6 @@ func (s *Storage) CategoriesWithFeedCount(userID int64) (model.Categories, error
// CreateCategory creates a new category. // CreateCategory creates a new category.
func (s *Storage) CreateCategory(category *model.Category) error { func (s *Storage) CreateCategory(category *model.Category) error {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:CreateCategory] title=%s", category.Title))
query := ` query := `
INSERT INTO categories INSERT INTO categories
(user_id, title) (user_id, title)
@ -160,8 +146,6 @@ func (s *Storage) CreateCategory(category *model.Category) error {
// UpdateCategory updates an existing category. // UpdateCategory updates an existing category.
func (s *Storage) UpdateCategory(category *model.Category) error { func (s *Storage) UpdateCategory(category *model.Category) error {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:UpdateCategory] categoryID=%d", category.ID))
query := `UPDATE categories SET title=$1 WHERE id=$2 AND user_id=$3` query := `UPDATE categories SET title=$1 WHERE id=$2 AND user_id=$3`
_, err := s.db.Exec( _, err := s.db.Exec(
query, query,
@ -179,8 +163,6 @@ func (s *Storage) UpdateCategory(category *model.Category) error {
// RemoveCategory deletes a category. // RemoveCategory deletes a category.
func (s *Storage) RemoveCategory(userID, categoryID int64) error { func (s *Storage) RemoveCategory(userID, categoryID int64) error {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:RemoveCategory] userID=%d, categoryID=%d", userID, categoryID))
result, err := s.db.Exec("DELETE FROM categories WHERE id = $1 AND user_id = $2", categoryID, userID) result, err := s.db.Exec("DELETE FROM categories WHERE id = $1 AND user_id = $2", categoryID, userID)
if err != nil { if err != nil {
return fmt.Errorf("Unable to remove this category: %v", err) return fmt.Errorf("Unable to remove this category: %v", err)

13
storage/entry.go
View file

@ -11,7 +11,6 @@ import (
"miniflux.app/logger" "miniflux.app/logger"
"miniflux.app/model" "miniflux.app/model"
"miniflux.app/timer"
"github.com/lib/pq" "github.com/lib/pq"
) )
@ -204,8 +203,6 @@ func (s *Storage) ArchiveEntries(days int) error {
// SetEntriesStatus update the status of the given list of entries. // SetEntriesStatus update the status of the given list of entries.
func (s *Storage) SetEntriesStatus(userID int64, entryIDs []int64, status string) error { func (s *Storage) SetEntriesStatus(userID int64, entryIDs []int64, status string) error {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:SetEntriesStatus] userID=%d, entryIDs=%v, status=%s", userID, entryIDs, status))
query := `UPDATE entries SET status=$1 WHERE user_id=$2 AND id=ANY($3)` query := `UPDATE entries SET status=$1 WHERE user_id=$2 AND id=ANY($3)`
result, err := s.db.Exec(query, status, userID, pq.Array(entryIDs)) result, err := s.db.Exec(query, status, userID, pq.Array(entryIDs))
if err != nil { if err != nil {
@ -226,8 +223,6 @@ func (s *Storage) SetEntriesStatus(userID int64, entryIDs []int64, status string
// ToggleBookmark toggles entry bookmark value. // ToggleBookmark toggles entry bookmark value.
func (s *Storage) ToggleBookmark(userID int64, entryID int64) error { func (s *Storage) ToggleBookmark(userID int64, entryID int64) error {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:ToggleBookmark] userID=%d, entryID=%d", userID, entryID))
query := `UPDATE entries SET starred = NOT starred WHERE user_id=$1 AND id=$2` query := `UPDATE entries SET starred = NOT starred WHERE user_id=$1 AND id=$2`
result, err := s.db.Exec(query, userID, entryID) result, err := s.db.Exec(query, userID, entryID)
if err != nil { if err != nil {
@ -248,8 +243,6 @@ func (s *Storage) ToggleBookmark(userID int64, entryID int64) error {
// FlushHistory set all entries with the status "read" to "removed". // FlushHistory set all entries with the status "read" to "removed".
func (s *Storage) FlushHistory(userID int64) error { func (s *Storage) FlushHistory(userID int64) error {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:FlushHistory] userID=%d", userID))
query := `UPDATE entries SET status=$1 WHERE user_id=$2 AND status=$3 AND starred='f'` query := `UPDATE entries SET status=$1 WHERE user_id=$2 AND status=$3 AND starred='f'`
_, err := s.db.Exec(query, model.EntryStatusRemoved, userID, model.EntryStatusRead) _, err := s.db.Exec(query, model.EntryStatusRemoved, userID, model.EntryStatusRead)
if err != nil { if err != nil {
@ -261,8 +254,6 @@ func (s *Storage) FlushHistory(userID int64) error {
// MarkAllAsRead updates all user entries to the read status. // MarkAllAsRead updates all user entries to the read status.
func (s *Storage) MarkAllAsRead(userID int64) error { func (s *Storage) MarkAllAsRead(userID int64) error {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:MarkAllAsRead] userID=%d", userID))
query := `UPDATE entries SET status=$1 WHERE user_id=$2 AND status=$3` query := `UPDATE entries SET status=$1 WHERE user_id=$2 AND status=$3`
result, err := s.db.Exec(query, model.EntryStatusRead, userID, model.EntryStatusUnread) result, err := s.db.Exec(query, model.EntryStatusRead, userID, model.EntryStatusUnread)
if err != nil { if err != nil {
@ -277,8 +268,6 @@ func (s *Storage) MarkAllAsRead(userID int64) error {
// MarkFeedAsRead updates all feed entries to the read status. // MarkFeedAsRead updates all feed entries to the read status.
func (s *Storage) MarkFeedAsRead(userID, feedID int64, before time.Time) error { func (s *Storage) MarkFeedAsRead(userID, feedID int64, before time.Time) error {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:MarkFeedAsRead] userID=%d, feedID=%d, before=%v", userID, feedID, before))
query := ` query := `
UPDATE entries UPDATE entries
SET status=$1 SET status=$1
@ -298,8 +287,6 @@ func (s *Storage) MarkFeedAsRead(userID, feedID int64, before time.Time) error {
// MarkCategoryAsRead updates all category entries to the read status. // MarkCategoryAsRead updates all category entries to the read status.
func (s *Storage) MarkCategoryAsRead(userID, categoryID int64, before time.Time) error { func (s *Storage) MarkCategoryAsRead(userID, categoryID int64, before time.Time) error {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:MarkCategoryAsRead] userID=%d, categoryID=%d, before=%v", userID, categoryID, before))
query := ` query := `
UPDATE entries UPDATE entries
SET status=$1 SET status=$1

17
storage/feed.go
View file

@ -8,17 +8,13 @@ import (
"database/sql" "database/sql"
"errors" "errors"
"fmt" "fmt"
"time"
"miniflux.app/model" "miniflux.app/model"
"miniflux.app/timer"
"miniflux.app/timezone" "miniflux.app/timezone"
) )
// FeedExists checks if the given feed exists. // FeedExists checks if the given feed exists.
func (s *Storage) FeedExists(userID, feedID int64) bool { func (s *Storage) FeedExists(userID, feedID int64) bool {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:FeedExists] userID=%d, feedID=%d", userID, feedID))
var result int var result int
query := `SELECT count(*) as c FROM feeds WHERE user_id=$1 AND id=$2` query := `SELECT count(*) as c FROM feeds WHERE user_id=$1 AND id=$2`
s.db.QueryRow(query, userID, feedID).Scan(&result) s.db.QueryRow(query, userID, feedID).Scan(&result)
@ -27,8 +23,6 @@ func (s *Storage) FeedExists(userID, feedID int64) bool {
// FeedURLExists checks if feed URL already exists. // FeedURLExists checks if feed URL already exists.
func (s *Storage) FeedURLExists(userID int64, feedURL string) bool { func (s *Storage) FeedURLExists(userID int64, feedURL string) bool {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:FeedURLExists] userID=%d, feedURL=%s", userID, feedURL))
var result int var result int
query := `SELECT count(*) as c FROM feeds WHERE user_id=$1 AND feed_url=$2` query := `SELECT count(*) as c FROM feeds WHERE user_id=$1 AND feed_url=$2`
s.db.QueryRow(query, userID, feedURL).Scan(&result) s.db.QueryRow(query, userID, feedURL).Scan(&result)
@ -59,8 +53,6 @@ func (s *Storage) CountErrorFeeds(userID int64) int {
// Feeds returns all feeds of the given user. // Feeds returns all feeds of the given user.
func (s *Storage) Feeds(userID int64) (model.Feeds, error) { func (s *Storage) Feeds(userID int64) (model.Feeds, error) {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:Feeds] userID=%d", userID))
feeds := make(model.Feeds, 0) feeds := make(model.Feeds, 0)
query := `SELECT query := `SELECT
f.id, f.feed_url, f.site_url, f.title, f.etag_header, f.last_modified_header, f.id, f.feed_url, f.site_url, f.title, f.etag_header, f.last_modified_header,
@ -130,8 +122,6 @@ func (s *Storage) Feeds(userID int64) (model.Feeds, error) {
// FeedByID returns a feed by the ID. // FeedByID returns a feed by the ID.
func (s *Storage) FeedByID(userID, feedID int64) (*model.Feed, error) { func (s *Storage) FeedByID(userID, feedID int64) (*model.Feed, error) {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:FeedByID] feedID=%d", feedID))
var feed model.Feed var feed model.Feed
var iconID interface{} var iconID interface{}
var tz string var tz string
@ -193,7 +183,6 @@ func (s *Storage) FeedByID(userID, feedID int64) (*model.Feed, error) {
// CreateFeed creates a new feed. // CreateFeed creates a new feed.
func (s *Storage) CreateFeed(feed *model.Feed) error { func (s *Storage) CreateFeed(feed *model.Feed) error {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:CreateFeed] feedURL=%s", feed.FeedURL))
sql := ` sql := `
INSERT INTO feeds INSERT INTO feeds
(feed_url, site_url, title, category_id, user_id, etag_header, last_modified_header, crawler, user_agent, username, password) (feed_url, site_url, title, category_id, user_id, etag_header, last_modified_header, crawler, user_agent, username, password)
@ -233,8 +222,6 @@ func (s *Storage) CreateFeed(feed *model.Feed) error {
// UpdateFeed updates an existing feed. // UpdateFeed updates an existing feed.
func (s *Storage) UpdateFeed(feed *model.Feed) (err error) { func (s *Storage) UpdateFeed(feed *model.Feed) (err error) {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:UpdateFeed] feedURL=%s", feed.FeedURL))
query := `UPDATE feeds SET query := `UPDATE feeds SET
feed_url=$1, site_url=$2, title=$3, category_id=$4, etag_header=$5, last_modified_header=$6, checked_at=$7, feed_url=$1, site_url=$2, title=$3, category_id=$4, etag_header=$5, last_modified_header=$6, checked_at=$7,
parsing_error_msg=$8, parsing_error_count=$9, scraper_rules=$10, rewrite_rules=$11, crawler=$12, user_agent=$13, parsing_error_msg=$8, parsing_error_count=$9, scraper_rules=$10, rewrite_rules=$11, crawler=$12, user_agent=$13,
@ -270,8 +257,6 @@ func (s *Storage) UpdateFeed(feed *model.Feed) (err error) {
// UpdateFeedError updates feed errors. // UpdateFeedError updates feed errors.
func (s *Storage) UpdateFeedError(feed *model.Feed) (err error) { func (s *Storage) UpdateFeedError(feed *model.Feed) (err error) {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:UpdateFeedError] feedID=%d", feed.ID))
query := ` query := `
UPDATE feeds UPDATE feeds
SET SET
@ -297,8 +282,6 @@ func (s *Storage) UpdateFeedError(feed *model.Feed) (err error) {
// RemoveFeed removes a feed. // RemoveFeed removes a feed.
func (s *Storage) RemoveFeed(userID, feedID int64) error { func (s *Storage) RemoveFeed(userID, feedID int64) error {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:RemoveFeed] userID=%d, feedID=%d", userID, feedID))
result, err := s.db.Exec("DELETE FROM feeds WHERE id = $1 AND user_id = $2", feedID, userID) result, err := s.db.Exec("DELETE FROM feeds WHERE id = $1 AND user_id = $2", feedID, userID)
if err != nil { if err != nil {
return fmt.Errorf("unable to remove feed #%d: %v", feedID, err) return fmt.Errorf("unable to remove feed #%d: %v", feedID, err)

12
storage/icon.go
View file

@ -8,10 +8,8 @@ import (
"database/sql" "database/sql"
"fmt" "fmt"
"strings" "strings"
"time"
"miniflux.app/model" "miniflux.app/model"
"miniflux.app/timer"
) )
// HasIcon checks if the given feed has an icon. // HasIcon checks if the given feed has an icon.
@ -24,8 +22,6 @@ func (s *Storage) HasIcon(feedID int64) bool {
// IconByID returns an icon by the ID. // IconByID returns an icon by the ID.
func (s *Storage) IconByID(iconID int64) (*model.Icon, error) { func (s *Storage) IconByID(iconID int64) (*model.Icon, error) {
defer timer.ExecutionTime(time.Now(), "[Storage:IconByID]")
var icon model.Icon var icon model.Icon
query := `SELECT id, hash, mime_type, content FROM icons WHERE id=$1` query := `SELECT id, hash, mime_type, content FROM icons WHERE id=$1`
err := s.db.QueryRow(query, iconID).Scan(&icon.ID, &icon.Hash, &icon.MimeType, &icon.Content) err := s.db.QueryRow(query, iconID).Scan(&icon.ID, &icon.Hash, &icon.MimeType, &icon.Content)
@ -40,7 +36,6 @@ func (s *Storage) IconByID(iconID int64) (*model.Icon, error) {
// IconByFeedID returns a feed icon. // IconByFeedID returns a feed icon.
func (s *Storage) IconByFeedID(userID, feedID int64) (*model.Icon, error) { func (s *Storage) IconByFeedID(userID, feedID int64) (*model.Icon, error) {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:IconByFeedID] userID=%d, feedID=%d", userID, feedID))
query := ` query := `
SELECT SELECT
icons.id, icons.hash, icons.mime_type, icons.content icons.id, icons.hash, icons.mime_type, icons.content
@ -62,8 +57,6 @@ func (s *Storage) IconByFeedID(userID, feedID int64) (*model.Icon, error) {
// IconByHash returns an icon by the hash (checksum). // IconByHash returns an icon by the hash (checksum).
func (s *Storage) IconByHash(icon *model.Icon) error { func (s *Storage) IconByHash(icon *model.Icon) error {
defer timer.ExecutionTime(time.Now(), "[Storage:IconByHash]")
err := s.db.QueryRow(`SELECT id FROM icons WHERE hash=$1`, icon.Hash).Scan(&icon.ID) err := s.db.QueryRow(`SELECT id FROM icons WHERE hash=$1`, icon.Hash).Scan(&icon.ID)
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
return nil return nil
@ -76,8 +69,6 @@ func (s *Storage) IconByHash(icon *model.Icon) error {
// CreateIcon creates a new icon. // CreateIcon creates a new icon.
func (s *Storage) CreateIcon(icon *model.Icon) error { func (s *Storage) CreateIcon(icon *model.Icon) error {
defer timer.ExecutionTime(time.Now(), "[Storage:CreateIcon]")
query := ` query := `
INSERT INTO icons INSERT INTO icons
(hash, mime_type, content) (hash, mime_type, content)
@ -101,8 +92,6 @@ func (s *Storage) CreateIcon(icon *model.Icon) error {
// CreateFeedIcon creates an icon and associate the icon to the given feed. // CreateFeedIcon creates an icon and associate the icon to the given feed.
func (s *Storage) CreateFeedIcon(feedID int64, icon *model.Icon) error { func (s *Storage) CreateFeedIcon(feedID int64, icon *model.Icon) error {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:CreateFeedIcon] feedID=%d", feedID))
err := s.IconByHash(icon) err := s.IconByHash(icon)
if err != nil { if err != nil {
return err return err
@ -125,7 +114,6 @@ func (s *Storage) CreateFeedIcon(feedID int64, icon *model.Icon) error {
// Icons returns all icons tht belongs to a user. // Icons returns all icons tht belongs to a user.
func (s *Storage) Icons(userID int64) (model.Icons, error) { func (s *Storage) Icons(userID int64) (model.Icons, error) {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:Icons] userID=%d", userID))
query := ` query := `
SELECT SELECT
icons.id, icons.hash, icons.mime_type, icons.content icons.id, icons.hash, icons.mime_type, icons.content

5
storage/job.go
View file

@ -6,17 +6,14 @@ package storage // import "miniflux.app/storage"
import ( import (
"fmt" "fmt"
"time"
"miniflux.app/model" "miniflux.app/model"
"miniflux.app/timer"
) )
const maxParsingError = 3 const maxParsingError = 3
// NewBatch returns a serie of jobs. // NewBatch returns a serie of jobs.
func (s *Storage) NewBatch(batchSize int) (jobs model.JobList, err error) { func (s *Storage) NewBatch(batchSize int) (jobs model.JobList, err error) {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:GetJobs] batchSize=%d", batchSize))
query := ` query := `
SELECT SELECT
id, user_id id, user_id
@ -29,8 +26,6 @@ func (s *Storage) NewBatch(batchSize int) (jobs model.JobList, err error) {
// NewUserBatch returns a serie of jobs but only for a given user. // NewUserBatch returns a serie of jobs but only for a given user.
func (s *Storage) NewUserBatch(userID int64, batchSize int) (jobs model.JobList, err error) { func (s *Storage) NewUserBatch(userID int64, batchSize int) (jobs model.JobList, err error) {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:GetUserJobs] batchSize=%d, userID=%d", batchSize, userID))
// We do not take the error counter into consideration when the given // We do not take the error counter into consideration when the given
// user refresh manually all his feeds to force a refresh. // user refresh manually all his feeds to force a refresh.
query := ` query := `

4
storage/timezone.go
View file

@ -7,14 +7,10 @@ package storage // import "miniflux.app/storage"
import ( import (
"fmt" "fmt"
"strings" "strings"
"time"
"miniflux.app/timer"
) )
// Timezones returns all timezones supported by the database. // Timezones returns all timezones supported by the database.
func (s *Storage) Timezones() (map[string]string, error) { func (s *Storage) Timezones() (map[string]string, error) {
defer timer.ExecutionTime(time.Now(), "[Storage:Timezones]")
timezones := make(map[string]string) timezones := make(map[string]string)
rows, err := s.db.Query(`SELECT name FROM pg_timezone_names() ORDER BY name ASC`) rows, err := s.db.Query(`SELECT name FROM pg_timezone_names() ORDER BY name ASC`)
if err != nil { if err != nil {

19
storage/user.go
View file

@ -9,10 +9,8 @@ import (
"errors" "errors"
"fmt" "fmt"
"strings" "strings"
"time"
"miniflux.app/model" "miniflux.app/model"
"miniflux.app/timer"
"github.com/lib/pq/hstore" "github.com/lib/pq/hstore"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
@ -20,7 +18,6 @@ import (
// SetLastLogin updates the last login date of a user. // SetLastLogin updates the last login date of a user.
func (s *Storage) SetLastLogin(userID int64) error { func (s *Storage) SetLastLogin(userID int64) error {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:SetLastLogin] userID=%d", userID))
query := "UPDATE users SET last_login_at=now() WHERE id=$1" query := "UPDATE users SET last_login_at=now() WHERE id=$1"
_, err := s.db.Exec(query, userID) _, err := s.db.Exec(query, userID)
if err != nil { if err != nil {
@ -32,8 +29,6 @@ func (s *Storage) SetLastLogin(userID int64) error {
// UserExists checks if a user exists by using the given username. // UserExists checks if a user exists by using the given username.
func (s *Storage) UserExists(username string) bool { func (s *Storage) UserExists(username string) bool {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:UserExists] username=%s", username))
var result int var result int
s.db.QueryRow(`SELECT count(*) as c FROM users WHERE username=LOWER($1)`, username).Scan(&result) s.db.QueryRow(`SELECT count(*) as c FROM users WHERE username=LOWER($1)`, username).Scan(&result)
return result >= 1 return result >= 1
@ -41,8 +36,6 @@ func (s *Storage) UserExists(username string) bool {
// AnotherUserExists checks if another user exists with the given username. // AnotherUserExists checks if another user exists with the given username.
func (s *Storage) AnotherUserExists(userID int64, username string) bool { func (s *Storage) AnotherUserExists(userID int64, username string) bool {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:AnotherUserExists] userID=%d, username=%s", userID, username))
var result int var result int
s.db.QueryRow(`SELECT count(*) as c FROM users WHERE id != $1 AND username=LOWER($2)`, userID, username).Scan(&result) s.db.QueryRow(`SELECT count(*) as c FROM users WHERE id != $1 AND username=LOWER($2)`, userID, username).Scan(&result)
return result >= 1 return result >= 1
@ -50,7 +43,6 @@ func (s *Storage) AnotherUserExists(userID int64, username string) bool {
// CreateUser creates a new user. // CreateUser creates a new user.
func (s *Storage) CreateUser(user *model.User) (err error) { func (s *Storage) CreateUser(user *model.User) (err error) {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:CreateUser] username=%s", user.Username))
password := "" password := ""
extra := hstore.Hstore{Map: make(map[string]sql.NullString)} extra := hstore.Hstore{Map: make(map[string]sql.NullString)}
@ -117,8 +109,6 @@ func (s *Storage) RemoveExtraField(userID int64, field string) error {
// UpdateUser updates a user. // UpdateUser updates a user.
func (s *Storage) UpdateUser(user *model.User) error { func (s *Storage) UpdateUser(user *model.User) error {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:UpdateUser] userID=%d", user.ID))
if user.Password != "" { if user.Password != "" {
hashedPassword, err := hashPassword(user.Password) hashedPassword, err := hashPassword(user.Password)
if err != nil { if err != nil {
@ -190,7 +180,6 @@ func (s *Storage) UpdateUser(user *model.User) error {
// UserLanguage returns the language of the given user. // UserLanguage returns the language of the given user.
func (s *Storage) UserLanguage(userID int64) (language string) { func (s *Storage) UserLanguage(userID int64) (language string) {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:UserLanguage] userID=%d", userID))
err := s.db.QueryRow(`SELECT language FROM users WHERE id = $1`, userID).Scan(&language) err := s.db.QueryRow(`SELECT language FROM users WHERE id = $1`, userID).Scan(&language)
if err != nil { if err != nil {
return "en_US" return "en_US"
@ -201,7 +190,6 @@ func (s *Storage) UserLanguage(userID int64) (language string) {
// UserByID finds a user by the ID. // UserByID finds a user by the ID.
func (s *Storage) UserByID(userID int64) (*model.User, error) { func (s *Storage) UserByID(userID int64) (*model.User, error) {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:UserByID] userID=%d", userID))
query := ` query := `
SELECT SELECT
id, username, is_admin, theme, language, timezone, entry_direction, keyboard_shortcuts, id, username, is_admin, theme, language, timezone, entry_direction, keyboard_shortcuts,
@ -217,7 +205,6 @@ func (s *Storage) UserByID(userID int64) (*model.User, error) {
// UserByUsername finds a user by the username. // UserByUsername finds a user by the username.
func (s *Storage) UserByUsername(username string) (*model.User, error) { func (s *Storage) UserByUsername(username string) (*model.User, error) {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:UserByUsername] username=%s", username))
query := ` query := `
SELECT SELECT
id, username, is_admin, theme, language, timezone, entry_direction, keyboard_shortcuts, id, username, is_admin, theme, language, timezone, entry_direction, keyboard_shortcuts,
@ -233,7 +220,6 @@ func (s *Storage) UserByUsername(username string) (*model.User, error) {
// UserByExtraField finds a user by an extra field value. // UserByExtraField finds a user by an extra field value.
func (s *Storage) UserByExtraField(field, value string) (*model.User, error) { func (s *Storage) UserByExtraField(field, value string) (*model.User, error) {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:UserByExtraField] field=%s", field))
query := ` query := `
SELECT SELECT
id, username, is_admin, theme, language, timezone, entry_direction, keyboard_shortcuts, id, username, is_admin, theme, language, timezone, entry_direction, keyboard_shortcuts,
@ -281,8 +267,6 @@ func (s *Storage) fetchUser(query string, args ...interface{}) (*model.User, err
// RemoveUser deletes a user. // RemoveUser deletes a user.
func (s *Storage) RemoveUser(userID int64) error { func (s *Storage) RemoveUser(userID int64) error {
defer timer.ExecutionTime(time.Now(), fmt.Sprintf("[Storage:RemoveUser] userID=%d", userID))
result, err := s.db.Exec("DELETE FROM users WHERE id = $1", userID) result, err := s.db.Exec("DELETE FROM users WHERE id = $1", userID)
if err != nil { if err != nil {
return fmt.Errorf("unable to remove this user: %v", err) return fmt.Errorf("unable to remove this user: %v", err)
@ -302,7 +286,6 @@ func (s *Storage) RemoveUser(userID int64) error {
// Users returns all users. // Users returns all users.
func (s *Storage) Users() (model.Users, error) { func (s *Storage) Users() (model.Users, error) {
defer timer.ExecutionTime(time.Now(), "[Storage:Users]")
query := ` query := `
SELECT SELECT
id, username, is_admin, theme, language, timezone, entry_direction, keyboard_shortcuts, id, username, is_admin, theme, language, timezone, entry_direction, keyboard_shortcuts,
@ -353,8 +336,6 @@ func (s *Storage) Users() (model.Users, error) {
// CheckPassword validate the hashed password. // CheckPassword validate the hashed password.
func (s *Storage) CheckPassword(username, password string) error { func (s *Storage) CheckPassword(username, password string) error {
defer timer.ExecutionTime(time.Now(), "[Storage:CheckPassword]")
var hash string var hash string
username = strings.ToLower(username) username = strings.ToLower(username)