[Zorba-coders] [Merge] lp:~zorba-coders/zorba/xqxq-memory-smash into lp:zorba/xqxq-module
The proposal to merge lp:~zorba-coders/zorba/xqxq-memory-smash into lp:zorba/xqxq-module has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqxq-memory-smash/+merge/130657 -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-memory-smash/+merge/130657 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/xqxq-memory-smash into lp:zorba/xqxq-module
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-memory-smash/+merge/130657 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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/xqxq-memory-smash into lp:zorba/xqxq-module
Validation queue job xqxq-memory-smash-2012-10-20T02-21-41.631Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-memory-smash/+merge/130657 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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/xqxq-memory-smash into lp:zorba/xqxq-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/xqxq-memory-smash-2012-10-20T02-21-41.631Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-memory-smash/+merge/130657 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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/xqxq-memory-smash into lp:zorba/xqxq-module
The proposal to merge lp:~zorba-coders/zorba/xqxq-memory-smash into lp:zorba/xqxq-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqxq-memory-smash/+merge/130657 -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-memory-smash/+merge/130657 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/xqxq-memory-smash into lp:zorba/xqxq-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-memory-smash/+merge/130657 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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/xqxq-memory-smash into lp:zorba/xqxq-module
The proposal to merge lp:~zorba-coders/zorba/xqxq-memory-smash into lp:zorba/xqxq-module has been updated. Commit Message changed to: Fix several memory errors having to do with freeing URIMappers / URLResolvers. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqxq-memory-smash/+merge/130657 -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-memory-smash/+merge/130657 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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/xqxq-memory-smash into lp:zorba/xqxq-module
Chris Hillery has proposed merging lp:~zorba-coders/zorba/xqxq-memory-smash
into lp:zorba/xqxq-module.
Commit message:
Fix several memory errors having to do with freeing URIMappers / URLResolvers.
Requested reviews:
Chris Hillery (ceejatec)
Juan Zacarias (juan457)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/xqxq-memory-smash/+merge/130657
--
https://code.launchpad.net/~zorba-coders/zorba/xqxq-memory-smash/+merge/130657
Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-module.
=== modified file 'src/xqxq.xq.src/xqxq.cpp'
--- src/xqxq.xq.src/xqxq.cpp 2012-10-19 01:22:47 +
+++ src/xqxq.xq.src/xqxq.cpp 2012-10-20 02:20:24 +
@@ -179,20 +179,39 @@
String errDescription(aErrorMessage);
throw USER_EXCEPTION(errQName, errDescription);
}
-
- /***
- ***/
-
+
+ /***
+ ***/
+
+ QueryData::QueryData(XQuery_t aQuery, URIMapper *aMapper, URLResolver *aResolver)
+: theQuery(aQuery),
+ theURIMapper(aMapper),
+ theURLResolver(aResolver)
+ {
+ }
+
+ QueryData::~QueryData()
+ {
+theQuery->close();
+delete theURIMapper;
+delete theURLResolver;
+ }
+
+ /***
+ ***/
+
QueryMap::QueryMap()
{
QueryMap::queryMap = new QueryMap_t();
}
bool
-QueryMap::storeQuery(const String& aKeyName, XQuery_t aQuery)
+QueryMap::storeQuery(const String& aKeyName, XQuery_t aQuery,
+ URIMapper* aMapper, URLResolver* aResolver)
{
+QueryData_t lQueryData(new QueryData(aQuery, aMapper, aResolver));
std::pair ret;
-ret = queryMap->insert(std::pair(aKeyName, aQuery));
+ret = queryMap->insert(std::pair(aKeyName, lQueryData));
return ret.second;
}
@@ -204,7 +223,7 @@
if(lIter == queryMap->end())
return NULL;
-XQuery_t lQuery = lIter->second;
+XQuery_t lQuery = lIter->second->getQuery();
return lQuery;
}
@@ -216,14 +235,27 @@
if(lIter == queryMap->end())
return false;
-
-lIter->second->close();
queryMap->erase(lIter);
-
return true;
}
+ void
+QueryMap::destroy() throw()
+ {
+if(queryMap)
+{
+ for (QueryMap_t::const_iterator lIter = queryMap->begin();
+ lIter != queryMap->end(); ++lIter)
+ {
+deleteQuery(lIter->first);
+ }
+ queryMap->clear();
+ delete queryMap;
+}
+delete this;
+ }
+
/***
***/
static void streamReleaser(std::istream* aStream)
@@ -344,7 +376,6 @@
{
DynamicContext* lDynCtx = const_cast(aDctx);
StaticContext_t lSctxChild = aSctx->createChildContext();
-StaticContext_t lMapperSctx = aSctx->createChildContext();
QueryMap* lQueryMap;
if(!(lQueryMap = dynamic_cast(lDynCtx->getExternalFunctionParameter("xqxqQueryMap"
@@ -360,16 +391,16 @@
XQuery_t lQuery;
StaticContext_t ltempSctx = lZorba->createStaticContext();
-XQXQURLResolver* lResolver = NULL;
-XQXQURIMapper* lMapper = NULL;
+std::auto_ptr lResolver;
+std::auto_ptr lMapper;
if ( aArgs.size() > 2 )
{
Item lMapperFunctionItem = getItemArgument(aArgs, 2);
if (!lMapperFunctionItem.isNull())
{
-lMapper = new XQXQURIMapper(lMapperFunctionItem, lSctxChild);
-ltempSctx->registerURIMapper(lMapper);
+lMapper.reset(new XQXQURIMapper(lMapperFunctionItem, lSctxChild));
+ltempSctx->registerURIMapper(lMapper.get());
}
}
@@ -378,8 +409,8 @@
Item lResolverFunctionItem = getItemArgument(aArgs, 1);
if (!lResolverFunctionItem.isNull())
{
-lResolver = new XQXQURLResolver(lResolverFunctionItem, lSctxChild);
-ltempSctx->registerURLResolver(lResolver);
+lResolver.reset(new XQXQURLResolver(lResolverFunctionItem, lSctxChild));
+ltempSctx->registerURLResolver(lResolver.get());
}
}
@@ -390,6 +421,7 @@
}
catch (XQueryException& xe)
{
+ lQuery = NULL;
std::ostringstream err;
err << "The query compiled using xqxq:prepare-main-module raised an error at"
<< " line " << xe.source_line() << " column " << xe.source_column() << ": " << xe.what();
@@ -399,6 +431,7 @@
}
catch (ZorbaException& e)
{
+ lQuery = NULL;
std::ostringstr
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130495 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130495 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/markos-scratch into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/markos-scratch 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 markos-scratch-2012-10-19T20-51-12.253Z 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 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130495 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/markos-scratch into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2012-10-19T20-51-12.253Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130495 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/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130495 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130495 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/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130495 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/xqxq-url-resolver into lp:zorba/xqxq-module
The proposal to merge lp:~zorba-coders/zorba/xqxq-url-resolver into lp:zorba/xqxq-module has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/130460 -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/130460 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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/xqxq-url-resolver into lp:zorba/xqxq-module
Validation queue job xqxq-url-resolver-2012-10-19T08-27-45.258Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/130460 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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/xqxq-url-resolver into lp:zorba/xqxq-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/xqxq-url-resolver-2012-10-19T08-27-45.258Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/130460 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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/xqxq-url-resolver into lp:zorba/xqxq-module
The proposal to merge lp:~zorba-coders/zorba/xqxq-url-resolver into lp:zorba/xqxq-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/130460 -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/130460 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/xqxq-url-resolver into lp:zorba/xqxq-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/xqxq-url-resolver/+merge/130460 Your team Zorba Coders is subscribed to branch lp:zorba/xqxq-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/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba. Commit message: Fixed bug #1067706 (wrong const folding in mutually recursive udfs) Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130495 Fixed bug #1067706 (wrong const folding in mutually recursive udfs) -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/130495 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
