Merge lp:~zorba-coders/zorba/no-copy into lp:zorba

[Markos Zaharioudakis]

1. The target expr of insert and rename exprs is unsafe only if it returns a shared node
2. block expr is safe

1. the target expr of insert and rename exprs is unsafe only if it returns a shared node
2. block expr is safe

[lp:~zorba-coders/zorba/no-copy]

11079. By Markos Zaharioudakis on 2012-10-03

block expr is safe

11080. By Markos Zaharioudakis on 2012-10-04

merge from trunk

[Markos Zaharioudakis (markos-za)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/no-copy-2012-10-04T11-42-43.984Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job no-copy-2012-10-04T11-42-43.984Z is finished. The final status was:

All tests succeeded!

=== modified file 'src/compiler/rewriter/rules/nodeid_rules.cpp'
--- src/compiler/rewriter/rules/nodeid_rules.cpp	2012-10-03 13:10:43 +0000
+++ src/compiler/rewriter/rules/nodeid_rules.cpp	2012-10-04 11:36:24 +0000
@@ -868,16 +868,30 @@
   case replace_expr_kind:
   {
     update_expr_base* e = static_cast<update_expr_base*>(node);
+    expr_kind_t kind = e->get_expr_kind();
 
-    std::vector<expr*> sources;
-    theSourceFinder->findNodeSources(e->getTargetExpr(), &udfCaller, sources);
-    markSources(sources);
+    // The target node cannot be a shared node because the update would be seen
+    // by multiple trees. For updates that delete nodes (delete and replace), the
+    // whole tree must be standalone because we have to sum up the reference
+    // counts of all the nodes in the delete subtree and that won't work if the
+    // deleted subtree contains shared nodes.
+    if (kind == replace_expr_kind || kind == delete_expr_kind)
+    {
+      std::vector<expr*> sources;
+      theSourceFinder->findNodeSources(e->getTargetExpr(), &udfCaller, sources);
+      markSources(sources);
+    }
+    else
+    {
+      markInUnsafeContext(node);
+    }
 
     static_context* sctx = e->get_sctx();
 
+    // TODO: apply no-copy rule to insert and replace updates
     if (e->getSourceExpr() != NULL &&
-        (e->get_expr_kind() == insert_expr_kind ||
-         (e->get_expr_kind() == replace_expr_kind &&
+        (kind == insert_expr_kind ||
+         (kind == replace_expr_kind &&
           static_cast<replace_expr*>(e)->getType() == store::UpdateConsts::NODE)) &&
         sctx->inherit_ns() &&
         sctx->preserve_ns())
@@ -919,43 +933,8 @@
   case flowctl_expr_kind:
   case exit_expr_kind:
   case exit_catcher_expr_kind:
-  {
-    break;
-  }
-
   case block_expr_kind:
   {
-    block_expr* e = static_cast<block_expr *>(node);
-
-    if (e->is_sequential())
-    {
-      csize numChildren = e->size();
-      bool haveUpdates = false;
-
-      for (csize i = numChildren; i > 0; --i)
-      {
-        expr* child = (*e)[i-1];
-
-        if (haveUpdates)
-        {
-          std::vector<expr*> sources;
-          theSourceFinder->findNodeSources(child, &udfCaller, sources);
-          markSources(sources);
-        }
-        else
-        {
-          short scriptingKind = child->get_scripting_detail();
-
-          if (scriptingKind & APPLYING_EXPR ||
-              scriptingKind & EXITING_EXPR ||
-              scriptingKind & SEQUENTIAL_FUNC_EXPR)
-          {
-            haveUpdates = true;
-          }
-        }
-      }
-    }
-
     break;
   }
 

=== removed file 'test/rbkt/ExpQueryResults/zorba/eval/eval13.xml.res'
--- test/rbkt/ExpQueryResults/zorba/eval/eval13.xml.res	2012-03-05 13:31:47 +0000
+++ test/rbkt/ExpQueryResults/zorba/eval/eval13.xml.res	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root><a><b><c/></b></a></root><root><a><b><c/></b></a></root><a><b><c/></b></a><b><c/></b>

=== removed file 'test/rbkt/Queries/zorba/eval/eval13.xq'
--- test/rbkt/Queries/zorba/eval/eval13.xq	2012-03-05 13:31:47 +0000
+++ test/rbkt/Queries/zorba/eval/eval13.xq	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-import module namespace refl = "http://www.zorba-xquery.com/modules/reflection";
-
-
-declare function local:dummy($n as node())
-{
-};
-
-
-declare function local:foo($n as node()) as node()*
-{
-  local:dummy($n),
-  $n/ancestor::node()
-};
-
-
-declare function local:constr($n as node()) as node()*
-{
-  local:dummy($n),
-  <root>{$n}</root>
-};
-
-
-declare variable $doc :=
-<a>
-  <b>
-    <c/>
-  </b>
-</a>
-;
-
-
-local:constr($doc)
-,
-refl:eval("local:foo(local:constr($doc)//c)")