NPO-Accounting/conservancy_beancount Changeset - b599ddee5de9

Changeset - b599ddee5de9

Parent rev.

Child rev.

[Not reviewed]

0 1 0

Brett Smith - 3 years ago 2021-03-06 14:33:10
brettcsmith@brettcsmith.org

query: Skip rewrite rule logic when none are loaded.

This saves a few seconds of load time for the user on each run and is easy
to implement, so it's worth it.

1 file changed with 15 insertions and 11 deletions:

conservancy_beancount/reports/query.py

0 comments (0 inline, 0 general)

conservancy_beancount/reports/query.py

➞

Show inline comments

@@ ... / @@ -38,108 +38,112 @@ from ..beancount_types import ( @@
 from decimal import Decimal
 from pathlib import Path
 import beancount.query.numberify as bc_query_numberify
 import beancount.query.query_compile as bc_query_compile
 import beancount.query.query_env as bc_query_env
 import beancount.query.query_execute as bc_query_execute
 import beancount.query.query_parser as bc_query_parser
 import beancount.query.query_render as bc_query_render
 import beancount.query.shell as bc_query_shell
 from . import core
 from . import rewrite
 from .. import books
 from .. import cliutil
 from .. import config as configmod
 from .. import data
 BUILTIN_FIELDS: AbstractSet[str] = frozenset(itertools.chain(
     bc_query_env.TargetsEnvironment.columns,  # type:ignore[has-type]
     bc_query_env.TargetsEnvironment.functions,  # type:ignore[has-type]
 ))
 PROGNAME = 'query-report'
 QUERY_PARSER = bc_query_parser.Parser()
 logger = logging.getLogger('conservancy_beancount.reports.query')
 RowTypes = Sequence[Tuple[str, Type]]
 Rows = Sequence[NamedTuple]
 class BooksLoader:
     """Closure to load books with a zero-argument callable
     This matches the load interface that BQLShell expects.
     """
     def __init__(
             self,
             books_loader: Optional[books.Loader],
             start_date: Optional[datetime.date]=None,
             stop_date: Optional[datetime.date]=None,
             rewrite_rules: Sequence[rewrite.RewriteRuleset]=(),
     ) -> None:
         self.books_loader = books_loader
         self.start_date = start_date
         self.stop_date = stop_date
         self.rewrite_rules = rewrite_rules
     def __call__(self) -> books.LoadResult:
         logger.debug("BooksLoader called")
         result = books.Loader.dispatch(self.books_loader, self.start_date, self.stop_date)
         for index, entry in enumerate(result.entries):
             # entry might not be a Transaction; we catch that later.
             # The type ignores are because the underlying Beancount type isn't
             # type-checkable.
             postings = data.Posting.from_txn(entry)  # type:ignore[arg-type]
             for ruleset in self.rewrite_rules:
                 postings = ruleset.rewrite(postings)
             try:
                 result.entries[index] = entry._replace(postings=list(postings))  # type:ignore[call-arg]
             except AttributeError:
                 pass
         logger.debug("books loaded from Beancount")
         if self.rewrite_rules:
             for index, entry in enumerate(result.entries):
                 # entry might not be a Transaction; we catch that later.
                 # The type ignores are because the underlying Beancount type isn't
                 # type-checkable.
                 postings = data.Posting.from_txn(entry)  # type:ignore[arg-type]
                 for ruleset in self.rewrite_rules:
                     postings = ruleset.rewrite(postings)
                 try:
                     result.entries[index] = entry._replace(postings=list(postings))  # type:ignore[call-arg]
                 except AttributeError:
                     pass
             logger.debug("rewrite rules applied")
         return result
 class BQLShell(bc_query_shell.BQLShell):
     def on_Select(self, statement: str) -> None:
         output_format: str = self.vars['format']
         try:
             render_func = getattr(self, f'_render_{output_format}')
         except AttributeError:
             logger.error("unknown output format %r", output_format)
             return
         try:
             logger.debug("compiling query")
             compiled_query = bc_query_compile.compile(
                 statement, self.env_targets, self.env_postings, self.env_entries,
+            )
             logger.debug("executing query")
             row_types, rows = bc_query_execute.execute_query(
                 compiled_query, self.entries, self.options_map,
+            )
             if self.vars['numberify'] and output_format != 'ods':
                 logger.debug("numberifying query")
                 row_types, rows = bc_query_numberify.numberify_results(
                     row_types, rows, self.options_map['dcontext'].build(),
+                )
         except Exception as error:
             logger.error(str(error), exc_info=logger.isEnabledFor(logging.DEBUG))
             return
         if not rows and output_format != 'ods':
             print("(empty)", file=self.outfile)
         else:
             logger.debug("rendering query as %s", output_format)
             render_func(row_types, rows)
     def _render_csv(self, row_types: RowTypes, rows: Rows) -> None:
         bc_query_render.render_csv(
             row_types,
             rows,
             self.options_map['dcontext'],
             self.outfile,
             self.vars['expand'],
+        )
     def _render_text(self, row_types: RowTypes, rows: Rows) -> None:
         with contextlib.ExitStack() as stack:
             if self.is_interactive:

0 comments (0 inline, 0 general)