lib: Let Xapian manage the memory for FieldProcessors
authorDavid Bremner <david@tethera.net>
Fri, 17 Feb 2017 03:07:50 +0000 (23:07 -0400)
committerDavid Bremner <david@tethera.net>
Sun, 19 Feb 2017 02:18:06 +0000 (22:18 -0400)
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
lib/database.cc

index 67d985700934e216a964450c1ba017995ce8b4f0..2fb60f5ef3ac9e941ebf3112cae997872f143a47 100644 (file)
@@ -211,10 +211,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;
 };
 
index b954b34cc3be57fd76fe182753f10849685e6371..8016c4df3d167c2c6fd30dbbe5e3ba66dd3fbffc 100644 (file)
@@ -1030,10 +1030,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:");
 
@@ -1126,13 +1130,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;
 }