Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-966706 into lp:zorba
This is ready for review again. -- https://code.launchpad.net/~zorba-coders/zorba/bug-966706/+merge/101498 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/general-tree-ids into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/general-tree-ids/+merge/100608 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 989490] [NEW] on ubuntu 12.04, Java and/or JNI not found
Public bug reported: Hey Chris Java and/or JNI is not found on ubuntu 12.04. Therefore, fop doesn't work. I think the paths to java stuff changed on ubuntu 12.04. Maybe, cmake 2.8.8 is handle those changes. cmake 2.8.7 is not. David ** 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/989490 Title: on ubuntu 12.04, Java and/or JNI not found Status in Zorba - The XQuery Processor: New Bug description: Hey Chris Java and/or JNI is not found on ubuntu 12.04. Therefore, fop doesn't work. I think the paths to java stuff changed on ubuntu 12.04. Maybe, cmake 2.8.8 is handle those changes. cmake 2.8.7 is not. David To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/989490/+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-966706 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-966706 into lp:zorba has been updated. Commit Message changed to: fixed bug #966706 (key uniqueness of value equality index not enforced) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-966706/+merge/103835 -- https://code.launchpad.net/~zorba-coders/zorba/bug-966706/+merge/103835 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-966706 into lp:zorba
Review: Approve Looks good. I have disabled some debug output in rev. 10748. -- https://code.launchpad.net/~zorba-coders/zorba/bug-966706/+merge/103835 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/feature-ft_module into lp:zorba
Review: Approve I think Chris should be a reviewer too as there is a lot of URI-resolution stuff here, and the two of you have worked together on this. -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103741 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/jsoniq-plan_serialization into lp:~zorba-coders/zorba/jsoniq
The proposal to merge lp:~zorba-coders/zorba/jsoniq-plan_serialization into lp:~zorba-coders/zorba/jsoniq has been updated. Commit Message changed to: - plan serializer for jsoniq items and iterators - some fixes for the build without json (still not compiling because of problems with the collection functions) - marked all -nodes dml functions as deprecated - fixed documentation of the dml and jsoniq modules - fixed collections/dynamic5/6 tests - ignore jsoniq.org/errors module in the moduleDocumentation test For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jsoniq-plan_serialization/+merge/103872 -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-plan_serialization/+merge/103872 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/jsoniq. -- 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/jsoniq-plan_serialization into lp:~zorba-coders/zorba/jsoniq
The proposal to merge lp:~zorba-coders/zorba/jsoniq-plan_serialization into lp:~zorba-coders/zorba/jsoniq has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jsoniq-plan_serialization/+merge/103872 -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-plan_serialization/+merge/103872 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/jsoniq. -- 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/general-tree-ids into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/general-tree-ids/+merge/100608 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/sorting-chained-tests into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/sorting-chained-tests/+merge/103440 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/general-tree-ids into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/general-tree-ids into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/general-tree-ids/+merge/100608 -- https://code.launchpad.net/~zorba-coders/zorba/general-tree-ids/+merge/100608 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/sorting-chained-tests into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/sorting-chained-tests into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/sorting-chained-tests/+merge/103440 -- https://code.launchpad.net/~zorba-coders/zorba/sorting-chained-tests/+merge/103440 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/feature-ft_module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-ft_module into lp:zorba has been updated. Commit Message changed to: 1. Added a new full-text module. 2. Fixed semi-broken Thesaurus API. 3. Now supporting many more languages for tokenization including Chinese. 4. Many other full-text improvements. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103884 -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103884 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/feature-ft_module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-ft_module into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103884 -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103884 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/feature-node_copy into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/feature-node_copy
into lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-node_copy/+merge/103890
node:copy function
--
https://code.launchpad.net/~zorba-coders/zorba/feature-node_copy/+merge/103890
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-04-25 17:16:48 +
+++ ChangeLog 2012-04-27 14:41:19 +
@@ -12,6 +12,7 @@
* Add jvm classpath to zorbacmd and to Zorba API. Tracked by #931816
* Added support for NO_ICU (to not use ICU for unicode processing)
* Added XQJ support.
+ * Added a node copy function to the node module
Optimization:
=== modified file 'modules/com/zorba-xquery/www/modules/node.xq'
--- modules/com/zorba-xquery/www/modules/node.xq 2012-04-24 12:39:38 +
+++ modules/com/zorba-xquery/www/modules/node.xq 2012-04-27 14:41:19 +
@@ -164,3 +164,16 @@
declare function node:least-common-ancestor(
$node1 as node(),
$node2 as node()) as node()? external;
+
+(:~
+ : Return a deep copy of every given node according to the properties
+ : specified in the static context of the invoking module.
+ :
+ : Please note that a copy of a node is parentless.
+ :
+ : @param $input the node to copy
+ :
+ : @return a deep copy of every node in the input sequence or the empty sequence if
+ : $input is the empty sequence.
+ :)
+declare function node:copy($input as node()*) as node()* external;
=== modified file 'src/functions/CMakeLists.txt'
--- src/functions/CMakeLists.txt 2012-04-24 12:39:38 +
+++ src/functions/CMakeLists.txt 2012-04-27 14:41:19 +
@@ -74,6 +74,7 @@
func_hoist.cpp
func_index_ddl.cpp
func_node_sort_distinct.cpp
+func_nodes_impl.cpp
func_numerics_impl.cpp
func_sequences_impl.cpp
func_strings_impl.cpp
=== added file 'src/functions/func_nodes_impl.cpp'
--- src/functions/func_nodes_impl.cpp 1970-01-01 00:00:00 +
+++ src/functions/func_nodes_impl.cpp 2012-04-27 14:41:19 +
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+ #include "stdafx.h"
+
+#include
+
+#include "functions/func_nodes.h"
+
+#include "system/globalenv.h"
+
+#include "compiler/expression/expr.h"
+#include "compiler/expression/fo_expr.h"
+#include "compiler/expression/path_expr.h"
+
+#include "types/typeops.h"
+
+namespace zorba
+{
+
+
+/***
+
+/
+xqtref_t fn_zorba_node_copy::getReturnType(const fo_expr* caller) const
+{
+ return caller->get_arg(0)->get_return_type();
+}
+
+
+/***
+
+/
+bool fn_zorba_node_copy::mustCopyInputNodes(expr* fo, csize input) const
+{
+ static_context* lSctx = fo->get_sctx();
+ return lSctx->preserve_mode() == StaticContextConsts::no_preserve_ns;
+}
+
+} /* namespace zorba */
+/* vim:set et sw=2 ts=2: */
+
=== modified file 'src/functions/pregenerated/func_nodes.cpp'
--- src/functions/pregenerated/func_nodes.cpp 2012-04-24 12:39:38 +
+++ src/functions/pregenerated/func_nodes.cpp 2012-04-27 14:41:19 +
@@ -231,6 +231,16 @@
return new LeastCommonAncestor(sctx, loc, argv);
}
+PlanIter_t fn_zorba_node_copy::codegen(
+ CompilerCB*,
+ static_context* sctx,
+ const QueryLoc& loc,
+ std::vector& argv,
+ expr& ann) const
+{
+ return new NodeCopyIterator(sctx, loc, argv);
+}
+
void populate_context_nodes(static_context* sctx)
{
{
@@ -538,6 +548,18 @@
}
+
+ {
+
+
+DECL_WITH_KIND(sctx, fn_zorba_node_copy,
+(createQName("http://www.zorba-xquery.com/modules/node","","copy";),
+GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR,
+GENV_TYPESYSTEM.ANY_NODE_TYPE_STAR),
+FunctionConsts::FN_ZORBA_NODE_COPY_1);
+
+ }
+
}
=== modified file 'src/functions/pregenerated/func_nodes.h'
--- src/functions/pregenerated/func_nodes.h 2012-04-24 12:39:38 +
+++ src/functions/pregenerated/func_nodes.h 2012-04-27 14:41:19 +
@@ -372,6 +372,25 @@
};
+//fn-zorba-node:copy
+class fn_zorba_node_copy : public function
+{
+public:
+ fn_zorba_node_copy(
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-node_copy into lp:zorba
I have specialized the return type and implement the mustCopyInputNodes functions. -- https://code.launchpad.net/~zorba-coders/zorba/feature-node_copy/+merge/103890 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/feature-node_copy into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-node_copy into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-node_copy/+merge/103890 -- https://code.launchpad.net/~zorba-coders/zorba/feature-node_copy/+merge/103890 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/feature-node_copy into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-node_copy/+merge/103890 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/feature-node_copy into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-node_copy into lp:zorba has been updated. Commit Message changed to: node:copy function For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-node_copy/+merge/103890 -- https://code.launchpad.net/~zorba-coders/zorba/feature-node_copy/+merge/103890 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/jsoniq-plan_serialization into lp:~zorba-coders/zorba/jsoniq
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/jsoniq-plan_serialization-2012-04-27T14-52-02.942Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-plan_serialization/+merge/103872 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/jsoniq. -- 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:~diogo-simoes89/zorba/DC-documentation into lp:zorba/data-cleaning-module
The proposal to merge lp:~diogo-simoes89/zorba/DC-documentation into lp:zorba/data-cleaning-module has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~diogo-simoes89/zorba/DC-documentation/+merge/103728 -- https://code.launchpad.net/~diogo-simoes89/zorba/DC-documentation/+merge/103728 Your team Zorba Coders is requested to review the proposed merge of lp:~diogo-simoes89/zorba/DC-documentation into lp:zorba/data-cleaning-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:~diogo-simoes89/zorba/DC-documentation into lp:zorba/data-cleaning-module
Diogo Simões has proposed merging lp:~diogo-simoes89/zorba/DC-documentation
into lp:zorba/data-cleaning-module.
Requested reviews:
Zorba Coders (zorba-coders)
For more details, see:
https://code.launchpad.net/~diogo-simoes89/zorba/DC-documentation/+merge/103902
Addition of return types in functions signatures:
Applied in conversion, consolidation and set-similarity modules.
--
https://code.launchpad.net/~diogo-simoes89/zorba/DC-documentation/+merge/103902
Your team Zorba Coders is requested to review the proposed merge of
lp:~diogo-simoes89/zorba/DC-documentation into lp:zorba/data-cleaning-module.
=== modified file 'src/com/zorba-xquery/www/modules/data-cleaning/consolidation.xq'
--- src/com/zorba-xquery/www/modules/data-cleaning/consolidation.xq 2011-08-01 11:26:53 +
+++ src/com/zorba-xquery/www/modules/data-cleaning/consolidation.xq 2012-04-27 15:23:42 +
@@ -50,7 +50,7 @@
: @return The most frequent node in the input sequence.
: @example test/Queries/data-cleaning/consolidation/most-frequent.xq
:)
-declare function con:most-frequent ( $s ) {
+declare function con:most-frequent ( $s ) as item(){
(for $str in set:distinct($s) order by count($s[deep-equal(.,$str)]) descending return $str)[1]
};
@@ -67,7 +67,7 @@
: @return The least frequent node in the input sequence.
: @example test/Queries/data-cleaning/consolidation/leastfrequent_1.xq
:)
-declare function con:least-frequent ( $s ) {
+declare function con:least-frequent ( $s ) as item(){
let $aux := for $str in set:distinct($s) order by count($s[deep-equal(.,$str)]) return $str
return if (count($aux) = 0) then () else ($aux[1])
};
@@ -242,7 +242,7 @@
: @return The node having the largest number of descending elements in the input sequence.
: @example test/Queries/data-cleaning/consolidation/most-elements.xq
:)
-declare function con:most-elements ( $s ) {
+declare function con:most-elements ( $s ) as element(){
(for $str in set:distinct($s) order by count($str/descendant-or-self::element()) descending return $str)[1]
};
@@ -260,7 +260,7 @@
: @return The node having the largest number of descending attributes in the input sequence.
: @example test/Queries/data-cleaning/consolidation/most-attributes.xq
:)
-declare function con:most-attributes ( $s ) {
+declare function con:most-attributes ( $s ) as element(){
(for $str in set:distinct($s) order by count($str/descendant-or-self::*/attribute()) descending return $str)[1]
};
@@ -278,7 +278,7 @@
: @return The node having the largest number of descending nodes in the input sequence.
: @example test/Queries/data-cleaning/consolidation/most-nodes.xq
:)
-declare function con:most-nodes ( $s ) {
+declare function con:most-nodes ( $s ) as element(){
(for $str in set:distinct($s) order by count($str/descendant-or-self::node()) descending return $str)[1]
};
@@ -296,7 +296,7 @@
: @return The node having the smallest number of descending elements in the input sequence.
: @example test/Queries/data-cleaning/consolidation/least-elements.xq
:)
-declare function con:least-elements ( $s ) {
+declare function con:least-elements ( $s ) as element(){
(for $str in set:distinct($s) order by count($str/descendant-or-self::element()) return $str)[1]
};
@@ -314,7 +314,7 @@
: @return The node having the smallest number of descending attributes in the input sequence.
: @example test/Queries/data-cleaning/consolidation/least-attributes.xq
:)
-declare function con:least-attributes ( $s ) {
+declare function con:least-attributes ( $s ) as element(){
(for $str in set:distinct($s) order by count($str/descendant-or-self::*/attribute()) return $str)[1]
};
@@ -332,7 +332,7 @@
: @return The node having the smallest number of descending nodes in the input sequence.
: @example test/Queries/data-cleaning/consolidation/least-nodes.xq
:)
-declare function con:least-nodes ( $s ) {
+declare function con:least-nodes ( $s ) as element(){
(for $str in set:distinct($s) order by count($str/descendant-or-self::node()) return $str)[1]
};
@@ -350,7 +350,7 @@
: @return The node having the largest number of distinct descending elements in the input sequence.
: @example test/Queries/data-cleaning/consolidation/most-distinct-elements.xq
:)
-declare function con:most-distinct-elements ( $s ) {
+declare function con:most-distinct-elements ( $s ) as element(){
(for $str in set:distinct($s) order by count(set:distinct($str/descendant-or-self::element())) descending return $str)[1]
};
@@ -368,7 +368,7 @@
: @return The node having the largest number of distinct descending attributes in the input sequence.
: @example test/Queries/data-cleaning/consolidation/most-distinct-attributes.xq
:)
-declare function con:most-distinct-attributes ( $s ) {
+declare function con:most-distinct-attributes ( $s ) as element(){
(for $str in set:distinct($s) order by count(set:distinct($str/descendant-or-self::*/attribute())) descending return $str)[1]
};
@@ -386,7
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/jsoniq-plan_serialization into lp:~zorba-coders/zorba/jsoniq
The attempt to merge lp:~zorba-coders/zorba/jsoniq-plan_serialization into lp:~zorba-coders/zorba/jsoniq 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 jsoniq-plan_serialization-2012-04-27T14-52-02.942Z is finished. The final status was: 6 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/jsoniq-plan_serialization/+merge/103872 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/jsoniq. -- 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/jsoniq-plan_serialization into lp:~zorba-coders/zorba/jsoniq
The proposal to merge lp:~zorba-coders/zorba/jsoniq-plan_serialization into lp:~zorba-coders/zorba/jsoniq has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/jsoniq-plan_serialization/+merge/103872 -- https://code.launchpad.net/~zorba-coders/zorba/jsoniq-plan_serialization/+merge/103872 Your team Zorba Coders is subscribed to branch lp:~zorba-coders/zorba/jsoniq. -- 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/feature-node_copy into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-node_copy-2012-04-27T15-32-02.181Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/feature-node_copy/+merge/103890 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/feature-node_copy into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/feature-node_copy 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 feature-node_copy-2012-04-27T15-32-02.181Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/feature-node_copy/+merge/103890 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/feature-node_copy into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-node_copy into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-node_copy/+merge/103890 -- https://code.launchpad.net/~zorba-coders/zorba/feature-node_copy/+merge/103890 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/feature-ft_module into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-ft_module-2012-04-27T15-39-39.923Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103884 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 986377] Re: do not apply any updates on collection if it is to be truncated
** Branch linked: lp:~zorba-coders/zorba/bug-986377 -- You received this bug notification because you are a member of Zorba Coders, which is the registrant for Zorba. https://bugs.launchpad.net/bugs/986377 Title: do not apply any updates on collection if it is to be truncated Status in Zorba - The XQuery Processor: New Bug description: If a truncate-collection primitive is in a PUL, no other primitives for the same collection should be applied or undone, because the truncation primitive itself is not undoable To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/986377/+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-986377 into lp:zorba
Matthias Brantner has proposed merging lp:~zorba-coders/zorba/bug-986377 into
lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Markos Zaharioudakis (markos-za)
Related bugs:
Bug #986377 in Zorba: "do not apply any updates on collection if it is to be
truncated "
https://bugs.launchpad.net/zorba/+bug/986377
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-986377/+merge/103908
- no undo is done for collection truncate
- fix for bug #986377 "do not apply any updates on collection if it is to be
truncated"
--
https://code.launchpad.net/~zorba-coders/zorba/bug-986377/+merge/103908
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-04-25 17:16:48 +
+++ ChangeLog 2012-04-27 15:49:21 +
@@ -32,6 +32,7 @@
* Fixed bug #906494 (default compile with D_FILE_OFFSET_BITS=64)
* Fixed bug #988412 (date:current-dateTime daylight saving)
* Fixed bug #912586, #912593 and #912722 (assertion failures with lax validation)
+ * Fixed bug #986377 (do not apply any updates on collection if it is to be truncated)
* Fixed bug #921458 (file:read-text-lines() blocking)
* Fixed bug #981405 (do not hoist expr containing try-catch variables out of the
associated try-catch expression)
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2012-04-24 12:39:38 +
+++ src/diagnostics/diagnostic_en.xml 2012-04-27 15:49:21 +
@@ -2044,10 +2044,6 @@
all nodes must be in same collection
-
- "$1": collection $2 cannot be undone
-
-
"$1": index domain expression yields nodes that are not in collection
=== modified file 'src/store/naive/pul_primitives.cpp'
--- src/store/naive/pul_primitives.cpp 2012-04-24 12:39:38 +
+++ src/store/naive/pul_primitives.cpp 2012-04-27 15:49:21 +
@@ -1293,19 +1293,11 @@
assert(lColl);
lColl->removeAll();
- theIsApplied = true;
-
}
void UpdTruncateCollection::undo()
{
- if (!theIsApplied) return;
-
- throw ZORBA_EXCEPTION(
-zerr::ZDDY0019_UNDO_NOT_POSSIBLE,
-ERROR_PARAMS( theName->getStringValue(), "truncation" )
- );
-
+ // NOOP
}
=== modified file 'src/store/naive/simple_pul.cpp'
--- src/store/naive/simple_pul.cpp 2012-04-24 12:39:38 +
+++ src/store/naive/simple_pul.cpp 2012-04-27 15:49:21 +
@@ -2104,6 +2104,14 @@
if (!theDeleteCollectionList.empty())
return;
+ // if the collection is truncated, no other primitive needs to be applied
+ if (!theTruncateCollectionList.empty())
+ {
+applyList(theTruncateCollectionList);
+theIsApplied = true;
+return;
+ }
+
try
{
// Compute the before-delta for each incrementally maintained index.
@@ -2195,7 +2203,6 @@
applyList(theCreateCollectionList);
applyList(theInsertIntoCollectionList);
applyList(theDeleteFromCollectionList);
-applyList(theTruncateCollectionList);
// Compute the after-delta for each incrementally maintained index.
computeIndexAfterDeltas();
--
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-986377 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-986377 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-986377/+merge/103908 -- https://code.launchpad.net/~zorba-coders/zorba/bug-986377/+merge/103908 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-986377 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-986377/+merge/103908 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/feature-ft_module into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/feature-ft_module 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 feature-ft_module-2012-04-27T15-39-39.923Z is finished. The final status was: 2 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/feature-ft_module/+merge/103884 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/feature-ft_module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-ft_module into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103884 -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103884 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/sorting-chained-tests into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/sorting-chained-tests-2012-04-27T16-16-33.744Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/sorting-chained-tests/+merge/103440 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/sorting-chained-tests into lp:zorba
Validation queue job sorting-chained-tests-2012-04-27T16-16-33.744Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/sorting-chained-tests/+merge/103440 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-986377 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-986377-2012-04-27T17-11-02.437Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-986377/+merge/103908 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-986377 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-986377 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-986377-2012-04-27T17-11-02.437Z is finished. The final status was: 5 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-986377/+merge/103908 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-986377 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-986377 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-986377/+merge/103908 -- https://code.launchpad.net/~zorba-coders/zorba/bug-986377/+merge/103908 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/sorting-chained-tests into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/sorting-chained-tests-2012-04-27T17-42-24.552Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/sorting-chained-tests/+merge/103440 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/sorting-chained-tests into lp:zorba
Validation queue job sorting-chained-tests-2012-04-27T17-42-24.552Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/sorting-chained-tests/+merge/103440 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/sorting-chained-tests into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/sorting-chained-tests-2012-04-27T18-32-03.215Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/sorting-chained-tests/+merge/103440 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/sorting-chained-tests into lp:zorba
Validation queue job sorting-chained-tests-2012-04-27T18-32-03.215Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/sorting-chained-tests/+merge/103440 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/sorting-chained-tests into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/sorting-chained-tests into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/sorting-chained-tests/+merge/103440 -- https://code.launchpad.net/~zorba-coders/zorba/sorting-chained-tests/+merge/103440 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/general-tree-ids into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/general-tree-ids-2012-04-27T19-03-49.707Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/general-tree-ids/+merge/100608 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/general-tree-ids into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/general-tree-ids 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 general-tree-ids-2012-04-27T19-03-49.707Z is finished. The final status was: 2 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/general-tree-ids/+merge/100608 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/general-tree-ids into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/general-tree-ids into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/general-tree-ids/+merge/100608 -- https://code.launchpad.net/~zorba-coders/zorba/general-tree-ids/+merge/100608 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-966706 into lp:zorba
Review: Approve
It would be nice to have 2 comments explaining
1) the modification of the parameter in simple_index_value.cpp:380 and 674 and
2) the role of key2 in Store::populateValueIndex.
It would also be nice to use the typedef here:
=== modified file 'src/store/naive/simple_pul.cpp'
--- src/store/naive/simple_pul.cpp 2012-04-27 19:58:40 +
+++ src/store/naive/simple_pul.cpp 2012-04-27 20:03:20 +
@@ -1463,8 +1463,8 @@
{
csize numRoots = rootNodes.size();
- std::vector::const_iterator collIte =
theCollectionPuls.begin();
- std::vector::const_iterator collEnd =
theCollectionPuls.end();
+ CollectionPuls::const_iterator collIte = theCollectionPuls.begin();
+ CollectionPuls::const_iterator collEnd = theCollectionPuls.end();
for (; collIte != collEnd; ++collIte)
{
--
https://code.launchpad.net/~zorba-coders/zorba/bug-966706/+merge/103835
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/bugs2 into lp:zorba
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/bugs2 into lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Related bugs:
Bug #931501 in Zorba: "improve error message for fn:format-number"
https://bugs.launchpad.net/zorba/+bug/931501
For more details, see:
https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/103938
Fixes for bugs #931501 and #866987 -- improved error messages for
fn:format-number()
--
https://code.launchpad.net/~nbrinza/zorba/bugs2/+merge/103938
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-04-25 17:16:48 +
+++ ChangeLog 2012-04-27 20:11:20 +
@@ -16,12 +16,13 @@
Optimization:
Bug Fixes/Other Changes:
+ * Fixed bugs #931501 and #866987 (improved error messages for fn:format-number(). Additionally, the function now throws the FODF1310 error instead of XTDE1310, as the 3.0 spec requires)
* Fixed bug 955170 (Catch clause with URILiteral-based wilcard NameTest)
* Fixed bug 955135 (err:XQDY0044 not caught by try-catch expressions)
* Fixed bug #986075 (encountering flwor expr with no clauses; due to common
subexression being formed when inlining var in if-then-else expression)
* Fixed bug #967864 (var substitution did not update theFreeVars property)
- * Fixed buf #891650 (context size var not always declared within path expr)
+ * Fixed bug #891650 (context size var not always declared within path expr)
* Fixed bug #948879 (--uri-path doesn't work with fetch:content())
* Fixed bug in window iterator (binding the end vars in the output tuple stream)
* Fixed bug #866547 (protect index-join rule from general flwor)
=== modified file 'src/diagnostics/diagnostic_en.xml'
--- src/diagnostics/diagnostic_en.xml 2012-04-24 12:39:38 +
+++ src/diagnostics/diagnostic_en.xml 2012-04-27 20:11:20 +
@@ -983,7 +983,7 @@
Invalid \c fn:format-number() picture string.
- "$1": invalid fn:format-number() picture string
+ "$1": invalid fn:format-number() picture string$2
@@ -3643,6 +3643,31 @@
invalid options passed to the parse-xml:parse() function, the element must in the schema target namespace
+
+
+ : a sub-picture must not contain more than one of the "$3" sign
+
+
+
+ : a sub-picture must not contain a grouping-separator-sign adjacent to a decimal-separator-sign
+
+
+
+ : the integer part of a sub-picture must not contain a member of the decimal-digit-family that is followed by an optional-digit-sign
+
+
+
+ : the fractional part of a sub-picture must not contain an optional-digit-sign that is followed by a member of the decimal-digit-family
+
+
+
+ : a sub-picture must not contain more than one percent-sign or per-mille-sign, and it must not contain one of each
+
+
+
+ : a sub-picture must contain at least one character that is an optional-digit-sign or a member of the decimal-digit-family
+
+
=== modified file 'src/diagnostics/pregenerated/dict_en.cpp'
--- src/diagnostics/pregenerated/dict_en.cpp 2012-04-24 12:39:38 +
+++ src/diagnostics/pregenerated/dict_en.cpp 2012-04-27 20:11:20 +
@@ -47,7 +47,7 @@
{ "FODC0006", "invalid content passed to $1: $2" },
{ "FODC0007", "\"$1\": base URI passed to fn:parse() is not a valid absolute URI" },
{ "FODF1280", "\"$1\": invalid decimal format name for fn:format-number()" },
- { "FODF1310", "\"$1\": invalid fn:format-number() picture string" },
+ { "FODF1310", "\"$1\": invalid fn:format-number() picture string$2" },
{ "FODT0001", "overflow/underflow in date/time operation" },
{ "FODT0002", "overflow/underflow in duration operation" },
{ "FODT0003", "\"$1\": invalid timezone value" },
@@ -514,6 +514,12 @@
{ "~FileNotFoundOrReadable", "file not found or readable" },
{ "~FnNilledArgNotNode", "fn:nilled() argument not a node" },
{ "~FnOnlyInXQueryVersion_3", "function only available in XQuery $3" },
+ { "~FormatNumberAtLeastOneOptionalOrDecimal", ": a sub-picture must contain at least one character that is an optional-digit-sign or a member of the decimal-digit-family" },
+ { "~FormatNumberDuplicates", ": a sub-picture must not contain more than one of the \"$3\" sign" },
+ { "~FormatNumberFractionalPart", ": the fractional part of a sub-picture must not contain an optional-digit-sign that is followed by a member of the decimal-digit-family" },
+ { "~FormatNumberGroupingAdjacentToDecimal", ": a sub-picture must not contain a grouping-separator-sign adjacent to a decimal-separator-sign" },
+ { "~FormatNumberIntegerPart", ": the integer part of a sub-picture must not contain a member of the decimal-digit-family that is followed by an optional-digit-sign" },
+ { "~FormatNumberPercentPermille", ": a sub-picture must not contain more than one percent-sign or per-mille-sign, and it must not contain one of each" },
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug857842-textWithComment into lp:zorba
Cezar Andrei has proposed merging
lp:~zorba-coders/zorba/bug857842-textWithComment into lp:zorba.
Requested reviews:
Cezar Andrei (cezar-andrei)
Matthias Brantner (matthias-brantner)
Related bugs:
Bug #857842 in Zorba: "Assertion failed with simple content element with
comments"
https://bugs.launchpad.net/zorba/+bug/857842
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug857842-textWithComment/+merge/103944
Fix for Bug #857842 Assertion failed with simple content element with comments
Make use of XML_SCHEMA_NS definition from ns_consts.h.
Skip whole text when part of mixed content, this allows w3c_update_testsuite to
pass.
--
https://code.launchpad.net/~zorba-coders/zorba/bug857842-textWithComment/+merge/103944
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-04-25 17:16:48 +
+++ ChangeLog 2012-04-27 21:00:30 +
@@ -41,6 +41,7 @@
* Fixed bug #949910 (has-children may be invoked on all nodes). Internally, zorba::store::Item::getChildren() now returns NULL on node classes without offspring (instead of raising an error).
* 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)
version 2.2
=== modified file 'src/api/xmldatamanagerimpl.cpp'
--- src/api/xmldatamanagerimpl.cpp 2012-04-24 12:39:38 +
+++ src/api/xmldatamanagerimpl.cpp 2012-04-27 21:00:30 +
@@ -33,18 +33,15 @@
#include "api/staticcontextimpl.h"
#include "api/documentmanagerimpl.h"
#include "api/collectionmanagerimpl.h"
-
+#include "context/static_context.h"
#include "diagnostics/xquery_diagnostics.h"
-
+#include "runtime/util/flowctl_exception.h"
#include "store/api/collection.h"
#include "store/api/item.h"
-#include "system/globalenv.h"
#include "store/api/store.h"
#include "store/api/item_factory.h"
-
-#include "context/static_context.h"
-
-#include "runtime/util/flowctl_exception.h"
+#include "system/globalenv.h"
+#include "zorbamisc/ns_consts.h"
#ifndef ZORBA_NO_FULL_TEXT
#include "stemmer_wrapper.h"
@@ -292,7 +289,7 @@
Item empty_item;
Item validated_options;
NsBindings nsPairs;
-Item untyped_type = theFactory->createQName("http://www.w3.org/2001/XMLSchema";, "xs", "untyped");
+Item untyped_type = theFactory->createQName(XML_SCHEMA_NS, XML_SCHEMA_PREFIX, "untyped");
Item options_node = theFactory->createElementNode(empty_item,
theFactory->createQName(static_context::ZORBA_XML_FN_OPTIONS_NS, "options"),
untyped_type, false, false, nsPairs);
@@ -340,7 +337,7 @@
Item empty_item;
Item validated_options;
NsBindings nsPairs;
-Item untyped_type = theFactory->createQName("http://www.w3.org/2001/XMLSchema";, "xs", "untyped");
+Item untyped_type = theFactory->createQName(XML_SCHEMA_NS, XML_SCHEMA_PREFIX, "untyped");
Item options_node = theFactory->createElementNode(empty_item,
theFactory->createQName(static_context::ZORBA_XML_FN_OPTIONS_NS, "options"),
untyped_type, false, false, nsPairs);
=== modified file 'src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp'
--- src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp 2012-04-24 12:39:38 +
+++ src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp 2012-04-27 21:00:30 +
@@ -38,6 +38,8 @@
#include "store/api/iterator.h"
#include "system/globalenv.h"
+#include "zorbamisc/ns_consts.h"
+
using namespace std;
@@ -499,10 +501,10 @@
theVersion("1.0"),
theFactory(GENV_ITEMFACTORY)
{
- theNamespaceMap["fn"] = "http://www.w3.org/2005/xpath-functions";;
- theNamespaceMap[""] = "http://www.w3.org/2005/xpath-functions";;
- theNamespaceMap["xs"] = "http://www.w3.org/2001/XMLSchema";;
- theNamespaceMap["local"] = "http://www.w3.org/2005/xquery-local-functions";;
+ theNamespaceMap["fn"] = XQUERY_XPATH_FN_NS;
+ theNamespaceMap[""] = XQUERY_XPATH_FN_NS;
+ theNamespaceMap[XML_SCHEMA_PREFIX] = XML_SCHEMA_NS;
+ theNamespaceMap["local"] = XQUERY_LOCAL_FN_NS;
}
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2012-04-24 12:39:38 +
+++ src/compiler/translator/translator.cpp 2012-04-27 21:00:30 +
@@ -83,6 +83,7 @@
#include "zorbatypes/URI.h"
#include "zorbatypes/numconversions.h"
+#include "zorbamisc/ns_consts.h"
#ifdef ZORBA_WITH_DEBUGGER
#include "debugger/debugger_commons.h"
@@ -105,7 +106,6 @@
#define NODE_SORT_OPT
-#define XS_URI "http://www.w3.org/2001/XMLSchema";
namespace zorba
{
@@ -2011,7 +2011,7 @@
theSctx->bind_ns(pfx, targetNS, loc, err::XQST0033);
}
- zstring xsdTNS = zstring(XS_URI);
+ zstring xsdTNS = zstring(XML_SCHEMA_NS);
if ( xsdTNS.compare(targetNS)==0 )
{
// Xerces doesn't like importing XMLSchema.xsd schema4schema, so we skip it
=== modified file 'src/runtime
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug857842-textWithComment into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug857842-textWithComment into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug857842-textWithComment/+merge/103944 -- https://code.launchpad.net/~zorba-coders/zorba/bug857842-textWithComment/+merge/103944 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/bug857842-textWithComment into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug857842-textWithComment into lp:zorba has been updated. Commit Message changed to: Fix for Bug #857842 Assertion failed with simple content element with comments Make use of XML_SCHEMA_NS definition from ns_consts.h. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug857842-textWithComment/+merge/103944 -- https://code.launchpad.net/~zorba-coders/zorba/bug857842-textWithComment/+merge/103944 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/bug857842-textWithComment into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug857842-textWithComment/+merge/103944 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/bug857842-textWithComment into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug857842-textWithComment-2012-04-27T21-03-03.185Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug857842-textWithComment/+merge/103944 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 925366] Re: Setting a prefixed default value for an attribute typed as xs:QName makes zorba crash.
No crash but incorect error -> Medium Importance ** Changed in: zorba Importance: High => 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/925366 Title: Setting a prefixed default value for an attribute typed as xs:QName makes zorba crash. Status in Zorba - The XQuery Processor: New Bug description: Upon import of the following schema in a query, Zorba crashes. schema.xsd = http://www.w3.org/2001/XMLSchema"; xmlns:my="http://ns.example.com/"; targetNamespace="http://www.example.com/";> Query = import schema namespace pul = "http://www.example.com/"; at "schema.xsd"; () It seems to be because the prefix binding of "my" (the default value's prefix) is forgotten outside of the schema (removing this prefix does not lead to a crash). To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/925366/+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 990119] [NEW] Rename EXPECTED_FAILURE() to KNOWN_BUG()
Public bug reported: The name "EXPECTED_FAILURE()" is a bit confusing, as it could imply a negative test. It should not be used for negative tests, however; it is only for those tests that are failing due to a known, filed-but-as-yet- unfixed bug. I propose renaming this to KNOWN_BUG(). EXPECTED_FAILURE() could be kept as a deprecated synonym for the time being. ** Affects: zorba Importance: Medium Status: New ** 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/990119 Title: Rename EXPECTED_FAILURE() to KNOWN_BUG() Status in Zorba - The XQuery Processor: New Bug description: The name "EXPECTED_FAILURE()" is a bit confusing, as it could imply a negative test. It should not be used for negative tests, however; it is only for those tests that are failing due to a known, filed-but-as- yet-unfixed bug. I propose renaming this to KNOWN_BUG(). EXPECTED_FAILURE() could be kept as a deprecated synonym for the time being. To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/990119/+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/bug857842-textWithComment into lp:zorba
Validation queue job bug857842-textWithComment-2012-04-27T21-03-03.185Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug857842-textWithComment/+merge/103944 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/bug857842-textWithComment into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug857842-textWithComment/+merge/103944 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/bug857842-textWithComment into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug857842-textWithComment into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug857842-textWithComment/+merge/103944 -- https://code.launchpad.net/~zorba-coders/zorba/bug857842-textWithComment/+merge/103944 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/feature-ft_module into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103953 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/feature-ft_module into lp:zorba
Review: Approve I have reviewed the thesuarus-URI code and made a couple minor changes. I also fixed the ZORBA_NO_FULL_TEXT build. -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103953 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/feature-ft_module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-ft_module into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103953 -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103953 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/feature-ft_module into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-ft_module-2012-04-28T00-52-11.832Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103953 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/feature-ft_module into lp:zorba
Validation queue job feature-ft_module-2012-04-28T00-52-11.832Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103953 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/feature-ft_module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-ft_module into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103953 -- https://code.launchpad.net/~zorba-coders/zorba/feature-ft_module/+merge/103953 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 944795] Re: XQDoc doesn't handle & in URLs
** Changed in: zorba Status: Invalid => 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/944795 Title: XQDoc doesn't handle & in URLs Status in Zorba - The XQuery Processor: Fix Committed Bug description: If one has a URL within XQDoc documentation that contains a &, e.g.: : When using the WordNet implementation, : Zorba supports all of the relationships (and their abbreviations) : specified by : http://www.niso.org/kst/reports/standards?step=2&gid=&project_key=7cc9b583cb5a62e8c15d3099e0bb46bbae9cf38a";>ANSI/NISO Z39.19-2005. the parser complains: can not parse as XML for xqdoc: loader parsing error: EntityRef: expecting ';' ; raised at /Users/pjl/src/flwor/zorba/repo/feature-ft_module/zorba/src/compiler/parsetree/parsenode_print_xqdoc_visitor.cpp:417 To manage notifications about this bug go to: https://bugs.launchpad.net/zorba/+bug/944795/+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/bug925143 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug925143 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug925143/+merge/102791 -- https://code.launchpad.net/~zorba-coders/zorba/bug925143/+merge/102791 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/bug925143 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug925143-2012-04-28T06-34-01.999Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug925143/+merge/102791 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
