[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/threads into
lp:zorba.
Commit message:
fixed a failing PathExpr test in XQTS
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/188554
fixed a failing PathExpr test in XQTS
--
https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/188554
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/expression/expr_type.cpp'
--- src/compiler/expression/expr_type.cpp 2013-09-23 09:11:02 +
+++ src/compiler/expression/expr_type.cpp 2013-10-01 11:12:39 +
@@ -319,6 +319,9 @@
stepType = axis_step_type(theSctx,
axisStep,
static_castconst NodeXQType*(stepType.getp()));
+
+ if (stepType-is_empty() || stepType-is_none())
+break;
}
newType = stepType.getp();
@@ -1141,6 +1144,10 @@
case store::StoreConsts::commentNode:
return RTM.COMMENT_TYPE_STAR;
+case store::StoreConsts::attributeNode:
+case store::StoreConsts::documentNode:
+ return RTM.EMPTY_TYPE;
+
default:
ZORBA_ASSERT(false);
}
=== modified file 'test/driver/testdriver_comparator.cpp'
--- test/driver/testdriver_comparator.cpp 2013-05-16 08:22:46 +
+++ test/driver/testdriver_comparator.cpp 2013-10-01 11:12:39 +
@@ -34,7 +34,8 @@
/***
/
-int canonicalizeAndCompare(const std::string aComparisonMethod,
+int canonicalizeAndCompare(
+const std::string aComparisonMethod,
const char* aRefFile,
const char* aResultFile,
std::ostream aOutput)
@@ -224,7 +225,7 @@
zorba::printFile(aOutput, lCanonicalRefFile);
aOutput std::endl std::endl;
-
+#if 0
aOutput See line lLine , col lCol
of expected result. std::endl;
aOutput Actual: ;
@@ -235,7 +236,7 @@
aOutput lRefLine;
aOutputstd::endl;
-
+#endif
return 8;
}
return 0;
=== modified file 'test/driver/testdriver_mt.cpp'
--- test/driver/testdriver_mt.cpp 2013-09-26 07:38:44 +
+++ test/driver/testdriver_mt.cpp 2013-10-01 11:12:39 +
@@ -364,6 +364,7 @@
}
else
{
+#if 0
printErrors(errHandler, Unexpected errors executing query, true, lOutput);
std::ofstream errFile(errHandler.getErrorFile().c_str());
@@ -375,6 +376,7 @@
errFile *lIter;
}
errFile std::endl;
+#endif
return false;
}
}
@@ -539,16 +541,23 @@
// in the pathname of the result and error files.
resultFilePath = fs::path(queries-theResultsDir) / (relativeQueryFile);
resultFilePath = fs::change_extension(resultFilePath, (.res_ + tnoStr));
+
+if (fs::exists(resultFilePath))
+ fs::remove(resultFilePath);
+
+std::ofstream resFileStream;
+createPath(resultFilePath, resFileStream);
+
+#if 0
errorFilePath = fs::path(queries-theResultsDir) / (relativeQueryFile);
errorFilePath = fs::change_extension(errorFilePath, (.err_ + tnoStr));
-if (fs::exists(resultFilePath)) fs::remove(resultFilePath);
-if (fs::exists(errorFilePath)) fs::remove(errorFilePath);
+if (fs::exists(errorFilePath))
+ fs::remove(errorFilePath);
-std::ofstream resFileStream;
std::ofstream errFileStream;
-createPath(resultFilePath, resFileStream);
createPath(errorFilePath, errFileStream);
+#endif
queries-theQueryLocks[queryNo]-unlock();
@@ -615,8 +624,6 @@
//
zorba::XQuery_t query = zorba-createQuery(errHandler);
-query-registerDiagnosticHandler(errHandler);
-
//
// Compile the query
//
=== modified file 'test/rbkt/Queries/w3c_known_failures.txt'
--- test/rbkt/Queries/w3c_known_failures.txt 2013-07-02 09:58:23 +
+++ test/rbkt/Queries/w3c_known_failures.txt 2013-10-01 11:12:39 +
@@ -52,7 +52,6 @@
test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-005
test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-007
test/rbkt/w3c_testsuite/XQuery/Functions/HigherOrder/Map/map-003
-test/rbkt/w3c_testsuite/XQuery/PathExpr/Steps/Axes/K2-Axes-86
test/rbkt/w3c_testsuite/XQuery/PathExpr/Steps/Axes/K2-Axes-52
test/rbkt/w3c_testsuite/XQuery/StaticTyping/STFunctions/ST-Data001
test/rbkt/w3c_testsuite/XQuery/StaticTyping/STFLWORExpr/ST-PITest-02
--
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/threads into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/188554 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/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/188554 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/188554 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/threads into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/188554 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/188554 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/188554 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Description changed to: 1. Adding Xereces mutex for multi-thread safety 2. parse-xml() function will not use cached document For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Commit Message changed to: 1. Adding Xereces mutex for multi-thread safety 2. parse-xml() function will not use cached document For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 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/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 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/threads into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/threads into
lp:zorba.
Commit message:
Adding Xereces mutex for multi-thread safety
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178
Adding Xereces mutex for multi-thread safety
--
https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/system/globalenv.cpp'
--- src/system/globalenv.cpp 2013-09-19 16:47:08 +
+++ src/system/globalenv.cpp 2013-09-24 09:51:29 +
@@ -96,7 +96,7 @@
ZORBA_FATAL(store != NULL, Must provide store during zorba initialization);
- m_globalEnv-m_store = store;
+ m_globalEnv-theStore = store;
m_globalEnv-theRootTypeManager = new RootTypeManager;
RCHelper::addReference(m_globalEnv-theRootTypeManager);
@@ -169,7 +169,7 @@
AnnotationInternal::destroyBuiltIn();
- m_globalEnv-m_store = NULL;
+ m_globalEnv-theStore = NULL;
// we shutdown icu
// again it is important to mention this in the documentation
@@ -206,7 +206,7 @@
/
GlobalEnvironment::GlobalEnvironment()
:
- m_store(0),
+ theStore(0),
theRootTypeManager(NULL),
theRootStaticContext(0),
m_compilerSubSys(0)
@@ -310,19 +310,19 @@
store::Store GlobalEnvironment::getStore()
{
- return *m_store;
+ return *theStore;
}
store::ItemFactory* GlobalEnvironment::getItemFactory()
{
- return m_store-getItemFactory();
+ return theStore-getItemFactory();
}
store::IteratorFactory* GlobalEnvironment::getIteratorFactory()
{
- return m_store-getIteratorFactory();
+ return theStore-getIteratorFactory();
}
=== modified file 'src/system/globalenv.h'
--- src/system/globalenv.h 2013-09-17 21:12:49 +
+++ src/system/globalenv.h 2013-09-24 09:51:29 +
@@ -61,7 +61,7 @@
static GlobalEnvironment* m_globalEnv;
private:
- store::Store* m_store;
+ store::Store* theStore;
RootTypeManager * theRootTypeManager;
=== modified file 'src/types/casting.cpp'
--- src/types/casting.cpp 2013-09-17 21:12:49 +
+++ src/types/casting.cpp 2013-09-24 09:51:29 +
@@ -2657,7 +2657,8 @@
if (!targetType-isAtomicOne())
{
-if ( throw_on_error ) {
+if ( throw_on_error )
+{
RAISE_ERROR(err::XPST0051, loc,
ERROR_PARAMS(ZED(XPST0051_Atomic_2), targetType));
}
@@ -2700,9 +2701,11 @@
{
CastFunc castFunc = theCastMatrix[theMapping[sourceTypeCode]]
[theMapping[targetTypeCode]];
-if (castFunc == 0) {
+if (castFunc == 0)
+{
if ( throw_on_error )
throwXPTY0004Exception(errInfo);
+
return false;
}
@@ -3202,7 +3205,7 @@
TypeManager* tm)
{
#ifndef ZORBA_NO_XMLSCHEMA
- if (targetType-type_kind() == XQType::USER_DEFINED_KIND )
+ if (targetType-type_kind() == XQType::USER_DEFINED_KIND)
{
const UserDefinedXQType* udt = static_castconst UserDefinedXQType*(targetType);
if (!udt-isComplex())
@@ -3254,20 +3257,19 @@
/
bool GenericCast::isCastable(
const zstring str,
-const XQType* aTargetType,
+const XQType* targetType,
TypeManager* tm)
{
#ifndef ZORBA_NO_XMLSCHEMA
- if (aTargetType-type_kind() == XQType::USER_DEFINED_KIND )
+ if (targetType-type_kind() == XQType::USER_DEFINED_KIND )
{
-const UserDefinedXQType* udt = static_castconst UserDefinedXQType*(aTargetType);
+const UserDefinedXQType* udt = static_castconst UserDefinedXQType*(targetType);
if (!udt-isComplex())
{
tm-initializeSchema();
return tm-getSchema()-
- isCastableUserSimpleTypes(str,
- udt-getBaseType().getp());
+ isCastableUserSimpleTypes(str, udt-getBaseType().getp());
}
}
#endif // ZORBA_NO_XMLSCHEMA
@@ -3276,8 +3278,9 @@
xqtref_t lSourceType = rtm.STRING_TYPE_ONE;
- TypeConstants::castable_t lIsCastable = TypeOps::castability(*lSourceType,
- *aTargetType);
+ TypeConstants::castable_t lIsCastable =
+ TypeOps::castability(*lSourceType, *targetType);
+
switch(lIsCastable)
{
case TypeConstants::NOT_CASTABLE:
@@ -3292,7 +3295,7 @@
{
store::Item_t dummy;
zstring copyStr = str;
- return castStringToAtomic(dummy, copyStr, aTargetType, tm, NULL, QueryLoc::null, false);
+ return castStringToAtomic(dummy, copyStr, targetType, tm, NULL, QueryLoc::null, false);
}
catch (ZorbaException const)
{
=== modified file 'src/types/root_typemanager.h'
--- src/types/root_typemanager.h 2013-06-15 02:57:08 +
+++ src/types/root_typemanager.h 2013-09-24 09:51:29 +
@@ -18,9
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/187178 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/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 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/threads into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 Stage TestZorbaUbuntu failed. 1 tests failed (8550 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/329/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 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/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 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/threads into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 Stage TestZorbaUbuntu failed. 6 tests failed (8535 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/319/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 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/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 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/threads into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 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/threads into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 Stage TestZorbaUbuntu failed. 11 tests failed (8535 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/315/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 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/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 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/threads into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/186514 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/threads into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/threads into lp:zorba. Commit message: destroy the XmlDataManager before shuting down the store in zorbacmd Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 destroy the XmlDataManager before shuting down the store in zorbacmd -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'bin/zorbacmd.cpp' --- bin/zorbacmd.cpp 2013-08-06 09:10:25 + +++ bin/zorbacmd.cpp 2013-08-06 13:26:52 + @@ -1301,6 +1301,8 @@ lAuditProvider-destroyConfiguration(config); #endif + xmlDataMgr = NULL; + lZorbaInstance-shutdown(); zorba::StoreManager::shutdownStore(store); -- 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/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 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/threads into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 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/threads into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 Stage TestZorbaUbuntu failed. tests failed ( total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/168/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 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/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 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/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 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/threads into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 Stage TestZorbaUbuntu failed. 13 tests failed (8404 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/171/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178750 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Commit Message changed to: More work tawards thread-safe zorba: 1. XmlDataManager is not a singleton anymore 2. synchronize Item::getRefCount() method 3. fixed memory leak related to function annotations 4. removed 2 non-const global variables from locale 5. do not set annotations for builtin functions in the translator 6. make set_length() method a noop if this is the empty string 7. fixed a bug in StaticContext::validate() 8. datetime module is a pure builtin module 9. no stable ids for iterators in multi-threaded mode (for now at least) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Commit Message changed to: More work tawards thread-safe zorba: 1. XmlDataManager is not a singleton anymore 2. synchronize Item::getRefCount() method 3. fixed memory leak related to function annotations 4. removed 2 non-const global variables from locale 5. do not set annotations for builtin functions in the translator 6. make set_length() method a noop if this is the empty string 7. fixed a bug in StaticContext::validate() 8. datetime module is a pure builtin module 9. no stable ids for iterators in multi-threaded mode (for now at least) 10. bug fix in URI.cpp For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/threads into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/threads into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Stage BuildZorbaUbuntu failed. Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/187/parsed_console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Description changed to: More work tawards thread-safe zorba: 1. XmlDataManager is not a singleton anymore 2. synchronize Item::getRefCount() method 3. fixed memory leak related to function annotations 4. removed 2 non-const global variables from locale 5. do not set annotations for builtin functions in the translator 6. make set_length() method a noop if this is the empty string 7. fixed a bug in StaticContext::validate() 8. datetime module is a pure builtin module 9. no stable ids for iterators in multi-threaded mode (for now at least) 10. bug fix in URI.cpp For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Commit Message changed to: More work tawards thread-safe zorba: 1. XmlDataManager is not a singleton anymore 2. synchronize Item::getRefCount() method 3. fixed memory leak related to function annotations 4. removed 2 non-const global variables from locale 5. do not set annotations for builtin functions in the translator 6. make set_length() method a noop if this is the empty string 7. fixed a bug in StaticContext::validate() 8. datetime module is a pure builtin module 9. no stable ids for iterators in multi-threaded mode (for now at least) 10. bug fix in URI.cpp 11. thread-safe MAPM For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Description changed to: More work tawards thread-safe zorba: 1. XmlDataManager is not a singleton anymore 2. synchronize Item::getRefCount() method 3. fixed memory leak related to function annotations 4. removed 2 non-const global variables from locale 5. do not set annotations for builtin functions in the translator 6. make set_length() method a noop if this is the empty string 7. fixed a bug in StaticContext::validate() 8. datetime module is a pure builtin module 9. no stable ids for iterators in multi-threaded mode (for now at least) 10. bug fix in URI.cpp 11. thread-safe MAPM For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/threads into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Stage BuildZorbaUbuntu failed. Check compiler output at http://jenkins.lambda.nu/job/BuildZorbaUbuntu/188/parsed_console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/threads into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Stage TestZorbaUbuntu failed. 22 tests failed (8404 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/154/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/threads into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Stage TestZorbaUbuntu failed. 11 tests failed (8376 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/156/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/threads into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897 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/threads into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/threads into lp:zorba. Commit message: re-enabled html module Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178588 re-enabled html module -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178588 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'modules/ExternalModules.conf' --- modules/ExternalModules.conf 2013-08-05 14:54:22 + +++ modules/ExternalModules.conf 2013-08-05 15:33:33 + @@ -35,7 +35,7 @@ geo bzr lp:zorba/geo-module geoproj bzr lp:zorba/geoproj-module zorba-2.9 graphvizbzr lp:zorba/graphviz-module zorba-2.9 -#htmlbzr lp:zorba/html-module zorba-2.9 +htmlbzr lp:zorba/html-module zorba-2.9 http-client bzr lp:zorba/http-client-module zorba-2.9 image bzr lp:zorba/image-module jdbcbzr lp:zorba/jdbc-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/threads into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178588 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/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178588 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178588 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/threads into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178588 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178588 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178588 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/threads into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/threads into lp:zorba. Commit message: re-enabled languages and schema tools modules Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178624 re-enabled languages and schema tools modules -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178624 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'modules/ExternalModules.conf' --- modules/ExternalModules.conf 2013-08-05 15:31:02 + +++ modules/ExternalModules.conf 2013-08-05 19:23:28 + @@ -39,7 +39,7 @@ http-client bzr lp:zorba/http-client-module zorba-2.9 image bzr lp:zorba/image-module jdbcbzr lp:zorba/jdbc-module -#languages bzr lp:zorba/languages-module +languages bzr lp:zorba/languages-module oracle-nosql-db bzr lp:zorba/oracle-nosql-db-module oauth bzr lp:zorba/oauth-modulezorba-2.9 process bzr lp:zorba/process-module @@ -48,7 +48,7 @@ system bzr lp:zorba/system-module zorba-2.9 email bzr lp:zorba/email-module util-jvmbzr lp:zorba/util-jvm-module -#schema-toolsbzr lp:zorba/schema-tools-module +schema-toolsbzr lp:zorba/schema-tools-module stack bzr lp:zorba/stack-module queue bzr lp:zorba/queue-module couchbase bzr lp:zorba/couchbase-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/threads into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178624 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/threads into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178624 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178624 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/threads into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178624 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178624 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/178624 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/threads into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/threads into
lp:zorba.
Commit message:
fixed memory leak related to function annotations
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897
fixed memory leak related to function annotations
--
https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/177897
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'bin/zorbacmd.cpp'
--- bin/zorbacmd.cpp 2013-06-14 23:46:26 +
+++ bin/zorbacmd.cpp 2013-07-31 16:13:34 +
@@ -272,14 +272,14 @@
/
bool populateDynamicContext(
Zorba* zorba,
+XmlDataManager* xmlMgr,
zorba::DynamicContext* aDynamicContext,
const ZorbaCMDProperties props)
{
if ( props.contextItem().size() != 0 )
{
-XmlDataManager* lXmlMgr = zorba-getXmlDataManager();
std::ifstream lInStream(props.contextItem().c_str());
-Item lDoc = lXmlMgr-parseXML(lInStream);
+Item lDoc = xmlMgr-parseXML(lInStream);
aDynamicContext-setContextItem(lDoc);
}
@@ -293,9 +293,8 @@
{
if ((*lIter).inline_file)
{
-XmlDataManager* lXmlMgr = zorba-getXmlDataManager();
std::ifstream lInStream((*lIter).var_value.c_str());
-Item lDoc = lXmlMgr-parseXML(lInStream);
+Item lDoc = xmlMgr-parseXML(lInStream);
aDynamicContext-setVariable((*lIter).var_name, lDoc);
}
else
@@ -642,6 +641,7 @@
int
compileAndExecute(
zorba::Zorba* zorbaInstance,
+zorba::XmlDataManager* xmlDataMgr,
const ZorbaCMDProperties properties,
zorba::StaticContext_t staticContext,
const std::string qfilepath,
@@ -715,7 +715,8 @@
lHints.lib_module = true;
}
- Zorba_SerializerOptions lSerOptions = Zorba_SerializerOptions::SerializerOptionsFromStringParams(properties.getSerializerParameters());
+ Zorba_SerializerOptions lSerOptions =
+ Zorba_SerializerOptions::SerializerOptionsFromStringParams(properties.getSerializerParameters());
createSerializerOptions(lSerOptions, properties);
@@ -831,7 +832,10 @@
zorba::DynamicContext* lDynamicContext = query-getDynamicContext();
try
{
- if ( ! populateDynamicContext(zorbaInstance, lDynamicContext, properties) )
+ if ( ! populateDynamicContext(zorbaInstance,
+xmlDataMgr,
+lDynamicContext,
+properties) )
{
properties.printHelp(std::cout);
return 21;
@@ -894,11 +898,9 @@
//
if (doTiming)
{
- XmlDataManager* store = zorbaInstance-getXmlDataManager();
-
timing.startTimer(TimingInfo::UNLOAD_TIMER, i);
- DocumentManager* docMgr = store-getDocumentManager();
+ DocumentManager* docMgr = xmlDataMgr-getDocumentManager();
ItemSequence_t docsSeq = docMgr-availableDocuments();
Iterator_t lIter = docsSeq-getIterator();
lIter-open();
@@ -1019,6 +1021,8 @@
zorba::Zorba* lZorbaInstance = zorba::Zorba::getInstance(store);
+ zorba::XmlDataManager_t xmlDataMgr = lZorbaInstance-createXmlDataManager();
+
#ifdef DO_AUDIT
zorba::audit::Provider* lAuditProvider = lZorbaInstance-getAuditProvider();
@@ -1240,7 +1244,11 @@
lQuery-compile(*lXQ.get(), lHints);
zorba::DynamicContext* lDynamicContext = lQuery-getDynamicContext();
-if (!populateDynamicContext(lZorbaInstance, lDynamicContext, properties)) {
+if (!populateDynamicContext(lZorbaInstance,
+xmlDataMgr,
+lDynamicContext,
+properties))
+{
return 9;
}
=== modified file 'include/zorba/api_shared_types.h'
--- include/zorba/api_shared_types.h 2013-06-12 04:55:14 +
+++ include/zorba/api_shared_types.h 2013-07-31 16:13:34 +
@@ -61,6 +61,7 @@
typedef SmartPtrQueryLocation QueryLocation_t;
typedef SmartPtrSerializer Serializer_t;
typedef SmartPtrStaticContext StaticContext_t;
+typedef SmartPtrXmlDataManager XmlDataManager_t;
typedef SmartPtrTypeIdentifier TypeIdentifier_t;
typedef SmartPtrXQuery XQuery_t;
=== modified file 'include/zorba/xmldatamanager.h'
--- include/zorba/xmldatamanager.h 2013-02-07 17:24:36 +
+++ include/zorba/xmldatamanager.h 2013-07-31 16:13:34 +
@@ -23,224 +23,223 @@
namespace zorba {
- /** \brief Using the XmlDataManager one can manage documents and collections.
- *
- * The XmlDataManager is a singleton instance. The Zorba object is reponsible
- * for maintaining its lifetime. The instance can be accessed by calling
- * getXmlDataManager() on the Zorba object. It may not be accessed anymore
- * after Zorba::shutdown() has been called.
- *
-
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Commit Message changed to: Some work towards multi-threading 1. Fixed a couple of threading bugs in qname pool 2. Redefined free() method for root_static_context and for builtin functions 3. Annotations are not RCObjects anymore 4. Use atomic ints are counters in RCObjects 5. No query cloning in testdriver_mt For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/174198 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/174198 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Description changed to: Some work towards multi-threading 1. Fixed a couple of threading bugs in qname pool 2. Redefined free() method for root_static_context and for builtin functions 3. Annotations are not RCObjects anymore 4. Use atomic ints are counters in RCObjects 5. No query cloning in testdriver_mt For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/174198 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/174198 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/threads into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/174198 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/threads into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/174198 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/threads into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/threads into lp:zorba has been updated. Status: Needs review = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/174198 -- https://code.launchpad.net/~zorba-coders/zorba/threads/+merge/174198 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
