[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-windows-compile into lp:zorba
Carlos Manuel Lopez has proposed merging
lp:~zorba-coders/zorba/fix-windows-compile into lp:zorba.
Requested reviews:
Zorba Coders (zorba-coders)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/fix-windows-compile/+merge/122976
Fixed a typo and a portability issue that prevented Zorba from compiling
correctly on Windows.
--
https://code.launchpad.net/~zorba-coders/zorba/fix-windows-compile/+merge/122976
Your team Zorba Coders is requested to review the proposed merge of
lp:~zorba-coders/zorba/fix-windows-compile into lp:zorba.
=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp 2012-09-05 12:22:23 +
+++ src/context/static_context.cpp 2012-09-05 23:31:14 +
@@ -538,7 +538,7 @@
#ifndef ZORBA_NO_FULL_TEXT
ns == ZORBA_FULL_TEXT_FN_NS ||
#endif /* ZORBA_NO_FULL_TEXT */
-#ifndef ZORBA_WITH_JSON
+#ifdef ZORBA_WITH_JSON
ns == JSONIQ_FN_NS ||
#endif /* ZORBA_WITH_JSON */
ns == ZORBA_XML_FN_NS);
=== modified file 'src/util/uuid.h'
--- src/util/uuid.h 2012-08-07 14:02:38 +
+++ src/util/uuid.h 2012-09-05 23:31:14 +
@@ -1,12 +1,12 @@
/*
* 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.
@@ -44,7 +44,7 @@
* section "4.1.2. Layout and Byte Order" due to possible padding.
*/
struct uuid {
- typedef uint8_t value_type;
+ typedef unsigned char value_type;
typedef value_type& reference;
typedef value_type const& const_reference;
typedef value_type* pointer;
--
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 924055] Re: adapt group-by to latest spec
** Changed in: zorba Status: In Progress => Fix Released -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/924055 Title: adapt group-by to latest spec Status in Zorba - The XQuery Processor: Fix Released Bug description: The semantics of group-by was changed in the latest working drafts. (1) an abbreviated syntax has been introduced (2) the values of the post-grouping tuples are atomized. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/924055/+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 924055] Re: adapt group-by to latest spec
** Changed in: zorba Status: New => Incomplete ** Changed in: zorba Status: Incomplete => In Progress ** Branch linked: lp:~zorba-coders/zorba/new-groupby -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/924055 Title: adapt group-by to latest spec Status in Zorba - The XQuery Processor: In Progress Bug description: The semantics of group-by was changed in the latest working drafts. (1) an abbreviated syntax has been introduced (2) the values of the post-grouping tuples are atomized. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/924055/+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/new-groupby into lp:~zorba-coders/zorba/post-25
The proposal to merge lp:~zorba-coders/zorba/new-groupby into lp:~zorba-coders/zorba/post-25 has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~zorba-coders/zorba/new-groupby/+merge/106070 -- https://code.launchpad.net/~zorba-coders/zorba/new-groupby/+merge/106070 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/post-25. -- 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/new-groupby into lp:zorba
Carlos Manuel Lopez has proposed merging lp:~zorba-coders/zorba/new-groupby
into lp:zorba.
Requested reviews:
Zorba Coders (zorba-coders)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/new-groupby/+merge/108231
Implements new group by syntax, as defined in the XQuery 3.0 Spec since
September 2011
The group by is converted into the syntactically equivalent combination of lets
and a group by as defined by the spec.
--
https://code.launchpad.net/~zorba-coders/zorba/new-groupby/+merge/108231
Your team Zorba Coders is requested to review the proposed merge of
lp:~zorba-coders/zorba/new-groupby into lp:zorba.
=== modified file 'src/compiler/parser/xquery_parser.y'
--- src/compiler/parser/xquery_parser.y 2012-05-16 17:25:48 +
+++ src/compiler/parser/xquery_parser.y 2012-05-31 20:11:22 +
@@ -2924,12 +2924,42 @@
GroupSpec :
DOLLAR QNAME
{
- $$ = new GroupSpec(LOC(@$), static_cast($2), NULL);
+ $$ = new GroupSpec(LOC(@$), static_cast($2), NULL, NULL, NULL);
+}
+ | DOLLAR QNAME GETS ExprSingle
+{
+ $$ = new GroupSpec(LOC(@$), static_cast($2), NULL, $4, NULL);
+}
+ | DOLLAR QNAME TypeDeclaration GETS ExprSingle
+{
+ $$ = new GroupSpec(LOC(@$),
+ static_cast($2),
+ dynamic_cast($3),
+ $5,
+ NULL);
+}
+ | DOLLAR QNAME TypeDeclaration GETS ExprSingle GroupCollationSpec
+{
+ $$ = new GroupSpec(LOC(@$),
+ static_cast($2),
+ dynamic_cast($3),
+ $5,
+ dynamic_cast($6));
+}
+ | DOLLAR QNAME GETS ExprSingle GroupCollationSpec
+{
+ $$ = new GroupSpec(LOC(@$),
+ static_cast($2),
+ NULL,
+ $4,
+ dynamic_cast($5));
}
| DOLLAR QNAME GroupCollationSpec
{
$$ = new GroupSpec(LOC(@$),
static_cast($2),
+ NULL,
+ NULL,
dynamic_cast($3));
}
;
=== modified file 'src/compiler/parsetree/parsenodes.cpp'
--- src/compiler/parsetree/parsenodes.cpp 2012-05-03 12:31:51 +
+++ src/compiler/parsetree/parsenodes.cpp 2012-05-31 20:11:22 +
@@ -1774,16 +1774,28 @@
vector >::const_iterator ite = theSpecs.begin();
vector >::const_iterator end = theSpecs.end();
- for (; ite != end; ++ite)
+ //If no expression is given, then it'll just be the variable.
+ //If this is the case, and the variable is already defined as a
+ //grouping variable, it makes no sense to add it, so this is a
+ //quick optimization.
+ if(spec->get_var_expr() == NULL)
{
-const GroupSpec* currSpec = (*ite).getp();
-
-if (*currSpec->get_var_name() == *spec->get_var_name())
- break;
+for (; ite != end; ++ite)
+{
+ const GroupSpec* currSpec = (*ite).getp();
+
+ if (*currSpec->get_var_name() == *spec->get_var_name() &&
+ currSpec->get_var_expr() == NULL)
+break;
+}
+
+if (ite == end)
+ theSpecs.push_back(spec);
}
-
- if (ite == end)
+ else
+ {
theSpecs.push_back(spec);
+ }
}
@@ -1805,10 +1817,14 @@
GroupSpec::GroupSpec(
const QueryLoc& loc_,
rchandle _var_name_h,
+ rchandle _var_type_h,
+ rchandle _var_value_h,
rchandle _group_coll_spec_h)
:
parsenode(loc_),
var_name_h(_var_name_h),
+ var_type_h(_var_type_h),
+ var_init_expr_h(_var_value_h),
group_coll_spec_h(_group_coll_spec_h)
{
}
@@ -1817,7 +1833,9 @@
void GroupSpec::accept(parsenode_visitor& v) const
{
BEGIN_VISITOR();
+ ACCEPT (var_type_h);
ACCEPT (group_coll_spec_h);
+ ACCEPT (var_init_expr_h);
END_VISITOR();
}
=== modified file 'src/compiler/parsetree/parsenodes.h'
--- src/compiler/parsetree/parsenodes.h 2012-05-16 17:16:44 +
+++ src/compiler/parsetree/parsenodes.h 2012-05-31 20:11:22 +
@@ -2207,22 +2207,30 @@
/***
- GroupSpec ::= "$" VarName ("collation" URILiteral)?
+ GroupSpec ::= "$" VarName (TypeDeclaration? ":=" ExprSingle)? ("collation" URILiteral)?
/
class GroupSpec : public parsenode
{
protected:
rchandle var_name_h;
rchandle group_coll_spec_h;
+ rchandle var_init_expr_h;
+ rchandle var_type_h;
public:
GroupSpec(
const QueryLoc&,
rchandle,
+rchandle,
+rchandle,
rchandle);
const QName* get_var_name() const { return var_name_h.getp(); }
+ const rchandle get_var_expr() const {return var_init_expr_h;}
+
+ const rchandle get_var_type() const {return var_type_h;}
+
rchandle gro
[Zorba-coders] [Bug 930132] [NEW] General Flwor Optimizations
Public bug reported: The new kind of FLWOR expressions (Xquery 3.0) are treated diferently in Zorba at the moment and do not have any optimizations done to them. Since the old Flwor expressions are just a subset, all optimizations should be able to be done to general flwor expressions as well. ** Affects: zorba Importance: Undecided Assignee: Carlos Manuel Lopez (charlie-lobo) Status: In Progress ** Tags: optimization -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/930132 Title: General Flwor Optimizations Status in Zorba - The XQuery Processor: In Progress Bug description: The new kind of FLWOR expressions (Xquery 3.0) are treated diferently in Zorba at the moment and do not have any optimizations done to them. Since the old Flwor expressions are just a subset, all optimizations should be able to be done to general flwor expressions as well. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/930132/+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 929540] [NEW] Function inferred return types optimization
Public bug reported: Several function within the core zorba could have their return types inferred into a more specific one based on the arguments they recieve. A more specific return type allows for better optimizations in some cases. Some but not all functions in zorba that could apply this optimization currently do, but a lot could be done for that. ** Affects: zorba Importance: Wishlist Assignee: Carlos Manuel Lopez (charlie-lobo) Status: In Progress ** Tags: optimization -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/929540 Title: Function inferred return types optimization Status in Zorba - The XQuery Processor: In Progress Bug description: Several function within the core zorba could have their return types inferred into a more specific one based on the arguments they recieve. A more specific return type allows for better optimizations in some cases. Some but not all functions in zorba that could apply this optimization currently do, but a lot could be done for that. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/929540/+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_867198 into lp:zorba/data-converters-module
The proposal to merge lp:~zorba-coders/zorba/bug_867198 into lp:zorba/data-converters-module has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug_867198/+merge/84617 -- https://code.launchpad.net/~zorba-coders/zorba/bug_867198/+merge/84617 Your team Zorba Coders is subscribed to branch 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/bug_867198 into lp:zorba/data-converters-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug_867198/+merge/84617 Your team Zorba Coders is subscribed to branch 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/substring-intopt into lp:zorba
Did the changes, though the use of xs_integer instead of xs_int didn't work as elegantly as I expected. Can be easily undone though. -- https://code.launchpad.net/~zorba-coders/zorba/substring-intopt/+merge/81949 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/substring-intopt into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/substring-intopt into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/substring-intopt/+merge/81949 -- https://code.launchpad.net/~zorba-coders/zorba/substring-intopt/+merge/81949 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 878508] [NEW] JSON Module not escaping escape characters
Public bug reported: The module doesn't convert escaped characters as you would expect. You instead get a string containing the string with it's unescaped value. A conversion needs to be implemented, something such as: JSON <-> XML \"<-> " \\<-> \ \/<-> / \b<-> \f<-> \n<-> *actual newline* \r<-> *actual carriage return* \t<-> ' ' \u<-> &#x; or #$; with the correct hex-decimal conversion < <-> < > <-> > & <-> & ' <-> ' This proposition might create a regresion related to bug #866757. ** Affects: zorba Importance: Undecided Assignee: Sorin Marian Nasoi (sorin.marian.nasoi) Status: New ** Changed in: zorba Assignee: (unassigned) => Sorin Marian Nasoi (sorin.marian.nasoi) -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/878508 Title: JSON Module not escaping escape characters Status in Zorba - The XQuery Processor: New Bug description: The module doesn't convert escaped characters as you would expect. You instead get a string containing the string with it's unescaped value. A conversion needs to be implemented, something such as: JSON <-> XML \"<-> " \\<-> \ \/<-> / \b<-> \f<-> \n<-> *actual newline* \r<-> *actual carriage return* \t<-> ' ' \u<-> &#x; or #$; with the correct hex-decimal conversion < <-> < > <-> > & <-> & ' <-> ' This proposition might create a regresion related to bug #866757. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/878508/+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
