jiri/org-ql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change: (org-ql-query) Call --select-cached with query, not pred

Browse source 
Since we will be pre-processing and modifying the query, the predicate
may not correspond exactly to the query, so we should key the cache on
the original query.
This commit is contained in:
Adam Porter 2019-07-16 09:31:48 -05:00
parent 014e0f1388
commit 3adaf4e5fc
1 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
org-ql.el
View file

@ -209,7 +209,7 @@ a list of defined `org-ql' sorting methods: `date', `deadline',
(--map (with-current-buffer it
(unless (derived-mode-p 'org-mode)
(user-error "Not an Org buffer: %s" (buffer-name)))
(org-ql--select-cached :predicate predicate :action action :narrow narrow)))
(org-ql--select-cached :query query :predicate predicate :action action :narrow narrow)))
;; Flatten items
(-flatten-n 1))))
;; Sort items
@ -230,11 +230,13 @@ a list of defined `org-ql' sorting methods: `date', `deadline',
"Return results for ARGS and current buffer using cache."
;; MAYBE: Timeout cached queries. Probably not necessarily since they will be removed when a
;; buffer is closed, or when a query is run after modifying a buffer.
(-let (((&plist :query query :action action :narrow narrow) args))
(if-let* ((buffer-cache (gethash (current-buffer) org-ql-cache))
(query-cache (cadr buffer-cache))
(modified-tick (car buffer-cache))
(buffer-unmodified-p (eq (buffer-modified-tick) modified-tick))
(cached-result (gethash args query-cache)))
(cache-key (list query action narrow))
(cached-result (gethash cache-key query-cache)))
(pcase cached-result
('org-ql-nil nil)
(_ cached-result))
@ -248,9 +250,9 @@ a list of defined `org-ql' sorting methods: `date', `deadline',
table))
org-ql-cache))
(t (puthash args (or new-result 'org-ql-nil) query-cache)))
new-result)))
new-result))))
(cl-defun org-ql--select (&key predicate action narrow)
(cl-defun org-ql--select (&key predicate action narrow &allow-other-keys)
"Return results of mapping function ACTION across entries in current buffer matching function PREDICATE.
If NARROW is non-nil, buffer will not be widened."
;; Since the mappings are stored in the variable `org-ql-predicates', macros like `flet'