Ticket #434: replicate_reopen_tests.patch

api_replicate.cc

@@ -2 +2 @@
  *
  * Copyright 2008 Lemur Consulting Ltd
  * Copyright 2009 Olly Betts
+ * Copyright 2010 Richard Boulton
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -26 +27 @@
 #include <xapian.h>
 
 #include "apitest.h"
+#include "dbcheck.h"
 #include "safeerrno.h"
 #include "safefcntl.h"
 #include "safesysstat.h"
@@ -112 +114 @@
     Xapian::Database db2(path2);
 
     TEST_EQUAL(db1.get_doccount(), db2.get_doccount());
+
+    // FIXME - do a proper check here.
 }
 
 // #######################################################################
@@ -191 +195 @@
     rmtmpdir(tempdir);
     return true;
 }
+
+static void write_stub(const string & stubpath, const string & contents) {
+    int fd = open(stubpath.c_str(), O_WRONLY | O_CREAT | O_TRUNC, 0666);
+    TEST_EQUAL(write(fd, contents.c_str(), contents.size()), (ssize_t)contents.size());
+    close(fd);
+}
+
+// Test of reopen of a database which has been replaced underneath the reader.
+DEFINE_TESTCASE(reopen1, flint || chert || brass) {
+    // Create a directory with a XAPIANDB file pointing to a sub database.
+    string topdbdir = get_named_writable_database_path("reopen1");
+    mkdir(topdbdir.c_str(), 0755);
+    string stubpath = topdbdir + "/XAPIANDB";
+    string subdb1path = topdbdir + "/db1";
+    string subdb2path = topdbdir + "/db2";
+
+    write_stub(stubpath, "auto db1");
+
+    // Make the sub database, and add document to it.
+    {
+        Xapian::WritableDatabase db(get_named_writable_database("reopen1/db1"));
+        for (int i = 0; i != 1000; ++i) {
+            Xapian::Document doc1;
+            doc1.add_term("hello");
+            db.add_document(doc1);
+        }
+        db.commit();
+        db.close();
+    }
+
+    // Open the database through the stub directory, through the stub, and
+    // directly.
+    Xapian::Database db1(topdbdir);
+    Xapian::Database db2(stubpath);
+    Xapian::Database db3(subdb1path);
+    dbcheck(db1, 1000, 1000);
+    dbcheck(db2, 1000, 1000);
+    dbcheck(db3, 1000, 1000);
+    check_equal_dbs(topdbdir, stubpath);
+    check_equal_dbs(topdbdir, subdb1path);
+
+    // Delete the old database.
+    rm_rf(subdb1path);
+
+    // Make a new database in the original location.
+    {
+        Xapian::WritableDatabase db(get_named_writable_database("reopen1/db1"));
+        Xapian::Document doc1;
+        doc1.add_term("hola");
+        doc1.add_term("hello");
+        db.add_document(doc1);
+        db.commit();
+        db.add_document(doc1);
+        db.commit();
+        db.delete_document(1);
+        db.commit();
+        db.close();
+    }
+
+    // Reopen the database and check.
+    db1.reopen();
+    db2.reopen();
+    db3.reopen();
+    dbcheck(db1, 1, 2);
+    dbcheck(db2, 1, 2);
+    dbcheck(db3, 1, 2);
+    check_equal_dbs(topdbdir, stubpath);
+    check_equal_dbs(topdbdir, subdb1path);
+ 
+    return true;
+}
+
+// Test of reopen of a database opened through a stub path.
+DEFINE_TESTCASE(reopen2, flint || chert || brass) {
+    // Create a directory with a XAPIANDB file pointing to a sub database.
+    string topdbdir = get_named_writable_database_path("reopen2");
+    mkdir(topdbdir.c_str(), 0755);
+    string stubpath = topdbdir + "/XAPIANDB";
+    string subdb1path = topdbdir + "/db1";
+    string subdb2path = topdbdir + "/db2";
+
+    write_stub(stubpath, "auto db1");
+
+    // Make the sub database, and add document to it.
+    {
+        Xapian::WritableDatabase db(get_named_writable_database("reopen2/db1"));
+        Xapian::Document doc1;
+        doc1.add_term("hello");
+        db.add_document(doc1);
+        db.commit();
+        db.close();
+    }
+
+    // Open the database through the stub directory, through the stub, and
+    // directly.
+    Xapian::Database db1(topdbdir);
+    Xapian::Database db2(stubpath);
+    Xapian::Database db3(subdb1path);
+    dbcheck(db1, 1, 1);
+    dbcheck(db2, 1, 1);
+    dbcheck(db3, 1, 1);
+    check_equal_dbs(topdbdir, stubpath);
+    check_equal_dbs(topdbdir, subdb1path);
+
+    // Make a new database, and change the stub to point to it.
+    {
+        Xapian::WritableDatabase db(get_named_writable_database("reopen2/db2"));
+        Xapian::Document doc1;
+        doc1.add_term("world");
+        db.add_document(doc1);
+        db.commit();
+        db.close();
+    }
+    write_stub(stubpath, "auto db2");
+
+    // Delete the old database.
+    rm_rf(subdb1path);
+
+    // Reopen the database and check.
+    db1.reopen();
+    db2.reopen();
+    db3.reopen();
+    dbcheck(db1, 1, 1);
+    dbcheck(db2, 1, 1);
+    dbcheck(db3, 1, 1);
+    check_equal_dbs(topdbdir, stubpath);
+    check_equal_dbs(topdbdir, subdb2path);
+
+    // Make a new database in the original location.
+    rm_rf(subdb1path);
+    {
+        Xapian::WritableDatabase db(get_named_writable_database("reopen2/db1"));
+        Xapian::Document doc1;
+        doc1.add_term("hola");
+        doc1.add_term("hello");
+        db.add_document(doc1);
+        db.commit();
+        db.add_document(doc1);
+        db.commit();
+        db.delete_document(1);
+        db.commit();
+        db.close();
+    }
+
+    // Reopen the database and check.
+    db1.reopen();
+    db2.reopen();
+    db3.reopen();
+    dbcheck(db1, 1, 2);
+    dbcheck(db2, 1, 2);
+    dbcheck(db3, 1, 2);
+    check_equal_dbs(topdbdir, stubpath);
+    check_equal_dbs(topdbdir, subdb2path);
+ 
+    return true;
+}