Zorba

Merge lp:~zorba-coders/zorba/xqxq-bug-1056704 into lp:zorba/xqxq-module

  1. xqxq-bug-1056704
  2. Merge into xqxq-module
Proposed by Sorin Marian Nasoi
Status: Merged
Approved by: Juan Zacarias
Approved revision: 39
Merged at revision: 39
Proposed branch: lp:~zorba-coders/zorba/xqxq-bug-1056704
Merge into: lp:zorba/xqxq-module
Diff against target: 73 lines (+13/-32)
2 files modified
src/xqxq.xq.src/xqxq.cpp (+13/-24)
src/xqxq.xq.src/xqxq.h (+0/-8)
To merge this branch: bzr merge lp:~zorba-coders/zorba/xqxq-bug-1056704
Reviewer Review Type Date Requested Status
Juan Zacarias Approve
Sorin Marian Nasoi Approve
Review via email: mp+127594@code.launchpad.net

This proposal supersedes a proposal from 2012-10-01.

Commit message

Replaced xqxq's implementation of uuid for zorba's implementation in zorba/util/uuid.h

Description of the change

Replaced xqxq's implementation of uuid for zorba's implementation in zorba/util/uuid.h

To post a comment you must log in.
Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) wrote : Posted in a previous version of this proposal

I have checked these changes in XQXQ together with the changes made by Paul in the public API and the reported problem was fixed.

Thanks for the help,
Sorin

review: Approve
Revision history for this message
Juan Zacarias (juan457) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

No proposals found for merge of lp:~zorba-coders/zorba/bug-1056704 into lp:zorba/xqxq-module.

Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) wrote :

Resubmitted merge proposal.

review: Approve
Revision history for this message
Juan Zacarias (juan457) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/xqxq-bug-1056704-2012-10-03T02-14-38.686Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/xqxq-bug-1056704 into lp:zorba/xqxq-module 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 xqxq-bug-1056704-2012-10-03T02-14-38.686Z 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

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/xqxq-bug-1056704-2012-10-03T06-13-39.924Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/xqxq-bug-1056704 into lp:zorba/xqxq-module 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 xqxq-bug-1056704-2012-10-03T06-13-39.924Z 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

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/xqxq-bug-1056704-2012-10-03T06-40-40.619Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/xqxq-bug-1056704 into lp:zorba/xqxq-module 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 xqxq-bug-1056704-2012-10-03T06-40-40.619Z 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

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/xqxq-bug-1056704-2012-10-03T07-08-38.488Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~zorba-coders/zorba/xqxq-bug-1056704 into lp:zorba/xqxq-module 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 xqxq-bug-1056704-2012-10-03T07-08-38.488Z is finished.
  The final status was:

  2 tests did not succeed - changes not commited.

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

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/xqxq-bug-1056704-2012-10-04T20-23-38.473Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job xqxq-bug-1056704-2012-10-04T20-23-38.473Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/xqxq.xq.src/xqxq.cpp'
--- src/xqxq.xq.src/xqxq.cpp 2011-11-30 21:57:52 +0000
+++ src/xqxq.xq.src/xqxq.cpp 2012-10-02 21:11:22 +0000
@@ -10,7 +10,7 @@
10#include <zorba/xquery.h>10#include <zorba/xquery.h>
11#include <time.h>11#include <time.h>
12#include <stdio.h>12#include <stdio.h>
1313#include <zorba/util/uuid.h>
14#include <vector>14#include <vector>
1515
16#include "xqxq.h"16#include "xqxq.h"
@@ -269,29 +269,18 @@
269 e.diagnostic().qname().ns(), e.diagnostic().qname().localname());269 e.diagnostic().qname().ns(), e.diagnostic().qname().localname());
270 throw USER_EXCEPTION(errQName, err.str());270 throw USER_EXCEPTION(errQName, err.str());
271 }271 }
272272
273 String lUUID = getUUID();273 uuid lUUID;
274 274 uuid::create(&lUUID);
275 lQueryMap->storeQuery(lUUID, lQuery);275
276276 std::stringstream lStream;
277 return ItemSequence_t(new SingletonItemSequence(XQXQModule::getItemFactory()->createAnyURI(lUUID)));277 lStream << lUUID;
278 }278
279279 String lStrUUID = lStream.str();
280 String 280
281 PrepareMainModuleFunction::S4 ()281 lQueryMap->storeQuery(lStrUUID, lQuery);
282 {282
283 unsigned long randNum = (1 + rand() * 0x10000)|0;283 return ItemSequence_t(new SingletonItemSequence(XQXQModule::getItemFactory()->createAnyURI(lStrUUID)));
284 char* randBuff= new char[20];
285 sprintf(randBuff, "%lx", randNum);
286 String lString(randBuff);
287 delete[] randBuff;
288 return lString;
289 }
290
291 String
292 PrepareMainModuleFunction::getUUID()
293 {
294 return (String("urn:uuid:") + S4()+"-"+S4()+"-"+S4()+"-"+S4()+"-"+S4()+S4());
295 }284 }
296285
297 /*******************************************************************************************286 /*******************************************************************************************
298287
=== modified file 'src/xqxq.xq.src/xqxq.h'
--- src/xqxq.xq.src/xqxq.h 2011-11-28 23:55:59 +0000
+++ src/xqxq.xq.src/xqxq.h 2012-10-02 21:11:22 +0000
@@ -126,14 +126,6 @@
126 evaluate(const Arguments_t&,126 evaluate(const Arguments_t&,
127 const zorba::StaticContext*,127 const zorba::StaticContext*,
128 const zorba::DynamicContext*) const;128 const zorba::DynamicContext*) const;
129
130 protected:
131 static String
132 getUUID();
133
134 static String
135 S4();
136
137 };129 };
138130
139 class PrepareLibraryModuleFunction : public XQXQFunction{131 class PrepareLibraryModuleFunction : public XQXQFunction{

Subscribers

People subscribed via source and target branches

to all changes: