Changeset 288

Timestamp:

02/20/08 04:50:22 (9 months ago)

Author:

jake

Message:

Fixed remove code

Location:

trunk/thrudex/src

Files:

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

trunk/thrudex/src/CLuceneIndex.cpp

@@ -48 +48 @@
     bool   new_index;
 
+    random_seed = (size_t)filter_space*rand();
+
     try {
 
@@ -72 +74 @@
         //build up bloom filter
 
-        disk_bloom    = shared_ptr<bloom_filter>(new bloom_filter(filter_space,1.0/(1.0 * filter_space), ((int) filter_space*rand())));
+        disk_bloom    = shared_ptr<bloom_filter>(new bloom_filter(filter_space,1.0/(1.0 * filter_space), random_seed));
 
         if(!new_index){
@@ -100 +102 @@
         ram_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), ((int) filter_space*rand())));
+        ram_bloom     = shared_ptr<bloom_filter> (new bloom_filter(filter_space,1.0/(1.0 * filter_space), random_seed));
         ram_searcher  = shared_ptr<IndexSearcher>(new IndexSearcher(ram_directory.get()));
 
@@ -223 +225 @@
     shared_ptr<set<string> >  l_disk_deletes = disk_deletes;
 
+
     //Since we don't want to write to disk
     //We'll simply track the docs to remove on next merge
     if( l_disk_bloom->contains( key )){
+        LOG4CXX_INFO(logger, "Removed "+key);
         l_disk_deletes->insert( key );
+        last_modified = Util::currentTime();
     }
 
@@ -430 +435 @@
 
         //create new handles
-        ram_directory = shared_ptr<CLuceneRAMDirectory>(new CLuceneRAMDirectory());
+        ram_directory.reset(new CLuceneRAMDirectory());
         ram_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), ((int) filter_space*rand())));
-        modifier      = shared_ptr<IndexModifier>(new IndexModifier(ram_directory.get(),analyzer.get(),true));
+        ram_bloom.reset(new bloom_filter(filter_space,1.0/(1.0 * filter_space), random_seed));
+        modifier.reset(new IndexModifier(ram_directory.get(),analyzer.get(),true));
 
         ram_prev_prev_directory = ram_prev_directory;
         ram_prev_directory      = l_ram_directory;
 
-        disk_deletes  = shared_ptr<set<string> >(new set<string>());
+        disk_deletes.reset(new set<string>());
     }
 
@@ -456 +461 @@
 
         disk_reader->deleteDocuments(t);
+
+        LOG4CXX_DEBUG(logger,"Deleted"+(*it));
 
         delete t;
@@ -476 +483 @@
         disk_writer->close();
 
+        //Merge in the ram bloom
+        *l_disk_bloom.get() |= *l_ram_bloom.get();
+
+
         LOG4CXX_DEBUG(logger,"Merged");
     }
-        //Search new index (big perf hit so get it over now)
+    //Search new index (big perf hit so get it over now)
+
     shared_ptr<IndexSearcher> l_disk_searcher(new IndexSearcher(idx_path.c_str()));
     wstring q = wstring(DOC_KEY)+wstring(L":1234");

trunk/thrudex/src/CLuceneIndex.h

@@ -92 +92 @@
 
     boost::shared_ptr<bloom_filter>                  ram_bloom;
+
+    std::size_t random_seed;
 };