Merge lp:~nbrinza/zorba/bugs into lp:zorba

[Nicolae Brinza]

Fix for lp: bug #867256 - test Steps-leading-lone-slash-8a is failing.

Indeed, the condition that Markos mentioned was not necessary, so I have removed it. Resubmitting for merge into the trunk.

[Matthias Brantner (matthias-brantner)]

Nicolae, could you please also update the ChangeLog?

review: Needs Fixing

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs-2011-11-03T02-45-02.853Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~nbrinza/zorba/bugs into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message):
  Validation queue job bugs-2011-11-03T02-45-02.853Z 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

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs-2011-11-07T17-26-04.331Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bugs-2011-11-07T17-26-04.331Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Pending.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs-2011-11-07T17-48-33.425Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bugs-2011-11-07T17-48-33.425Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Pending.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bugs-2011-11-07T18-09-02.8Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bugs-2011-11-07T18-09-02.8Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Markos Zaharioudakis (markos-za)]

In computing the value of the is_element_test variable, why do we need the condition:

dynamic_cast<const NodeXQType*>(m_content_type.getp())->m_schema_test == false

? In fact, this seems wrong to me, because if "this" is document-node(SchemaElementTest), then we will return true without really checking the SchemaElementTest.

BTW, the dynamic_cast is not necessary since you have already checked the type kind. A static_cast is better here.

[Nicolae Brinza (nbrinza)]

Indeed, the condition that Markos mentioned was not necessary, so I have removed it. Resubmitting for merge into the trunk.

[Markos Zaharioudakis (markos-za)]

review: Approve

[Markos Zaharioudakis (markos-za)]

Nicolae, I have approved the branch, but it would be nice to also add a test for the document-node(schema-element-test) case. Apparently, the XQTS does not have one!

[lp:~nbrinza/zorba/bugs]

10540. By Nicolae Brinza on 2011-12-16

Merged with Zorba trunk

10541. By Nicolae Brinza on 2011-12-17

Added tests for the document-node(schema-element()) node test, used as variable types and in 'instance of' expressions

10542. By Nicolae Brinza on 2011-12-17

Added test results files for the previous commit (tests for document-node(schema-element()) node test)

10543. By Nicolae Brinza on 2011-12-17

Added spec files for tests with the document-node(schema-element()) node tests

10544. By Nicolae Brinza on 2011-12-20

Merged with Zorba trunk

10545. By Nicolae Brinza on 2012-03-15

Merged with Zorba trunk

10546. By Nicolae Brinza on 2012-03-17

Merged with Zorba trunk

10547. By Nicolae Brinza on 2012-05-10

Merged with Zorba trunk

10548. By Nicolae Brinza on 2012-06-21

Merged with Zorba trunk

10549. By Nicolae Brinza on 2012-06-21

Fixed the 6 failing doc-node-schema-elem-test- tests

10550. By Nicolae Brinza on 2012-12-14

Merged with Zorba trunk

Unmerged revisions

10550. By Nicolae Brinza on 2012-12-14

Merged with Zorba trunk

10549. By Nicolae Brinza on 2012-06-21

Fixed the 6 failing doc-node-schema-elem-test- tests

10548. By Nicolae Brinza on 2012-06-21

Merged with Zorba trunk

10547. By Nicolae Brinza on 2012-05-10

Merged with Zorba trunk

10546. By Nicolae Brinza on 2012-03-17

Merged with Zorba trunk

10545. By Nicolae Brinza on 2012-03-15

Merged with Zorba trunk

10544. By Nicolae Brinza on 2011-12-20

Merged with Zorba trunk

10543. By Nicolae Brinza on 2011-12-17

Added spec files for tests with the document-node(schema-element()) node tests

10542. By Nicolae Brinza on 2011-12-17

Added test results files for the previous commit (tests for document-node(schema-element()) node test)

10541. By Nicolae Brinza on 2011-12-17

Added tests for the document-node(schema-element()) node test, used as variable types and in 'instance of' expressions

=== modified file 'ChangeLog'
--- ChangeLog	2011-12-13 03:38:23 +0000
+++ ChangeLog	2011-12-17 00:22:28 +0000
@@ -1,5 +1,9 @@
 Zorba - The XQuery Processor
 
+version 2.x
+
+  * Fixed bug #867256 (document-node(element(x)) types and tests were not working correctly)
+   
 version 2.2
 
   * Caching of results for recursive functions with atomic parameter and return types.

=== modified file 'src/types/typeimpl.cpp'
--- src/types/typeimpl.cpp	2011-07-01 05:22:12 +0000
+++ src/types/typeimpl.cpp	2011-12-17 00:22:28 +0000
@@ -361,7 +361,7 @@
 
 
 bool NodeXQType::is_subtype(
-    const TypeManager* tm, 
+    const TypeManager* tm,
     const NodeXQType& supertype,
     const QueryLoc& loc) const
 {
@@ -443,7 +443,7 @@
 
 
 bool NodeXQType::is_supertype(
-    const TypeManager* tm, 
+    const TypeManager* tm,
     const store::Item* subitem,
     const QueryLoc& loc) const
 {
@@ -488,14 +488,29 @@
     }
   }
 
-  if (m_node_kind != store::StoreConsts::elementNode && 
-      m_node_kind != store::StoreConsts::attributeNode)
+  // document-node( E ) matches any document node that contains exactly one element
+  // node, optionally accompanied by one or more comment and processing instruction
+  // nodes, if E is an ElementTest or SchemaElementTest that matches the element node.
+  bool is_element_test = (
+      m_node_kind == store::StoreConsts::documentNode &&
+      m_content_type != NULL &&
+      m_content_type->type_kind() == XQType::NODE_TYPE_KIND);
+
+  if (m_node_kind != store::StoreConsts::elementNode &&
+      m_node_kind != store::StoreConsts::attributeNode &&
+      !is_element_test)
     return true;
 
   if (m_content_type == NULL ||
       m_content_type->type_kind() == XQType::ANY_TYPE_KIND)
     return true;
 
+  if (is_element_test)
+  {
+    xqtref_t documentNodeType = tm->create_value_type(subitem, loc);
+    return TypeOps::is_subtype(tm, *documentNodeType, *this);
+  }
+
   xqtref_t subContentType = tm->create_named_type(subitem->getType(),
                                                   TypeConstants::QUANT_ONE,
                                                   loc,

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-03.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-03.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-03.xml.res	2011-12-17 00:22:28 +0000
@@ -0,0 +1,1 @@
+true
\ No newline at end of file

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-05.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-05.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-05.xml.res	2011-12-17 00:22:28 +0000
@@ -0,0 +1,1 @@
+false
\ No newline at end of file

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-06.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-06.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-06.xml.res	2011-12-17 00:22:28 +0000
@@ -0,0 +1,1 @@
+false
\ No newline at end of file

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-07.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-07.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-07.xml.res	2011-12-17 00:22:28 +0000
@@ -0,0 +1,1 @@
+true
\ No newline at end of file

=== added file 'test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-08.xml.res'
--- test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-08.xml.res	1970-01-01 00:00:00 +0000
+++ test/rbkt/ExpQueryResults/zorba/schemas/doc-node-schema-elem-test-08.xml.res	2011-12-17 00:22:28 +0000
@@ -0,0 +1,1 @@
+false
\ No newline at end of file

=== modified file 'test/rbkt/Queries/CMakeLists.txt'
--- test/rbkt/Queries/CMakeLists.txt	2011-12-09 19:37:09 +0000
+++ test/rbkt/Queries/CMakeLists.txt	2011-12-17 00:22:28 +0000
@@ -210,7 +210,6 @@
 ####
 IF (FOUND_XQTS AND NOT ZORBA_TEST_W3C_TO_SUBMIT_RESULTS)
 
-  EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQuery/PathExpr/Steps/Steps-leading-lone-slash-8a 3408285)
   EXPECTED_FAILURE(test/rbkt/w3c_testsuite/XQuery/Functions/QNameFunc/NamespaceURIForPrefixFunc/K2-NamespaceURIForPrefixFunc-2 872732)
 
   IF(NOT ZORBA_WITH_BIG_INTEGER)

=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.spec'
--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.spec	2011-12-17 00:22:28 +0000
@@ -0,0 +1,1 @@
+Error: http://www.w3.org/2005/xqt-errors:XPTY0004

=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.xq'
--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-01.xq	2011-12-17 00:22:28 +0000
@@ -0,0 +1,10 @@
+import schema default element namespace "http://www.w3.org/XQueryTestOrderBy" at "orderData.xsd"; 
+
+declare variable $source := document { (
+    <!--comment-->, 
+    <Strings><orderData>one string</orderData></Strings>,
+    <?processing instruction?>
+  ) };
+
+let $document as document-node(schema-element(Strings)) := $source 
+return true()

=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-02.spec'
--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-02.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-02.spec	2011-12-17 00:22:28 +0000
@@ -0,0 +1,1 @@
+Error: http://www.w3.org/2005/xqt-errors:XPTY0004

=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-02.xq'
--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-02.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-02.xq	2011-12-17 00:22:28 +0000
@@ -0,0 +1,10 @@
+import schema default element namespace "http://www.w3.org/XQueryTestOrderBy" at "orderData.xsd"; 
+
+declare variable $source := document { (
+    <!--comment-->, 
+    <Strings><orderData>one string</orderData></Strings>,
+    <?processing instruction?>
+  ) };
+
+let $document as document-node(schema-element(Strings2)) := $source 
+return true()

=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-03.xq'
--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-03.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-03.xq	2011-12-17 00:22:28 +0000
@@ -0,0 +1,10 @@
+import schema default element namespace "http://www.w3.org/XQueryTestOrderBy" at "orderData.xsd"; 
+
+declare variable $source := document { (
+    <!--comment-->, 
+    <Strings><orderData>one string</orderData></Strings>,
+    <?processing instruction?>
+  ) };
+
+let $document as document-node(schema-element(Strings)) := validate { $source }
+return true()

=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-04.spec'
--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-04.spec	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-04.spec	2011-12-17 00:22:28 +0000
@@ -0,0 +1,1 @@
+Error: http://www.w3.org/2005/xqt-errors:XPTY0004

=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-04.xq'
--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-04.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-04.xq	2011-12-17 00:22:28 +0000
@@ -0,0 +1,10 @@
+import schema default element namespace "http://www.w3.org/XQueryTestOrderBy" at "orderData.xsd"; 
+
+declare variable $source := document { (
+    <!--comment-->, 
+    <Strings><orderData>one string</orderData></Strings>,
+    <?processing instruction?>
+  ) };
+
+let $document as document-node(schema-element(Strings2)) := validate { $source }
+return true()

=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-05.xq'
--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-05.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-05.xq	2011-12-17 00:22:28 +0000
@@ -0,0 +1,9 @@
+import schema default element namespace "http://www.w3.org/XQueryTestOrderBy" at "orderData.xsd"; 
+
+declare variable $source := document { (
+    <!--comment-->, 
+    <Strings><orderData>one string</orderData></Strings>,
+    <?processing instruction?>
+  ) };
+
+$source instance of document-node(schema-element(Strings))

=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-06.xq'
--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-06.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-06.xq	2011-12-17 00:22:28 +0000
@@ -0,0 +1,9 @@
+import schema default element namespace "http://www.w3.org/XQueryTestOrderBy" at "orderData.xsd"; 
+
+declare variable $source := document { (
+    <!--comment-->, 
+    <Strings><orderData>one string</orderData></Strings>,
+    <?processing instruction?>
+  ) };
+
+$source instance of document-node(schema-element(Strings2))

=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-07.xq'
--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-07.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-07.xq	2011-12-17 00:22:28 +0000
@@ -0,0 +1,9 @@
+import schema default element namespace "http://www.w3.org/XQueryTestOrderBy" at "orderData.xsd"; 
+
+declare variable $source := document { (
+    <!--comment-->, 
+    <Strings><orderData>one string</orderData></Strings>,
+    <?processing instruction?>
+  ) };
+
+validate{$source} instance of document-node(schema-element(Strings))

=== added file 'test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-08.xq'
--- test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-08.xq	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/schemas/doc-node-schema-elem-test-08.xq	2011-12-17 00:22:28 +0000
@@ -0,0 +1,9 @@
+import schema default element namespace "http://www.w3.org/XQueryTestOrderBy" at "orderData.xsd"; 
+
+declare variable $source := document { (
+    <!--comment-->, 
+    <Strings><orderData>one string</orderData></Strings>,
+    <?processing instruction?>
+  ) };
+
+validate{$source} instance of document-node(schema-element(Strings2))

=== added file 'test/rbkt/Queries/zorba/schemas/orderData.xsd'
--- test/rbkt/Queries/zorba/schemas/orderData.xsd	1970-01-01 00:00:00 +0000
+++ test/rbkt/Queries/zorba/schemas/orderData.xsd	2011-12-17 00:22:28 +0000
@@ -0,0 +1,36 @@
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:order="http://www.w3.org/XQueryTestOrderBy" targetNamespace="http://www.w3.org/XQueryTestOrderBy" elementFormDefault="qualified">
+	<xs:complexType name = "numbers">
+		<xs:sequence>
+			<xs:element name="orderData" type="xs:decimal" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+	</xs:complexType>	
+	<xs:element name = "Strings">
+		<xs:complexType>	
+			<xs:sequence>
+				<xs:element name="orderData" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+		</xs:complexType>	
+	</xs:element>
+	<xs:element name = "Strings2">
+		<xs:complexType>	
+			<xs:sequence>
+				<xs:element name="orderData" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+			</xs:sequence>
+		</xs:complexType>	
+	</xs:element>
+	<xs:element name = "NegativeNumbers" type = "order:numbers"/>
+	<xs:element name = "PositiveNumbers" type = "order:numbers"/>
+	<xs:element name = "SmallNegativeNumbers" type = "order:numbers"/>
+	<xs:element name = "SmallPositiveNumbers" type = "order:numbers"/>  
+	<xs:element name = "DataValues">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element ref="order:Strings"/>
+				<xs:element ref="order:NegativeNumbers"/>
+				<xs:element ref="order:PositiveNumbers"/>
+				<xs:element ref="order:SmallNegativeNumbers"/>
+				<xs:element ref="order:SmallPositiveNumbers"/>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
\ No newline at end of file