From 5e4dc87ffec7f87bbf3ebfcf256777ad773e8450 Mon Sep 17 00:00:00 2001
From: Michael Muré <batolettre@gmail.com>
Date: Sat, 14 Mar 2020 16:47:38 +0100
Subject: cache: replace the all-in-one query parser by a complete one with
 AST/lexer/parser

---
 cache/repo_cache.go | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'cache/repo_cache.go')

diff --git a/cache/repo_cache.go b/cache/repo_cache.go
index d859a966..6546b15e 100644
--- a/cache/repo_cache.go
+++ b/cache/repo_cache.go
@@ -18,6 +18,7 @@ import (
 	"github.com/MichaelMure/git-bug/bug"
 	"github.com/MichaelMure/git-bug/entity"
 	"github.com/MichaelMure/git-bug/identity"
+	"github.com/MichaelMure/git-bug/query/ast"
 	"github.com/MichaelMure/git-bug/repository"
 	"github.com/MichaelMure/git-bug/util/git"
 	"github.com/MichaelMure/git-bug/util/process"
@@ -525,7 +526,7 @@ func (c *RepoCache) resolveBugMatcher(f func(*BugExcerpt) bool) (entity.Id, erro
 }
 
 // QueryBugs return the id of all Bug matching the given Query
-func (c *RepoCache) QueryBugs(query *Query) []entity.Id {
+func (c *RepoCache) QueryBugs(query *ast.Query) []entity.Id {
 	c.muBug.RLock()
 	defer c.muBug.RUnlock()
 
@@ -533,10 +534,12 @@ func (c *RepoCache) QueryBugs(query *Query) []entity.Id {
 		return c.AllBugsIds()
 	}
 
+	matcher := compileMatcher(query.Filters)
+
 	var filtered []*BugExcerpt
 
 	for _, excerpt := range c.bugExcerpts {
-		if query.Match(excerpt, c) {
+		if matcher.Match(excerpt, c) {
 			filtered = append(filtered, excerpt)
 		}
 	}
@@ -544,18 +547,23 @@ func (c *RepoCache) QueryBugs(query *Query) []entity.Id {
 	var sorter sort.Interface
 
 	switch query.OrderBy {
-	case OrderById:
+	case ast.OrderById:
 		sorter = BugsById(filtered)
-	case OrderByCreation:
+	case ast.OrderByCreation:
 		sorter = BugsByCreationTime(filtered)
-	case OrderByEdit:
+	case ast.OrderByEdit:
 		sorter = BugsByEditTime(filtered)
 	default:
 		panic("missing sort type")
 	}
 
-	if query.OrderDirection == OrderDescending {
+	switch query.OrderDirection {
+	case ast.OrderAscending:
+		// Nothing to do
+	case ast.OrderDescending:
 		sorter = sort.Reverse(sorter)
+	default:
+		panic("missing sort direction")
 	}
 
 	sort.Sort(sorter)
-- 
cgit 


From 314fcbb2293d869c33d6a76aedd148aedff6561d Mon Sep 17 00:00:00 2001
From: Michael Muré <batolettre@gmail.com>
Date: Sun, 22 Mar 2020 13:53:34 +0100
Subject: query: no need for an ast package

---
 cache/repo_cache.go | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'cache/repo_cache.go')

diff --git a/cache/repo_cache.go b/cache/repo_cache.go
index 6546b15e..f2e1c7d0 100644
--- a/cache/repo_cache.go
+++ b/cache/repo_cache.go
@@ -18,7 +18,7 @@ import (
 	"github.com/MichaelMure/git-bug/bug"
 	"github.com/MichaelMure/git-bug/entity"
 	"github.com/MichaelMure/git-bug/identity"
-	"github.com/MichaelMure/git-bug/query/ast"
+	"github.com/MichaelMure/git-bug/query"
 	"github.com/MichaelMure/git-bug/repository"
 	"github.com/MichaelMure/git-bug/util/git"
 	"github.com/MichaelMure/git-bug/util/process"
@@ -526,15 +526,15 @@ func (c *RepoCache) resolveBugMatcher(f func(*BugExcerpt) bool) (entity.Id, erro
 }
 
 // QueryBugs return the id of all Bug matching the given Query
-func (c *RepoCache) QueryBugs(query *ast.Query) []entity.Id {
+func (c *RepoCache) QueryBugs(q *query.Query) []entity.Id {
 	c.muBug.RLock()
 	defer c.muBug.RUnlock()
 
-	if query == nil {
+	if q == nil {
 		return c.AllBugsIds()
 	}
 
-	matcher := compileMatcher(query.Filters)
+	matcher := compileMatcher(q.Filters)
 
 	var filtered []*BugExcerpt
 
@@ -546,21 +546,21 @@ func (c *RepoCache) QueryBugs(query *ast.Query) []entity.Id {
 
 	var sorter sort.Interface
 
-	switch query.OrderBy {
-	case ast.OrderById:
+	switch q.OrderBy {
+	case query.OrderById:
 		sorter = BugsById(filtered)
-	case ast.OrderByCreation:
+	case query.OrderByCreation:
 		sorter = BugsByCreationTime(filtered)
-	case ast.OrderByEdit:
+	case query.OrderByEdit:
 		sorter = BugsByEditTime(filtered)
 	default:
 		panic("missing sort type")
 	}
 
-	switch query.OrderDirection {
-	case ast.OrderAscending:
+	switch q.OrderDirection {
+	case query.OrderAscending:
 		// Nothing to do
-	case ast.OrderDescending:
+	case query.OrderDescending:
 		sorter = sort.Reverse(sorter)
 	default:
 		panic("missing sort direction")
-- 
cgit