Changeset 349

Timestamp:

04/20/08 04:09:29 (7 months ago)

Author:

jake

Message:

bug fix, clucene is messed up

Files:

• trunk/thrudex/src/CLuceneIndex.cpp (modified) (7 diffs)

trunk/thrudex/src/CLuceneIndex.cpp

@@ -56 +56 @@
     }
 
-
     string idx_path = index_root + "/" + index_name;
     bool   new_index;
@@ -111 +110 @@
 
         ram_prev_directory = shared_ptr<CLuceneRAMDirectory> (new CLuceneRAMDirectory());
-        ram_directory->__cl_addref(); //trick clucene's lame ref counters
+        ram_prev_directory->__cl_addref(); //trick clucene's lame ref counters
 
         ram_bloom     = shared_ptr<bloom_filter> (new bloom_filter(filter_space,1.0/(1.0 * filter_space), random_seed));
@@ -168 +167 @@
 
         modifier->flush();
-
+      
         ram_searcher.reset();
 
+        //shared_ptr<CLuceneRAMDirectory> l_ram_readonly_directory = ram_readonly_directory;
+
         //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.reset( new CLuceneRAMDirectory( ram_directory.get() ), null_deleter() );
         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
@@ -186 +186 @@
         if(syncing){
             //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_readonly_prev_directory = shared_ptr<CLuceneRAMDirectory>(new CLuceneRAMDirectory( ram_prev_directory.get() ), null_deleter() );
+          ram_readonly_prev_directory->__cl_addref(); //trick clucene's lame ref counters
 
             ram_prev_searcher.reset(new IndexSearcher( ram_readonly_prev_directory.get() ));
@@ -504 +503 @@
     shared_ptr<bloom_filter>        l_ram_bloom;
     shared_ptr<CLuceneRAMDirectory> l_ram_directory;
+    shared_ptr<CLuceneRAMDirectory> l_ram_ro_dir;
     shared_ptr<set<string> >        l_disk_deletes;
     shared_ptr<bloom_filter>        l_disk_bloom;
@@ -525 +525 @@
         l_disk_bloom   = disk_bloom;
 
+        l_ram_ro_dir.reset( new CLuceneRAMDirectory( l_ram_directory.get() ) );
+        l_ram_ro_dir->__cl_addref(); //trick clucene's lame ref counters
+
         //create new handles
         ram_directory.reset(new CLuceneRAMDirectory());
@@ -572 +575 @@
         Directory *dirs[2];
 
-        dirs[0] = l_ram_directory.get();
+        dirs[0] = l_ram_ro_dir.get();
         dirs[1] = NULL;