[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-node-reference-management into lp:zorba
Till Westmann has proposed merging
lp:~zorba-coders/zorba/feature-node-reference-management into lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-node-reference-management/+merge/112660
Add ref:has-node-reference and ref:assign-node-reference to the node reference
module that can be used to actively manage node references. As node-references
are usually created on-demand, these functions are not needed for the usual
lifecycle of node references. Therefore these functions are not part of the
documentation.
--
https://code.launchpad.net/~zorba-coders/zorba/feature-node-reference-management/+merge/112660
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/functions/pregenerated/func_nodes.cpp'
--- src/functions/pregenerated/func_nodes.cpp 2012-06-28 04:14:03 +
+++ src/functions/pregenerated/func_nodes.cpp 2012-06-28 22:02:21 +
@@ -41,6 +41,26 @@
return new NodeReferenceIterator(sctx, loc, argv);
}
+PlanIter_t fn_zorba_ref_has_node_reference::codegen(
+ CompilerCB*,
+ static_context* sctx,
+ const QueryLoc loc,
+ std::vectorPlanIter_t argv,
+ expr ann) const
+{
+ return new HasNodeReferenceIterator(sctx, loc, argv);
+}
+
+PlanIter_t fn_zorba_ref_assign_node_reference::codegen(
+ CompilerCB*,
+ static_context* sctx,
+ const QueryLoc loc,
+ std::vectorPlanIter_t argv,
+ expr ann) const
+{
+ return new AssignNodeReferenceIterator(sctx, loc, argv);
+}
+
PlanIter_t fn_zorba_ref_node_by_reference::codegen(
CompilerCB*,
static_context* sctx,
@@ -258,6 +278,31 @@
{
+DECL_WITH_KIND(sctx, fn_zorba_ref_has_node_reference,
+(createQName(http://www.zorba-xquery.com/modules/node-reference,,has-node-reference;),
+GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
+GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
+FunctionConsts::FN_ZORBA_REF_HAS_NODE_REFERENCE_1);
+
+ }
+
+
+
+
+ {
+DECL_WITH_KIND(sctx, fn_zorba_ref_assign_node_reference,
+(createQName(http://www.zorba-xquery.com/modules/node-reference,,assign-node-reference;),
+GENV_TYPESYSTEM.ANY_NODE_TYPE_ONE,
+GENV_TYPESYSTEM.ANY_URI_TYPE_ONE,
+GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
+FunctionConsts::FN_ZORBA_REF_ASSIGN_NODE_REFERENCE_2);
+
+ }
+
+
+
+
+ {
DECL_WITH_KIND(sctx, fn_zorba_ref_node_by_reference,
(createQName(http://www.zorba-xquery.com/modules/node-reference,,node-by-reference;),
GENV_TYPESYSTEM.ANY_URI_TYPE_ONE,
=== modified file 'src/functions/pregenerated/func_nodes.h'
--- src/functions/pregenerated/func_nodes.h 2012-06-28 04:14:03 +
+++ src/functions/pregenerated/func_nodes.h 2012-06-28 22:02:21 +
@@ -55,6 +55,38 @@
};
+//fn-zorba-ref:has-node-reference
+class fn_zorba_ref_has_node_reference : public function
+{
+public:
+ fn_zorba_ref_has_node_reference(const signature sig, FunctionConsts::FunctionKind kind)
+:
+function(sig, kind)
+ {
+
+ }
+
+ CODEGEN_DECL();
+};
+
+
+//fn-zorba-ref:assign-node-reference
+class fn_zorba_ref_assign_node_reference : public function
+{
+public:
+ fn_zorba_ref_assign_node_reference(const signature sig, FunctionConsts::FunctionKind kind)
+:
+function(sig, kind)
+ {
+
+ }
+
+ unsigned short getScriptingKind() const { return SEQUENTIAL_FUNC_EXPR; }
+
+ CODEGEN_DECL();
+};
+
+
//fn-zorba-ref:node-by-reference
class fn_zorba_ref_node_by_reference : public function
{
=== modified file 'src/functions/pregenerated/function_enum.h'
--- src/functions/pregenerated/function_enum.h 2012-06-28 04:14:03 +
+++ src/functions/pregenerated/function_enum.h 2012-06-28 22:02:21 +
@@ -288,6 +288,8 @@
FN_ZORBA_POS_IN_COLLECTION_1,
FN_ZORBA_POS_IN_SAME_COLLECTION_OF_2,
FN_ZORBA_REF_NODE_REFERENCE_1,
+ FN_ZORBA_REF_HAS_NODE_REFERENCE_1,
+ FN_ZORBA_REF_ASSIGN_NODE_REFERENCE_2,
FN_ZORBA_REF_NODE_BY_REFERENCE_1,
FN_LOCAL_NAME_0,
FN_LOCAL_NAME_1,
=== modified file 'src/runtime/nodes/nodes_impl.cpp'
--- src/runtime/nodes/nodes_impl.cpp 2012-06-28 19:06:27 +
+++ src/runtime/nodes/nodes_impl.cpp 2012-06-28 22:02:21 +
@@ -40,8 +40,6 @@
NodeReferenceIterator::nextImpl(store::Item_t aResult, PlanState aPlanState) const
{
store::Item_t lNode;
- store::Item_t lGenerateIdentifier;
- zstring lNodeId;
PlanIteratorState* state;
DEFAULT_STACK_INIT(PlanIteratorState, state, aPlanState);
@@ -58,6 +56,58 @@
/
bool
+HasNodeReferenceIterator::nextImpl(store::Item_t aResult, PlanState aPlanState) const
+{
+ store::Item_t lNode;
+ xs_boolean lHasReference;
+
+ PlanIteratorState* state;
+ DEFAULT_STACK_INIT(PlanIteratorState, state, aPlanState);
+
+ consumeNext(lNode, theChildren[0].getp(), aPlanState);
+
+ lHasReference = GENV_STORE.hasReference(lNode);
+
+ STACK_PUSH(GENV_ITEMFACTORY-createBoolean(aResult, lHasReference),
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-node-reference-management into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-node-reference-management into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-node-reference-management/+merge/112660 -- https://code.launchpad.net/~zorba-coders/zorba/feature-node-reference-management/+merge/112660 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-reference-management into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-node-reference-management-2012-06-28T22-05-56.705Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/feature-node-reference-management/+merge/112660 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-reference-management into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-node-reference-management/+merge/112660 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-reference-management into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/feature-node-reference-management 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-reference-management-2012-06-28T22-05-56.705Z 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/feature-node-reference-management/+merge/112660 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-reference-management into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-node-reference-management into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-node-reference-management/+merge/112660 -- https://code.launchpad.net/~zorba-coders/zorba/feature-node-reference-management/+merge/112660 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-reference-management into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/feature-node-reference-management/+merge/112660 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-reference-management into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-node-reference-management into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-node-reference-management/+merge/112660 -- https://code.launchpad.net/~zorba-coders/zorba/feature-node-reference-management/+merge/112660 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-reference-management into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/feature-node-reference-management-2012-06-29T02-50-57.727Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/feature-node-reference-management/+merge/112660 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-reference-management into lp:zorba
Validation queue job feature-node-reference-management-2012-06-29T02-50-57.727Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/feature-node-reference-management/+merge/112660 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-reference-management into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/feature-node-reference-management into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/feature-node-reference-management/+merge/112660 -- https://code.launchpad.net/~zorba-coders/zorba/feature-node-reference-management/+merge/112660 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
