Changeset 362

Timestamp:

04/26/08 20:32:35 (7 months ago)

Author:

jake

Message:

Bloom filter size not configurable, need to implement dynamic blooms

Location:

trunk/thrudex/src

Files:

• CLuceneBackend.cpp (modified) (4 diffs)
• CLuceneIndex.cpp (modified) (3 diffs)
• CLuceneIndex.h (modified) (3 diffs)

trunk/thrudex/src/CLuceneBackend.cpp

@@ -6 +6 @@
 
 #include "CLuceneBackend.h"
+#include "ConfigFile.h"
 #include "utils.h"
 #include <boost/filesystem.hpp>
@@ -86 +87 @@
         return;
 
+    size_t filter_space = ConfigManager->read<int>("FILTER_SPACE_SIZE",1000000);
+
     index_cache[index] =
-        shared_ptr<CLuceneIndex>(new CLuceneIndex(idx_root,index,analyzer));
+        shared_ptr<CLuceneIndex>(new CLuceneIndex(idx_root,index,filter_space,analyzer));
 }
 
@@ -101 +104 @@
         throw ex;
     }
-
 
     lucene::document::Document *doc = new lucene::document::Document();
@@ -240 +242 @@
     } else if (op == "put_log_position") {
         fs::ofstream outfile;
-        outfile.open( log_pos_file.c_str (), 
+        outfile.open( log_pos_file.c_str (),
                       ios::out | ios::binary | ios::trunc);
         if (!outfile.is_open ())

trunk/thrudex/src/CLuceneIndex.cpp

@@ -46 +46 @@
 };
 
-CLuceneIndex::CLuceneIndex(const string &index_root, const string &index_name, shared_ptr<Analyzer> analyzer)
-    : index_root(index_root), index_name(index_name), analyzer(analyzer), filter_space(10000000), last_synched(0), syncing(false)
+CLuceneIndex::CLuceneIndex(const string &index_root, const string &index_name, const size_t &filter_space, shared_ptr<Analyzer> analyzer)
+    : index_root(index_root), index_name(index_name), analyzer(analyzer), filter_space(filter_space), last_synched(0), syncing(false)
 {
 
@@ -167 +167 @@
 
         modifier->flush();
-      
+
         ram_searcher.reset();
 
-        //shared_ptr<CLuceneRAMDirectory> l_ram_readonly_directory = ram_readonly_directory;
+        //shared_ptr<CLuceneRAMDirectory> l_ram_readonly_directory = ram_readonly_directory;
 
         //make a copy of the ram dir since its not thread safe
@@ -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() ), null_deleter() );
-          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() ));

trunk/thrudex/src/CLuceneIndex.h

@@ -47 +47 @@
     CLuceneIndex(const std::string &index_root,
                  const std::string &index_name,
+                 const std::size_t &filter_space,
                  boost::shared_ptr<lucene::analysis::Analyzer> analyzer);
 
@@ -64 +65 @@
 
     static log4cxx::LoggerPtr                        logger;
-    facebook::thrift::concurrency::Mutex           mutex;
-    //facebook::thrift::concurrency::ReadWriteMutex    mutex;
+    facebook::thrift::concurrency::Mutex             mutex;
 
     const std::string                                index_root;
@@ -71 +71 @@
     boost::shared_ptr<lucene::analysis::Analyzer>    analyzer;
 
-    int filter_space;
+    std::size_t filter_space;
 
     boost::shared_ptr<lucene::index::IndexModifier>  modifier;