From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [RFC Patch 2/2] lib: Let Xapian manage the memory for FieldProcessors
Date: Sat, 28 Jan 2017 09:15:21 -0400 [thread overview]
Message-ID: <20170128131521.26414-3-david@tethera.net> (raw)
In-Reply-To: <20170128131521.26414-1-david@tethera.net>
It turns out this is exactly what release() is for; Xapian will
deallocate the objects when it's done with them.
---
lib/database-private.h | 4 ----
lib/database.cc | 19 ++++++++-----------
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/lib/database-private.h b/lib/database-private.h
index 32357ce0..3eac3c7e 100644
--- a/lib/database-private.h
+++ b/lib/database-private.h
@@ -194,10 +194,6 @@ struct _notmuch_database {
Xapian::TermGenerator *term_gen;
Xapian::ValueRangeProcessor *value_range_processor;
Xapian::ValueRangeProcessor *date_range_processor;
-#if HAVE_XAPIAN_FIELD_PROCESSOR
- Xapian::FieldProcessor *date_field_processor;
- Xapian::FieldProcessor *query_field_processor;
-#endif
Xapian::ValueRangeProcessor *last_mod_range_processor;
};
diff --git a/lib/database.cc b/lib/database.cc
index b98468a6..c1563ca7 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -1029,10 +1029,14 @@ notmuch_database_open_verbose (const char *path,
#if HAVE_XAPIAN_FIELD_PROCESSOR
/* This currently relies on the query parser to pass anything
* with a .. to the range processor */
- notmuch->date_field_processor = new DateFieldProcessor();
- notmuch->query_parser->add_boolean_prefix("date", notmuch->date_field_processor);
- notmuch->query_field_processor = new QueryFieldProcessor (*notmuch->query_parser, notmuch);
- notmuch->query_parser->add_boolean_prefix("query", notmuch->query_field_processor);
+ {
+ Xapian::FieldProcessor * date_fp = new DateFieldProcessor();
+ Xapian::FieldProcessor * query_fp =
+ new QueryFieldProcessor (*notmuch->query_parser, notmuch);
+
+ notmuch->query_parser->add_boolean_prefix("date", date_fp->release ());
+ notmuch->query_parser->add_boolean_prefix("query", query_fp->release ());
+ }
#endif
notmuch->last_mod_range_processor = new Xapian::NumberValueRangeProcessor (NOTMUCH_VALUE_LAST_MOD, "lastmod:");
@@ -1125,13 +1129,6 @@ notmuch_database_close (notmuch_database_t *notmuch)
delete notmuch->last_mod_range_processor;
notmuch->last_mod_range_processor = NULL;
-#if HAVE_XAPIAN_FIELD_PROCESSOR
- delete notmuch->date_field_processor;
- notmuch->date_field_processor = NULL;
- delete notmuch->query_field_processor;
- notmuch->query_field_processor = NULL;
-#endif
-
return status;
}
--
2.11.0
next prev parent reply other threads:[~2017-01-28 13:15 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-28 13:15 library prefix / field processor cleanup David Bremner
2017-01-28 13:15 ` [RFC Patch 1/2] lib: merge internal prefix tables David Bremner
2017-01-29 10:14 ` Jani Nikula
2017-01-28 13:15 ` David Bremner [this message]
2017-01-29 10:46 ` [RFC Patch 2/2] lib: Let Xapian manage the memory for FieldProcessors Jani Nikula
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170128131521.26414-3-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).