Merge lp:~zorba-coders/zorba/bug-1006960 into lp:zorba

[Markos Zaharioudakis]

Fixed bug #1006960 (taking construction mode into account during no-copy rule)

Fixed bug #1006960 (taking construction mode into account during no-copy rule)

[lp:~zorba-coders/zorba/bug-1006960]

10869. By Markos Zaharioudakis on 2012-09-30

fixed schema-type function

10870. By Markos Zaharioudakis on 2012-10-01

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/bug-1006960-2012-10-01T08-28-50.906Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-1006960-2012-10-01T08-28-50.906Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2012-09-28 07:56:07 +0000
+++ ChangeLog	2012-10-01 08:20:29 +0000
@@ -15,12 +15,13 @@
   * Best-effort serialization of atomic values in JSON items.
   * Positional pagination support for index probes 
   * Recognize the {http://www.zorba-xquery.com/extensions}no-copy pragma to avoid
-  copying nodes before insertion into a collection.
-  * Recognize the no-copy pragma to avoid copying nodes before insertion into a collection.
-	* Added createUntypedAtomic to API's ItemFactory.
+    copying nodes before insertion into a collection.
+  * Recognize the no-copy pragma to avoid copying nodes before insertion into
+    a collection.
+  * Added createUntypedAtomic to API's ItemFactory.
   * new xqDoc feature; reporting collections and indexes
-  * new xqDoc function parameter to enable/disable xqDoc generation of
-	  certain components
+  * new xqDoc function parameter to enable/disable xqDoc generation of certain
+    components
 
 Optimizations:
   * Improved memory management for compiler expressions (no more ref counting)
@@ -36,7 +37,9 @@
   * Optimized runtime group iterator based on latest group-by semantics.
 
 Bug Fixes/Other Changes:
-  * Fixed bug #950621 (Removed two-arg version of fn:parse-xml(); use XML module function xml:parse() instead)
+  * Fixed bug #1006960 (taking construction mode into account during no-copy rule)
+  * Fixed bug #950621 (Removed two-arg version of fn:parse-xml(); use XML module
+    function xml:parse() instead)
   * Fixed bug #867227 (Improved error message for missing commas)
   * Fixed bug #1024033 and #1023170 (segfaults in parse-xml:parse())
   * Fixed bug #898792 (Dynamically computed strings can now be cast to xs:QName)
@@ -129,6 +132,7 @@
   * The XML plan serialization format is not supported anymore
 
 
+>>>>>>> MERGE-SOURCE
 version 2.5
 
 New Features:

=== modified file 'src/compiler/rewriter/rules/nodeid_rules.cpp'
--- src/compiler/rewriter/rules/nodeid_rules.cpp	2012-09-28 19:16:51 +0000
+++ src/compiler/rewriter/rules/nodeid_rules.cpp	2012-10-01 08:20:29 +0000
@@ -587,7 +587,9 @@
   {
     if (rCtx.theCCB->theConfig.for_serialization_only)
     {
+      // Serialization may or may not be a "node-id-sesitive" op.
       static_context* sctx = node->get_sctx();
+
       if (sctx->preserve_mode() == StaticContextConsts::preserve_ns &&
           sctx->inherit_mode() == StaticContextConsts::inherit_ns)
       {
@@ -603,6 +605,8 @@
     }
     else
     {
+      // We have to assume that the result of the "node" expr will be used in a
+      // "node-id-sesitive" op, so it must consist of standalone trees.  
       std::vector<expr*> sources;
       UDFCallChain dummyUdfCaller;
       theSourceFinder->findNodeSources(rCtx.theRoot, &dummyUdfCaller, sources);
@@ -801,10 +805,21 @@
 
   case castable_expr_kind:
   case cast_expr_kind:
+  case promote_expr_kind:
   case instanceof_expr_kind:
+  case treat_expr_kind:
+  {
+    if (node->get_sctx()->construction_mode() == StaticContextConsts::cons_strip)
+    {
+      cast_or_castable_base_expr* e = static_cast<cast_or_castable_base_expr*>(node);
+
+      markForSerialization(e->get_input());
+    }
+
+    break;
+  }
+
   case name_cast_expr_kind:
-  case promote_expr_kind:
-  case treat_expr_kind:
   case order_expr_kind:
   case wrapper_expr_kind:
   case function_trace_expr_kind:

=== modified file 'src/functions/CMakeLists.txt'
--- src/functions/CMakeLists.txt	2012-09-17 00:36:37 +0000
+++ src/functions/CMakeLists.txt	2012-10-01 08:20:29 +0000
@@ -85,6 +85,7 @@
     func_apply.cpp
     func_serialize_impl.cpp
     func_parse_fragment_impl.cpp
+    func_schema_impl.cpp
 )
 
 IF (ZORBA_WITH_JSON)

=== added file 'src/functions/func_schema_impl.cpp'
--- src/functions/func_schema_impl.cpp	1970-01-01 00:00:00 +0000
+++ src/functions/func_schema_impl.cpp	2012-10-01 08:20:29 +0000
@@ -0,0 +1,36 @@
+/*
+ * 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 "functions/func_schema.h"
+
+#include "compiler/expression/expr_base.h"
+
+#include "context/static_context.h"
+
+namespace zorba
+{
+
+
+/*******************************************************************************
+
+********************************************************************************/
+bool fn_zorba_schema_schema_type::mustCopyInputNodes(expr* fo, csize producer) const 
+{
+  return (fo->get_sctx()->construction_mode() == StaticContextConsts::cons_strip);
+}
+
+
+}

=== modified file 'src/functions/pregenerated/func_schema.h'
--- src/functions/pregenerated/func_schema.h	2012-09-24 09:17:44 +0000
+++ src/functions/pregenerated/func_schema.h	2012-10-01 08:20:29 +0000
@@ -87,7 +87,7 @@
 
   }
 
-  bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
+  bool mustCopyInputNodes(expr* fo, csize producer) const;
 
   CODEGEN_DECL();
 };

=== modified file 'src/runtime/spec/schema/schema.xml'
--- src/runtime/spec/schema/schema.xml	2012-09-17 00:36:37 +0000
+++ src/runtime/spec/schema/schema.xml	2012-10-01 08:20:29 +0000
@@ -99,7 +99,7 @@
     </zorba:signature>
 
     <zorba:methods>
-      <zorba:mustCopyInputNodes value="false"/>
+      <zorba:mustCopyInputNodes/>
     </zorba:methods>
 
   </zorba:function>

=== added file 'test/rbkt/ExpQueryResults/zorba/no-copy/test2.xml.res'
--- test/rbkt/ExpQueryResults/zorba/no-copy/test2.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/no-copy/test2.xml.res	2012-10-01 08:20:29 +0000
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+false

=== added file 'test/rbkt/ExpQueryResults/zorba/no-copy/test3.xml.res'
--- test/rbkt/ExpQueryResults/zorba/no-copy/test3.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/no-copy/test3.xml.res	2012-10-01 08:20:29 +0000
@@ -0,0 +1,1 @@
+xs:untypedAtomic

=== added file 'test/rbkt/Queries/zorba/no-copy/simple.xsd'
--- test/rbkt/Queries/zorba/no-copy/simple.xsd	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/no-copy/simple.xsd	2012-10-01 08:20:29 +0000
@@ -0,0 +1,27 @@
+<xs:schema 
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  targetNamespace="http://www.zorba-xquery.org/simple"
+  xmlns="http://www.zorba-xquery.org/simple"
+  elementFormDefault="qualified"
+  attributeFormDefault="qualified">
+
+<xs:element name="person" type="PersonType"/>
+
+<xs:complexType name="PersonType">
+  <xs:sequence>
+     <xs:element name="name" type="xs:string"/>
+     <xs:element name="age" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+  </xs:sequence>
+</xs:complexType>
+
+
+<xs:element name="person2" type="PersonType2"/>
+
+<xs:complexType name="PersonType2">
+  <xs:sequence>
+     <xs:element name="name" type="xs:string"/>
+  </xs:sequence>
+  <xs:attribute name="age" type="xs:string"/>
+</xs:complexType>
+
+</xs:schema>

=== added file 'test/rbkt/Queries/zorba/no-copy/test2.xq'
--- test/rbkt/Queries/zorba/no-copy/test2.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/no-copy/test2.xq	2012-10-01 08:20:29 +0000
@@ -0,0 +1,14 @@
+
+declare namespace opt = "http://www.zorba-xquery.com/options/optimizer";
+
+declare construction strip;
+
+import schema namespace s="http://www.zorba-xquery.org/simple" at "simple.xsd";
+
+declare option opt:enable "for-serialization-only";
+
+declare variable $doc := <s:person><s:name>foo</s:name><s:age>25</s:age></s:person>;
+
+let $vdoc := validate { $doc }
+let $copy := <root>{$vdoc/s:name}</root>
+return $copy/s:name instance of element(*, xs:string)

=== added file 'test/rbkt/Queries/zorba/no-copy/test3.xq'
--- test/rbkt/Queries/zorba/no-copy/test3.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/no-copy/test3.xq	2012-10-01 08:20:29 +0000
@@ -0,0 +1,12 @@
+declare construction strip;
+
+import schema namespace ft =  "http://www.zorba-xquery.com/modules/full-text";
+import module namespace schema = "http://www.zorba-xquery.com/modules/schema";
+
+let $x := validate {<ft:compare-options 
+                           case="case sensitive" 
+                           diacritics="diacritics sensitive"
+                           stemming="stemming"/>}
+let $y:= (<a> { $x } </a>)/*
+return 
+   schema:schema-type($y/@case)