Merge lp:~matthias-brantner/zorba/bug-fixing into lp:zorba

[Matthias Brantner]

Do not raise warnings for unknown annotations in unknown namespaces

- Do not raise warnings for unknown annotations in unknown namespaces
- Improved error message for wrong annotations

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[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/bug-fixing-2011-11-28T20-13-15.46Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~matthias-brantner/zorba/bug-fixing 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 bug-fixing-2011-11-28T20-13-15.46Z is finished. The
  final status was:

  3 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

[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/bug-fixing-2011-11-28T20-49-20.043Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-fixing-2011-11-28T20-49-20.043Z 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, 1 Pending.

[lp:~matthias-brantner/zorba/bug-fixing]

10557. By Markos Zaharioudakis on 2011-11-29

fixed a performance bug in the implementation of groupby: no node copying for non-groupby vars Approved: Matthias Brantner, Markos Zaharioudakis

[William Candillon (wcandillon)]

Testing both cases: known and unknown annotations.
It works like a charm.
Good job!

review: Approve

[Nicolae Brinza (nbrinza)]

I have approved the fix. I would have a small suggestion that in principle should not hinder the commit: maybe the annot-unknown-02.xq and annot-unknown-04.xq tests should be deleted since they serve no purpose now.

review: Approve

[lp:~matthias-brantner/zorba/bug-fixing]

10558. By Sorin Marian Nasoi on 2011-11-29

Fix for bug #897619. Approved: Markos Zaharioudakis, Sorin Marian Nasoi

10559. By Sorin Marian Nasoi on 2011-11-29

Fix for bug #897616. Approved: Nicolae Brinza, Sorin Marian Nasoi

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-fixing-2011-11-29T22-12-35.046Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug-fixing-2011-11-29T22-12-35.046Z is finished. The final status was:

All tests succeeded!

[lp:~matthias-brantner/zorba/bug-fixing]

10560. By Matthias Brantner on 2011-11-29

Do not raise warnings for unknown annotations in unknown namespaces Approved: Nicolae Brinza, William Candillon, Matthias Brantner

=== modified file 'ChangeLog'
--- ChangeLog	2011-11-23 22:25:05 +0000
+++ ChangeLog	2011-11-28 20:47:26 +0000
@@ -38,6 +38,7 @@
   * Fixed bug #3290122 (ZDST0003 needs collection name)
   * Fixed bug #3406272 (merging of adjacent text nodes must be done after all
     updates have been applied).
+  * Don't raise warnings for unknown annotations.
   * Fixed bug #3409344 (during detach, if the node being detached is the root of
     its tree, it should be detached from the tree as well; otherwise memory
     corruption will occur)

=== modified file 'doc/cxx/examples/errors.cpp'
--- doc/cxx/examples/errors.cpp	2011-08-11 05:11:12 +0000
+++ doc/cxx/examples/errors.cpp	2011-11-28 20:47:26 +0000
@@ -139,12 +139,12 @@
     // make sure that the warning zwarn::ZWST0002 is turned
     // into an error
     StaticContext_t lCtx = aZorba->createStaticContext();
-    lCtx->declareOption(lQName, "ZWST0002");
+    lCtx->declareOption(lQName, "ZWST0003");
 
     std::ostringstream s;
-    s << "declare namespace unknown = 'unknown-annotation';" << std::endl
-      << "declare %unknown:test variable $var := 3;" << std::endl
-      << "$var" << std::endl;
+    s << "declare namespace z = 'http://www.zorba-xquery.com/annotations';" << std::endl
+      << "declare %z:sequential function local:foo() { 1 };" << std::endl
+      << "local:foo()" << std::endl;
     XQuery_t lQuery = aZorba->compileQuery(s.str(), lCtx); 
 
     std::cout << lQuery << std::endl;

=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp	2011-11-24 10:18:51 +0000
+++ src/compiler/translator/translator.cpp	2011-11-28 20:47:26 +0000
@@ -3811,24 +3811,10 @@
     if (AnnotationInternal::lookup(lExpandedQName) == AnnotationInternal::zann_end)
     {
       RAISE_ERROR(err::XQST0045, loc,
-      ERROR_PARAMS( "%" + (lExpandedQName->getPrefix().empty() ?
-                           "\'" + lExpandedQName->getNamespace() + "\'"
-                           : lExpandedQName->getPrefix())
-                    + ":" + lExpandedQName->getLocalName()));
+      ERROR_PARAMS( "%" + ("\"" + lExpandedQName->getNamespace() + "\""
+                    + ":" + lExpandedQName->getLocalName())));
     }
   }
-  else
-  {
-    // annotation in unknown namespace -- generate a warning
-    theCCB->theXQueryDiagnostics->add_warning(
-      NEW_XQUERY_WARNING(
-        zwarn::ZWST0002_UNKNOWN_ANNOTATION,
-        WARN_PARAMS( "%" + (lExpandedQName->getPrefix().empty() ?
-                      "\'" + lExpandedQName->getNamespace() + "\'"
-                      : lExpandedQName->getPrefix())
-                      + ":" + lExpandedQName->getLocalName()),
-        WARN_LOC(loc)));
-  }
 
   std::vector<rchandle<const_expr> > lLiterals;
 

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-unknown-02.spec'
--- test/rbkt/Queries/zorba/annotations/annot-unknown-02.spec	2011-07-12 23:32:16 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-unknown-02.spec	2011-11-28 20:47:26 +0000
@@ -1,1 +1,1 @@
-Error: http://www.zorba-xquery.com/warnings:ZWST0002
+Error: http://www.zorba-xquery.com/warnings:ZWST0003

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-unknown-02.xq'
--- test/rbkt/Queries/zorba/annotations/annot-unknown-02.xq	2011-07-12 23:32:16 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-unknown-02.xq	2011-11-28 20:47:26 +0000
@@ -1,7 +1,11 @@
-declare namespace unknown = "unknown-annotation";
+declare namespace zann = "http://www.zorba-xquery.com/annotations";
 declare namespace zwarn = "http://www.zorba-xquery.com/options/warnings";
-declare option zwarn:error "ZWST0002";
-
-declare %unknown:test variable $var := 3;
-
-$var
+declare option zwarn:error "ZWST0003";
+
+declare %zann:sequential function local:foo()
+{
+  1
+};
+
+local:foo()
+

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-unknown-04.spec'
--- test/rbkt/Queries/zorba/annotations/annot-unknown-04.spec	2011-07-12 23:32:16 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-unknown-04.spec	2011-11-28 20:47:26 +0000
@@ -1,2 +1,2 @@
-Error: http://www.zorba-xquery.com/warnings:ZWST0002
+Error: http://www.zorba-xquery.com/warnings:ZWST0003
 

=== modified file 'test/rbkt/Queries/zorba/annotations/annot-unknown-04.xq'
--- test/rbkt/Queries/zorba/annotations/annot-unknown-04.xq	2011-07-12 23:32:16 +0000
+++ test/rbkt/Queries/zorba/annotations/annot-unknown-04.xq	2011-11-28 20:47:26 +0000
@@ -1,9 +1,12 @@
-declare namespace unknown = "unknown-annotation";
+declare namespace zann = "http://www.zorba-xquery.com/annotations";
 declare namespace zwarn = "http://www.zorba-xquery.com/options/warnings";
 declare option zwarn:enable "all";
-declare option zwarn:error "ZWST0002";
-
-declare %unknown:test variable $var := 3;
-
-$var
+declare option zwarn:error "ZWST0003";
+
+declare %zann:sequential function local:foo()
+{
+  1
+};
+
+local:foo()