[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-943788 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-943788 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-943788/+merge/95309 -- https://code.launchpad.net/~zorba-coders/zorba/bug-943788/+merge/95309 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/bug-943788 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-943788 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 bug-943788-2012-03-01T04-09-09.503Z 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 -- https://code.launchpad.net/~zorba-coders/zorba/bug-943788/+merge/95309 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/bug-943788 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-943788-2012-03-01T04-09-09.503Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-943788/+merge/95309 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/bug-943788 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-943788 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-943788/+merge/95309 -- https://code.launchpad.net/~zorba-coders/zorba/bug-943788/+merge/95309 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] [Bug 943788] [NEW] streamable string is not seekable
Public bug reported:
import module namespace f = "http://expath.org/ns/file";;
let $s := f:read-text(fn:resolve-uri("tmp.xml"))
let $p := fn:parse-xml($s)
let $l := fn:string-length($s)
return ($p, $l)
The query returns 0 for $l after the streamable string has been consumed
by parse-xml.
** Affects: zorba
Importance: High
Assignee: Matthias Brantner (matthias-brantner)
Status: New
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/943788
Title:
streamable string is not seekable
Status in Zorba - The XQuery Processor:
New
Bug description:
import module namespace f = "http://expath.org/ns/file";;
let $s := f:read-text(fn:resolve-uri("tmp.xml"))
let $p := fn:parse-xml($s)
let $l := fn:string-length($s)
return ($p, $l)
The query returns 0 for $l after the streamable string has been
consumed by parse-xml.
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/943788/+subscriptions
--
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] [Bug 943788] Re: streamable string is not seekable
** Branch linked: lp:~zorba-coders/zorba/bug-943788
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/943788
Title:
streamable string is not seekable
Status in Zorba - The XQuery Processor:
New
Bug description:
import module namespace f = "http://expath.org/ns/file";;
let $s := f:read-text(fn:resolve-uri("tmp.xml"))
let $p := fn:parse-xml($s)
let $l := fn:string-length($s)
return ($p, $l)
The query returns 0 for $l after the streamable string has been
consumed by parse-xml.
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/943788/+subscriptions
--
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/bug-943788 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-943788/+merge/95309 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/bug-943788 into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-943788 into
lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Till Westmann (tillw)
Related bugs:
Bug #943788 in Zorba: "streamable string is not seekable"
https://bugs.launchpad.net/zorba/+bug/943788
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-943788/+merge/95309
fix for bug #943788 (streamable string is not seekable)
--
https://code.launchpad.net/~zorba-coders/zorba/bug-943788/+merge/95309
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-02-29 17:15:09 +
+++ ChangeLog 2012-03-01 04:07:22 +
@@ -51,6 +51,7 @@
* Fixed bug #917981 (disallow declaring same module twice).
* Added API method StaticContext::getNamespaceBindings() (see bug #905035)
* Deprecated StaticContext:getNamespaceURIByPrefix()
+ * Fixed bug #943788 (streamable string is not seekable)
* Fixed bug 921624 (slow queries with bogus example.com schema URIs)
* Fixed bug #918211 (xqueryx fulltext w3c conformance generation)
* Fixed bug #918157 (Add XQFTTS to validation queue)
=== modified file 'modules/org/expath/ns/file.xq.src/file.cpp'
--- modules/org/expath/ns/file.xq.src/file.cpp 2012-02-28 20:45:43 +
+++ modules/org/expath/ns/file.xq.src/file.cpp 2012-03-01 04:07:22 +
@@ -215,7 +215,7 @@
}
lFile->openInputStream(*lInStream.get(), false, true);
lResult = theModule->getItemFactory()->createStreamableString(
- *lInStream.release(), &FileModule::streamReleaser
+ *lInStream.release(), &FileModule::streamReleaser, true
);
return ItemSequence_t(new SingletonItemSequence(lResult));
=== modified file 'src/store/naive/atomic_items.cpp'
--- src/store/naive/atomic_items.cpp 2012-02-29 17:15:09 +
+++ src/store/naive/atomic_items.cpp 2012-03-01 04:07:22 +
@@ -1787,6 +1787,7 @@
std::streambuf * pbuf;
pbuf = theIstream.rdbuf();
pbuf->pubseekoff(0, std::ios::beg);
+theIstream.clear();
}
theIsConsumed = true;
return theIstream;
=== added file 'test/rbkt/ExpQueryResults/zorba/file/streamability4.xml.res'
--- test/rbkt/ExpQueryResults/zorba/file/streamability4.xml.res 1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/file/streamability4.xml.res 2012-03-01 04:07:22 +
@@ -0,0 +1,33 @@
+
+
+
+broiler
+kitchen
+100
+70
+
+
+toaster
+kitchen
+30
+10
+
+
+blender
+kitchen
+50
+25
+
+
+socks
+clothes
+10
+2
+
+
+shirt
+clothes
+10
+3
+
+642
=== added file 'test/rbkt/Queries/zorba/file/streamability4.xq'
--- test/rbkt/Queries/zorba/file/streamability4.xq 1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/file/streamability4.xq 2012-03-01 04:07:22 +
@@ -0,0 +1,6 @@
+import module namespace f = "http://expath.org/ns/file";;
+
+let $s := f:read-text(fn:resolve-uri("mydata.xml"))
+let $p := fn:parse-xml($s)
+let $l := fn:string-length($s)
+return ($p, $l)
--
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/bug-912579 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-912579/+merge/95259 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] [Bug 891209] Re: validation with xsi:type returns untyped
** Branch linked: lp:~zorba-coders/zorba/bug891209-xsiType
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/891209
Title:
validation with xsi:type returns untyped
Status in Zorba - The XQuery Processor:
Confirmed
Bug description:
import module namespace schema = "http://www.zorba-
xquery.com/modules/schema";
schema:schema-type(
data(
validate lax { 2 }
)
)
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/891209/+subscriptions
--
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/bug-912579 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-912579 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-912579/+merge/95259 -- https://code.launchpad.net/~zorba-coders/zorba/bug-912579/+merge/95259 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/bug-912579 into lp:zorba
Review: Approve Should be good now. -- https://code.launchpad.net/~zorba-coders/zorba/bug-912579/+merge/95259 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/bug-912579 into lp:zorba
Cezar Andrei has proposed merging lp:~zorba-coders/zorba/bug-912579 into
lp:zorba.
Requested reviews:
Cezar Andrei (cezar-andrei)
Markos Zaharioudakis (markos-za)
Related bugs:
Bug #912579 in Zorba: "Validate in place applied on non-root element produces
an invalid xdm instance"
https://bugs.launchpad.net/zorba/+bug/912579
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-912579/+merge/95259
Fixed bug #912579 (validate-in-place on non-root elements)
Fixed merge of updput primitives
Fixed merge conflict.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-912579/+merge/95259
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-02-29 17:15:09 +
+++ ChangeLog 2012-02-29 20:57:28 +
@@ -56,6 +56,7 @@
* Fixed bug #918157 (Add XQFTTS to validation queue)
* Fixed bug with unversioned modules with C++ external functions
* Fixed bug #878508 (JSON Module not escaping escape characters)
+ * Fixed bug #912579 (validate-in-place on non-root elements)
version 2.1
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h 2012-02-16 14:11:02 +
+++ include/zorba/pregenerated/diagnostic_list.h 2012-02-29 20:57:28 +
@@ -510,6 +510,8 @@
extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0080_CANNOT_RETRIEVE_NODE_REFERENCE;
+extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZAPI0090_CANNOT_VALIDATE_NON_ROOT;
+
extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZCSE0001_NONEXISTENT_INPUT_FIELD;
extern ZORBA_DLL_PUBLIC ZorbaErrorCode ZCSE0002_INCOMPATIBLE_INPUT_FIELD;
=== modified file 'modules/com/zorba-xquery/www/modules/pregenerated/errors.xq'
--- modules/com/zorba-xquery/www/modules/pregenerated/errors.xq 2012-02-16 14:11:02 +
+++ modules/com/zorba-xquery/www/modules/pregenerated/errors.xq 2012-02-29 20:57:28 +
@@ -321,6 +321,10 @@
(:~
:)
+declare variable $zerr:ZAPI0090 as xs:QName := fn:QName($zerr:NS, "zerr:ZAPI0090");
+
+(:~
+:)
declare variable $zerr:ZCSE0001 as xs:QName := fn:QName($zerr:NS, "zerr:ZCSE0001");
(:~
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2012-02-28 20:45:43 +
+++ src/diagnostics/diagnostic_en.xml 2012-02-29 20:57:28 +
@@ -1832,6 +1832,10 @@
can not retrieve node-reference for a node that is not in a collection.
+
+
+ a non root element cannot be validated in place.
+
=== modified file 'src/diagnostics/pregenerated/diagnostic_list.cpp'
--- src/diagnostics/pregenerated/diagnostic_list.cpp 2012-02-16 14:11:02 +
+++ src/diagnostics/pregenerated/diagnostic_list.cpp 2012-02-29 20:57:28 +
@@ -744,6 +744,9 @@
ZorbaErrorCode ZAPI0080_CANNOT_RETRIEVE_NODE_REFERENCE( "ZAPI0080" );
+ZorbaErrorCode ZAPI0090_CANNOT_VALIDATE_NON_ROOT( "ZAPI0090" );
+
+
ZorbaErrorCode ZCSE0001_NONEXISTENT_INPUT_FIELD( "ZCSE0001" );
=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp 2012-02-28 20:45:43 +
+++ src/diagnostics/pregenerated/dict_en.cpp 2012-02-29 20:57:28 +
@@ -248,6 +248,7 @@
{ "ZAPI0042", "iterator is closed" },
{ "ZAPI0070", "\"$1\": invalid serialization method for SAX" },
{ "ZAPI0080", "can not retrieve node-reference for a node that is not in a collection." },
+ { "ZAPI0090", "a non root element cannot be validated in place." },
{ "ZCSE0001", "\"$1\": nonexistent input field" },
{ "ZCSE0002", "\"$1\": incompatible input field${: type=2}${, class=3}" },
{ "ZCSE0003", "\"$1\": unrecognized class field" },
=== modified file 'src/runtime/schema/schema_impl.cpp'
--- src/runtime/schema/schema_impl.cpp 2011-10-13 19:44:33 +
+++ src/runtime/schema/schema_impl.cpp 2012-02-29 20:57:28 +
@@ -93,6 +93,12 @@
if (consumeNext(node, theChild.getp(), planState))
{
+// verify that if the element being revalidated is an element it is the root
+if (node->getNodeKind()==store::StoreConsts::elementNode &&
+node->getParent() &&
+node->getParent()->getNodeKind()!=store::StoreConsts::documentNode)
+ throw XQUERY_EXCEPTION( zerr::ZAPI0090_CANNOT_VALIDATE_NON_ROOT, ERROR_LOC( loc ) );
+
pul = GENV_ITEMFACTORY->createPendingUpdateList();
pul->addRevalidate(&loc,node);
=== modified file 'src/store/naive/simple_pul.cpp'
--- src/store/naive/simple_pul.cpp 2012-02-22 16:45:50 +
+++ src/store/naive/simple_pul.cpp 2012-02-29 20:57:28 +
@@ -1205,6 +1205,7 @@
}
thePutList.push_back(otherUpd);
+otherUpd->thePul = this;
otherp->thePutList[i] = NULL;
}
=== added file 'test/rbkt/Queries/zorba/schemas/val-inplace-err2.spec'
--- test/rbkt/Queries/zorba/schemas/val-inplace-err2.spec 1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/schemas/val-inplace-err2.spec 2012-02-29 20:57:28 +
@@ -0,0 +1,1 @@
+Error: http://www.zorba-xquery.com/errors:ZAPI0090
=== added file 'test/rbkt/Queries
[Zorba-coders] [Bug 912579] Re: Validate in place applied on non-root element produces an invalid xdm instance
** Branch linked: lp:~zorba-coders/zorba/bug-912579 -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/912579 Title: Validate in place applied on non-root element produces an invalid xdm instance Status in Zorba - The XQuery Processor: New Bug description: If validate-in-place is called on a non-root element the resulting xdm instance can be invalid since it may contain typed nodes as descendant of untyped nodes. Schema http://www.w3.org/2001/XMLSchema"; targetNamespace="http://www.zorba-xquery.org/schema"; xmlns="http://www.zorba-xquery.org/schema"; elementFormDefault="qualified"> Query import module namespace schema = "http://www.zorba-xquery.com/modules/schema";; import module namespace doc = "http://www.zorba-xquery.com/modules/store/dynamic/documents";; import schema namespace d="http://www.zorba-xquery.org/schema"; at "val-inplace-err2.xsd"; declare revalidation lax; declare construction strip; declare variable $doc2:=http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://www.zorba-xquery.org/schema";> ; schema:validate-in-place($doc2/d:root); (schema:schema-type($doc2), schema:schema-type($doc2/d:root)) Result xs:untyped rootType To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/912579/+subscriptions -- 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] [Bug 943430] [NEW] XQuery 3.0 vs Zorba
Public bug reported: ctest -R xquery_3_0 on the branch lp:~zorba-coders/zorba/fn_envvars shows that: - the following functions are still not implemented: filter#2 fold-left#3 fold-right#3 function-lookup#2 map#2 map-pairs#3 parse-xml-fragment#1 unparsed-text-lines#1 unparsed-text-lines#2 has-children#0 nilled#0 path#0 path#1 - the following functions are in the fn namespace and according to the F&O 3.0 spec they should not be there: parse-xml#2 partial-apply#2 partial-apply#3 ** Affects: zorba Importance: Medium Status: New -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/943430 Title: XQuery 3.0 vs Zorba Status in Zorba - The XQuery Processor: New Bug description: ctest -R xquery_3_0 on the branch lp:~zorba-coders/zorba/fn_envvars shows that: - the following functions are still not implemented: filter#2 fold-left#3 fold-right#3 function-lookup#2 map#2 map-pairs#3 parse-xml-fragment#1 unparsed-text-lines#1 unparsed-text-lines#2 has-children#0 nilled#0 path#0 path#1 - the following functions are in the fn namespace and according to the F&O 3.0 spec they should not be there: parse-xml#2 partial-apply#2 partial-apply#3 To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/943430/+subscriptions -- 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] [Bug 867059] Re: Can not handle largest xs:unsignedLong values
** Changed in: zorba Status: In Progress => Fix Committed -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/867059 Title: Can not handle largest xs:unsignedLong values Status in Zorba - The XQuery Processor: Fix Committed Bug description: When ZORBA_WITH_BIG_INTEGER=OFF, the implementation of Integer used a "long long" for the representation. However, Zorba currently uses Integer for xs:unsignedLong. This can not handle the largest, unsigned, 64-bit value. A possible solution would be to templatize Integer with the representation type, e.g.: typedef IntegerImpl Integer; typedef IntegerImpl UnsignedInteger; To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/867059/+subscriptions -- 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/bug-867059 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-867059 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-867059/+merge/83717 -- https://code.launchpad.net/~zorba-coders/zorba/bug-867059/+merge/83717 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/bug-867059 into lp:zorba
Validation queue job bug-867059-2012-02-29T16-42-56.599Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-867059/+merge/83717 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] [Bug 942011] Re: translator should flatten a tree of StringConcatExprs
** Changed in: zorba Status: In Progress => Fix Committed -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/942011 Title: translator should flatten a tree of StringConcatExprs Status in Zorba - The XQuery Processor: Fix Committed Bug description: For example, a query like: "foo" || "boo" || "ga" || "ga" should generate a single fo_expr instead of three (and correspondigly, a sinlge ConcatStrIterator iterator). To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/942011/+subscriptions -- 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] [Bug 934136] Re: plan serialization error with registerURIMapper
** Changed in: zorba
Importance: Critical => Undecided
** Changed in: zorba
Milestone: 2.2 => None
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/934136
Title:
plan serialization error with registerURIMapper
Status in Zorba - The XQuery Processor:
Invalid
Bug description:
The following program:
{
StaticContext_t lSctx = aZorba->createStaticContext();
OneToOneURIMapper lStopWordsMapper(EntityData::STOP_WORDS);
lSctx->registerURIMapper(&lStopWordsMapper);
XQuery_t lQuery = aZorba->compileQuery(lIn, lSctx);
lQuery->saveExecutionPlan(lOut, ZORBA_USE_BINARY_ARCHIVE,
SAVE_UNUSED_FUNCTIONS);
}
{
std::istringstream lIn(lOut.str());
XQuery_t lQuery = aZorba->createQuery();
lQuery->loadExecutionPlan(lIn);
std::cout << lQuery << std::endl;
}
Returns:
Zorba serialization error [zerr:ZCSE0013]: failed to load pre-compiled query:
document, collection, or module resolver required but no SerializationCallback
given
By commenting " lSctx->registerURIMapper(&lStopWordsMapper);" this
program works fine.
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/934136/+subscriptions
--
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/bug-867059 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-867059-2012-02-29T16-42-56.599Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-867059/+merge/83717 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/bug-912579 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-912579 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-912579/+merge/87750 -- https://code.launchpad.net/~zorba-coders/zorba/bug-912579/+merge/87750 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/bug-912579 into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in ChangeLog -- https://code.launchpad.net/~zorba-coders/zorba/bug-912579/+merge/87750 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/concat_operator into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/concat_operator into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/concat_operator/+merge/95147 -- https://code.launchpad.net/~zorba-coders/zorba/concat_operator/+merge/95147 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/concat_operator into lp:zorba
Validation queue job concat_operator-2012-02-29T16-12-18.077Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/concat_operator/+merge/95147 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/bug-912579 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-912579 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-912579/+merge/87750 -- https://code.launchpad.net/~zorba-coders/zorba/bug-912579/+merge/87750 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/concat_operator into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/concat_operator-2012-02-29T16-12-18.077Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/concat_operator/+merge/95147 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:~nbrinza/zorba/parse-fragment into lp:zorba
The proposal to merge lp:~nbrinza/zorba/parse-fragment into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/parse-fragment/+merge/95152 -- https://code.launchpad.net/~nbrinza/zorba/parse-fragment/+merge/95152 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:~nbrinza/zorba/parse-fragment into lp:zorba
The attempt to merge lp:~nbrinza/zorba/parse-fragment 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 parse-fragment-2012-02-29T15-41-14.921Z 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 -- https://code.launchpad.net/~nbrinza/zorba/parse-fragment/+merge/95152 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/bug-867059 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-867059 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-867059/+merge/83717 -- https://code.launchpad.net/~zorba-coders/zorba/bug-867059/+merge/83717 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:~nbrinza/zorba/parse-fragment into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/parse-fragment-2012-02-29T15-41-14.921Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/parse-fragment/+merge/95152 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/web_crawler_tutorial into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/web_crawler_tutorial into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/web_crawler_tutorial/+merge/95049 -- https://code.launchpad.net/~zorba-coders/zorba/web_crawler_tutorial/+merge/95049 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/web_crawler_tutorial into 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/web_crawler_tutorial into lp:zorba
Validation queue job web_crawler_tutorial-2012-02-29T15-12-04.445Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/web_crawler_tutorial/+merge/95049 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/web_crawler_tutorial into 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:~nbrinza/zorba/parse-fragment into lp:zorba
The proposal to merge lp:~nbrinza/zorba/parse-fragment into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/parse-fragment/+merge/95152 -- https://code.launchpad.net/~nbrinza/zorba/parse-fragment/+merge/95152 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:~nbrinza/zorba/parse-fragment into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/parse-fragment/+merge/95152 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/concat_operator into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/concat_operator into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/concat_operator/+merge/95147 -- https://code.launchpad.net/~zorba-coders/zorba/concat_operator/+merge/95147 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:~nbrinza/zorba/parse-fragment into lp:zorba
The proposal to merge lp:~nbrinza/zorba/parse-fragment into lp:zorba has been updated. Commit Message changed to: Fully streaming module for parsing XML. Parsing can also be configured with several options such as skip-text-only-whitespace. For more details, see: https://code.launchpad.net/~nbrinza/zorba/parse-fragment/+merge/95152 -- https://code.launchpad.net/~nbrinza/zorba/parse-fragment/+merge/95152 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/web_crawler_tutorial into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/web_crawler_tutorial-2012-02-29T15-12-04.445Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/web_crawler_tutorial/+merge/95049 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/web_crawler_tutorial into 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/concat_operator into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/concat_operator into lp:zorba has been updated. Commit Message changed to: Optimize iterator generation for the concat operator (fixes bug #942011) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/concat_operator/+merge/95147 -- https://code.launchpad.net/~zorba-coders/zorba/concat_operator/+merge/95147 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/my_conv_module into lp:zorba/data-converters-module
The proposal to merge lp:~zorba-coders/zorba/my_conv_module into lp:zorba/data-converters-module has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/my_conv_module/+merge/95051 -- https://code.launchpad.net/~zorba-coders/zorba/my_conv_module/+merge/95051 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/my_conv_module into lp:zorba/data-converters-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/concat_operator into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/concat_operator/+merge/95147 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/concat_operator into lp:zorba
I approve the fix but the indentation still deserves some improvements (i.e. a
space after the if "if(").
--
https://code.launchpad.net/~zorba-coders/zorba/concat_operator/+merge/95147
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/my_conv_module into lp:zorba/data-converters-module
Validation queue job my_conv_module-2012-02-29T14-43-37.547Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/my_conv_module/+merge/95051 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/my_conv_module into lp:zorba/data-converters-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/fn_envvars into lp:zorba
I ran ctest -R xquery_3_0 on this branch, and: - the following functions from F&O 3.0 spec are still not implemented: filter#2 fold-left#3 fold-right#3 function-lookup#2 map#2 map-pairs#3 parse-xml-fragment#1 unparsed-text-lines#1 unparsed-text-lines#2 has-children#0 nilled#0 path#0 path#1 - the following functions are in the fn namespace (according to the introspection module) and the F&O 3.0 spec state that they should not be there: parse-xml#2 partial-apply#2 partial-apply#3 So it seems that all functions linked to this commit are implemented. -- https://code.launchpad.net/~zorba-coders/zorba/fn_envvars/+merge/88143 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] [Bug 930157] Re: fn:available-environment-variables Implementation
ctest -R xquery_3_0 shows that: - the following functions are still not implemented: filter#2 fold-left#3 fold-right#3 function-lookup#2 map#2 map-pairs#3 parse-xml-fragment#1 unparsed-text-lines#1 unparsed-text-lines#2 has-children#0 nilled#0 path#0 path#1 - the following functions are in the fn namespace and according to the F&O 3.0 spec they should not be there: parse-xml#2 partial-apply#2 partial-apply#3 So, fn:available-environment-variables appears as implemented. -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/930157 Title: fn:available-environment-variables Implementation Status in Zorba - The XQuery Processor: Fix Committed Bug description: Implementation of XQuery 3.0 function fn:available-environment-variables To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/930157/+subscriptions -- 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] [Bug 930158] Re: fn:environment-variables Implementation
ctest -R xquery_3_0 shows that: - the following functions are still not implemented: filter#2 fold-left#3 fold-right#3 function-lookup#2 map#2 map-pairs#3 parse-xml-fragment#1 unparsed-text-lines#1 unparsed-text-lines#2 has-children#0 nilled#0 path#0 path#1 - the following functions are in the fn namespace and according to the F&O 3.0 spec they should not be there: parse-xml#2 partial-apply#2 partial-apply#3 So, fn:environment-variables appears as implemented. -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/930158 Title: fn:environment-variables Implementation Status in Zorba - The XQuery Processor: Fix Committed Bug description: Implementation of XQuery 3.0 function fn:environment-variables To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/930158/+subscriptions -- 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] [Bug 930160] Re: fn:uri-collection Implementation
ctest -R xquery_3_0 shows that: - the following functions are still not implemented: filter#2 fold-left#3 fold-right#3 function-lookup#2 map#2 map-pairs#3 parse-xml-fragment#1 unparsed-text-lines#1 unparsed-text-lines#2 has-children#0 nilled#0 path#0 path#1 - the following functions are in the fn namespace and according to the F&O 3.0 spec they should not be there: parse-xml#2 partial-apply#2 partial-apply#3 So, fn:uri-collection appears as implemented. -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/930160 Title: fn:uri-collection Implementation Status in Zorba - The XQuery Processor: Fix Committed Bug description: Implementation of XQuery 3.0 function fn:uri-collection To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/930160/+subscriptions -- 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] [Bug 930162] Re: fn:unparsed-text-available Implementation
ctest -R xquery_3_0 shows that: - the following functions are still not implemented: filter#2 fold-left#3 fold-right#3 function-lookup#2 map#2 map-pairs#3 parse-xml-fragment#1 unparsed-text-lines#1 unparsed-text-lines#2 has-children#0 nilled#0 path#0 path#1 - the following functions are in the fn namespace and according to the F&O 3.0 spec they should not be there: parse-xml#2 partial-apply#2 partial-apply#3 So, fn:unparsed-text-available appears as implemented. -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/930162 Title: fn:unparsed-text-available Implementation Status in Zorba - The XQuery Processor: In Progress Bug description: Implementation of XQuery 3.0 function fn:unparsed-text-available To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/930162/+subscriptions -- 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] [Bug 930161] Re: fn:unparsed-text Implementation
ctest -R xquery_3_0 shows that: - the following functions are still not implemented: filter#2 fold-left#3 fold-right#3 function-lookup#2 map#2 map-pairs#3 parse-xml-fragment#1 unparsed-text-lines#1 unparsed-text-lines#2 has-children#0 nilled#0 path#0 path#1 - the following functions are in the fn namespace and according to the F&O 3.0 spec they should not be there: parse-xml#2 partial-apply#2 partial-apply#3 So, fn:unparsed-text-available appears as implemented. -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/930161 Title: fn:unparsed-text Implementation Status in Zorba - The XQuery Processor: In Progress Bug description: Implementation of XQuery 3.0 function fn:unparsed-text To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/930161/+subscriptions -- 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/web_crawler_tutorial into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/web_crawler_tutorial into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/web_crawler_tutorial/+merge/95049 -- https://code.launchpad.net/~zorba-coders/zorba/web_crawler_tutorial/+merge/95049 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/web_crawler_tutorial into 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/web_crawler_tutorial into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/web_crawler_tutorial/+merge/95049 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/web_crawler_tutorial into 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/my_conv_module into lp:zorba/data-converters-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/my_conv_module-2012-02-29T14-43-37.547Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/my_conv_module/+merge/95051 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/my_conv_module into lp:zorba/data-converters-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/my_conv_module into lp:zorba/data-converters-module
The proposal to merge lp:~zorba-coders/zorba/my_conv_module into lp:zorba/data-converters-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/my_conv_module/+merge/95051 -- https://code.launchpad.net/~zorba-coders/zorba/my_conv_module/+merge/95051 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/my_conv_module into lp:zorba/data-converters-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/web_crawler_tutorial into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/web_crawler_tutorial/+merge/95038 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/web_crawler_tutorial into 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/my_conv_module into lp:zorba/data-converters-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/my_conv_module/+merge/95051 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/my_conv_module into lp:zorba/data-converters-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] [Bug 943150] Re: Allow Module Development without Zorba Sources
It is absolutely the goal that module developers should be able to work
against a binary installation of Zorba, and I know that it actually did
work at some point in time. I certainly took some pains to make that use
case functional when developing the initial non-core module
architecture. In particular, I am sure that at some point it was
possible to build a non-core module AND run its tests without needing a
Zorba build directory.
David, have you actually tried it? Follow the instructions from our
documentation:
http://www.zorba-
xquery.com/html/documentation/2.1.0/zorba/modules_authoring
starting with the "Creating a CMake Module Project" section.
That said, a lot has changed since I last tried it, and I don't think
anybody is actually doing development in that fashion. So it wouldn't
surprise me to find out that this is currently broken. Also, the
particular case of inter-module dependencies is one that has never
worked very well, so it may well be that that doesn't work even if
simpler modules do. So, I'll take this bug as a reason to check out the
current situation and see if there are things to improve.
** Changed in: zorba
Importance: Undecided => Medium
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/943150
Title:
Allow Module Development without Zorba Sources
Status in Zorba - The XQuery Processor:
New
Bug description:
As far as I see it correctly, module development can currently not be done
without checking out zorba sources and compiling it. One reason are the module
dependencies
E.g. the following dependency in the http-client module works only, if the
data converter sources are available:
FIND_PACKAGE(zorba_data-converters_module REQUIRED
HINTS ${DATA_CONVERTERS_BUILD_DIR})
And testing seems to be possible only if the build directory of zorba
is available.
Would be nice if those two things (defining module dependencies and
writing/executing tests for a module) were possible with the Zorba
installation. I should not be necessary to compile zorba to hack a new
module.
Chris, I assigned the bug to you because I know you are the master of
this stuff. You might have comments on this. Thanks in advance!
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/943150/+subscriptions
--
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:~nbrinza/zorba/parse-fragment into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/parse-fragment/+merge/95152 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:~nbrinza/zorba/parse-fragment into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/parse-fragment/+merge/95150 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/no_unicode into lp:zorba
FWIW, I've skimmed the change for CMake-related changes, and they all look fine (mostly quite trivial). -- https://code.launchpad.net/~zorba-coders/zorba/no_unicode/+merge/89104 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/qname-pool-refactoring into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/qname-pool-refactoring into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/qname-pool-refactoring/+merge/94953 -- https://code.launchpad.net/~zorba-coders/zorba/qname-pool-refactoring/+merge/94953 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/qname-pool-refactoring into lp:zorba
Validation queue job qname-pool-refactoring-2012-02-29T10-40-16.554Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/qname-pool-refactoring/+merge/94953 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:~nbrinza/zorba/parse-fragment into lp:zorba
I have fixed the regressions and the conflicts. Resubmitting. -- https://code.launchpad.net/~nbrinza/zorba/parse-fragment/+merge/94419 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/concat_operator into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/concat_operator/+merge/95147 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/concat_operator into lp:zorba
I've added this improvement in commit 10674. -- https://code.launchpad.net/~zorba-coders/zorba/concat_operator/+merge/95147 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/concat_operator into lp:zorba
William Candillon has proposed merging lp:~zorba-coders/zorba/concat_operator
into lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Markos Zaharioudakis (markos-za)
Related bugs:
Bug #937120 in Zorba: "Improve error message for || "
https://bugs.launchpad.net/zorba/+bug/937120
Bug #942011 in Zorba: "translator should flatten a tree of StringConcatExprs"
https://bugs.launchpad.net/zorba/+bug/942011
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/concat_operator/+merge/95147
Optimize iterator generation for the concat operator.
--
https://code.launchpad.net/~zorba-coders/zorba/concat_operator/+merge/95147
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2012-02-28 20:45:43 +
+++ src/compiler/translator/translator.cpp 2012-02-29 10:59:26 +
@@ -9401,7 +9401,29 @@
expr_t right = pop_nodestack();
expr_t left = pop_nodestack();
concat_args.push_back(left);
- concat_args.push_back(right);
+
+ //If the right leaf is the concat expr,
+ //we add directly its leafs to the new concat expr.
+ bool rightLeafIsConcatExpr = false;
+ if(right->get_expr_kind() == fo_expr_kind)
+ {
+fo_expr* lFoExpr = dynamic_cast(right.getp());
+if(lFoExpr->get_func() == GET_BUILTIN_FUNCTION(FN_CONCAT_N))
+{
+ rightLeafIsConcatExpr = true;
+ csize i = 0;
+ for(i = 0; i < lFoExpr->num_args(); ++i)
+ {
+concat_args.push_back(lFoExpr->get_arg(i));
+ }
+}
+ }
+
+ if(!rightLeafIsConcatExpr)
+ {
+concat_args.push_back(right);
+ }
+
rchandle concat = new fo_expr(theRootSctx, loc, GET_BUILTIN_FUNCTION(FN_CONCAT_N), concat_args);
push_nodestack(concat);
}
--
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/qname-pool-refactoring into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/qname-pool-refactoring/+merge/94953 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/qname-pool-refactoring into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/qname-pool-refactoring-2012-02-29T10-40-16.554Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/qname-pool-refactoring/+merge/94953 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/qname-pool-refactoring into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/qname-pool-refactoring into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/qname-pool-refactoring/+merge/94953 -- https://code.launchpad.net/~zorba-coders/zorba/qname-pool-refactoring/+merge/94953 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/qname-pool-refactoring into lp:zorba
Hi Markos, all suggested fixes have been implemented. -- https://code.launchpad.net/~zorba-coders/zorba/qname-pool-refactoring/+merge/94953 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] [Bug 943150] [NEW] Allow Module Development without Zorba Sources
Public bug reported:
As far as I see it correctly, module development can currently not be done
without checking out zorba sources and compiling it. One reason are the module
dependencies
E.g. the following dependency in the http-client module works only, if the data
converter sources are available:
FIND_PACKAGE(zorba_data-converters_module REQUIRED
HINTS ${DATA_CONVERTERS_BUILD_DIR})
And testing seems to be possible only if the build directory of zorba is
available.
Would be nice if those two things (defining module dependencies and
writing/executing tests for a module) were possible with the Zorba
installation. I should not be necessary to compile zorba to hack a new
module.
Chris, I assigned the bug to you because I know you are the master of
this stuff. You might have comments on this. Thanks in advance!
** Affects: zorba
Importance: Undecided
Assignee: Chris Hillery (ceejatec)
Status: New
--
You received this bug notification because you are a member of Zorba
Coders, which is the registrant for Zorba.
https://bugs.launchpad.net/bugs/943150
Title:
Allow Module Development without Zorba Sources
Status in Zorba - The XQuery Processor:
New
Bug description:
As far as I see it correctly, module development can currently not be done
without checking out zorba sources and compiling it. One reason are the module
dependencies
E.g. the following dependency in the http-client module works only, if the
data converter sources are available:
FIND_PACKAGE(zorba_data-converters_module REQUIRED
HINTS ${DATA_CONVERTERS_BUILD_DIR})
And testing seems to be possible only if the build directory of zorba
is available.
Would be nice if those two things (defining module dependencies and
writing/executing tests for a module) were possible with the Zorba
installation. I should not be necessary to compile zorba to hack a new
module.
Chris, I assigned the bug to you because I know you are the master of
this stuff. You might have comments on this. Thanks in advance!
To manage notifications about this bug go to:
https://bugs.launchpad.net/zorba/+bug/943150/+subscriptions
--
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/my_queue into lp:zorba/queue-module
You have been requested to review the proposed merge of
lp:~zorba-coders/zorba/my_queue into lp:zorba/queue-module.
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/my_queue/+merge/95133
- the names of the queues are now xs:QNames instead of xs:string
- the module was moved inside 'src' folder
- corrected some typos inside the module
--
https://code.launchpad.net/~zorba-coders/zorba/my_queue/+merge/95133
Your team Zorba Coders is requested to review the proposed merge of
lp:~zorba-coders/zorba/my_queue into lp:zorba/queue-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-01-23 14:34:33 +
+++ CMakeLists.txt 2012-02-29 09:13:26 +
@@ -22,6 +22,6 @@
INCLUDE ("${Zorba_USE_FILE}")
-ADD_SUBDIRECTORY("src/com/zorba-xquery/www/modules/store/data-structures")
+ADD_SUBDIRECTORY("src")
DONE_DECLARING_ZORBA_URIS()
=== added file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 1970-01-01 00:00:00 +
+++ src/CMakeLists.txt 2012-02-29 09:13:26 +
@@ -0,0 +1,20 @@
+# Copyright 2006-2008 The FLWOR Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# Queue data structure
+
+DECLARE_ZORBA_MODULE (URI "http://www.zorba-xquery.com/modules/store/data-structures/queue"; VERSION 1.0 FILE "queue.xq")
+
+ADD_TEST_DIRECTORY("${PROJECT_SOURCE_DIR}/test")
=== removed directory 'src/com'
=== removed directory 'src/com/zorba-xquery'
=== removed directory 'src/com/zorba-xquery/www'
=== removed directory 'src/com/zorba-xquery/www/modules'
=== removed directory 'src/com/zorba-xquery/www/modules/store'
=== removed directory 'src/com/zorba-xquery/www/modules/store/data-structures'
=== removed file 'src/com/zorba-xquery/www/modules/store/data-structures/CMakeLists.txt'
--- src/com/zorba-xquery/www/modules/store/data-structures/CMakeLists.txt 2012-01-23 14:34:33 +
+++ src/com/zorba-xquery/www/modules/store/data-structures/CMakeLists.txt 1970-01-01 00:00:00 +
@@ -1,20 +0,0 @@
-# Copyright 2006-2008 The FLWOR Foundation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# Queue data structure
-
-DECLARE_ZORBA_MODULE (URI "http://www.zorba-xquery.com/modules/store/data-structures/queue"; VERSION 1.0 FILE "queue.xq")
-
-ADD_TEST_DIRECTORY("${PROJECT_SOURCE_DIR}/test")
=== removed file 'src/com/zorba-xquery/www/modules/store/data-structures/queue.xq'
--- src/com/zorba-xquery/www/modules/store/data-structures/queue.xq 2012-02-07 10:25:28 +
+++ src/com/zorba-xquery/www/modules/store/data-structures/queue.xq 1970-01-01 00:00:00 +
@@ -1,197 +0,0 @@
-xquery version "3.0";
-
-(:
- : Copyright 2006-2012 The FLWOR Foundation.
- :
- : Licensed under the Apache License, Version 2.0 (the "License");
- : you may not use this file except in compliance with the License.
- : You may obtain a copy of the License at
- :
- : http://www.apache.org/licenses/LICENSE-2.0
- :
- : Unless required by applicable law or agreed to in writing, software
- : distributed under the License is distributed on an "AS IS" BASIS,
- : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- : See the License for the specific language governing permissions and
- : limitations under the License.
-:)
-
-(:~
- : Implementation of queue for node items, using collections data structures.
- : Queues are created at first node insert.
- :
- : @author Daniel Turcanu
- : @project store/data structures
- :)
-module namespace queue = "http://www.zorba-xquery.com/modules/store/data-structures/queue";;
-
-import module namespace collections-ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
-import module namespace collections-dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
-
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
-declare option ver:module-version "1.0";
-
-(:~
- : URI for all collections QNames. Queue names are combined with this
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/my_queue into lp:zorba/queue-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/my_queue/+merge/95133 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/my_queue into lp:zorba/queue-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/my_queue into lp:zorba/queue-module
Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/my_queue into
lp:zorba/queue-module.
Requested reviews:
Zorba Coders (zorba-coders)
Sorin Marian Nasoi (sorin.marian.nasoi)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/my_queue/+merge/95133
- the names of the queues are now xs:QNames instead of xs:string
- the module was moved inside 'src' folder
- corrected some typos inside the module
--
https://code.launchpad.net/~zorba-coders/zorba/my_queue/+merge/95133
Your team Zorba Coders is requested to review the proposed merge of
lp:~zorba-coders/zorba/my_queue into lp:zorba/queue-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-01-23 14:34:33 +
+++ CMakeLists.txt 2012-02-29 09:13:26 +
@@ -22,6 +22,6 @@
INCLUDE ("${Zorba_USE_FILE}")
-ADD_SUBDIRECTORY("src/com/zorba-xquery/www/modules/store/data-structures")
+ADD_SUBDIRECTORY("src")
DONE_DECLARING_ZORBA_URIS()
=== added file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 1970-01-01 00:00:00 +
+++ src/CMakeLists.txt 2012-02-29 09:13:26 +
@@ -0,0 +1,20 @@
+# Copyright 2006-2008 The FLWOR Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# Queue data structure
+
+DECLARE_ZORBA_MODULE (URI "http://www.zorba-xquery.com/modules/store/data-structures/queue"; VERSION 1.0 FILE "queue.xq")
+
+ADD_TEST_DIRECTORY("${PROJECT_SOURCE_DIR}/test")
=== removed directory 'src/com'
=== removed directory 'src/com/zorba-xquery'
=== removed directory 'src/com/zorba-xquery/www'
=== removed directory 'src/com/zorba-xquery/www/modules'
=== removed directory 'src/com/zorba-xquery/www/modules/store'
=== removed directory 'src/com/zorba-xquery/www/modules/store/data-structures'
=== removed file 'src/com/zorba-xquery/www/modules/store/data-structures/CMakeLists.txt'
--- src/com/zorba-xquery/www/modules/store/data-structures/CMakeLists.txt 2012-01-23 14:34:33 +
+++ src/com/zorba-xquery/www/modules/store/data-structures/CMakeLists.txt 1970-01-01 00:00:00 +
@@ -1,20 +0,0 @@
-# Copyright 2006-2008 The FLWOR Foundation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# Queue data structure
-
-DECLARE_ZORBA_MODULE (URI "http://www.zorba-xquery.com/modules/store/data-structures/queue"; VERSION 1.0 FILE "queue.xq")
-
-ADD_TEST_DIRECTORY("${PROJECT_SOURCE_DIR}/test")
=== removed file 'src/com/zorba-xquery/www/modules/store/data-structures/queue.xq'
--- src/com/zorba-xquery/www/modules/store/data-structures/queue.xq 2012-02-07 10:25:28 +
+++ src/com/zorba-xquery/www/modules/store/data-structures/queue.xq 1970-01-01 00:00:00 +
@@ -1,197 +0,0 @@
-xquery version "3.0";
-
-(:
- : Copyright 2006-2012 The FLWOR Foundation.
- :
- : Licensed under the Apache License, Version 2.0 (the "License");
- : you may not use this file except in compliance with the License.
- : You may obtain a copy of the License at
- :
- : http://www.apache.org/licenses/LICENSE-2.0
- :
- : Unless required by applicable law or agreed to in writing, software
- : distributed under the License is distributed on an "AS IS" BASIS,
- : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- : See the License for the specific language governing permissions and
- : limitations under the License.
-:)
-
-(:~
- : Implementation of queue for node items, using collections data structures.
- : Queues are created at first node insert.
- :
- : @author Daniel Turcanu
- : @project store/data structures
- :)
-module namespace queue = "http://www.zorba-xquery.com/modules/store/data-structures/queue";;
-
-import module namespace collections-ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
-import module namespace collections-dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
-
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
-declare option ver:module-version "1.0";
-
-
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/my_stack into lp:zorba/stack-module
You have been requested to review the proposed merge of
lp:~zorba-coders/zorba/my_stack into lp:zorba/stack-module.
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/my_stack/+merge/95132
- the names of the stacks are now xs:QNames instead of xs:string
- the module was moved inside 'src' folder
- corrected some typos inside the module
--
https://code.launchpad.net/~zorba-coders/zorba/my_stack/+merge/95132
Your team Zorba Coders is requested to review the proposed merge of
lp:~zorba-coders/zorba/my_stack into lp:zorba/stack-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-01-19 17:32:41 +
+++ CMakeLists.txt 2012-02-29 09:07:21 +
@@ -22,6 +22,6 @@
INCLUDE ("${Zorba_USE_FILE}")
-ADD_SUBDIRECTORY("src/com/zorba-xquery/www/modules/store/data-structures")
+ADD_SUBDIRECTORY("src")
DONE_DECLARING_ZORBA_URIS()
=== added file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 1970-01-01 00:00:00 +
+++ src/CMakeLists.txt 2012-02-29 09:07:21 +
@@ -0,0 +1,20 @@
+# Copyright 2006-2008 The FLWOR Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# Stack data structure
+
+DECLARE_ZORBA_MODULE (URI "http://www.zorba-xquery.com/modules/store/data-structures/stack"; VERSION 1.0 FILE "stack.xq")
+
+ADD_TEST_DIRECTORY("${PROJECT_SOURCE_DIR}/test")
=== removed directory 'src/com'
=== removed directory 'src/com/zorba-xquery'
=== removed directory 'src/com/zorba-xquery/www'
=== removed directory 'src/com/zorba-xquery/www/modules'
=== removed directory 'src/com/zorba-xquery/www/modules/store'
=== removed directory 'src/com/zorba-xquery/www/modules/store/data-structures'
=== removed file 'src/com/zorba-xquery/www/modules/store/data-structures/CMakeLists.txt'
--- src/com/zorba-xquery/www/modules/store/data-structures/CMakeLists.txt 2012-01-19 17:32:41 +
+++ src/com/zorba-xquery/www/modules/store/data-structures/CMakeLists.txt 1970-01-01 00:00:00 +
@@ -1,20 +0,0 @@
-# Copyright 2006-2008 The FLWOR Foundation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# Stack data structure
-
-DECLARE_ZORBA_MODULE (URI "http://www.zorba-xquery.com/modules/store/data-structures/stack"; VERSION 1.0 FILE "stack.xq")
-
-ADD_TEST_DIRECTORY("${PROJECT_SOURCE_DIR}/test")
=== removed file 'src/com/zorba-xquery/www/modules/store/data-structures/stack.xq'
--- src/com/zorba-xquery/www/modules/store/data-structures/stack.xq 2012-02-07 10:24:11 +
+++ src/com/zorba-xquery/www/modules/store/data-structures/stack.xq 1970-01-01 00:00:00 +
@@ -1,179 +0,0 @@
-xquery version "3.0";
-
-(:
- : Copyright 2006-2012 The FLWOR Foundation.
- :
- : Licensed under the Apache License, Version 2.0 (the "License");
- : you may not use this file except in compliance with the License.
- : You may obtain a copy of the License at
- :
- : http://www.apache.org/licenses/LICENSE-2.0
- :
- : Unless required by applicable law or agreed to in writing, software
- : distributed under the License is distributed on an "AS IS" BASIS,
- : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- : See the License for the specific language governing permissions and
- : limitations under the License.
-:)
-
-(:~
- : Implementation of stack for node items, using collections data structures.
- : Stacks are created at first node insert.
- :
- : @author Daniel Turcanu
- : @project store/data structures
- :)
-module namespace stack = "http://www.zorba-xquery.com/modules/store/data-structures/stack";;
-
-import module namespace collections-ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
-import module namespace collections-dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
-
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
-declare option ver:module-version "1.0";
-
-(:~
- : URI for all collections QNames. Stack names are combined with this
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/my_stack into lp:zorba/stack-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/my_stack/+merge/95132 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/my_stack into lp:zorba/stack-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/my_stack into lp:zorba/stack-module
Sorin Marian Nasoi has proposed merging lp:~zorba-coders/zorba/my_stack into
lp:zorba/stack-module.
Requested reviews:
Zorba Coders (zorba-coders)
Sorin Marian Nasoi (sorin.marian.nasoi)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/my_stack/+merge/95132
- the names of the stacks are now xs:QNames instead of xs:string
- the module was moved inside 'src' folder
- corrected some typos inside the module
--
https://code.launchpad.net/~zorba-coders/zorba/my_stack/+merge/95132
Your team Zorba Coders is requested to review the proposed merge of
lp:~zorba-coders/zorba/my_stack into lp:zorba/stack-module.
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-01-19 17:32:41 +
+++ CMakeLists.txt 2012-02-29 09:07:21 +
@@ -22,6 +22,6 @@
INCLUDE ("${Zorba_USE_FILE}")
-ADD_SUBDIRECTORY("src/com/zorba-xquery/www/modules/store/data-structures")
+ADD_SUBDIRECTORY("src")
DONE_DECLARING_ZORBA_URIS()
=== added file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 1970-01-01 00:00:00 +
+++ src/CMakeLists.txt 2012-02-29 09:07:21 +
@@ -0,0 +1,20 @@
+# Copyright 2006-2008 The FLWOR Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# Stack data structure
+
+DECLARE_ZORBA_MODULE (URI "http://www.zorba-xquery.com/modules/store/data-structures/stack"; VERSION 1.0 FILE "stack.xq")
+
+ADD_TEST_DIRECTORY("${PROJECT_SOURCE_DIR}/test")
=== removed directory 'src/com'
=== removed directory 'src/com/zorba-xquery'
=== removed directory 'src/com/zorba-xquery/www'
=== removed directory 'src/com/zorba-xquery/www/modules'
=== removed directory 'src/com/zorba-xquery/www/modules/store'
=== removed directory 'src/com/zorba-xquery/www/modules/store/data-structures'
=== removed file 'src/com/zorba-xquery/www/modules/store/data-structures/CMakeLists.txt'
--- src/com/zorba-xquery/www/modules/store/data-structures/CMakeLists.txt 2012-01-19 17:32:41 +
+++ src/com/zorba-xquery/www/modules/store/data-structures/CMakeLists.txt 1970-01-01 00:00:00 +
@@ -1,20 +0,0 @@
-# Copyright 2006-2008 The FLWOR Foundation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# Stack data structure
-
-DECLARE_ZORBA_MODULE (URI "http://www.zorba-xquery.com/modules/store/data-structures/stack"; VERSION 1.0 FILE "stack.xq")
-
-ADD_TEST_DIRECTORY("${PROJECT_SOURCE_DIR}/test")
=== removed file 'src/com/zorba-xquery/www/modules/store/data-structures/stack.xq'
--- src/com/zorba-xquery/www/modules/store/data-structures/stack.xq 2012-02-07 10:24:11 +
+++ src/com/zorba-xquery/www/modules/store/data-structures/stack.xq 1970-01-01 00:00:00 +
@@ -1,179 +0,0 @@
-xquery version "3.0";
-
-(:
- : Copyright 2006-2012 The FLWOR Foundation.
- :
- : Licensed under the Apache License, Version 2.0 (the "License");
- : you may not use this file except in compliance with the License.
- : You may obtain a copy of the License at
- :
- : http://www.apache.org/licenses/LICENSE-2.0
- :
- : Unless required by applicable law or agreed to in writing, software
- : distributed under the License is distributed on an "AS IS" BASIS,
- : WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- : See the License for the specific language governing permissions and
- : limitations under the License.
-:)
-
-(:~
- : Implementation of stack for node items, using collections data structures.
- : Stacks are created at first node insert.
- :
- : @author Daniel Turcanu
- : @project store/data structures
- :)
-module namespace stack = "http://www.zorba-xquery.com/modules/store/data-structures/stack";;
-
-import module namespace collections-ddl = "http://www.zorba-xquery.com/modules/store/dynamic/collections/ddl";;
-import module namespace collections-dml = "http://www.zorba-xquery.com/modules/store/dynamic/collections/dml";;
-
-declare namespace ann = "http://www.zorba-xquery.com/annotations";;
-declare namespace ver = "http://www.zorba-xquery.com/options/versioning";;
-declare option ver:module-version "1.0";
-
-
