Changeset 327

Timestamp:

03/07/08 05:15:27 (9 months ago)

Author:

jake

Message:

Query perf speedup

Location:

trunk/thrudex/src

Files:

• CLuceneIndex.cpp (modified) (2 diffs)
• CLuceneIndex.h (modified) (1 diff)
• CLuceneRAMDirectory.cpp (modified) (2 diffs)

trunk/thrudex/src/CLuceneIndex.cpp

@@ -155 +155 @@
     if(last_refresh < last_modified || last_refresh < last_synched){
 
+
         modifier->flush();
 
-        ram_searcher.reset(new IndexSearcher( ram_directory.get() ));
+
+        ram_searcher.reset();
+
+        //make a copy of the ram dir since its not thread safe
+        ram_readonly_directory = shared_ptr<CLuceneRAMDirectory>(new CLuceneRAMDirectory( ram_directory.get() ));
+        ram_readonly_directory->__cl_addref(); //trick clucene's lame ref counters
+
+        ram_searcher.reset(new IndexSearcher( ram_readonly_directory.get() ));
+
 
         //since clucene doesn't use shared_ptr we need to get the
@@ -282 +291 @@
     }
 
-
+    shared_ptr<CLuceneRAMDirectory> l_ram_readonly_directory;
+    shared_ptr<CLuceneRAMDirectory> l_ram_directory;
+    shared_ptr<CLuceneRAMDirectory> l_ram_prev_directory;
+    shared_ptr<IndexSearcher>       l_ram_searcher;
+    shared_ptr<IndexSearcher>       l_ram_prev_searcher;
+    shared_ptr<IndexSearcher>       l_disk_searcher;
+    shared_ptr<UpdateFilter>        l_disk_filter;
+    shared_ptr<MultiSearcher>       l_searcher;
     //RWGuard g(mutex);
-    Guard g(mutex);
-
-
-    //making sure references to underlying objects stay above 0
-    //for the duration of this function
-    shared_ptr<CLuceneRAMDirectory> l_ram_directory      = ram_directory;
-    shared_ptr<CLuceneRAMDirectory> l_ram_prev_directory = ram_prev_directory;
-    shared_ptr<IndexSearcher>       l_ram_searcher       = ram_searcher;
-    shared_ptr<IndexSearcher>       l_ram_prev_searcher  = ram_prev_searcher;
-    shared_ptr<IndexSearcher>       l_disk_searcher      = disk_searcher;
-
-
-    shared_ptr<MultiSearcher> l_searcher    = this->getSearcher();
-    shared_ptr<UpdateFilter>  l_disk_filter = disk_filter;
+    {
+        Guard g(mutex);
+
+        l_searcher    = this->getSearcher();
+
+        //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_disk_filter = disk_filter;
+
+    }
 
     Query *query;

trunk/thrudex/src/CLuceneIndex.h

@@ -91 +91 @@
     boost::shared_ptr<lucene::store::CLuceneRAMDirectory>  ram_prev_directory;
     boost::shared_ptr<lucene::store::CLuceneRAMDirectory>  ram_prev_prev_directory;
+    boost::shared_ptr<lucene::store::CLuceneRAMDirectory>  ram_readonly_directory;
 
     boost::shared_ptr<lucene::search::IndexSearcher> ram_searcher;

trunk/thrudex/src/CLuceneRAMDirectory.cpp

@@ -103 +103 @@
         }
 
+
+
         // graceful cleanup
         is->close();
@@ -109 +111 @@
         _CLDELETE(os);
     }
+
     if (closeDir)
         dir->close();