[Zorba-coders] [Merge] lp:~zorba-coders/zorba/new-groupby-alt into lp:zorba
Markos Zaharioudakis has proposed merging
lp:~zorba-coders/zorba/new-groupby-alt into lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/new-groupby-alt/+merge/107737
Implementation of the new syntax/semantics for the group-by clause.
--
https://code.launchpad.net/~zorba-coders/zorba/new-groupby-alt/+merge/107737
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/codegen/plan_visitor.cpp'
--- src/compiler/codegen/plan_visitor.cpp 2012-05-03 12:31:51 +
+++ src/compiler/codegen/plan_visitor.cpp 2012-05-29 08:57:31 +
@@ -1093,17 +1093,34 @@
const flwor_clause::rebind_list_t gvars = gc-get_grouping_vars();
const flwor_clause::rebind_list_t ngvars = gc-get_nongrouping_vars();
+ //Since group var exprs may reference group vars declared
+ //before them within the same group clause.
+ //We need to add to the Clause stack a partial clauseVarMap that contains the
+ //vars defined until the moment.
+ FlworClauseVarMap_t clauseVarMap = new FlworClauseVarMap(c, isGeneral);
+ theClauseStack.push_back(clauseVarMap);
+
for (ulong i = 0; i gvars.size(); ++i)
{
gvars[i].first-accept(*this);
+
+VarRebind_t varRebind = new VarRebind;
+clauseVarMap-theVarExprs.push_back(gvars[i].second.getp());
+clauseVarMap-theVarRebinds.push_back(varRebind);
}
for (ulong i = 0; i ngvars.size(); ++i)
{
ngvars[i].first-accept(*this);
+
+VarRebind_t varRebind = new VarRebind;
+clauseVarMap-theVarExprs.push_back(ngvars[i].second.getp());
+clauseVarMap-theVarRebinds.push_back(varRebind);
}
- visit_flwor_clause(c, isGeneral);
+ //Since we already created the clauseVarMap for the group clause,
+ //we don't do anything when visiting.
+ //visit_flwor_clause(c, isGeneral);
break;
}
@@ -1228,24 +1245,8 @@
case flwor_clause::group_clause:
{
-const group_clause* gbc = static_castconst group_clause *(c);
-const group_clause::rebind_list_t grouping_vars = gbc-get_grouping_vars();
-const group_clause::rebind_list_t nongrouping_vars = gbc-get_nongrouping_vars();
-
-for (unsigned i = 0; i grouping_vars.size(); ++i)
-{
- VarRebind_t varRebind = new VarRebind;
- clauseVarMap-theVarExprs.push_back(grouping_vars[i].second.getp());
- clauseVarMap-theVarRebinds.push_back(varRebind);
-}
-
-for (unsigned i = 0; i nongrouping_vars.size(); ++i)
-{
- VarRebind_t varRebind = new VarRebind;
- clauseVarMap-theVarExprs.push_back(nongrouping_vars[i].second.getp());
- clauseVarMap-theVarRebinds.push_back(varRebind);
-}
-
+//The handling of group clauses is diferent and the clauseVarMap
+//is generated within the visitor, look @ plan_visitor.cpp:1096
break;
}
@@ -1937,15 +1938,19 @@
for (; i = 0; --i)
{
-VarRebind* varRebind = clauseVarMap-theVarRebinds[i].getp();
+//The group vars need to exist in the order they are written, as
+//they can reference previous group vars.
+long varPos = numGroupVars - 1 - i;
+
+VarRebind* varRebind = clauseVarMap-theVarRebinds[varPos].getp();
const std::vectorPlanIter_t varRefs = varRebind-theOutputVarRefs;
-bool fastComparison = nativeColumnSort(clauseVarMap-theVarExprs[i]);
+bool fastComparison = nativeColumnSort(clauseVarMap-theVarExprs[varPos]);
gspecs.push_back(flwor::GroupingSpec(pop_itstack(),
varRefs,
- collations[i],
+ collations[varPos],
fastComparison));
}
}
=== 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-29 08:57:31 +
@@ -2924,12 +2924,42 @@
GroupSpec :
DOLLAR QNAME
{
- $$ = new GroupSpec(LOC(@$), static_castQName*($2), NULL);
+ $$ = new GroupSpec(LOC(@$), static_castQName*($2), NULL, NULL, NULL);
+}
+ | DOLLAR QNAME GETS ExprSingle
+{
+ $$ = new GroupSpec(LOC(@$), static_castQName*($2), NULL, $4, NULL);
+}
+ | DOLLAR QNAME TypeDeclaration GETS ExprSingle
+{
+ $$ = new GroupSpec(LOC(@$),
+ static_castQName*($2),
+ dynamic_castSequenceType*($3),
+ $5,
+ NULL);
+}
+ | DOLLAR QNAME TypeDeclaration GETS ExprSingle GroupCollationSpec
+{
+ $$ = new GroupSpec(LOC(@$),
+ static_castQName*($2),
+ dynamic_castSequenceType*($3),
+ $5,
+ dynamic_castGroupCollationSpec*($6));
+}
+ | DOLLAR QNAME GETS ExprSingle GroupCollationSpec
+
[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. Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/107793 Fixed bug #867170 (Variables declared in Prolog are Overwritten inside the query) -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/107793 Your team Zorba Coders is subscribed to branch lp:zorba. === modified file 'src/api/staticcontextimpl.cpp' === modified file 'src/api/staticcontextimpl.h' -- 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 1005995] [NEW] fn:path() should support fragments as well as documents
Public bug reported: Modify fn:path to add support for fragments ** Affects: zorba Importance: Undecided Assignee: Juan Zacarias (juan457) 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/1005995 Title: fn:path() should support fragments as well as documents Status in Zorba - The XQuery Processor: New Bug description: Modify fn:path to add support for fragments To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/1005995/+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/no-expr-serialization into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/no-expr-serialization into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/no-expr-serialization/+merge/104856 -- https://code.launchpad.net/~zorba-coders/zorba/no-expr-serialization/+merge/104856 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/no-expr-serialization into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/no-expr-serialization-2012-05-29T19-51-24.224Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/no-expr-serialization/+merge/104856 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-expr-serialization into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/no-expr-serialization 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 no-expr-serialization-2012-05-29T19-51-24.224Z 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/no-expr-serialization/+merge/104856 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/no-expr-serialization into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/no-expr-serialization into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/no-expr-serialization/+merge/104856 -- https://code.launchpad.net/~zorba-coders/zorba/no-expr-serialization/+merge/104856 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 867357] Re: Improved parser error message
** Branch linked: lp:~nbrinza/zorba/error-messages -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/867357 Title: Improved parser error message Status in Zorba - The XQuery Processor: New Bug description: Provide an improved error message for a syntax error reported by the parser: Given: for sm1 in $x/match I get: line 23, column 7: [XPST0003] syntax error, unexpected 'QName', expecting end of file A better error message would be: unexpected QName (missing '$'?) To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/867357/+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 1006166] [NEW] cannot disable two functions with the same name
Public bug reported: Disabling two functions (using StaticContext::disableFunction) with the same name but different arities is currently not possible. Only the first version of the function is actually disabled. The problem seems to be in static_context::unbind_fn where only the FunctionInfo for the first function is inserted into the vector. ** Affects: zorba Importance: Undecided Assignee: Markos Zaharioudakis (markos-za) 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/1006166 Title: cannot disable two functions with the same name Status in Zorba - The XQuery Processor: New Bug description: Disabling two functions (using StaticContext::disableFunction) with the same name but different arities is currently not possible. Only the first version of the function is actually disabled. The problem seems to be in static_context::unbind_fn where only the FunctionInfo for the first function is inserted into the vector. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/1006166/+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 1006167] [NEW] cannot disable two functions with the same name
Public bug reported: Disabling two functions (using StaticContext::disableFunction) with the same name but different arities is currently not possible. Only the first version of the function is actually disabled. The problem seems to be in static_context::unbind_fn where only the FunctionInfo for the first function is inserted into the vector. ** Affects: zorba Importance: Undecided Assignee: Markos Zaharioudakis (markos-za) 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/1006167 Title: cannot disable two functions with the same name Status in Zorba - The XQuery Processor: New Bug description: Disabling two functions (using StaticContext::disableFunction) with the same name but different arities is currently not possible. Only the first version of the function is actually disabled. The problem seems to be in static_context::unbind_fn where only the FunctionInfo for the first function is inserted into the vector. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/1006167/+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 1006167] Re: cannot disable two functions with the same name
*** This bug is a duplicate of bug 1006166 *** https://bugs.launchpad.net/bugs/1006166 ** This bug has been marked a duplicate of bug 1006166 cannot disable two functions with the same name -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/1006167 Title: cannot disable two functions with the same name Status in Zorba - The XQuery Processor: New Bug description: Disabling two functions (using StaticContext::disableFunction) with the same name but different arities is currently not possible. Only the first version of the function is actually disabled. The problem seems to be in static_context::unbind_fn where only the FunctionInfo for the first function is inserted into the vector. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/1006167/+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/not-packaging-external-jars into lp:zorba
Matthias Brantner has proposed merging
lp:~zorba-coders/zorba/not-packaging-external-jars into lp:zorba.
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/not-packaging-external-jars/+merge/107895
- added a cmake variable that allows to configure whether external jars are
packaged or not (ZORBA_PACKAGE_EXTERNAL_JARS)
- removed a test that started to fail if the ZORBA_PACKAGE_EXTERNAL_JARS
variable is turned on. the test was actually cheating and didn't have an actual
jar
- extended changelog for schema-tools and xsl-fo
--
https://code.launchpad.net/~zorba-coders/zorba/not-packaging-external-jars/+merge/107895
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-05-23 16:11:13 +
+++ ChangeLog 2012-05-30 00:41:21 +
@@ -24,6 +24,8 @@
stream is seekable or not.
* Added new functions in the fetch module and the StaticContext to fetch
resources as binary
+ * Added non-core schema-tools module for getting sample XMLSchema from
+XML instances and sample XML instances from XMLSchema.
Optimizations:
* optimized insertion into a collection (don't copy it if the node was
@@ -64,6 +66,7 @@
* Fixed Bug #933490 (Error ItemFactoryImpl::createBase64Binary with istream)
* Fixed bug #867112 (Diagnostic Handler was not working on external APIs)
* Fixed bug #857842 (Assertion failed with simple content element with comments)
+ * Fixed bug #928626 (no setting classpath in xsl-fo module)
version 2.2
=== modified file 'cmake_modules/ZorbaModule.cmake'
--- cmake_modules/ZorbaModule.cmake 2012-05-18 19:34:39 +
+++ cmake_modules/ZorbaModule.cmake 2012-05-30 00:41:21 +
@@ -481,16 +481,16 @@
# Iterate over all supplied jar files
FOREACH (_jar_file ${JAR_FILE})
-IF (JAR_EXTERNAL)
+IF (JAR_EXTERNAL AND NOT ZORBA_PACKAGE_EXTERNAL_JARS)
# Put absolute path into classpath file
FILE (APPEND ${_CP_FILE} ${_jar_file}\n)
-ELSE (JAR_EXTERNAL)
+ELSE (JAR_EXTERNAL AND NOT ZORBA_PACKAGE_EXTERNAL_JARS)
# Copy jar to jars/ directory and add relative path to classpath file
GET_FILENAME_COMPONENT (_output_filename ${_jar_file} NAME)
ADD_COPY_RULE (LIB ${_jar_file} jars/${_output_filename}
${JAR_TARGET} 1 ${JAR_TEST_ONLY})
FILE (APPEND ${_CP_FILE} ${_output_filename}\n)
-ENDIF (JAR_EXTERNAL)
+ENDIF (JAR_EXTERNAL AND NOT ZORBA_PACKAGE_EXTERNAL_JARS)
ENDFOREACH (_jar_file)
ENDMACRO (DECLARE_ZORBA_JAR)
=== modified file 'test/rbkt/modules/java/CMakeLists.txt'
--- test/rbkt/modules/java/CMakeLists.txt 2012-04-05 11:48:50 +
+++ test/rbkt/modules/java/CMakeLists.txt 2012-05-30 00:41:21 +
@@ -32,9 +32,5 @@
DECLARE_ZORBA_JAR(FILE ${JavaTest_JAR_FILE} TARGET JavaTest TEST_ONLY)
DECLARE_ZORBA_JAR(FILE ${JavaTest2_JAR_FILE} TARGET JavaTest2 TEST_ONLY)
-# Pretend to tell Zorba about some system jars
-DECLARE_ZORBA_JAR(EXTERNAL FILE
- ${PROJECT_SOURCE_DIR}/MyJar.jar ${PROJECT_SOURCE_DIR}/MyJar2.jar)
-
ENDIF (Java_Development_FOUND)
ENDIF (${RESULT} GREATER -1)
--
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/error-messages into lp:zorba
The proposal to merge lp:~nbrinza/zorba/error-messages into lp:zorba has been updated. Commit Message changed to: Improved parser error messages (bug #867357) For more details, see: https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/107899 -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/107899 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/not-packaging-external-jars into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/not-packaging-external-jars/+merge/107895 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/not-packaging-external-jars into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/not-packaging-external-jars/+merge/107895 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/not-packaging-external-jars into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/not-packaging-external-jars into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/not-packaging-external-jars/+merge/107895 -- https://code.launchpad.net/~zorba-coders/zorba/not-packaging-external-jars/+merge/107895 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/not-packaging-external-jars into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/not-packaging-external-jars-2012-05-30T01-18-06.466Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/not-packaging-external-jars/+merge/107895 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/not-packaging-external-jars into lp:zorba
Validation queue job not-packaging-external-jars-2012-05-30T01-18-06.466Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/not-packaging-external-jars/+merge/107895 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/not-packaging-external-jars into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/not-packaging-external-jars into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/not-packaging-external-jars/+merge/107895 -- https://code.launchpad.net/~zorba-coders/zorba/not-packaging-external-jars/+merge/107895 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
