Zorba

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

  1. bugs
  2. Merge into trunk
Proposed by Nicolae Brinza
Status: Superseded
Proposed branch: lp:~nbrinza/zorba/bugs
Merge into: lp:zorba
Diff against target: 68 lines (+22/-5)
2 files modified
ChangeLog (+2/-1)
src/types/typeimpl.cpp (+20/-4)
To merge this branch: bzr merge lp:~nbrinza/zorba/bugs
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Review via email: mp+81424@code.launchpad.net

This proposal supersedes a proposal from 2011-11-06.

This proposal has been superseded by a proposal from 2011-11-07.

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Matthias Brantner (matthias-brantner) wrote : Posted in a previous version of this proposal

Nicolae, could you please also update the ChangeLog?

review: Needs Fixing
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

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

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote : Posted in a previous version of this proposal

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

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

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

lp:~nbrinza/zorba/bugs updated
10538. By Nicolae Brinza

Merged changes from Zorba trunk

10539. By Nicolae Brinza

Related to the Steps-leading-lone-slash-8a test: removed an unecessary condition from typeimpl.cpp. Removed the expected failure for the said test.

10540. By Nicolae Brinza

Merged with Zorba trunk

10541. By Nicolae Brinza

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

10542. By Nicolae Brinza

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

10543. By Nicolae Brinza

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

10544. By Nicolae Brinza

Merged with Zorba trunk

10545. By Nicolae Brinza

Merged with Zorba trunk

10546. By Nicolae Brinza

Merged with Zorba trunk

10547. By Nicolae Brinza

Merged with Zorba trunk

10548. By Nicolae Brinza

Merged with Zorba trunk

10549. By Nicolae Brinza

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

10550. By Nicolae Brinza

Merged with Zorba trunk

Unmerged revisions

10550. By Nicolae Brinza

Merged with Zorba trunk

10549. By Nicolae Brinza

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

10548. By Nicolae Brinza

Merged with Zorba trunk

10547. By Nicolae Brinza

Merged with Zorba trunk

10546. By Nicolae Brinza

Merged with Zorba trunk

10545. By Nicolae Brinza

Merged with Zorba trunk

10544. By Nicolae Brinza

Merged with Zorba trunk

10543. By Nicolae Brinza

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

10542. By Nicolae Brinza

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

10541. By Nicolae Brinza

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ChangeLog'
--- ChangeLog 2011-11-04 11:40:20 +0000
+++ ChangeLog 2011-11-07 02:14:25 +0000
@@ -1,7 +1,8 @@
1Zorba - The XQuery Processor1Zorba - The XQuery Processor
22
3version 2.x3version 2.x
44
5 * Fixed bug #867256 (document-node(element(x)) types and tests were not working correctly)
5 * Custom Full-text thesaurus.6 * Custom Full-text thesaurus.
6 * Fixed bug #3401971 (node-by-reference on dynamic collections)7 * Fixed bug #3401971 (node-by-reference on dynamic collections)
7 * Optimization for positioned sequence access (e.g. $x[$x[1]] where $x is a8 * Optimization for positioned sequence access (e.g. $x[$x[1]] where $x is a
89
=== modified file 'src/types/typeimpl.cpp'
--- src/types/typeimpl.cpp 2011-07-01 05:22:12 +0000
+++ src/types/typeimpl.cpp 2011-11-07 02:14:25 +0000
@@ -361,7 +361,7 @@
361361
362362
363bool NodeXQType::is_subtype(363bool NodeXQType::is_subtype(
364 const TypeManager* tm, 364 const TypeManager* tm,
365 const NodeXQType& supertype,365 const NodeXQType& supertype,
366 const QueryLoc& loc) const366 const QueryLoc& loc) const
367{367{
@@ -443,7 +443,7 @@
443443
444444
445bool NodeXQType::is_supertype(445bool NodeXQType::is_supertype(
446 const TypeManager* tm, 446 const TypeManager* tm,
447 const store::Item* subitem,447 const store::Item* subitem,
448 const QueryLoc& loc) const448 const QueryLoc& loc) const
449{449{
@@ -488,14 +488,30 @@
488 }488 }
489 }489 }
490490
491 if (m_node_kind != store::StoreConsts::elementNode && 491 // document-node( E ) matches any document node that contains exactly one element
492 m_node_kind != store::StoreConsts::attributeNode)492 // node, optionally accompanied by one or more comment and processing instruction
493 // nodes, if E is an ElementTest or SchemaElementTest that matches the element node.
494 bool is_element_test = (
495 m_node_kind == store::StoreConsts::documentNode &&
496 m_content_type != NULL &&
497 m_content_type->type_kind() == XQType::NODE_TYPE_KIND &&
498 dynamic_cast<const NodeXQType*>(m_content_type.getp())->m_schema_test == false);
499
500 if (m_node_kind != store::StoreConsts::elementNode &&
501 m_node_kind != store::StoreConsts::attributeNode &&
502 !is_element_test)
493 return true;503 return true;
494504
495 if (m_content_type == NULL ||505 if (m_content_type == NULL ||
496 m_content_type->type_kind() == XQType::ANY_TYPE_KIND)506 m_content_type->type_kind() == XQType::ANY_TYPE_KIND)
497 return true;507 return true;
498508
509 if (is_element_test)
510 {
511 xqtref_t documentNodeType = tm->create_value_type(subitem, loc);
512 return TypeOps::is_subtype(tm, *documentNodeType, *this);
513 }
514
499 xqtref_t subContentType = tm->create_named_type(subitem->getType(),515 xqtref_t subContentType = tm->create_named_type(subitem->getType(),
500 TypeConstants::QUANT_ONE,516 TypeConstants::QUANT_ONE,
501 loc,517 loc,

Subscribers

People subscribed via source and target branches