Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1073978 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1073978/+merge/138355 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-1073978 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1073978 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1073978/+merge/138355 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1073978/+merge/138355 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-1073978 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1073978 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1073978/+merge/138355 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1073978/+merge/138355 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/replace-nodes-in-collection into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/replace-nodes-in-collection-2012-12-11T19-26-03.976Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/replace-nodes-in-collection/+merge/138196 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/replace-nodes-in-collection 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/replace-nodes-in-collection into lp:zorba
Validation queue job replace-nodes-in-collection-2012-12-11T19-26-03.976Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/replace-nodes-in-collection/+merge/138196 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/replace-nodes-in-collection 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/replace-nodes-in-collection into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/replace-nodes-in-collection/+merge/138196 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/replace-nodes-in-collection 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/replace-nodes-in-collection into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/replace-nodes-in-collection into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/replace-nodes-in-collection/+merge/138196 -- https://code.launchpad.net/~zorba-coders/zorba/replace-nodes-in-collection/+merge/138196 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/replace-nodes-in-collection 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2012-12-11T19-57-11.912Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/138054 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2012-12-11T19-57-11.912Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/138054 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/138054 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/138054 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/bug1083269 into lp:zorba
Review: Needs Fixing If you're going to change zstring to std::string, then change all occurrences of zstring to std::string. -- https://code.launchpad.net/~zorba-coders/zorba/bug1083269/+merge/139125 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/bug1083269 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1083269 into lp:zorba has been updated. Commit Message changed to: Fix for errors on windows that avoid to be compiled. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1083269/+merge/139125 -- https://code.launchpad.net/~zorba-coders/zorba/bug1083269/+merge/139125 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/bug1073091 into lp:zorba
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/bug1073091 into
lp:zorba.
Commit message:
The function fn:unparsed-text-available now return false for fragment
identifiers
The functions fn:unparsed-text and fn:unparsed-text-lines now throw an error
when trying to load a fragment identifier
Requested reviews:
Chris Hillery (ceejatec)
Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
Bug #1073091 in Zorba: FOTS: fn:unparsed-text-lines bug
https://bugs.launchpad.net/zorba/+bug/1073091
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1073091/+merge/139346
--
https://code.launchpad.net/~zorba-coders/zorba/bug1073091/+merge/139346
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/sequences/sequences_impl.cpp'
--- src/runtime/sequences/sequences_impl.cpp 2012-10-16 14:30:02 +
+++ src/runtime/sequences/sequences_impl.cpp 2012-12-11 23:52:21 +
@@ -1905,9 +1905,22 @@
store::Item_t oResult)
{
//Normalize input to handle filesystem paths, etc.
- zstring lNormUri;
+ zstring lNormUri;
+ size_t found = 0;
+
normalizeInputUri(aUri, aSctx, loc, lNormUri);
+ //check if fragment identifier
+ found = lNormUri.find_last_of(#);
+ if (found != lNormUri.npos)
+ {
+//confirm if fragment
+if (lNormUri.at(found-1) == '/')
+{
+ throw XQUERY_EXCEPTION(err::FOUT1170, ERROR_PARAMS(aUri), ERROR_LOC(loc));
+}
+ }
+
//Resolve URI to stream
zstring lErrorMessage;
std::auto_ptrinternal::Resource lResource = aSctx-resolve_uri
@@ -2040,6 +2053,7 @@
zstring lErrorMessage;
std::auto_ptrinternal::Resource lResource;
StreamReleaser lStreamReleaser;
+ size_t found = 0;
FnUnparsedTextLinesIteratorState* state;
DEFAULT_STACK_INIT(FnUnparsedTextLinesIteratorState, state, planState);
@@ -2059,6 +2073,17 @@
uriItem-getStringValue2(uriString);
normalizeInputUri(uriString, theSctx, loc, lNormUri);
+ //check if fragment identifier
+ found = lNormUri.find_last_of(#);
+ if (found != lNormUri.npos)
+ {
+//confirm if fragment
+if (lNormUri.at(found-1) == '/')
+{
+ throw XQUERY_EXCEPTION(err::FOUT1170, ERROR_PARAMS(uriString), ERROR_LOC(loc));
+}
+ }
+
//Resolve URI to stream
lResource = theSctx-resolve_uri
(lNormUri, internal::EntityData::SOME_CONTENT, lErrorMessage);
--
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/bug1073091 into lp:zorba
Review: Needs Fixing Unless I'm mistaken, there's no requirement that a fragment identifier must follow a forward-slash. The following is a valid URI with a fragment identifier: http://www.example.com/foobar#zot So the check for (lNormUri.at(found-1) == '/') is incorrect. Also I think it might cause a crash if the URI is the string # (which is probably not valid anyway, but still we shouldn't crash). More generally: I just spent a while reading RFC 3986 to see whether a simple character-search for '#' was sufficient to identify a fragment, when it occurred to me that I shouldn't be trying to answer that question manually. I think a better solution here would be to construct a zorba::URI object (src/zorbatypes/URI.h) from lNormUri and then call get_encoded_fragment() on it to see if there is any fragment. I don't like introducing that much overhead to perform this function, but parsing URIs is tricky and IMHO it makes sense to consolidate all of that functionality in a single place, namely the URI class. -- https://code.launchpad.net/~zorba-coders/zorba/bug1073091/+merge/139346 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/bug1083269 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1083269/+merge/139125 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/bug1083269 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1083269/+merge/139125 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch
into lp:zorba.
Commit message:
1. Improved computation of static type for fn:data function,
2. Improved XQType::toSchemaString() method,
3. No need to cast xs:untypedAtomic to xs:string in order-by expression,
4. Fixed iteration over the components of a window clause; this improves static
type computation of expressions referencing window vars.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/139392
1. Improved computation of static type for fn:data function,
2. Improved XQType::toSchemaString() method,
3. No need to cast xs:untypedAtomic to xs:string in order-by expression,
4. Fixed iteration over the components of a window clause; this improves static
type computation of expressions referencing window vars.
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/139392
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-12-11 19:23:08 +
+++ ChangeLog 2012-12-12 07:38:30 +
@@ -14,6 +14,10 @@
* Various optimizations in the implementation of the optimizer rules.
* Better computation of the static type for global variables.
* Optimization of comparison operators when untypedAtomic items are involved.
+ * Improved computation of static type for fn:data function.
+ * Fixed iteration over the components of a window clause; this improves static
+type computation of expressions referencing window vars.
+ * No need to cast xs:untypedAtomic to xs:string in order-by expression.
Bug Fixes/Other Changes:
* Change XQXQ (XQuery-for-XQuery) module now part of Zorba core
=== modified file 'src/compiler/expression/expr_iter.cpp'
--- src/compiler/expression/expr_iter.cpp 2012-12-06 22:49:35 +
+++ src/compiler/expression/expr_iter.cpp 2012-12-12 07:38:30 +
@@ -345,6 +345,10 @@
else if (c-get_kind() == flwor_clause::window_clause)
{
+wc = static_castwindow_clause *(*theClausesIter);
+
+EXPR_ITER_NEXT(wc-theDomainExpr);
+
for (theWincondIter = 0; theWincondIter 2; ++theWincondIter)
{
wc = static_castwindow_clause *(*theClausesIter);
@@ -356,10 +360,6 @@
if (wincond != 0)
EXPR_ITER_NEXT(wincond-theCondExpr);
}
-
-wc = static_castwindow_clause *(*theClausesIter);
-
-EXPR_ITER_NEXT(wc-theDomainExpr);
}
else if (c-get_kind() == flwor_clause::group_clause)
=== modified file 'src/compiler/rewriter/rules/type_rules.cpp'
--- src/compiler/rewriter/rules/type_rules.cpp 2012-12-06 22:49:35 +
+++ src/compiler/rewriter/rules/type_rules.cpp 2012-12-12 07:38:30 +
@@ -427,6 +427,7 @@
}
}
}
+#if 0
else if (node-get_expr_kind() == flwor_expr_kind ||
node-get_expr_kind() == gflwor_expr_kind)
{
@@ -465,6 +466,7 @@
if (modified)
return node;
}
+#endif
return NULL;
}
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2012-12-11 20:27:40 +
+++ src/compiler/translator/translator.cpp 2012-12-12 07:38:30 +
@@ -4058,7 +4058,7 @@
expr::checkSimpleExpr(initExpr);
ve-set_has_initializer(true);
-if (!ve-is_mutable())
+if (!ve-is_mutable() !ve-is_external())
{
xqtref_t derivedType = initExpr-get_return_type();
=== modified file 'src/functions/func_accessors_impl.cpp'
--- src/functions/func_accessors_impl.cpp 2012-10-10 13:35:24 +
+++ src/functions/func_accessors_impl.cpp 2012-12-12 07:38:30 +
@@ -105,6 +105,10 @@
getListItemType();
return tm-create_type(*itemType, TypeConstants::QUANT_STAR);
}
+ else if (TypeOps::is_equal(tm, *cType, *RTM.UNTYPED_ATOMIC_TYPE_ONE))
+ {
+return tm-create_builtin_atomic_type(store::XS_UNTYPED_ATOMIC, q);
+ }
else if (TypeOps::is_equal(tm, *cType, *RTM.UNTYPED_TYPE))
{
return tm-create_builtin_atomic_type(store::XS_UNTYPED_ATOMIC, q);
=== modified file 'src/types/typeimpl.cpp'
--- src/types/typeimpl.cpp 2012-09-19 21:16:15 +
+++ src/types/typeimpl.cpp 2012-12-12 07:38:30 +
@@ -270,6 +270,11 @@
switch (type_kind())
{
+ case NONE_KIND:
+ {
+result = none;
+break;
+ }
case EMPTY_KIND:
{
result = empty-sequence();
@@ -283,11 +288,13 @@
case ITEM_KIND:
{
result = item();
+result += TypeOps::decode_quantifier(get_quantifier());
break;
}
case STRUCTURED_ITEM_KIND:
{
result = structured-item();
+result += TypeOps::decode_quantifier(get_quantifier());
break;
}
@@ -311,6 +318,7 @@
result = array();
}
+result += TypeOps::decode_quantifier(get_quantifier());
break;
}
#endif
@@ -318,11 +326,19 @@
case NODE_TYPE_KIND:
{
result =
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/139392 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/139392 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/139392 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/bug1083269 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1083269 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1083269/+merge/139125 -- https://code.launchpad.net/~zorba-coders/zorba/bug1083269/+merge/139125 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
