[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-949910 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-949910 into lp:zorba has been updated. Status: Needs review = Work in progress For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 -- https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 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-949910 into lp:zorba
Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/bug-949910 into
lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
Matthias Brantner (matthias-brantner)
Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
Bug #949910 in Zorba: fn:has-children segfaults on comment nodes
https://bugs.launchpad.net/zorba/+bug/949910
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573
Solved bug 949910.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-04-02 08:20:22 +
+++ ChangeLog 2012-04-04 16:06:20 +
@@ -13,6 +13,7 @@
* Fixed performance problem with the findNodeSources function of the no-copy rule
* Fixed bug #872234 (prevent a rewritting to take place in case of sequential expr)
* Fixed bug #912586, #912593 and #912722 (assertion failures with lax validation)
+ * 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).
version 2.2
=== modified file 'src/store/naive/node_items.cpp'
--- src/store/naive/node_items.cpp 2012-03-28 23:58:23 +
+++ src/store/naive/node_items.cpp 2012-04-04 16:06:20 +
@@ -3759,6 +3759,14 @@
}
+/***
+
+/
+store::Iterator_t AttributeNode::getChildren() const
+{
+ return NULL;
+}
+
/
// //
// class TextNode //
@@ -4458,6 +4466,14 @@
#endif // ! TEXT_ORDPATH
+/***
+
+/
+store::Iterator_t TextNode::getChildren() const
+{
+ return NULL;
+}
+
/
// //
// class PiNode //
@@ -4594,6 +4610,14 @@
return ? + theTarget + + theContent + ?;
}
+/***
+
+/
+store::Iterator_t PiNode::getChildren() const
+{
+ return NULL;
+}
+
/
// //
@@ -4718,6 +4742,15 @@
return !-- + theContent + --;
}
+/***
+
+/
+store::Iterator_t CommentNode::getChildren() const
+{
+ return NULL;
+}
+
+
#ifndef ZORBA_NO_FULL_TEXT
/**
=== modified file 'src/store/naive/node_items.h'
--- src/store/naive/node_items.h 2012-03-28 23:58:23 +
+++ src/store/naive/node_items.h 2012-04-04 16:06:20 +
@@ -1283,6 +1283,8 @@
#ifndef ZORBA_NO_FULL_TEXT
void tokenize( XmlNodeTokenizerCallback );
#endif
+
+ store::Iterator_t getChildren() const;
};
@@ -1443,6 +1445,8 @@
#ifndef ZORBA_NO_FULL_TEXT
void tokenize( XmlNodeTokenizerCallback );
#endif /* ZORBA_NO_FULL_TEXT */
+
+ store::Iterator_t getChildren() const;
};
@@ -1508,6 +1512,8 @@
void replaceName(UpdRenamePi upd);
void restoreName(UpdRenamePi upd);
+
+ store::Iterator_t getChildren() const;
};
@@ -1563,6 +1569,8 @@
void replaceValue(UpdReplaceCommentValue upd);
void restoreValue(UpdReplaceCommentValue upd);
+
+ store::Iterator_t getChildren() const;
};
=== added directory 'test/rbkt/ExpQueryResults/zorba/f-and-o'
=== added file 'test/rbkt/ExpQueryResults/zorba/f-and-o/has-children-attribute.xml.res'
--- test/rbkt/ExpQueryResults/zorba/f-and-o/has-children-attribute.xml.res 1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/f-and-o/has-children-attribute.xml.res 2012-04-04 16:06:20 +
@@ -0,0 +1,1 @@
+false
=== added file 'test/rbkt/ExpQueryResults/zorba/f-and-o/has-children-comment.xml.res'
--- test/rbkt/ExpQueryResults/zorba/f-and-o/has-children-comment.xml.res 1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/f-and-o/has-children-comment.xml.res 2012-04-04 16:06:20 +
@@ -0,0 +1,1 @@
+false
=== added file 'test/rbkt/ExpQueryResults/zorba/f-and-o/has-children-pi.xml.res'
---
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-949910 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-949910 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 -- https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 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-949910 into lp:zorba
Thanks, The ChangeLog is now updated. -- https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 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-949910 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-949910-2012-04-04T16-43-55.076Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 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-949910 into lp:zorba
Validation queue job bug-949910-2012-04-04T16-43-55.076Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 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-949910 into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Needs Information, 3 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 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-949910 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-949910 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 -- https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 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-949910 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 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-949910 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 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-949910 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-949910 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 -- https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 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-949910 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-949910-2012-04-04T19-05-12.59Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 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-949910 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-949910 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 -- https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 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-949910 into lp:zorba
No approved revision specified. -- https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 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-949910 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-949910 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 -- https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 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-949910 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-949910 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 -- https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 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-949910 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-949910-2012-03-08T13-53-07.61Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 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-949910 into lp:zorba
Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/bug-949910 into
lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
Bug #949910 in Zorba: fn:has-children segfaults on comment nodes
https://bugs.launchpad.net/zorba/+bug/949910
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573
Solved bug 949910.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/naive/node_items.cpp'
--- src/store/naive/node_items.cpp 2012-03-07 14:22:29 +
+++ src/store/naive/node_items.cpp 2012-03-08 13:47:38 +
@@ -3642,6 +3642,14 @@
}
+/***
+
+/
+store::Iterator_t AttributeNode::getChildren() const
+{
+ return NULL;
+}
+
/
// //
// class TextNode //
@@ -4341,6 +4349,14 @@
#endif // ! TEXT_ORDPATH
+/***
+
+/
+store::Iterator_t TextNode::getChildren() const
+{
+ return NULL;
+}
+
/
// //
// class PiNode //
@@ -4477,6 +4493,14 @@
return ? + theTarget + + theContent + ?;
}
+/***
+
+/
+store::Iterator_t PiNode::getChildren() const
+{
+ return NULL;
+}
+
/
// //
@@ -4601,6 +4625,15 @@
return !-- + theContent + --;
}
+/***
+
+/
+store::Iterator_t CommentNode::getChildren() const
+{
+ return NULL;
+}
+
+
#ifndef ZORBA_NO_FULL_TEXT
/**
=== modified file 'src/store/naive/node_items.h'
--- src/store/naive/node_items.h 2012-03-07 14:22:29 +
+++ src/store/naive/node_items.h 2012-03-08 13:47:38 +
@@ -1265,6 +1265,8 @@
#ifndef ZORBA_NO_FULL_TEXT
void tokenize( XmlNodeTokenizerCallback );
#endif
+
+ store::Iterator_t getChildren() const;
};
@@ -1425,6 +1427,8 @@
#ifndef ZORBA_NO_FULL_TEXT
void tokenize( XmlNodeTokenizerCallback );
#endif /* ZORBA_NO_FULL_TEXT */
+
+ store::Iterator_t getChildren() const;
};
@@ -1490,6 +1494,8 @@
void replaceName(UpdRenamePi upd);
void restoreName(UpdRenamePi upd);
+
+ store::Iterator_t getChildren() const;
};
@@ -1545,6 +1551,8 @@
void replaceValue(UpdReplaceCommentValue upd);
void restoreValue(UpdReplaceCommentValue upd);
+
+ store::Iterator_t getChildren() const;
};
=== added directory 'test/rbkt/ExpQueryResults/zorba/f-and-o'
=== added file 'test/rbkt/ExpQueryResults/zorba/f-and-o/has-children-attribute.xml.res'
--- test/rbkt/ExpQueryResults/zorba/f-and-o/has-children-attribute.xml.res 1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/f-and-o/has-children-attribute.xml.res 2012-03-08 13:47:38 +
@@ -0,0 +1,1 @@
+false
=== added file 'test/rbkt/ExpQueryResults/zorba/f-and-o/has-children-comment.xml.res'
--- test/rbkt/ExpQueryResults/zorba/f-and-o/has-children-comment.xml.res 1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/f-and-o/has-children-comment.xml.res 2012-03-08 13:47:38 +
@@ -0,0 +1,1 @@
+false
=== added file 'test/rbkt/ExpQueryResults/zorba/f-and-o/has-children-pi.xml.res'
--- test/rbkt/ExpQueryResults/zorba/f-and-o/has-children-pi.xml.res 1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/f-and-o/has-children-pi.xml.res 2012-03-08 13:47:38 +
@@ -0,0 +1,1 @@
+false
=== added file 'test/rbkt/ExpQueryResults/zorba/f-and-o/has-children-text.xml.res'
--- test/rbkt/ExpQueryResults/zorba/f-and-o/has-children-text.xml.res 1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/f-and-o/has-children-text.xml.res 2012-03-08 13:47:38 +
@@ -0,0 +1,1 @@
+false
=== added directory 'test/rbkt/Queries/zorba/f-and-o'
=== added file 'test/rbkt/Queries/zorba/f-and-o/has-children-attribute.xq'
---
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-949910 into lp:zorba
Validation queue job bug-949910-2012-03-08T13-53-07.61Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 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-949910 into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 2 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 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-949910 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-949910 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 -- https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 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-949910 into lp:zorba
Review: Needs Information An alternative implementation would be to make sure that the function is never invoked on comments or PIs. I think that was the philosophy so far. Could you please mention the fix in the ChangeLog? -- https://code.launchpad.net/~zorba-coders/zorba/bug-949910/+merge/96573 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
