Merge lp:~zorba-coders/zorba/bug1083269 into lp:zorba

[Rodolfo Ochoa]

Fix for errors on windows that avoid to be compiled.

Fix for errors on windows that avoid to be compiled. Read comments on bug.

[Paul J. Lucas (paul-lucas)]

If you're going to change zstring to std::string, then change all occurrences of zstring to std::string.

review: Needs Fixing

[Chris Hillery (ceejatec)]

review: Approve

[Paul J. Lucas (paul-lucas)]

review: Approve

[Paul J. Lucas (paul-lucas)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1083269-2012-12-12T08-15-09.222Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug1083269-2012-12-12T08-15-09.222Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Approve, 2 Pending.

[Rodolfo Ochoa (rodolfo-ochoa)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1083269-2012-12-12T13-32-03.688Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug1083269 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 bug1083269-2012-12-12T13-32-03.688Z is finished. The
  final status was:

  1 tests did not succeed - changes not commited.

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

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1083269-2012-12-12T14-06-58.294Z/log.html

[lp:~zorba-coders/zorba/bug1083269]

11143. By Rodolfo Ochoa on 2012-12-12

Merging Paul changes

11144. By Rodolfo Ochoa on 2012-12-12

Restoring hash.h

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug1083269-2012-12-12T14-06-58.294Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 3 Approve, 1 Pending.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1083269-2012-12-12T16-24-52.863Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug1083269-2012-12-12T16-24-52.863Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/compiler/expression/expr_clone.cpp'
--- src/compiler/expression/expr_clone.cpp	2012-12-06 22:49:35 +0000
+++ src/compiler/expression/expr_clone.cpp	2012-12-12 14:10:26 +0000
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "stdafx.h"
 #include "compiler/expression/expr_base.h"
 #include "compiler/expression/update_exprs.h"
 #include "compiler/expression/expr.h"
 
=== modified file 'src/context/dynamic_context.cpp'
--- src/context/dynamic_context.cpp	2012-10-22 17:08:12 +0000
+++ src/context/dynamic_context.cpp	2012-12-12 14:10:26 +0000
@@ -15,6 +15,10 @@
  */
 #include "stdafx.h"
 
+#ifdef WIN32
+#include <sys/types.h>
+#include <sys/timeb.h>
+#endif
 #include "common/common.h"
 #include <assert.h>
 #include <time.h>
@@ -23,7 +27,6 @@
 #include <sys/time.h>
 #include <unistd.h>
 #endif
-
 #include "store/api/iterator.h"
 #include "store/api/temp_seq.h"
 #include "store/api/item_factory.h"
 
=== modified file 'src/functions/func_schema_impl.cpp'
--- src/functions/func_schema_impl.cpp	2012-10-15 13:35:59 +0000
+++ src/functions/func_schema_impl.cpp	2012-12-12 14:10:26 +0000
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "stdafx.h"
 #include "functions/func_schema.h"
 
 #include "compiler/expression/expr_base.h"
 
=== modified file 'src/precompiled/stdafx.h'
--- src/precompiled/stdafx.h	2012-10-08 12:09:36 +0000
+++ src/precompiled/stdafx.h	2012-12-12 14:10:26 +0000
@@ -29,6 +29,7 @@
   #include <crtdefs.h>
   #include <map>
   #include <set>
+  #include <sys/timeb.h>
 
   #include "runtime/sequences/sequences.h"
   #include "diagnostics/xquery_diagnostics.h"
@@ -58,17 +59,19 @@
   #include "zorbatypes/m_apm.h"
   #include "zorbatypes/rclock.h"
   #include "zorbatypes/schema_types.h"
+//
   #include "zorbatypes/timezone.h"
   #include "zorbatypes/URI.h"
   #include "zorbatypes/xerces_xmlcharray.h"
   #include "zorbatypes/zorbatypes_decl.h"
   #include "zorbatypes/zstring.h"
   #include "zorbautils/condition.h"
-  #include "zorbautils/hashfun.h"
+
   #include "zorbautils/hashmap.h"
   #include "zorbautils/hashmap_itemp.h"
   #include "zorbautils/hashmap_zstring.h"
   #include "zorbautils/hashset.h"
+  
   #include "zorbautils/latch.h"
   #include "zorbautils/locale.h"
   #include "zorbautils/lock.h"
@@ -83,6 +86,5 @@
   #include "runtime/full_text/ftcontains_visitor.h"
   #include "store/api/ft_token_iterator.h"
   #include "store/naive/ft_token_store.h"
-
 #endif
 /* vim:set et sw=2 ts=2: */
 
=== modified file 'src/unit_tests/test_hashmaps.cpp'
--- src/unit_tests/test_hashmaps.cpp	2012-11-12 21:17:32 +0000
+++ src/unit_tests/test_hashmaps.cpp	2012-12-12 14:10:26 +0000
@@ -1,3 +1,4 @@
+#include "stdafx.h"
 
 #include <cstdlib>
 #include <stdio.h>
@@ -48,12 +49,12 @@
 class StrCompFunc
 {
 public:
-  static bool equal(const zstring& k1, const zstring& k2) 
+  static bool equal(const std::string& k1, const std::string& k2) 
   {
     return k1 == k2;
   }
 
-  static uint32_t hash(const zstring& key)
+  static uint32_t hash(const std::string& key)
   { 
     return hashfun::h32(key.c_str(), FNV_32_INIT);
   }
@@ -78,7 +79,7 @@
     int_buf[i] = rand() % num;
   }
 
-  zstring* str_buf = new zstring[num];
+  std::string* str_buf = new std::string[num];
 
   for (int i = 0; i < num; ++i)
   {
@@ -91,13 +92,13 @@
 
 
   HashMap<uint64_t, int, IntCompFunc> map1(1024, false);
-  HashMap<zstring, int, StrCompFunc> map2(1024, false);
+  HashMap<std::string, int, StrCompFunc> map2(1024, false);
 
   std::unordered_map<uint64_t, int> map3(1024);
-  std::unordered_map<zstring, int> map4(1024);
+  std::unordered_map<std::string, int> map4(1024);
 
   hash64map<int> map5(1024, load_factor);
-  hashmap<zstring, int> map6(1024, load_factor);
+  hashmap<std::string, int> map6(1024, load_factor);
 
   map1.set_load_factor(load_factor);
   map2.set_load_factor(load_factor);
@@ -133,9 +134,8 @@
 
     for (int i = 0; i < num; ++i)
     {
-      zstring key = str_buf[i];
       int value = 1;
-      (void)map2.insert(key, value);
+      (void)map2.insert(str_buf[i], value);
     }
 
     zorba::time::walltime stopTime;
@@ -144,7 +144,7 @@
     double time = time::get_walltime_elapsed(startTime, stopTime);  
 
     std::cout << "Load factor = " << load_factor << std::endl
-              << "Num zstring insertions = " << num << std::endl
+              << "Num string insertions = " << num << std::endl
               << "HashMap entries = " << map2.size() << std::endl
               << "HashMap buckets = " << map2.bucket_count() << std::endl
               << "HashMap capacity = " << map2.capacity() << std::endl
@@ -180,9 +180,8 @@
 
     for (int i = 0; i < num; ++i)
     {
-      zstring key = str_buf[i];
       int value = 1;
-      (void)map4.insert(std::pair<zstring, int>(key, value));
+      (void)map4.insert(std::pair<std::string, int>(str_buf[i], value));
     }
 
     zorba::time::walltime stopTime;
@@ -191,7 +190,7 @@
     double time = time::get_walltime_elapsed(startTime, stopTime);  
 
     std::cout << "Load factor = " << load_factor << std::endl
-              << "Num zstring insertions = " << num << std::endl
+              << "Num string insertions = " << num << std::endl
               << "UnorderedMap entries = " << map4.size() << std::endl
               << "UnorderedMap buckets = " << map4.bucket_count() << std::endl
               << "Time = " << time << std::endl;
@@ -225,9 +224,8 @@
 
     for (int i = 0; i < num; ++i)
     {
-      zstring key = str_buf[i];
       int value = 1;
-      (void)map6.put(key, value, false);
+      (void)map6.put(str_buf[i], value, false);
     }
 
     zorba::time::walltime stopTime;
@@ -236,7 +234,7 @@
     double time = time::get_walltime_elapsed(startTime, stopTime);  
 
     std::cout << "Load factor = " << load_factor << std::endl
-              << "Num zstring insertions = " << num << std::endl
+              << "Num string insertions = " << num << std::endl
               << "hashmap entries = " << map6.size() << std::endl
               << "Time = " << time << std::endl;
   }
 
=== modified file 'src/util/CMakeLists.txt'
--- src/util/CMakeLists.txt	2012-10-08 12:09:36 +0000
+++ src/util/CMakeLists.txt	2012-12-12 14:10:26 +0000
@@ -51,6 +51,4 @@
 HEADER_GROUP_SUBFOLDER(UTIL_SRCS fx)
 HEADER_GROUP_SUBFOLDER(UTIL_SRCS win32)
 
-IF (NOT (ZORBA_HAVE_UNORDERED_MAP AND ZORBA_HAVE_UNORDERED_SET))
-  ADD_SRC_SUBFOLDER(UTIL_SRCS hash UTIL_HASH_SRCS)
-ENDIF (NOT (ZORBA_HAVE_UNORDERED_MAP AND ZORBA_HAVE_UNORDERED_SET))
+ADD_SRC_SUBFOLDER(UTIL_SRCS hash UTIL_HASH_SRCS)
 
=== modified file 'src/util/hash/CMakeLists.txt'
--- src/util/hash/CMakeLists.txt	2012-05-24 16:19:28 +0000
+++ src/util/hash/CMakeLists.txt	2012-12-12 14:10:26 +0000
@@ -14,5 +14,9 @@
 
 SET(UTIL_HASH_SRCS
   hash.cpp
-  rehash_policy.cpp
-  )
+)
+
+IF (NOT (ZORBA_HAVE_UNORDERED_MAP AND ZORBA_HAVE_UNORDERED_SET))
+  LIST(APPEND UTIL_HASH_SRCS
+    rehash_policy.cpp)
+ENDIF (NOT (ZORBA_HAVE_UNORDERED_MAP AND ZORBA_HAVE_UNORDERED_SET))
 
=== modified file 'src/util/hash/hash.cpp'
--- src/util/hash/hash.cpp	2012-06-02 00:35:58 +0000
+++ src/util/hash/hash.cpp	2012-12-12 14:10:26 +0000
@@ -15,7 +15,9 @@
  */
 
 // standard
-#include <limits>
+#ifdef ZORBA_HASH_FN_PJW
+# include <limits>
+#endif /* ZORBA_HASH_FN_PJW */
 
 // local
 #include "hash.h"