File 0001-backends-chert-chert_cursor.cc-backends-ch... of Package xapian-core

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-backends-chert-chert_cursor.cc-backends-chert-chert_.patch of Package xapian-core (Revision 70d7b7d2fb062b064240d23d95b56bc4)

Currently displaying revision 70d7b7d2fb062b064240d23d95b56bc4 , Show latest

diff --git a/backends/chert/chert_cursor.cc b/backends/chert/chert_cursor.cc
index c470c85a276658851a764945ab3f0887827c2ce2..ab29efefbab93a8e2f885e58fd69210231c84b30 100644
--- a/backends/chert/chert_cursor.cc
+++ b/backends/chert/chert_cursor.cc
@@ -1,7 +1,7 @@
 /* chert_cursor.cc: Btree cursor implementation
  *
  * Copyright 1999,2000,2001 BrightStation PLC
- * Copyright 2002,2003,2004,2005,2006,2007,2008,2009,2010,2012 Olly Betts
+ * Copyright 2002,2003,2004,2005,2006,2007,2008,2009,2010,2012,2015 Olly Betts
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -97,6 +97,7 @@ ChertCursor::rebuild()
     C[level].n = B->C[level].n;
     C[level].p = B->C[level].p;
     version = B->cursor_version;
+    B->cursor_created_since_last_modification = true;
 }
 
 ChertCursor::~ChertCursor()
diff --git a/backends/chert/chert_table.cc b/backends/chert/chert_table.cc
index 2a97fd4405ed051e6cd1ec18f97bad49feb674d3..7b96ed9b150f20ba360fb486e7a2f96db3936a70 100644
--- a/backends/chert/chert_table.cc
+++ b/backends/chert/chert_table.cc
@@ -2,7 +2,7 @@
  *
  * Copyright 1999,2000,2001 BrightStation PLC
  * Copyright 2002 Ananova Ltd
- * Copyright 2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2013,2015 Olly Betts
+ * Copyright 2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015 Olly Betts
  * Copyright 2008 Lemur Consulting Ltd
  * Copyright 2010 Richard Boulton
  *
@@ -1483,6 +1483,11 @@ ChertTable::basic_open(bool revision_supplied, chert_revision_number_t revision_
 
     base_letter = ch;
 
+    if (cursor_created_since_last_modification) {
+	cursor_created_since_last_modification = false;
+	++cursor_version;
+    }
+
     /* ready to open the main file */
 
     RETURN(true);
@@ -2041,6 +2046,11 @@ ChertTable::cancel()
     changed_n = 0;
     changed_c = DIR_START;
     seq_count = SEQ_START_POINT;
+
+    if (cursor_created_since_last_modification) {
+	cursor_created_since_last_modification = false;
+	++cursor_version;
+    }
 }
 
 /************ B-tree reading ************/

Places

File 0001-backends-chert-chert_cursor.cc-backends-chert-chert_.patch of Package xapian-core (Revision 70d7b7d2fb062b064240d23d95b56bc4)

Places