Changeset 317

Timestamp:

02/27/08 21:36:42 (9 months ago)

Author:

rm

Message:

use the new Hashing stuff in thrucommon

Location:

trunk/thrudoc/src

Files:

• MySQLBackend.cpp (modified) (1 diff)
• MySQLBackend.h (modified) (2 diffs)

trunk/thrudoc/src/MySQLBackend.cpp

@@ -382 +382 @@
 }
 
-// copied from libmemcached_hash until it's librarizied
-static uint32_t FNV_32_INIT= 2166136261UL;
-static uint32_t FNV_32_PRIME= 16777619;
-
 FindReturn MySQLBackend::find_and_checkout (const string & bucket,
                                             const string & key)
 {
-    double point;
-    {
-        uint32_t hash;
-        /* this is a modified fvn algorithm, i'm seeing much better behavior 
-         * with small keys when i do the xor before and after the multiply */
-        hash= FNV_32_INIT;
-        for (unsigned int x = 0; x < key.length (); x++) 
-        {
-            hash ^= key[x];
-            hash *= FNV_32_PRIME;
-            hash ^= key[x];
-        }
-        point = hash / (double)UINT_MAX;
-    }
+    double point = hashing.get_point (key);
 
     if (logger->isDebugEnabled())

trunk/thrudoc/src/MySQLBackend.h

@@ -8 +8 @@
 #if HAVE_LIBMYSQLCLIENT_R
 
-#include <string>
-#include <set>
-#include <log4cxx/logger.h>
 #include "Thrudoc.h"
 #include "ThrudocBackend.h"
 #include "mysql_glue.h"
+
+#include <Hashing.h>
+#include <log4cxx/logger.h>
+#include <set>
+#include <string>
 
 struct FindReturn
@@ -72 +74 @@
         int max_value_size;
 
+        FNV32Hashing hashing;
+
         std::set<Partition*, bool(*)(Partition*, Partition*)> *
             load_partitions (const std::string & bucket);