Merge lp:~zorba-coders/zorba/bug905028 into lp:zorba

[Rodolfo Ochoa]

BaseURI can now be cleared through a method.
When BaseUri is undefined it returns an empty string instead of asserting.
Fixed some compilation warnings to have a cleaner compiling.
Added #define stdafx.h to some files to fix the precompiled headers on Windows.

BaseURI can now be cleared through a method.
When BaseUri is undefined it returns an empty string instead of asserting.

[Chris Hillery (ceejatec)]

1. When adding new virtual methods to a public API class, they must be added at the bottom of the class (after any other virtual methods) to maintain ABI compatibility.

2. Couldn't users just call setBaseURI(""), rather than needing this new method?

3. I don't understand the change to static_context::compute_base_uri(); that seems like it will change behaviour even when nobody calls clearBaseURI(). Can you clarify that logic?

Style issues:

4. dataflow_annotations.h: don't comment out code; just delete the line. Also, is the new #include of rewriter_context.h necessary?

5. I don't love the fact that the Windows compilation fixes are part of this merge proposal, since they're unrelated and that won't show up in the log. However, I admit it's a pain to run a separate proposal for them. Could you just add a note to the commit message saying they're there?

review: Needs Fixing

[Rodolfo Ochoa (rodolfo-ochoa)]

>>1. When adding new virtual methods to a public API class, they must be added at the bottom of the class (after any other virtual methods) to maintain ABI compatibility.
- Done

>>2. Couldn't users just call setBaseURI(""), rather than needing this new method?
- This functionality is implemented to set relative paths, so, for current base URI: http://www.foo.com/bar the method will set the base URI to http://www.foo.com

>>3. I don't understand the change to static_context::compute_base_uri(); that seems like it will change behaviour even when nobody calls clearBaseURI(). Can you clarify that logic?
- Seems that the method was created to make verifications on the base_uri, from this method I just removed the default http://www.zorba-xquery.com

Style issues:

>>4. dataflow_annotations.h: don't comment out code; just delete the line. Also, is the new #include of rewriter_context.h necessary?
line deleted, this is to avoid a warning where the compiler detect the a struct and the find this class re-definition, the right thing to do is to add the definition header.

>>5. I don't love the fact that the Windows compilation fixes are part of this merge proposal, since they're unrelated and that won't show up in the log. However, I admit it's a pain to run a separate proposal for them. Could you just add a note to the commit message saying they're there?
- Done

[Chris Hillery (ceejatec)]

Ok, thanks for thpe fixes and answers. It looks good to me.

My only other question is whether this should be merged yet, or wait until after 2.5. But since Matthias is also reviewing this, I'll let him make that call.

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug905028-2012-05-07T21-23-03.272Z/log.html

[Zorba Build Bot (zorba-buildbot)]

The attempt to merge lp:~zorba-coders/zorba/bug905028 into lp:zorba failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:274 (message):
  Validation queue job bug905028-2012-05-07T21-23-03.272Z 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

[Chris Hillery (ceejatec)]

Looks like cosmic rays again - that test runs fine when run manually. In this case it even said "testdriver: success" so I'm completely confused. I think we need new hardware. Anyway, I'm re-starting the queue.

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug905028-2012-05-07T23-48-59.044Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug905028-2012-05-07T23-48-59.044Z 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, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending.

[Matthias Brantner (matthias-brantner)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Attempt to merge into lp:zorba failed due to conflicts:

text conflict in src/runtime/full_text/ft_module_impl.cpp

[lp:~zorba-coders/zorba/bug905028]

10813. By Matthias Brantner on 2012-05-15

merge

10814. By Matthias Brantner on 2012-05-15

merge

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug905028-2012-05-15T21-16-08.381Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job bug905028-2012-05-15T21-16-08.381Z is finished. The final status was:

All tests succeeded!

=== modified file 'ChangeLog'
--- ChangeLog	2012-05-09 01:25:37 +0000
+++ ChangeLog	2012-05-15 21:16:18 +0000
@@ -31,6 +31,7 @@
     and is not used anywhere else in the query
 
 Bug Fixes/Other Changes:
+  * Fixed bugs #905028 (Allow to set base URI to undefined)
   * Fixed bugs #931501 and #866987 (improved error messages for fn:format-number(). Additionally, the function now throws the FODF1310 error instead of XTDE1310, as the 3.0 spec requires)
   * Fixed bug 955170 (Catch clause with URILiteral-based wilcard NameTest)
   * Fixed memory leak in case of index truncation

=== modified file 'include/zorba/static_context.h'
--- include/zorba/static_context.h	2012-05-05 02:39:12 +0000
+++ include/zorba/static_context.h	2012-05-15 21:16:18 +0000
@@ -719,8 +719,15 @@
    *
    * @return the fetched resource
    */
+
   virtual Item
   fetch(const String& aURI, const String& aEntityKind) const = 0;
+  /** \brief Clears the base URI and sets it to undefined state.
+   *         (see http://www.w3.org/TR/xquery/#static_context)
+   */
+  virtual void
+  clearBaseURI() = 0;
+
 };
 
 } /* namespace zorba */

=== modified file 'src/api/staticcontextimpl.cpp'
--- src/api/staticcontextimpl.cpp	2012-05-07 23:43:04 +0000
+++ src/api/staticcontextimpl.cpp	2012-05-15 21:16:18 +0000
@@ -1592,5 +1592,22 @@
   return 0;
 }
 
+void
+StaticContextImpl::clearBaseURI()
+{
+  try
+  {
+    theCtx->clear_base_uri();
+  }
+  catch (ZorbaException const& e)
+  {
+    ZorbaImpl::notifyError(theDiagnosticHandler, e);
+  }
+  catch (std::exception const& e)
+  {
+    ZorbaImpl::notifyError(theDiagnosticHandler, e.what());
+  }
+}
+
 } /* namespace zorba */
 /* vim:set et sw=2 ts=2: */

=== modified file 'src/api/staticcontextimpl.h'
--- src/api/staticcontextimpl.h	2012-05-07 23:43:04 +0000
+++ src/api/staticcontextimpl.h	2012-05-15 21:16:18 +0000
@@ -310,6 +310,11 @@
 
   Function_t
   checkInvokable(const Item& aQName, size_t aNumArgs) const;
+
+public:
+  virtual void
+  clearBaseURI();
+
 };
 
 } // namespace zorba

=== modified file 'src/compiler/rewriter/tools/dataflow_annotations.h'
--- src/compiler/rewriter/tools/dataflow_annotations.h	2012-05-03 12:31:51 +0000
+++ src/compiler/rewriter/tools/dataflow_annotations.h	2012-05-15 21:16:18 +0000
@@ -18,13 +18,11 @@
 #define ZORBA_COMPILER_DATAFLOW_ANNOTATIONS_H
 
 #include "compiler/expression/expr_classes.h"
+#include "compiler/rewriter/framework/rewriter_context.h"
 
 namespace zorba 
 {
 
-class UDFCallChain;
-
-
 /*******************************************************************************
 
 ********************************************************************************/

=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp	2012-05-09 20:40:03 +0000
+++ src/context/static_context.cpp	2012-05-15 21:16:18 +0000
@@ -1262,8 +1262,7 @@
 
     sctx = sctx->theParent;
   }
-
-  ZORBA_ASSERT(false);
+  return "";  //undefined
 }
 
 
@@ -1295,7 +1294,6 @@
   compute_base_uri();
 }
 
-
 /***************************************************************************//**
   Base Uri Computation
 
@@ -1416,8 +1414,8 @@
     return;
   }
 
-  theBaseUriInfo->theBaseUri = get_implementation_baseuri();
-  theBaseUriInfo->theHaveBaseUri = true;
+  theBaseUriInfo->theBaseUri = "";
+  theBaseUriInfo->theHaveBaseUri = false;
   return;
 }
 
@@ -4145,5 +4143,16 @@
   }
 }
 
+/***************************************************************************//**
+
+********************************************************************************/
+void static_context::clear_base_uri()
+{
+  if (theBaseUriInfo)
+    delete theBaseUriInfo;
+
+    theBaseUriInfo = new BaseUriInfo;
+}
+
 } // namespace zorba
 /* vim:set et sw=2 ts=2: */

=== modified file 'src/context/static_context.h'
--- src/context/static_context.h	2012-05-05 02:39:12 +0000
+++ src/context/static_context.h	2012-05-15 21:16:18 +0000
@@ -651,6 +651,8 @@
 
   zstring get_base_uri() const;
 
+  void clear_base_uri();
+
   void set_base_uri(const zstring& uri, bool from_prolog = true);
 
   void compute_base_uri();

=== modified file 'src/functions/func_sequences_impl.h'
--- src/functions/func_sequences_impl.h	2012-05-03 12:31:51 +0000
+++ src/functions/func_sequences_impl.h	2012-05-15 21:16:18 +0000
@@ -224,7 +224,7 @@
 
   bool propagatesInputNodes(expr* fo, csize input) const
   {
-    return ANNOTATION_TRUE_FIXED;
+    return ANNOTATION_TRUE_FIXED!=0;
   }
 
   bool mustCopyInputNodes(expr* fo, csize input) const
@@ -276,7 +276,7 @@
 
   bool propagatesInputNodes(expr* fo, csize input) const
   {
-    return ANNOTATION_TRUE_FIXED;
+    return ANNOTATION_TRUE_FIXED!=0;
   }
 
   bool mustCopyInputNodes(expr* fo, csize input) const

=== modified file 'src/runtime/full_text/ft_module_impl.cpp'
--- src/runtime/full_text/ft_module_impl.cpp	2012-05-15 21:04:28 +0000
+++ src/runtime/full_text/ft_module_impl.cpp	2012-05-15 21:16:18 +0000
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 #include "stdafx.h"
 #include <zorba/config.h>