Changeset 344

Timestamp:

04/19/08 01:54:30 (7 months ago)

Author:

jake

Message:

tweetscan bug fixes

Location:

trunk

Files:

• thrudex/src/CLuceneIndex.cpp (modified) (1 diff)
• thrudoc/src/BDBBackend.cpp (modified) (11 diffs)

trunk/thrudex/src/CLuceneIndex.cpp

@@ -601 +601 @@
         //the order of these things really matters
         disk_searcher = l_disk_searcher;
+        disk_filter.reset( new UpdateFilter(l_disk_reader) );
         disk_reader   = l_disk_reader;
-        disk_filter.reset( new UpdateFilter(disk_reader) );
+
 
 

trunk/thrudoc/src/BDBBackend.cpp

@@ -7 +7 @@
 #endif
 /* hack to work around thrift and log4cxx installing config.h's */
-#undef HAVE_CONFIG_H 
+#undef HAVE_CONFIG_H
 
 #if HAVE_LIBDB_CXX && HAVE_LIBBOOST_FILESYSTEM
@@ -25 +25 @@
 #define BDB_BACKEND_MAX_BUCKET_SIZE 32
 #define BDB_BACKEND_MAX_KEY_SIZE 64
-#define BDB_BACKEND_MAX_VALUE_SIZE 4096
+#define BDB_BACKEND_MAX_VALUE_SIZE 104096
 
 LoggerPtr BDBBackend::logger (Logger::getLogger ("BDBBackend"));
@@ -40 +40 @@
     }
 
-    try 
+    try
     {
         this->db_env = new DbEnv (0);
-        u_int32_t env_flags = 
+        u_int32_t env_flags =
             DB_CREATE     |   // If the environment does not exist, create it.
             DB_RECOVER    |   // run normal recovery
@@ -59 +59 @@
         this->db_env->set_lk_detect (DB_LOCK_MINWRITE);
         this->db_env->open (this->bdb_home.c_str (), env_flags, 0);
-    } 
+    }
     catch (DbException & e)
     {
@@ -70 +70 @@
 BDBBackend::~BDBBackend ()
 {
-    try 
+    try
     {
         map<string, Db *>::iterator i;
@@ -79 +79 @@
         this->db_env->close (0);
         delete db_env;
-    } 
-    catch (DbException & e) 
+    }
+    catch (DbException & e)
     {
         LOG4CXX_ERROR (logger, string ("bdb error: ") + e.what ());
@@ -94 +94 @@
          ++dir_itr)
     {
-        if ((fs::is_regular (dir_itr->status ())) && 
+        if ((fs::is_regular (dir_itr->status ())) &&
             (dir_itr->path ().leaf ().find ("log.") == string::npos))
         {
@@ -222 +222 @@
             if (seed != key_tmp)
             {
-                // we got the one after it, it must be gone now, so return 
+                // we got the one after it, it must be gone now, so return
                 // this one
                 Element e;
@@ -286 +286 @@
             LOG4CXX_INFO (logger, "admin: creating db=" + data);
 
-            u_int32_t db_flags = 
+            u_int32_t db_flags =
                 DB_CREATE       |   // allow creating db
-                DB_AUTO_COMMIT;     // allow auto-commit   
+                DB_AUTO_COMMIT;     // allow auto-commit
             db = new Db (this->db_env, 0);
             db->open (NULL,             // Txn pointer
@@ -302 +302 @@
         return "done";
     }
-    // TODO delete_bucket, but have to figure out how to close the db 
+    // TODO delete_bucket, but have to figure out how to close the db
     // handles across all of the threads first...
     return "";
@@ -336 +336 @@
     if (!db)
     {
-        u_int32_t db_flags = DB_AUTO_COMMIT; // allow auto-commit   
+        u_int32_t db_flags = DB_AUTO_COMMIT; // allow auto-commit
 
         db = new Db (this->db_env, 0);