[Zorba-coders] [Merge] lp:~zorba-coders/zorba/split-data-converters-and-image into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/split-data-converters-and-image into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/split-data-converters-and-image/+merge/118230 -- https://code.launchpad.net/~zorba-coders/zorba/split-data-converters-and-image/+merge/118230 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/split-data-converters-and-image into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/split-data-converters-and-image into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message): Validation queue job split-data-converters-and-image-2012-08-05T22-12-05.173Z is finished. The final status was: 34 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/split-data-converters-and-image/+merge/118230 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/split-data-converters-and-image into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/split-data-converters-and-image-2012-08-05T22-12-05.173Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/split-data-converters-and-image/+merge/118230 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/split-data-converters-and-image into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/split-data-converters-and-image into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/split-data-converters-and-image/+merge/118230 -- https://code.launchpad.net/~zorba-coders/zorba/split-data-converters-and-image/+merge/118230 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/split-data-converters-and-image into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/split-data-converters-and-image/+merge/118230 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/http-client-module-installers into lp:zorba/http-client-module
The proposal to merge lp:~zorba-coders/zorba/http-client-module-installers into lp:zorba/http-client-module has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/http-client-module-installers/+merge/118222 -- https://code.launchpad.net/~zorba-coders/zorba/http-client-module-installers/+merge/118222 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/http-client-module-installers into lp:zorba/http-client-module
Validation queue job http-client-module-installers-2012-08-05T21-33-44.184Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/http-client-module-installers/+merge/118222 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/http-client-module-installers into lp:zorba/http-client-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/http-client-module-installers-2012-08-05T21-33-44.184Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/http-client-module-installers/+merge/118222 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/http-client-module-installers into lp:zorba/http-client-module
The proposal to merge lp:~zorba-coders/zorba/http-client-module-installers into lp:zorba/http-client-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/http-client-module-installers/+merge/118222 -- https://code.launchpad.net/~zorba-coders/zorba/http-client-module-installers/+merge/118222 Your team Zorba Coders is subscribed to branch lp:zorba/http-client-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/temp-http-client-workarounds into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/temp-http-client-workarounds into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/temp-http-client-workarounds/+merge/118237 -- https://code.launchpad.net/~zorba-coders/zorba/temp-http-client-workarounds/+merge/118237 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/temp-http-client-workarounds into lp:zorba
Validation queue job temp-http-client-workarounds-2012-08-05T18-38-07.752Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/temp-http-client-workarounds/+merge/118237 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/temp-http-client-workarounds into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/temp-http-client-workarounds-2012-08-05T18-38-07.752Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/temp-http-client-workarounds/+merge/118237 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/temp-http-client-workarounds into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/temp-http-client-workarounds into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/temp-http-client-workarounds/+merge/118237 -- https://code.launchpad.net/~zorba-coders/zorba/temp-http-client-workarounds/+merge/118237 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/temp-http-client-workarounds into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/temp-http-client-workarounds/+merge/118237 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-uuid into lp:zorba
Chris: please look at the CMake stuff I changed. Rodolfo: please look at the Windows-specific stuff (including the Windows-specific CMake stuff). -- https://code.launchpad.net/~zorba-coders/zorba/feature-uuid/+merge/118268 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-uuid into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-uuid/+merge/118268 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-uuid into lp:zorba
Paul J. Lucas has proposed merging lp:~zorba-coders/zorba/feature-uuid into
lp:zorba.
Requested reviews:
Rodolfo Ochoa (rodolfo-ochoa)
Matthias Brantner (matthias-brantner)
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-uuid/+merge/118268
Replaced UUID with thin layer over native platform implementation.
--
https://code.launchpad.net/~zorba-coders/zorba/feature-uuid/+merge/118268
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'CMakeCompiler.txt'
--- CMakeCompiler.txt 2012-07-24 08:48:48 +
+++ CMakeCompiler.txt 2012-08-05 16:45:25 +
@@ -234,3 +234,13 @@
ENDIF (NOT CMAKE_C_FLAGS MATCHES "-fvisibility")
ENDIF ( ZORBA_GNUCOMPILER_MAJOR_VERSION GREATER 3 )
ENDIF(CMAKE_COMPILER_IS_GNUCC)
+
+IF (APPLE)
+ # Needed for CFUUID*() functions in util/uuid.c.
+ SET(CMAKE_SHARED_LINKER_FLAGS "-framework CoreFoundation ${CMAKE_SHARED_LINKER_FLAGS}")
+ELSEIF (WIN32)
+ SET(requiredlibs ${requiredlibs} "Rpcrt4")
+ELSEIF (ZORBA_HAVE_UUID_H)
+ # Needed for uuid_generate() function in util/uuid.c.
+ SET(CMAKE_SHARED_LINKER_FLAGS "-luuid ${CMAKE_SHARED_LINKER_FLAGS}")
+ENDIF (ZORBA_HAVE_UUID_H)
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-07-24 08:48:48 +
+++ CMakeLists.txt 2012-08-05 16:45:25 +
@@ -101,6 +101,7 @@
CHECK_INCLUDE_FILES ("execinfo.h" ZORBA_HAVE_EXECINFO_H)
ENDIF (NOT APPLE OR ${CMAKE_SYSTEM_VERSION} VERSION_GREATER "10.4")
CHECK_INCLUDE_FILE_CXX ("FlexLexer.h" ZORBA_HAVE_FLEXLEXER_H)
+CHECK_INCLUDE_FILES ("uuid/uuid.h" ZORBA_HAVE_UUID_H)
CHECK_FUNCTION_EXISTS (strtof ZORBA_HAVE_STRTOF_FUNCTION)
CHECK_FUNCTION_EXISTS (strtollZORBA_HAVE_STRTOLL_FUNCTION)
=== modified file 'include/zorba/config.h.cmake'
--- include/zorba/config.h.cmake 2012-07-24 08:48:48 +
+++ include/zorba/config.h.cmake 2012-08-05 16:45:25 +
@@ -52,6 +52,7 @@
#cmakedefine ZORBA_HAVE_SYS_TYPES_H
#cmakedefine ZORBA_HAVE_USTRING_H
#cmakedefine ZORBA_HAVE_UTYPES_H
+#cmakedefine ZORBA_HAVE_UUID_H
// Platform functions
#cmakedefine ZORBA_HAVE_CLOCKGETTIME_FUNCTION
=== modified file 'src/runtime/random/random_impl.cpp'
--- src/runtime/random/random_impl.cpp 2012-07-24 08:48:48 +
+++ src/runtime/random/random_impl.cpp 2012-08-05 16:45:25 +
@@ -15,6 +15,14 @@
*/
#include "stdafx.h"
+#include
+
+#ifdef WIN32
+# include
+#else
+# include
+#endif /* WIN32 */
+
#include "system/globalenv.h"
#include "runtime/random/random.h"
@@ -27,7 +35,7 @@
#include
#include
-#include "util/uuid/uuid.h"
+#include "util/uuid.h"
namespace zorba {
@@ -104,6 +112,7 @@
store::Item_tnum;
unsigned int int_seed;
long walltime_millis;
+ uint32_t time_low;
zstring ltmp;
RandomIteratorState* state;
@@ -125,11 +134,12 @@
time::get_current_walltime( lCurrWallTime );
walltime_millis = time::get_walltime_in_millis( lCurrWallTime );
-uuid_t u;
-memset(&u, 0, sizeof(uuid_t));
-uuid_create(&u);
-
-walltime_millis += u.time_low;
+uuid u;
+uuid::create(&u);
+time_low = ntohl(
+ (u.data[0] << 24) | (u.data[1] << 16) | (u.data[2] << 8) | u.data[3]
+);
+walltime_millis += time_low;
int_seed = walltime_millis % std::numeric_limits::max();
@@ -151,16 +161,16 @@
UuidIterator::nextImpl(store::Item_t& result, PlanState& planState) const
{
store::Item_t item;
- uuid_t u;
+ uuid u;
zstring uuidStr;
+ std::ostringstream oss;
PlanIteratorState* state;
DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
- memset(&u, 0, sizeof(uuid_t));
-
- uuid_create(&u);
- uuidStr = uuidToString(u);
+ uuid::create(&u);
+ oss << u;
+ uuidStr = oss.str();
GENV_ITEMFACTORY->createString(result, uuidStr);
STACK_PUSH(true, state);
=== modified file 'src/store/naive/simple_store.cpp'
--- src/store/naive/simple_store.cpp 2012-07-24 08:48:48 +
+++ src/store/naive/simple_store.cpp 2012-08-05 16:45:25 +
@@ -15,6 +15,8 @@
*/
#include "stdafx.h"
+#include
+
#include "simple_store.h"
#include "store_defs.h"
@@ -30,7 +32,7 @@
#include "diagnostics/diagnostic.h"
#include
-#include "util/uuid/uuid.h"
+#include "util/uuid.h"
#include "zorbautils/string_util.h"
#ifdef ZORBA_WITH_JSON
@@ -288,9 +290,11 @@
return theItemFactory->createAnyURI(result, id);
}
- uuid_t uuid;
- uuid_create(&uuid);
- zstring uuidStr = uuidToURI(uuid);
+ uuid u;
+ uuid::create(&u);
+ std::ostringstream oss;
+ oss << "urn:uuid:" << u;
+ zstring uuidStr = oss.str();
assignReference(xmlNode, uuidStr);
=== modified file 'src/store/naive/store.cpp'
--- src/store/naive/store.cpp 2012-07-24 08:48:48 +
+++ src/store/naive/store.cpp 2012-08-05 16:45:25 +
@@ -58,7 +58,6 @@
#include "tree_id_generator.h"
#include "util/cxx_util.h"
-#include "util/uuid/uuid.h"
#include "zorbautils/
