[Zorba-coders] [Merge] lp:~zorba-coders/zorba/feature-no-mat-setVariable into lp:zorba
Matthias Brantner has proposed merging
lp:~zorba-coders/zorba/feature-no-mat-setVariable into lp:zorba.
Commit message:
non-materializing query chaining using DynamicContext::setVariable
Requested reviews:
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/feature-no-mat-setVariable/+merge/179831
non-materializing query chaining using DynamicContext::setVariable
--
https://code.launchpad.net/~zorba-coders/zorba/feature-no-mat-setVariable/+merge/179831
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/dynamic_context.h'
--- include/zorba/dynamic_context.h 2013-08-01 07:58:48 +
+++ include/zorba/dynamic_context.h 2013-08-13 00:13:40 +
@@ -102,13 +102,16 @@
* @param aQName the QName that identifies the external variable.
* @param aIterator the Iterator producing the sequence that is assigned
*to the variable.
+ * @param aMaterialize determines whether the result of the iterator should
+ *be materialized before binding it to the variable.
* @return true if the variable has been set successfully, false otherwise.
* @throw ZorbaException if an error occured (e.g. the given Iterator is not valid).
*/
virtual bool
setVariable(
const String& aQName,
- const Iterator_t& aIterator) = 0;
+ const Iterator_t& aIterator,
+ bool aMaterialize = true) = 0;
/**
* \brief Defines the external variable identified by an expanded QName and
@@ -121,6 +124,8 @@
* @param aLocalname the local name of the variable's expanded QName
* @param aIterator the Iterator producing the sequence that is assigned
*to the variable.
+ * @param aMaterialize determines whether the result of the iterator should
+ *be materialized before binding it to the variable.
* @return true if the variable has been set successfully, false otherwise.
* @throw ZorbaException if an error occured (e.g. the given Iterator is not valid).
*/
@@ -128,7 +133,8 @@
setVariable(
const String& aNamespace,
const String& aLocalname,
- const Iterator_t& aIterator) = 0;
+ const Iterator_t& aIterator,
+ bool aMaterialize = true) = 0;
/** \brief Returns the current value of an external
* variable. Exactly one of the two return values (aItem or
=== modified file 'src/api/dynamiccontextimpl.cpp'
--- src/api/dynamiccontextimpl.cpp 2013-08-01 17:23:58 +
+++ src/api/dynamiccontextimpl.cpp 2013-08-13 00:13:40 +
@@ -232,7 +232,8 @@
/
bool DynamicContextImpl::setVariable(
const String& inVarName,
-const Iterator_t& inValue)
+const Iterator_t& inValue,
+bool aMaterialize)
{
ZORBA_DCTX_TRY
{
@@ -267,7 +268,7 @@
ulong varId = var->getId();
-theCtx->add_variable(varId, value);
+theCtx->add_variable(varId, value, aMaterialize);
return true;
}
@@ -282,7 +283,8 @@
bool DynamicContextImpl::setVariable(
const String& inNamespace,
const String& inLocalname,
-const Iterator_t& inValue)
+const Iterator_t& inValue,
+bool aMaterialize)
{
ZORBA_DCTX_TRY
{
@@ -319,7 +321,7 @@
ulong varId = var->getId();
-theCtx->add_variable(varId, value);
+theCtx->add_variable(varId, value, aMaterialize);
return true;
}
=== modified file 'src/api/dynamiccontextimpl.h'
--- src/api/dynamiccontextimpl.h 2013-08-01 07:57:57 +
+++ src/api/dynamiccontextimpl.h 2013-08-13 00:13:40 +
@@ -107,13 +107,15 @@
virtual bool
setVariable(
const String& inVarName,
- const Iterator_t& inValue);
+ const Iterator_t& inValue,
+ bool aMaterialize = true);
virtual bool
setVariable(
const String& inNamespace,
const String& inLocalname,
- const Iterator_t& inValue);
+ const Iterator_t& inValue,
+ bool aMaterialize = true);
virtual bool
setContextItem(const Item& inValue);
=== modified file 'src/context/dynamic_context.cpp'
--- src/context/dynamic_context.cpp 2013-08-02 18:36:02 +
+++ src/context/dynamic_context.cpp 2013-08-13 00:13:40 +
@@ -405,10 +405,13 @@
/***
/
-void dynamic_context::add_variable(ulong varid, store::Iterator_t& value)
+void dynamic_context::add_variable(
+ulong varid,
+store::Iterator_t& value,
+bool materialize)
{
declare_variable(varid, false);
- set_variable(varid, NULL, QueryLoc::null, value);
+ set_variable(varid, NULL, QueryLoc::null, value, materialize);
}
@@ -446,7 +449,8 @@
ulong varid,
const store::Item_t& varname,
const QueryLoc& loc,
-store::Iterator_t& valueIter)
+store::Iterator_t& valueIter,
+bool materialize)
{
if (varid >= theVarValues.s
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/update3.0_image-module into lp:zorba/image-module
Misses JSON validation -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_image-module/+merge/179826 Your team Zorba Coders is subscribed to branch lp:zorba/image-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/update3.0_datetime-module into lp:zorba
updated -- https://code.launchpad.net/~zorba-coders/zorba/update3.0_datetime-module/+merge/172685 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/partial_fix_bug_1167641 into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/partial_fix_bug_1167641 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/partial_fix_bug_1167641 into lp:zorba has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741 -- https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/partial_fix_bug_1167641 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/partial_fix_bug_1167641 into lp:zorba
Validation queue result for https://code.launchpad.net/%7Ezorba-coders/zorba/partial_fix_bug_1167641/+merge/179741 Stage "ZorbaVQ" failed. Check console output at http://jenkins.lambda.nu/job/ZorbaVQ/276/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/partial_fix_bug_1167641 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/partial_fix_bug_1167641 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/partial_fix_bug_1167641 into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741 Stage "CommitZorba" failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/120/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/partial_fix_bug_1167641 into lp:zorba
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741
:
Votes: {'Pending': 1}
--
https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741
Your team Zorba Coders is subscribed to branch lp:zorba.
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/partial_fix_bug_1167641 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/partial_fix_bug_1167641 into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741 Stage "TestZorbaUbuntu" failed. 1 tests failed (8402 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/209/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/partial_fix_bug_1167641 into lp:zorba
Sorin Marian Nasoi has proposed merging
lp:~zorba-coders/zorba/partial_fix_bug_1167641 into lp:zorba.
Commit message:
Re-added changes that were wrongfully reverted in r11402.1.5.
Requested reviews:
Sorin Marian Nasoi (sorin.marian.nasoi)
Related bugs:
Bug #1167641 in Zorba: "Can not expand NS prefix to URI for decimal-format #2"
https://bugs.launchpad.net/zorba/+bug/1167641
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741
--
https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'test/fots_driver/environment.xq'
--- test/fots_driver/environment.xq 2013-08-09 08:27:30 +
+++ test/fots_driver/environment.xq 2013-08-12 16:14:43 +
@@ -181,10 +181,12 @@
: to a test-case query.
:
: @param $decimal-formats decimal formats.
+ : @param $namespaces the declared environment namespaces.
: @return the decimal formats declarations.
:)
declare function env:decl-decimal-formats(
- $decimal-formats as element(fots:decimal-format)*
+ $decimal-formats as element(fots:decimal-format)*,
+ $namespaces as element(fots:namespace)*
) as xs:string*
{
if (empty($decimal-formats))
@@ -194,9 +196,10 @@
let $default := if ($tmp/@name)
then ()
else "default"
-let $name := if ($tmp/@name)
- then data($tmp/@name)
- else ()
+let $name := xs:string($tmp/@name)
+let $eqName := fn:resolve-QName(xs:string($tmp/@name), $tmp)
+let $prefix := fn:prefix-from-QName($eqName)
+let $namespace := $namespaces/following-sibling::*[@uri=fn:namespace-uri-from-QName($eqName)]
return
string-join
(
@@ -204,7 +207,9 @@
"declare",
$default,
"decimal-format",
-$name,
+if(exists($prefix) and empty($namespace))
+then concat("%Q{", namespace-uri-from-QName($eqName), "}", local-name-from-QName($eqName))
+else $name,
env:set-properties($tmp),
";"
),
=== modified file 'test/fots_driver/fots-driver.xq'
--- test/fots_driver/fots-driver.xq 2013-08-09 08:27:30 +
+++ test/fots_driver/fots-driver.xq 2013-08-12 16:14:43 +
@@ -875,7 +875,9 @@
env:decl-namespaces($env, $envCase, $test),
env:decl-decimal-formats(($env/fots:decimal-format,
- $envCase/fots:decimal-format)),
+ $envCase/fots:decimal-format),
+ ($env/fots:namespace,
+ $envCase/fots:namespace)),
env:add-var-decl($env, $envCase, $envBaseURI, $testSetURI),
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/partial_fix_bug_1167641 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/partial_fix_bug_1167641/+merge/179741 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_bug_1124374 into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1124374/+merge/174398 Stage "CommitZorba" failed. Check console output at http://jenkins.lambda.nu/job/CommitZorba/119/console to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1124374/+merge/174398 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_bug_1124374 into lp:zorba
Voting criteria failed for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1124374/+merge/174398 :
Votes: {'Approve': 1, 'Needs Fixing': 1}
--
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1124374/+merge/174398
Your team Zorba Coders is subscribed to branch lp:zorba.
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_bug_1124374 into lp:zorba
> - I don't think the prefix and the namespace for an annotation are needed. One
> should be good enough because the namespaces are listed at the beginning of
> the document.
Done in r11559.
> - Rename localname to just name
Done in r11559.
> - Would it be possible to keep the numeric type (i.e. xs:integer, xs:decimal,
> or xs:double)
Done in r11559.
> - It looks like the string literal ''no message delivered'' is missing the
> second ' at the beginning and the end in the annotation. Am I missing
> something?
Yes, I think you are missing the fact that the actual function annotation is:
declare %restxq:form-param("message","{$message}", "'no message delivered'", 5)
function annotations:function()
and NOT:
declare %restxq:form-param("message","{$message}", "''no message delivered''",
5) function annotations:function()
In the annotations.xq test-case the module is given as text and that is why
there is an escaping of the ' : does this makes sense?
--
https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1124374/+merge/174398
Your team Zorba Coders is subscribed to branch lp:zorba.
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_bug_1124374 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1124374/+merge/174398 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1124374/+merge/174398 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_bug_1124374 into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1124374/+merge/174398 Stage "TestZorbaUbuntu" failed. 1 tests failed (8403 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/207/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1124374/+merge/174398 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_bug_1124374 into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1124374/+merge/174398 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/fix_bug_1124374/+merge/174398 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179692 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179692 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179692 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179692 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179692 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/mz-couchbase-module into lp:zorba/couchbase-module
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/mz-couchbase-module/+merge/179700 Your team Zorba Coders is subscribed to branch lp:zorba/couchbase-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/mz-couchbase-module into lp:zorba/couchbase-module
The proposal to merge lp:~zorba-coders/zorba/mz-couchbase-module into lp:zorba/couchbase-module has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/mz-couchbase-module/+merge/179700 -- https://code.launchpad.net/~zorba-coders/zorba/mz-couchbase-module/+merge/179700 Your team Zorba Coders is subscribed to branch lp:zorba/couchbase-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/mz-couchbase-module into lp:zorba/couchbase-module
Markos Zaharioudakis has proposed merging
lp:~zorba-coders/zorba/mz-couchbase-module into lp:zorba/couchbase-module.
Commit message:
jn:null() to be removed
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/mz-couchbase-module/+merge/179700
jn:null() to be removed
--
https://code.launchpad.net/~zorba-coders/zorba/mz-couchbase-module/+merge/179700
Your team Zorba Coders is subscribed to branch lp:zorba/couchbase-module.
=== modified file 'test/Queries/couchbase_module/view.xq'
--- test/Queries/couchbase_module/view.xq 2013-03-24 05:25:54 +
+++ test/Queries/couchbase_module/view.xq 2013-08-12 13:26:30 +
@@ -15,5 +15,5 @@
variable $data := cb:view($instance, $view-name, {"stale" : "false"});
for $d in jn:members($data("rows"))
let $key := $d("key")
-where not(jn:is-null($key)) and $key >0
+where not($key instance of js:null) and $key >0
return $d
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/mz-couchbase-module into lp:zorba/couchbase-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/mz-couchbase-module/+merge/179700 Your team Zorba Coders is subscribed to branch lp:zorba/couchbase-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/mz-couchbase-module into lp:zorba/couchbase-module
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/mz-couchbase-module/+merge/179700 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/mz-couchbase-module/+merge/179700 Your team Zorba Coders is subscribed to branch lp:zorba/couchbase-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179692 Stage "TestZorbaUbuntu" failed. 1 tests failed (8402 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/204/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179692 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179692 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179692 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179692 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch
into lp:zorba.
Commit message:
removed jn:null() + allow empty seq as input to jn:size()
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179692
removed jn:null() + allow empty seq as input to jn:size()
--
https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179692
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'modules/org/jsoniq/www/functions.xq'
--- modules/org/jsoniq/www/functions.xq 2013-08-12 09:59:18 +
+++ modules/org/jsoniq/www/functions.xq 2013-08-12 12:50:29 +
@@ -215,7 +215,7 @@
: @param $j A JSON Array.
: @return The number of items in $j.
:)
-declare function jn:size($j as array()) as xs:integer external;
+declare function jn:size($j as array()?) as xs:integer? external;
(:~
@@ -260,14 +260,4 @@
declare function jn:null() as js:null external;
-(:~
- : Tests whether the supplied atomic item is a JSON null.
- :
- : @param An atomic item.
- :
- : @return true if the item is of type js:null.
- :)
-declare function jn:is-null($i as xs:anyAtomicType) as xs:boolean external;
-
-
=== modified file 'src/functions/func_jsoniq_functions_impl.cpp'
--- src/functions/func_jsoniq_functions_impl.cpp 2013-08-09 10:23:10 +
+++ src/functions/func_jsoniq_functions_impl.cpp 2013-08-12 12:50:29 +
@@ -70,6 +70,18 @@
/***
/
+xqtref_t fn_jsoniq_size::getReturnType(const fo_expr* caller) const
+{
+ if (caller->get_arg(0)->get_return_type()->get_quantifier() == TypeConstants::QUANT_ONE)
+return GENV_TYPESYSTEM.INTEGER_TYPE_ONE;
+
+ return theSignature.returnType();
+}
+
+
+/***
+
+/
PlanIter_t fn_jsoniq_keys::codegen(
CompilerCB*,
static_context* sctx,
=== modified file 'src/functions/pregenerated/func_jsoniq_functions.cpp'
--- src/functions/pregenerated/func_jsoniq_functions.cpp 2013-08-12 10:27:18 +
+++ src/functions/pregenerated/func_jsoniq_functions.cpp 2013-08-12 12:50:29 +
@@ -154,16 +154,6 @@
return new JSONNullIterator(sctx, loc);
}
-PlanIter_t fn_jsoniq_is_null::codegen(
- CompilerCB*,
- static_context* sctx,
- const QueryLoc& loc,
- std::vector& argv,
- expr& ann) const
-{
- return new JSONIsNullIterator(sctx, loc, argv[0]);
-}
-
PlanIter_t op_zorba_json_object_insert::codegen(
CompilerCB*,
static_context* sctx,
@@ -431,8 +421,8 @@
{
DECL_WITH_KIND(sctx, fn_jsoniq_size,
(createQName("http://jsoniq.org/functions","","size";),
-GENV_TYPESYSTEM.JSON_ARRAY_TYPE_ONE,
-GENV_TYPESYSTEM.INTEGER_TYPE_ONE),
+GENV_TYPESYSTEM.JSON_ARRAY_TYPE_QUESTION,
+GENV_TYPESYSTEM.INTEGER_TYPE_QUESTION),
FunctionConsts::FN_JSONIQ_SIZE_1);
}
@@ -464,18 +454,6 @@
{
-DECL_WITH_KIND(sctx, fn_jsoniq_is_null,
-(createQName("http://jsoniq.org/functions","","is-null";),
-GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_ONE,
-GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
-FunctionConsts::FN_JSONIQ_IS_NULL_1);
-
- }
-
-
-
-
- {
DECL_WITH_KIND(sctx, op_zorba_json_object_insert,
(createQName("http://zorba.io/internal/zorba-ops","","json-object-insert";),
GENV_TYPESYSTEM.JSON_OBJECT_TYPE_ONE,
=== modified file 'src/functions/pregenerated/func_jsoniq_functions.h'
--- src/functions/pregenerated/func_jsoniq_functions.h 2013-08-09 10:23:10 +
+++ src/functions/pregenerated/func_jsoniq_functions.h 2013-08-12 12:50:29 +
@@ -287,6 +287,8 @@
}
+ xqtref_t getReturnType(const fo_expr* caller) const;
+
bool propagatesInputNodes(expr* fo, csize producer) const { return false; }
bool mustCopyInputNodes(expr* fo, csize producer) const { return false; }
@@ -329,21 +331,6 @@
};
-//fn-jsoniq:is-null
-class fn_jsoniq_is_null : public function
-{
-public:
- fn_jsoniq_is_null(const signature& sig, FunctionConsts::FunctionKind kind)
-:
-function(sig, kind)
- {
-
- }
-
- CODEGEN_DECL();
-};
-
-
//op-zorba:json-object-insert
class op_zorba_json_object_insert : public function
{
=== modified file 'src/functions/pregenerated/function_enum.h'
--- src/functions/pregenerated/function_enum.h 2013-08-09 10:23:10 +
+++ src/functions/pregenerated/function_enum.h 2013-08-12 12:50:29 +
@@ -271,7 +271,6 @@
FN_JSONIQ_SIZE_1,
FN_JSONIQ_FLATTEN_1,
FN_JSONIQ_NULL_0,
- FN_JSONIQ_IS_NULL_1,
OP_ZORBA_JSON_OBJECT_INSERT_2,
OP_ZORBA_JSON_ARRAY_INSERT_3,
OP_ZORBA_JSON_DELETE_2,
=== modified file 'src/runtime/json/jsoniq_functions_impl.cpp'
--- src/runtime/json/jsoniq_functions_impl.cpp 2013-0
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179411 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179411 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue succeeded - proposal merged! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179411 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179411 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179411 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179411 Stage "TestZorbaUbuntu" failed. 1 tests failed (8402 total tests run). Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/202/testReport/ to view the results. -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179411 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Validation queue starting for the following merge proposals: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179411 Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/179411 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
