Changeset 347

Timestamp:

04/20/08 01:43:58 (7 months ago)

Author:

jake

Message:

hmm another break

Location:

trunk/thrudex/src

Files:

• CLuceneIndex.cpp (modified) (4 diffs)
• CLuceneIndex.h (modified) (1 diff)

trunk/thrudex/src/CLuceneIndex.cpp

@@ -169 +169 @@
         modifier->flush();
 
-
         ram_searcher.reset();
 
@@ -186 +185 @@
 
         if(syncing){
-            ram_prev_searcher.reset(new IndexSearcher( ram_prev_directory.get() ));
+            //make a copy of the ram dir since its not thread safe
+            ram_readonly_prev_directory = shared_ptr<CLuceneRAMDirectory>(new CLuceneRAMDirectory( ram_prev_directory.get() ));
+            ram_readonly_prev_directory->__cl_addref(); //trick clucene's lame ref counters
+
+
+            ram_prev_searcher.reset(new IndexSearcher( ram_readonly_prev_directory.get() ));
             searchers[2] = ram_prev_searcher.get();
             searchers[3] = NULL;
@@ -309 +313 @@
     shared_ptr<CLuceneRAMDirectory> l_ram_readonly_directory;
     shared_ptr<CLuceneRAMDirectory> l_ram_directory;
+    shared_ptr<CLuceneRAMDirectory> l_ram_readonly_prev_directory;
     shared_ptr<CLuceneRAMDirectory> l_ram_prev_directory;
     shared_ptr<IndexSearcher>       l_ram_searcher;
@@ -324 +329 @@
         //making sure references to underlying objects stay above 0
         //for the duration of this function
-        l_ram_readonly_directory  = ram_readonly_directory;
-        l_ram_directory      = ram_directory;
-        l_ram_prev_directory = ram_prev_directory;
-        l_ram_searcher       = ram_searcher;
-        l_ram_prev_searcher  = ram_prev_searcher;
-        l_disk_searcher      = disk_searcher;
+        l_ram_readonly_directory      = ram_readonly_directory;
+        l_ram_directory               = ram_directory;
+        l_ram_readonly_prev_directory = ram_readonly_prev_directory;
+        l_ram_prev_directory          = ram_prev_directory;
+        l_ram_searcher                = ram_searcher;
+        l_ram_prev_searcher           = ram_prev_searcher;
+        l_disk_searcher               = disk_searcher;
 
         l_disk_filter = disk_filter;
         l_disk_reader = disk_reader;
-
     }
 

trunk/thrudex/src/CLuceneIndex.h

@@ -90 +90 @@
     boost::shared_ptr<lucene::store::CLuceneRAMDirectory>  ram_directory;
     boost::shared_ptr<lucene::store::CLuceneRAMDirectory>  ram_prev_directory;
+    boost::shared_ptr<lucene::store::CLuceneRAMDirectory>  ram_readonly_prev_directory;
     boost::shared_ptr<lucene::store::CLuceneRAMDirectory>  ram_prev_prev_directory;
     boost::shared_ptr<lucene::store::CLuceneRAMDirectory>  ram_readonly_directory;