[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-2.6 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump-2.6 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-2.6/+merge/118625 -- https://code.launchpad.net/~zorba-coders/zorba/bump-2.6/+merge/118625 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/bump-2.6 into lp:zorba
Validation queue job bump-2.6-2012-08-08T14-59-08.364Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bump-2.6/+merge/118625 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/bump-2.6 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bump-2.6-2012-08-08T14-59-08.364Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bump-2.6/+merge/118625 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/bump-2.6 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bump-2.6 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bump-2.6/+merge/118625 -- https://code.launchpad.net/~zorba-coders/zorba/bump-2.6/+merge/118625 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:~davidagraf/zorba/detect-clang-properly into lp:zorba
Review: Approve -- https://code.launchpad.net/~davidagraf/zorba/detect-clang-properly/+merge/117994 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/bump-2.6 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bump-2.6/+merge/118625 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:~davidagraf/zorba/detect-clang-properly into lp:zorba
Match does partial matches. c++ --version does return much more then 'clang' :-). -- https://code.launchpad.net/~davidagraf/zorba/detect-clang-properly/+merge/117994 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:~davidagraf/zorba/detect-clang-properly into lp:zorba
Isn't the name of the clang C++ = "clang++"? Does MATCHES do partial or exact matches? -- https://code.launchpad.net/~davidagraf/zorba/detect-clang-properly/+merge/117994 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-899364 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-899364 into lp:zorba has been updated. Commit Message changed to: Fixed bugs #899364 and 899363 (throw XQST0103 in case of non-distinct window variables) Fixed bug #899366 (enforce the type declaration of a window variable) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-899364/+merge/118727 -- https://code.launchpad.net/~zorba-coders/zorba/bug-899364/+merge/118727 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-899364 into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/bug-899364
into lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-899364/+merge/118727
Fixed bugs #899364 and 899363 (throw XQST0103 in case of non-distinct window
variables)
Fixed bug #899366 (enforce the type declaration of a window variable)
--
https://code.launchpad.net/~zorba-coders/zorba/bug-899364/+merge/118727
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-08-07 14:45:59 +
+++ ChangeLog 2012-08-08 12:26:10 +
@@ -16,10 +16,10 @@
http://www.zorba-xquery.com/modules/store/data-structures/unordered-map module.
* Added support for fragments to fn:path
* Positional pagination support for collections
- * New function in the http://www.zorba-xquery.com/modules/store/static/indexes/dml module which returns
-the value of all keys contained in an index
+ * New function in the http://www.zorba-xquery.com/modules/store/static/indexes/dml
+module which returns the value of all keys contained in an index
* Incremental maintenance for general indexes
-
+
Optimizations:
* Optimization of comparison operations
* Tighter hoisting of expressions (also fixes bug #967428)
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h 2012-07-30 12:23:36 +
+++ include/zorba/pregenerated/diagnostic_list.h 2012-08-08 12:26:10 +
@@ -144,6 +144,8 @@
extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0099;
+extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0103;
+
extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0106;
extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0111;
=== modified file 'modules/w3c/pregenerated/xqt-errors.xq'
--- modules/w3c/pregenerated/xqt-errors.xq 2012-07-24 08:48:48 +
+++ modules/w3c/pregenerated/xqt-errors.xq 2012-08-08 12:26:10 +
@@ -609,6 +609,14 @@
(:~
:
+ : All variables in a window clause must have distinct names.
+ :
+ : @see http://www.w3.org/2005/xqt-errors
+:)
+declare variable $err:XQST0103 as xs:QName := fn:QName($err:NS, "err:XQST0103");
+
+(:~
+ :
: It is a static error if a function's annotations contain more than one
: annotation named \c private or \c public. It is a static error if a
: function's annotations contain more than one annotation named \c
=== modified file 'src/compiler/expression/flwor_expr.cpp'
--- src/compiler/expression/flwor_expr.cpp 2012-07-24 08:48:48 +
+++ src/compiler/expression/flwor_expr.cpp 2012-08-08 12:26:10 +
@@ -77,8 +77,32 @@
void forletwin_clause::set_var(var_expr_t v)
{
theVarExpr = v;
+
if (theVarExpr != NULL)
+ {
theVarExpr->set_flwor_clause(this);
+
+if (theKind == window_clause && theVarExpr->get_type() != NULL)
+{
+ RootTypeManager& rtm = GENV_TYPESYSTEM;
+ TypeManager* tm = theVarExpr->get_type_manager();
+
+ const QueryLoc& loc = theVarExpr->get_loc();
+
+ xqtref_t varType = theVarExpr->get_type();
+ xqtref_t domainType = theDomainExpr->get_return_type();
+
+ if (!TypeOps::is_subtype(tm, *rtm.ITEM_TYPE_STAR, *varType, loc) &&
+ !TypeOps::is_subtype(tm, *domainType, *varType, loc))
+ {
+theDomainExpr = new treat_expr(theDomainExpr->get_sctx(),
+ theDomainExpr->get_loc(),
+ theDomainExpr,
+ varType,
+ TreatIterator::TYPE_MATCH);
+ }
+}
+ }
}
@@ -245,6 +269,7 @@
TypeManager* tm = sctx->get_typemanager();
xqtref_t declaredType = varExpr->get_type();
+
if (declaredType != NULL)
{
xqtref_t domainType = domainExpr->get_return_type();
@@ -253,6 +278,7 @@
!TypeOps::is_subtype(tm, *domainType, *declaredType, loc))
{
xqtref_t varType = TypeOps::intersect_type(*domainType, *declaredType, tm);
+
if (TypeOps::is_equal(tm, *varType, *rtm.NONE_TYPE, loc))
{
RAISE_ERROR(err::XPTY0004, loc,
@@ -349,6 +375,7 @@
TypeManager* tm = sctx->get_typemanager();
xqtref_t varType = varExpr->get_type();
+
if (varType != NULL)
{
xqtref_t domainType = domainExpr->get_return_type();
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2012-07-31 22:06:33 +
+++ src/compiler/translator/translator.cpp 2012-08-08 12:26:10 +
@@ -1128,14 +1128,27 @@
{
assert(sctx != NULL);
- if(e->get_kind() == var_expr::let_var)
+ switch (e->get_kind())
+ {
+ case var_expr::let_var:
{
sctx->bind_var(e, e->get_loc(), err::XQST0039);
- }
- else
+break;
+ }
+ case var_expr::win_var:
+ case var_expr::wincond_out_var:
+ case var_expr::wincond_out_pos_var:
+ case var_expr::wincond_in_var:
+ case var_expr::wincond_in_pos_var:
+ {
+sctx->bi
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/feature-unordered_map into lp:zorba
Review: Disapprove There are several problems: 1. The new string pool is not thread-safe (the current one is) 2. The check made in ~StringPool() must be implemented in the new pool as well 3. Most of the time, the strings that are inserted in the pool are "char *" strings (for example, during doc loading, libxml gives chrar* strings to the loader). The StringPool::insertc() method is there to optimize this case: it will avoid the creation of a zstring (and the resulting string copy) if the string is already in the pool, which is the most common case. This optimization is lost with the new pool. 4. I think there is a bug in BasicItemFactory::createAnyURI(). The AnyUriItem constructor does a destructive assignment (calls take() on the input zstring). So, if the expression *theUriPool->insert(value).first returns a reference to the zstring that is in the pool, that zstring will be cleared. I am not against this change in principle, but at the same time I don't consider it important enough to spend much time on it. So, I would prefer if this is simply dropped. -- https://code.launchpad.net/~paul-lucas/zorba/feature-unordered_map/+merge/117498 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-899364 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-899364 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-899364/+merge/118691 -- https://code.launchpad.net/~zorba-coders/zorba/bug-899364/+merge/118691 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-899364 into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-899364/+merge/118691 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-899364 into lp:zorba
Validation queue job bug-899364-2012-08-08T09-14-03.892Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-899364/+merge/118691 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-899364 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-899364-2012-08-08T09-14-03.892Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-899364/+merge/118691 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-899364 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-899364 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-899364/+merge/118691 -- https://code.launchpad.net/~zorba-coders/zorba/bug-899364/+merge/118691 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-899364 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-899364 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-899364/+merge/118691 -- https://code.launchpad.net/~zorba-coders/zorba/bug-899364/+merge/118691 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-899364 into lp:zorba
There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions. -- https://code.launchpad.net/~zorba-coders/zorba/bug-899364/+merge/118691 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-899364 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-899364 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-899364/+merge/118691 -- https://code.launchpad.net/~zorba-coders/zorba/bug-899364/+merge/118691 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-899364 into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/bug-899364
into lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-899364/+merge/118691
Fixed bug #899364 (throw XQST0103 in case of non-distinct window variables)
--
https://code.launchpad.net/~zorba-coders/zorba/bug-899364/+merge/118691
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/pregenerated/diagnostic_list.h'
--- include/zorba/pregenerated/diagnostic_list.h 2012-07-30 12:23:36 +
+++ include/zorba/pregenerated/diagnostic_list.h 2012-08-08 08:59:22 +
@@ -144,6 +144,8 @@
extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0099;
+extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0103;
+
extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0106;
extern ZORBA_DLL_PUBLIC XQueryErrorCode XQST0111;
=== modified file 'modules/w3c/pregenerated/xqt-errors.xq'
--- modules/w3c/pregenerated/xqt-errors.xq 2012-07-24 08:48:48 +
+++ modules/w3c/pregenerated/xqt-errors.xq 2012-08-08 08:59:22 +
@@ -609,6 +609,14 @@
(:~
:
+ : All variables in a window clause must have distinct names.
+ :
+ : @see http://www.w3.org/2005/xqt-errors
+:)
+declare variable $err:XQST0103 as xs:QName := fn:QName($err:NS, "err:XQST0103");
+
+(:~
+ :
: It is a static error if a function's annotations contain more than one
: annotation named \c private or \c public. It is a static error if a
: function's annotations contain more than one annotation named \c
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2012-07-31 22:06:33 +
+++ src/compiler/translator/translator.cpp 2012-08-08 08:59:22 +
@@ -1128,14 +1128,27 @@
{
assert(sctx != NULL);
- if(e->get_kind() == var_expr::let_var)
+ switch (e->get_kind())
+ {
+ case var_expr::let_var:
{
sctx->bind_var(e, e->get_loc(), err::XQST0039);
- }
- else
+break;
+ }
+ case var_expr::win_var:
+ case var_expr::wincond_out_var:
+ case var_expr::wincond_out_pos_var:
+ case var_expr::wincond_in_var:
+ case var_expr::wincond_in_pos_var:
+ {
+sctx->bind_var(e, e->get_loc(), err::XQST0103);
+break;
+ }
+ default:
{
sctx->bind_var(e, e->get_loc(), err::XQST0049);
}
+ }
}
@@ -5883,7 +5896,6 @@
{
// window var + output window condition vars
pop_scope();
- pop_scope();
break;
}
case flwor_clause::group_clause:
@@ -6223,10 +6235,6 @@
var_expr_t windowVarExpr = pop_nodestack_var();
windowVarExpr->set_flwor_clause(windowClause);
- // Create scope for the output window-condition vars. These vars are visible
- // outside the window clause only.
- push_scope();
-
// Create var_exprs for output window-condition vars, associate them with this
// window clause, and push them to the nodestack.
rchandle cond;
@@ -6357,33 +6365,6 @@
/***
- WindowVarDecl ::= "$" VarName TypeDeclaration? "in" ExprSingle
-/
-void* begin_visit(const WindowVarDecl& v)
-{
- TRACE_VISIT();
-
- // Done with input window condition vars.
- pop_scope();
-
- return no_state;
-}
-
-void end_visit(const WindowVarDecl& v, void* /*visit_state*/)
-{
- TRACE_VISIT_OUT();
-
- // Create scope for the window var
- push_scope();
-
- xqtref_t type = (v.get_var_type() == NULL ? NULL : pop_tstack());
-
- var_expr_t ve = bind_var(loc, v.get_var_name(), var_expr::win_var, type);
- push_nodestack(ve.getp());
-}
-
-
-/***
WindowStartCondition ::= "start" WindowVars "when" ExprSingle
WindowEndCondition ::= "only"? "end" WindowVars "when" ExprSingle
@@ -6424,6 +6405,32 @@
}
+/***
+ WindowVarDecl ::= "$" VarName TypeDeclaration? "in" ExprSingle
+/
+void* begin_visit(const WindowVarDecl& v)
+{
+ TRACE_VISIT();
+
+ // Done with input window condition vars.
+ pop_scope();
+
+ return no_state;
+}
+
+void end_visit(const WindowVarDecl& v, void* /*visit_state*/)
+{
+ TRACE_VISIT_OUT();
+
+ // Create scope for the window var and the output window-condition vars
+ push_scope();
+
+ xqtref_t type = (v.get_var_type() == NULL ? NULL : pop_tstack());
+
+ var_expr_t ve = bind_var(loc, v.get_var_name(), var_expr::win_var, type);
+ push_nodestack(ve.getp());
+}
+
/***
GroupByClause ::= "group" "by" GroupingSpecList
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2012-08-02 13:41:29 +
+++ src/diagnostics/diagnostic_en.xml 2012-08-08 08:59:22 +
@@ -605,6
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bump-2.6 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bump-2.6/+merge/118625 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
