Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 12:24:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

Speed up tag count queries (#570)

Browse Source 
* Speed up tag count queries
* Add test for marker CountByTagID

Co-authored-by: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
This commit is contained in:
InfiniteTF
2020-05-24 08:18:02 +02:00
committed by GitHub
parent 95a6d3ea2f
commit 32fce9ac6f
3 changed files with 37 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/models/querybuilder_scene.go
View File

@@ -35,10 +35,10 @@ WHERE movies_join.movie_id = ?
GROUP BY scenes.id GROUP BY scenes.id
` `
var scenesForTagQuery = selectAll(sceneTable) + ` var countScenesForTagQuery = `
LEFT JOIN scenes_tags as tags_join on tags_join.scene_id = scenes.id SELECT tag_id AS id FROM scenes_tags
WHERE tags_join.tag_id = ? WHERE scenes_tags.tag_id = ?
GROUP BY scenes.id GROUP BY scenes_tags.scene_id
` `
type SceneQueryBuilder struct{} type SceneQueryBuilder struct{}
@@ -212,7 +212,7 @@ func (qb *SceneQueryBuilder) CountByStudioID(studioID int) (int, error) {
func (qb *SceneQueryBuilder) CountByTagID(tagID int) (int, error) { func (qb *SceneQueryBuilder) CountByTagID(tagID int) (int, error) {
args := []interface{}{tagID} args := []interface{}{tagID}
return runCountQuery(buildCountQuery(scenesForTagQuery), args) return runCountQuery(buildCountQuery(countScenesForTagQuery), args)
} }
func (qb *SceneQueryBuilder) Wall(q *string) ([]*Scene, error) { func (qb *SceneQueryBuilder) Wall(q *string) ([]*Scene, error) {

10
pkg/models/querybuilder_scene_marker.go
View File

@@ -7,12 +7,10 @@ import (
"strconv" "strconv"
) )
const sceneMarkersForTagQuery = ` const countSceneMarkersForTagQuery = `
SELECT scene_markers.* FROM scene_markers SELECT scene_markers.id FROM scene_markers
LEFT JOIN scene_markers_tags as tags_join on tags_join.scene_marker_id = scene_markers.id LEFT JOIN scene_markers_tags as tags_join on tags_join.scene_marker_id = scene_markers.id
LEFT JOIN tags on tags_join.tag_id = tags.id WHERE tags_join.tag_id = ? OR scene_markers.primary_tag_id = ?
LEFT JOIN tags AS ptj ON ptj.id = scene_markers.primary_tag_id
WHERE tags.id = ? OR ptj.id = ?
GROUP BY scene_markers.id GROUP BY scene_markers.id
` `
@@ -87,7 +85,7 @@ func (qb *SceneMarkerQueryBuilder) FindBySceneID(sceneID int, tx *sqlx.Tx) ([]*S
func (qb *SceneMarkerQueryBuilder) CountByTagID(tagID int) (int, error) { func (qb *SceneMarkerQueryBuilder) CountByTagID(tagID int) (int, error) {
args := []interface{}{tagID, tagID} args := []interface{}{tagID, tagID}
return runCountQuery(buildCountQuery(sceneMarkersForTagQuery), args) return runCountQuery(buildCountQuery(countSceneMarkersForTagQuery), args)
} }
func (qb *SceneMarkerQueryBuilder) GetMarkerStrings(q *string, sort *string) ([]*MarkerStringsResultType, error) { func (qb *SceneMarkerQueryBuilder) GetMarkerStrings(q *string, sort *string) ([]*MarkerStringsResultType, error) {

29
pkg/models/querybuilder_scene_marker_test.go
View File

@@ -32,10 +32,37 @@ func TestMarkerFindBySceneID(t *testing.T) {
assert.Len(t, markers, 0) assert.Len(t, markers, 0)
} }
func TestMarkerCountByTagID(t *testing.T) {
mqb := models.NewSceneMarkerQueryBuilder()
markerCount, err := mqb.CountByTagID(tagIDs[tagIdxWithPrimaryMarker])
if err != nil {
t.Fatalf("error calling CountByTagID: %s", err.Error())
}
assert.Equal(t, 1, markerCount)
markerCount, err = mqb.CountByTagID(tagIDs[tagIdxWithMarker])
if err != nil {
t.Fatalf("error calling CountByTagID: %s", err.Error())
}
assert.Equal(t, 1, markerCount)
markerCount, err = mqb.CountByTagID(0)
if err != nil {
t.Fatalf("error calling CountByTagID: %s", err.Error())
}
assert.Equal(t, 0, markerCount)
}
// TODO Update // TODO Update
// TODO Destroy // TODO Destroy
// TODO Find // TODO Find
// TODO CountByTagID
// TODO GetMarkerStrings // TODO GetMarkerStrings
// TODO Wall // TODO Wall
// TODO Query // TODO Query