X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=lib%2Fdatabase.cc;h=dd1fc6378c48c8b435eab97a0cede52ebc975f0a;hp=6842fafadad86967b4363abd5869a2aeaef345c2;hb=98845fdbb2a4acaa0036f8e2e998e726b18e6b13;hpb=14073b8851067db4dbf5727bf1f5547a66750934

diff --git a/lib/database.cc b/lib/database.cc
index 6842fafa..dd1fc637 100644
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -341,13 +341,20 @@ notmuch_database_find_message (notmuch_database_t *notmuch,
     notmuch_private_status_t status;
     unsigned int doc_id;
 
-    status = _notmuch_database_find_unique_doc_id (notmuch, "id",
-						   message_id, &doc_id);
+    try {
+	status = _notmuch_database_find_unique_doc_id (notmuch, "id",
+						       message_id, &doc_id);
 
-    if (status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND)
-	return NULL;
+	if (status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND)
+	    return NULL;
 
-    return _notmuch_message_create (notmuch, notmuch, doc_id, NULL);
+	return _notmuch_message_create (notmuch, notmuch, doc_id, NULL);
+    } catch (const Xapian::Error &error) {
+	fprintf (stderr, "A Xapian exception occurred finding message: %s.\n",
+		 error.get_msg().c_str());
+	notmuch->exception_reported = TRUE;
+	return NULL;
+    }
 }
 
 /* Advance 'str' past any whitespace or RFC 822 comments. A comment is
@@ -615,6 +622,7 @@ notmuch_database_open (const char *path,
 	    }
 	}
 
+	notmuch->last_doc_id = notmuch->xapian_db->get_lastdocid ();
 	last_thread_id = notmuch->xapian_db->get_metadata ("last_thread_id");
 	if (last_thread_id.empty ()) {
 	    notmuch->last_thread_id = 0;
@@ -1152,7 +1160,39 @@ notmuch_database_get_directory (notmuch_database_t *notmuch,
 {
     notmuch_status_t status;
 
-    return _notmuch_directory_create (notmuch, path, &status);
+    try {
+	return _notmuch_directory_create (notmuch, path, &status);
+    } catch (const Xapian::Error &error) {
+	fprintf (stderr, "A Xapian exception occurred getting directory: %s.\n",
+		 error.get_msg().c_str());
+	notmuch->exception_reported = TRUE;
+	return NULL;
+    }
+}
+
+/* Allocate a document ID that satisfies the following criteria:
+ *
+ * 1. The ID does not exist for any document in the Xapian database
+ *
+ * 2. The ID was not previously returned from this function
+ *
+ * 3. The ID is the smallest integer satisfying (1) and (2)
+ *
+ * This function will trigger an internal error if these constraints
+ * cannot all be satisfied, (that is, the pool of available document
+ * IDs has been exhausted).
+ */
+unsigned int
+_notmuch_database_generate_doc_id (notmuch_database_t *notmuch)
+{
+    assert (notmuch->last_doc_id >= notmuch->xapian_db->get_lastdocid ());
+
+    notmuch->last_doc_id++;
+
+    if (notmuch->last_doc_id == 0)
+	INTERNAL_ERROR ("Xapian document IDs are exhausted.\n");	
+
+    return notmuch->last_doc_id;
 }
 
 static const char *
@@ -1591,7 +1631,7 @@ notmuch_database_add_message (notmuch_database_t *notmuch,
 	_notmuch_message_sync (message);
     } catch (const Xapian::Error &error) {
 	fprintf (stderr, "A Xapian exception occurred adding message: %s.\n",
-		 error.get_description().c_str());
+		 error.get_msg().c_str());
 	notmuch->exception_reported = TRUE;
 	ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
 	goto DONE;
@@ -1616,7 +1656,7 @@ notmuch_database_remove_message (notmuch_database_t *notmuch,
 				 const char *filename)
 {
     Xapian::WritableDatabase *db;
-    void *local = talloc_new (notmuch);
+    void *local;
     const char *prefix = _find_prefix ("file-direntry");
     char *direntry, *term;
     Xapian::PostingIterator i, end;
@@ -1627,37 +1667,47 @@ notmuch_database_remove_message (notmuch_database_t *notmuch,
     if (status)
 	return status;
 
+    local = talloc_new (notmuch);
+
     db = static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db);
 
-    status = _notmuch_database_filename_to_direntry (local, notmuch,
-						     filename, &direntry);
-    if (status)
-	return status;
+    try {
 
-    term = talloc_asprintf (notmuch, "%s%s", prefix, direntry);
+	status = _notmuch_database_filename_to_direntry (local, notmuch,
+							 filename, &direntry);
+	if (status)
+	    return status;
 
-    find_doc_ids_for_term (notmuch, term, &i, &end);
+	term = talloc_asprintf (notmuch, "%s%s", prefix, direntry);
 
-    for ( ; i != end; i++) {
-	Xapian::TermIterator j;
+	find_doc_ids_for_term (notmuch, term, &i, &end);
 
-	document = find_document_for_doc_id (notmuch, *i);
+	for ( ; i != end; i++) {
+	    Xapian::TermIterator j;
 
-	document.remove_term (term);
+	    document = find_document_for_doc_id (notmuch, *i);
 
-	j = document.termlist_begin ();
-	j.skip_to (prefix);
+	    document.remove_term (term);
 
-	/* Was this the last file-direntry in the message? */
-	if (j == document.termlist_end () ||
-	    strncmp ((*j).c_str (), prefix, strlen (prefix)))
-	{
-	    db->delete_document (document.get_docid ());
-	    status = NOTMUCH_STATUS_SUCCESS;
-	} else {
-	    db->replace_document (document.get_docid (), document);
-	    status = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID;
+	    j = document.termlist_begin ();
+	    j.skip_to (prefix);
+
+	    /* Was this the last file-direntry in the message? */
+	    if (j == document.termlist_end () ||
+		strncmp ((*j).c_str (), prefix, strlen (prefix)))
+	    {
+		db->delete_document (document.get_docid ());
+		status = NOTMUCH_STATUS_SUCCESS;
+	    } else {
+		db->replace_document (document.get_docid (), document);
+		status = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID;
+	    }
 	}
+    } catch (const Xapian::Error &error) {
+	fprintf (stderr, "Error: A Xapian exception occurred removing message: %s\n",
+		 error.get_msg().c_str());
+	notmuch->exception_reported = TRUE;
+	status = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
     }
 
     talloc_free (local);
@@ -1703,7 +1753,15 @@ notmuch_tags_t *
 notmuch_database_get_all_tags (notmuch_database_t *db)
 {
     Xapian::TermIterator i, end;
-    i = db->xapian_db->allterms_begin();
-    end = db->xapian_db->allterms_end();
-    return _notmuch_convert_tags(db, i, end);
+
+    try {
+	i = db->xapian_db->allterms_begin();
+	end = db->xapian_db->allterms_end();
+	return _notmuch_convert_tags(db, i, end);
+    } catch (const Xapian::Error &error) {
+	fprintf (stderr, "A Xapian exception occurred getting tags: %s.\n",
+		 error.get_msg().c_str());
+	db->exception_reported = TRUE;
+	return NULL;
+    }
 }