Merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba

[Paul J. Lucas]

Added hash_c_str() and hash<char const*>.

Added hash_c_str() and hash<char const*>.

[Paul J. Lucas (paul-lucas)]

review: Approve

[Matthias Brantner (matthias-brantner)]

Please use the functions for the unordered_map in json_items.h.

review: Needs Fixing

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-04-18T01-59-51.531Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message):
  Validation queue job pjl-misc-2013-04-18T01-59-51.531Z is finished. The
  final status was:

  Undetermined, probably an error - please email <email address hidden> with the
  number of this job!

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[lp:~paul-lucas/zorba/pjl-misc]

11187. By Paul J. Lucas on 2013-04-18

Side merge from bug-1131990 branch since trunk is broken.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-04-18T03-02-04.504Z/log.html

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue job pjl-misc-2013-04-18T03-02-04.504Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/store/naive/json_items.h'
--- src/store/naive/json_items.h	2013-04-04 01:37:05 +0000
+++ src/store/naive/json_items.h	2013-04-18 02:12:27 +0000
@@ -20,6 +20,7 @@
 #include <vector>
 
 #include <zorba/config.h>
+#include "util/stl_util.h"
 #include "util/unordered_map.h"
 
 #include "diagnostics/assert.h"
@@ -208,36 +209,11 @@
 class SimpleJSONObject : public JSONObject
 {
 protected:
-  class ConstCharStarHash
-  {
-  public:
-    typedef size_t result_type;
-    size_t operator()(const char* a) const
-    {
-      size_t hash = 5381;
-      int c;
-
-      while ((c = *a++))
-        hash = ((hash << 5) + hash) + c;
-
-      return hash;
-    }
-  };
-
-  class ConstCharStarComparator
-  {
-  public:
-    bool operator()(const char* a, const char* b) const
-    {
-      return strcmp(a, b) == 0;
-    }
-  };
-
   typedef std::unordered_map<
     const char*,
     csize,
-    ConstCharStarHash,
-    ConstCharStarComparator> Keys;
+    ztd::hash<char const*>,
+    ztd::equal_to<char const*> > Keys;
 
   typedef std::vector<std::pair<store::Item*, store::Item*> > Pairs;
 
 
=== modified file 'src/util/hash/hash.cpp'
--- src/util/hash/hash.cpp	2013-02-07 17:24:36 +0000
+++ src/util/hash/hash.cpp	2013-04-18 02:12:27 +0000
@@ -31,15 +31,15 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 size_t hash_bytes( void const *p, size_t len, size_t result ) {
-  unsigned char const *c = reinterpret_cast<unsigned char const*>( p );
-  unsigned char const *const end = c + len;
+  unsigned char const *u = reinterpret_cast<unsigned char const*>( p );
+  unsigned char const *const end = u + len;
 #ifdef ZORBA_HASH_FN_FNV_1a
   //
   // FNV-1a (Fowler/Noll/Vo) hashing algorithm.
   //
-  while ( c < end ) {
+  while ( u < end ) {
     result *= Hash_Prime;
-    result ^= *c++;
+    result ^= *u++;
   }
 #endif /* ZORBA_HASH_FN_FNV_1a */
 #ifdef ZORBA_HASH_FN_PJW
@@ -61,8 +61,32 @@
   static size_t const OneEighth     = BitsInSizeT / 8;
   static size_t const HighBits      = ~( (size_t)(~0ul) >> OneEighth );
 
-  while ( c < end ) {
-    result = (result << OneEighth) + *c++;
+  while ( u < end ) {
+    result = (result << OneEighth) + *u++;
+    if ( size_t temp = result & HighBits )
+      result = (result ^ (temp >> ThreeFourths)) & ~HighBits;
+  }
+#endif /* ZORBA_HASH_FN_PJW */
+  return result;
+}
+
+size_t hash_c_str( char const *s, size_t result ) {
+  unsigned char const *u = reinterpret_cast<unsigned char const*>( s );
+#ifdef ZORBA_HASH_FN_FNV_1a
+  while ( *u ) {
+    result *= Hash_Prime;
+    result ^= *u++;
+  }
+#endif /* ZORBA_HASH_FN_FNV_1a */
+#ifdef ZORBA_HASH_FN_PJW
+  static size_t const BitsInSizeT   = sizeof( size_t ) *
+                                      numeric_limits<unsigned char>::digits;
+  static size_t const ThreeFourths  = BitsInSizeT * 3 / 4;
+  static size_t const OneEighth     = BitsInSizeT / 8;
+  static size_t const HighBits      = ~( (size_t)(~0ul) >> OneEighth );
+
+  while ( *u ) {
+    result = (result << OneEighth) + *u++;
     if ( size_t temp = result & HighBits )
       result = (result ^ (temp >> ThreeFourths)) & ~HighBits;
   }
 
=== modified file 'src/util/hash/hash.h'
--- src/util/hash/hash.h	2013-02-07 17:24:36 +0000
+++ src/util/hash/hash.h	2013-04-18 02:12:27 +0000
@@ -79,6 +79,31 @@
   return hash_bytes( &v, sizeof( v ) );
 }
 
+/**
+ * Generic hash function that hashes a null-terminated C string.
+ *
+ * @param s A pointer to the C string to hash.
+ * @param init The initialization value.
+ * @return Returns the hash code for the given C string.
+ */
+size_t hash_c_str( char const *s, size_t init = Hash_Init );
+
+/**
+ * The generic %hash unary_function class.
+ *
+ * @tparam T The type to hash.
+ */
+template<typename T>
+struct hash : std::unary_function<T,size_t> {
+  size_t operator()( T ) const; // not defined
+};
+
+/** Specialization for <code>char const*</code>. */
+template<> inline
+size_t hash<char const*>::operator()( char const *s ) const {
+  return hash_c_str( s );
+}
+
 } // namespace ztd
 } // namespace zorba
 
 
=== modified file 'src/util/stl_util.h'
--- src/util/stl_util.h	2013-03-22 19:06:19 +0000
+++ src/util/stl_util.h	2013-04-18 02:12:27 +0000
@@ -93,6 +93,28 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 /**
+ * Copy of std::equal_to in this namespace so we can specialize it below.
+ */
+template<typename T>
+struct equal_to : std::binary_function<T,T,bool> {
+  bool operator()( T const &a, T const &b ) const {
+    return a == b;
+  }
+};
+
+/**
+ * Specialization of std::equal_to for C strings.
+ */
+template<>
+struct equal_to<char const*> :
+  std::binary_function<char const*,char const*,bool>
+{
+  bool operator()( char const *s1, char const *s2 ) const {
+    return std::strcmp( s1, s2 ) == 0;
+  }
+};
+
+/**
  * Implementation of SGI's %identity extension.
  * See: http://www.sgi.com/tech/stl/identity.html
  */