[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bang_operator into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bang_operator into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bang_operator/+merge/121347 -- https://code.launchpad.net/~zorba-coders/zorba/bang_operator/+merge/121347 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/bang_operator into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in ChangeLog -- https://code.launchpad.net/~zorba-coders/zorba/bang_operator/+merge/121347 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/bang_operator into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bang_operator into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bang_operator/+merge/121347 -- https://code.launchpad.net/~zorba-coders/zorba/bang_operator/+merge/121347 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/bang_operator into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bang_operator into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bang_operator/+merge/121347 -- https://code.launchpad.net/~zorba-coders/zorba/bang_operator/+merge/121347 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/bang_operator into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bang_operator-2012-09-13T08-30-58.243Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bang_operator/+merge/121347 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/bang_operator into lp:zorba
Validation queue job bang_operator-2012-09-13T08-30-58.243Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bang_operator/+merge/121347 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/bang_operator into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bang_operator into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bang_operator/+merge/121347 -- https://code.launchpad.net/~zorba-coders/zorba/bang_operator/+merge/121347 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/bang_operator into lp:zorba
FYI, I just built the branch on Ubuntu, then ran copyparser.sh which produced updated scanner/parser.cpp files, and checked those in as well. I don't know why NOT having those updated files made it fail on the RQ, since the RQ should have re-generated them as well, I think... but, anyway, it's in now. -- https://code.launchpad.net/~zorba-coders/zorba/bang_operator/+merge/121347 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-1046415 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 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-1046415 into lp:zorba
Hi Cezar,
In general, an object constructor expression is not always valid JSON, as it is
more general. For example, { 1 : 1 } is valid JSONiq although it is not valid
JSON. A key expression, can be anything, and will be atomized and cast to
xs:string.
Also, { null : 1 } (which is what is produced) is valid JSON, just like { 1
: 1 }.
Accepting { null : 1 } in the same way makes the specification simpler, as we
need not special-case.
Does it make sense?
--
https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283
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/bug-1046561 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1046561 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1046561/+merge/123961 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046561/+merge/123961 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug-1046561 into 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/bug-1046561 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1046561 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1046561/+merge/123961 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046561/+merge/123961 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug-1046561 into 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/bug-1046561 into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in src/compiler/parser/xquery_parser.cpp text conflict in src/compiler/parser/xquery_parser.hpp text conflict in src/compiler/parser/xquery_scanner.cpp -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046561/+merge/123961 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug-1046561 into 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/bug-1046561 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1046561 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1046561/+merge/123961 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046561/+merge/123961 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug-1046561 into 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/bug-1046561 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1046561-2012-09-13T12-12-55.97Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046561/+merge/123961 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug-1046561 into 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/bug-1046561 into lp:zorba
Validation queue job bug-1046561-2012-09-13T12-12-55.97Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046561/+merge/123961 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug-1046561 into 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/bug-1046561 into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046561/+merge/123961 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug-1046561 into 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/bug-1046561 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1046561 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1046561/+merge/123961 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046561/+merge/123961 Your team Zorba Coders is requested to review the proposed merge of lp:~zorba-coders/zorba/bug-1046561 into 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/bug-1041445 into lp:zorba
Ghislain Fourny has proposed merging lp:~zorba-coders/zorba/bug-1041445 into
lp:zorba.
Requested reviews:
Till Westmann (tillw)
Related bugs:
Bug #1041445 in Zorba: Semantics of cast/comparison/arithmetics involving
null
https://bugs.launchpad.net/zorba/+bug/1041445
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1041445/+merge/124191
Implementing semantics of arithmetics and comparison operators for JSON nulls.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1041445/+merge/124191
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/store_consts.h'
--- include/zorba/store_consts.h 2012-09-11 22:55:05 +
+++ include/zorba/store_consts.h 2012-09-13 13:01:18 +
@@ -84,7 +84,7 @@
XS_QNAME = 43,
XS_NOTATION = 44,
- JDM_NULL = 45,
+ JS_NULL = 45,
XS_LAST
};
=== modified file 'modules/org/jsoniq/www/functions.xq'
--- modules/org/jsoniq/www/functions.xq 2012-09-11 22:55:05 +
+++ modules/org/jsoniq/www/functions.xq 2012-09-13 13:01:18 +
@@ -35,11 +35,9 @@
import module namespace schema = http://www.zorba-xquery.com/modules/schema;;
-declare namespace jdm = http://www.jsoniq.org/;;
-
declare namespace err = http://www.w3.org/2005/xqt-errors;;
-
declare namespace jerr = http://www.jsoniq.org/errors;;
+declare namespace js = http://www.jsoniq.org/data-model;;
declare namespace ver = http://www.zorba-xquery.com/options/versioning;;
declare option ver:module-version 1.0;
@@ -180,3 +178,20 @@
: @error jerr:JNDY0003 if there is a pair collision.
:)
declare function jn:object($o as object()*) as object() external;
+
+(:~
+ : Returns the JSON null.
+ :
+ : @return The JSON null.
+ :)
+declare function jn:null() as js:null external;
+
+(:~
+ : Tests whether the supplied atomic item is a JSON null.
+ :
+ : @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/api/serialization/serializer.cpp'
--- src/api/serialization/serializer.cpp 2012-09-13 08:28:50 +
+++ src/api/serialization/serializer.cpp 2012-09-13 13:01:18 +
@@ -1040,7 +1040,7 @@
tr (item-getBooleanValue() ? true : false);
break;
-case store::JDM_NULL:
+case store::JS_NULL:
tr null;
break;
=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp 2012-09-11 22:55:05 +
+++ src/context/static_context.cpp 2012-09-13 13:01:18 +
@@ -397,8 +397,8 @@
#ifdef ZORBA_WITH_JSON
const char*
-static_context::JSONIQ_NS =
-http://www.jsoniq.org/;;
+static_context::JSONIQ_DM_NS =
+http://www.jsoniq.org/data-model;;
const char*
static_context::JSONIQ_FN_NS =
=== modified file 'src/context/static_context.h'
--- src/context/static_context.h 2012-09-11 22:55:05 +
+++ src/context/static_context.h 2012-09-13 13:01:18 +
@@ -527,7 +527,7 @@
static const char* ZORBA_STORE_DYNAMIC_UNORDERED_MAP_FN_NS;
#ifdef ZORBA_WITH_JSON
- static const char* JSONIQ_NS;
+ static const char* JSONIQ_DM_NS;
static const char* JSONIQ_FN_NS;
#endif
=== modified file 'src/functions/func_jsoniq_functions_impl.cpp'
--- src/functions/func_jsoniq_functions_impl.cpp 2012-09-13 08:28:50 +
+++ src/functions/func_jsoniq_functions_impl.cpp 2012-09-13 13:01:18 +
@@ -145,7 +145,7 @@
return type;
if (type-max_card() == 0)
-return GENV_TYPESYSTEM.JDM_NULL_TYPE_ONE;
+return GENV_TYPESYSTEM.JS_NULL_TYPE_ONE;
return theSignature.returnType();
}
=== modified file 'src/functions/pregenerated/func_jsoniq_functions.cpp'
--- src/functions/pregenerated/func_jsoniq_functions.cpp 2012-09-11 22:55:05 +
+++ src/functions/pregenerated/func_jsoniq_functions.cpp 2012-09-13 13:01:18 +
@@ -142,6 +142,18 @@
#endif
#ifdef ZORBA_WITH_JSON
+PlanIter_t fn_jsoniq_is_null::codegen(
+ CompilerCB*,
+ static_context* sctx,
+ const QueryLoc loc,
+ std::vectorPlanIter_t argv,
+ expr ann) const
+{
+ return new JSONIsNullIterator(sctx, loc, argv[0]);
+}
+
+#endif
+#ifdef ZORBA_WITH_JSON
PlanIter_t op_zorba_json_array_insert::codegen(
CompilerCB*,
static_context* sctx,
@@ -379,7 +391,7 @@
{
DECL_WITH_KIND(sctx, fn_jsoniq_null,
(createQName(http://www.jsoniq.org/functions,,null;),
-GENV_TYPESYSTEM.JDM_NULL_TYPE_ONE),
+GENV_TYPESYSTEM.JS_NULL_TYPE_ONE),
FunctionConsts::FN_JSONIQ_NULL_0);
}
@@ -392,6 +404,22 @@
{
+DECL_WITH_KIND(sctx, fn_jsoniq_is_null,
+(createQName(http://www.jsoniq.org/functions,,is-null;),
+GENV_TYPESYSTEM.ANY_ATOMIC_TYPE_ONE,
+GENV_TYPESYSTEM.BOOLEAN_TYPE_ONE),
+FunctionConsts::FN_JSONIQ_IS_NULL_1);
+
+ }
+
+
+#endif
+
+
+#ifdef ZORBA_WITH_JSON
+
+
+ {
DECL_WITH_KIND(sctx, op_zorba_json_array_insert,
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1041445 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1041445-2012-09-13T12-55-25.237Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1041445/+merge/124191 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/bug-1041445 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-1041445 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 bug-1041445-2012-09-13T12-55-25.237Z is finished. The final status was: 2 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug-1041445/+merge/124191 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/bug-1041445 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1041445 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1041445/+merge/124191 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1041445/+merge/124191 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/bug-1041445 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1041445-2012-09-13T13-31-14.234Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1041445/+merge/124191 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-1046415 into lp:zorba
I understand, it make sense in this way but it's very dangerous, in this
way I don't think it helps the users on contrary can leave bad code falsely
working.
Cezar
On Thu, Sep 13, 2012 at 6:38 AM, Ghislain Fourny ghislain.fou...@28msec.com
wrote:
Hi Cezar,
In general, an object constructor expression is not always valid JSON, as
it is more general. For example, { 1 : 1 } is valid JSONiq although it is
not valid JSON. A key expression, can be anything, and will be atomized and
cast to xs:string.
Also, { null : 1 } (which is what is produced) is valid JSON, just like
{ 1 : 1 }.
Accepting { null : 1 } in the same way makes the specification simpler, as
we need not special-case.
Does it make sense?
--
https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283
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
--
https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283
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/bug-1041445 into lp:zorba
Validation queue job bug-1041445-2012-09-13T13-31-14.234Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1041445/+merge/124191 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-1046415 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-1046415 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 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-1046415 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix-1046415-2012-09-13T14-49-49.139Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 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-1046415 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/fix-1046415 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 fix-1046415-2012-09-13T14-49-49.139Z 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 -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 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/objects-with-unordered-maps-and-const-char-star into lp:zorba
Ghislain Fourny has proposed merging
lp:~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star into
lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star/+merge/124225
Changing JSON object implementation to unordered maps.
--
https://code.launchpad.net/~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star/+merge/124225
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/naive/json_items.cpp'
--- src/store/naive/json_items.cpp 2012-09-11 22:55:05 +
+++ src/store/naive/json_items.cpp 2012-09-13 15:14:32 +
@@ -292,7 +292,7 @@
bool accumulate)
{
ASSERT_INVARIANT();
- zstring lName = aName-getStringValue();
+ const char* lName = aName-getStringValue().c_str();
Keys::iterator ite = theKeys.find(lName);
@@ -308,7 +308,7 @@
}
csize lPosition = thePairs.size();
-theKeys.insert(lName, lPosition);
+theKeys.insert(std::make_pair(lName, lPosition));
thePairs.push_back(std::make_pair(aName.getp(), lValue));
aName-addReference();
lValue-addReference();
@@ -318,7 +318,7 @@
}
else if (accumulate)
{
-csize lPosition = ite.getValue();
+csize lPosition = ite-second;
assert(thePairs[lPosition].first-getStringValue() == lName);
@@ -359,15 +359,16 @@
{
ASSERT_INVARIANT();
- zstring lName = aName-getStringValue();
- csize lPosition = 0;
+ const char* lName = aName-getStringValue().c_str();
store::Item_t lValue;
- if (!theKeys.get(lName, lPosition))
+ Keys::iterator lIterator = theKeys.find(lName);
+ if (lIterator == theKeys.end())
{
ASSERT_INVARIANT();
return 0;
}
+ csize lPosition = lIterator-second;
store::Item* lKey;
@@ -393,10 +394,10 @@
Keys::iterator lKeysEnd = theKeys.end();
for (; lKeysIte != lKeysEnd; ++lKeysIte)
{
- csize lPos = lKeysIte.getValue();
+ csize lPos = lKeysIte-second;
if (lPos lPosition)
{
-lKeysIte.setValue(lPos - 1);
+lKeysIte-second = lPos - 1;
}
}
}
@@ -414,14 +415,15 @@
const store::Item_t aValue)
{
ASSERT_INVARIANT();
- zstring lName = aName-getStringValue();
- csize lPosition = 0;
+ const char* lName = aName-getStringValue().c_str();
- if (!theKeys.get(lName, lPosition))
+ Keys::iterator lIterator = theKeys.find(lName);
+ if (lIterator == theKeys.end())
{
ASSERT_INVARIANT();
-return NULL;
+return 0;
}
+ csize lPosition = lIterator-second;
assert(thePairs[lPosition].first-getStringValue() == lName);
@@ -461,10 +463,10 @@
const store::Item_t aNewName)
{
ASSERT_INVARIANT();
- zstring lName = aName-getStringValue();
- zstring lNewName = aNewName-getStringValue();
+ const char* lName = aName-getStringValue().c_str();
+ const char* lNewName = aNewName-getStringValue().c_str();
- if (theKeys.exists(lNewName))
+ if (theKeys.find(lNewName) != theKeys.end())
{
ASSERT_INVARIANT();
return false;
@@ -478,14 +480,14 @@
return false;
}
- csize lPosition = ite.getValue();
+ csize lPosition = ite-second;
assert(thePairs[lPosition].first-getStringValue() == lName);
thePairs[lPosition].first-removeReference();
aNewName-addReference();
thePairs[lPosition].first = aNewName.getp();
theKeys.erase(ite);
- theKeys.insert(lNewName, lPosition);
+ theKeys.insert(std::make_pair(lNewName, lPosition));
ASSERT_INVARIANT();
return true;
@@ -560,13 +562,14 @@
store::Item_t SimpleJSONObject::getObjectValue(const store::Item_t aKey) const
{
ASSERT_INVARIANT();
- zstring lName = aKey-getStringValue();
+ const char* lName = aKey-getStringValue().c_str();
- csize lPosition = 0;
- if (!theKeys.get(lName, lPosition))
+ Keys::const_iterator lIterator = theKeys.find(lName);
+ if (lIterator == theKeys.end())
{
return NULL;
}
+ csize lPosition = lIterator-second;
assert(thePairs[lPosition].first-equals(aKey));
return thePairs[lPosition].second;
@@ -593,15 +596,16 @@
JSONItem::assertInvariant();
assert(theKeys.size() == thePairs.size());
- for(Keys::iterator lIter = theKeys.begin();
+ for(Keys::const_iterator lIter = theKeys.begin();
lIter != theKeys.end();
++lIter)
{
-csize lPosition = lIter.getValue();
+csize lPosition = lIter-second;
assert(lPosition thePairs.size());
assert(thePairs[lPosition].first != NULL);
assert(thePairs[lPosition].first-isAtomic());
-assert(thePairs[lPosition].first-getStringValue() == lIter.getKey());
+assert(thePairs[lPosition].first-getStringValue().c_str() ==
+ lIter-first);
assert(thePairs[lPosition].second != NULL);
}
}
=== modified file 'src/store/naive/json_items.h'
--- src/store/naive/json_items.h 2012-09-11 22:55:05 +
+++ src/store/naive/json_items.h 2012-09-13 15:14:32 +
@@ -17,12
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-1046415 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-1046415 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 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-1046415 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-1046415 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 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-1046415 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix-1046415-2012-09-13T15-19-50.542Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 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/objects-with-unordered-maps-and-const-char-star into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star/+merge/124225 -- https://code.launchpad.net/~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star/+merge/124225 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-1046415 into lp:zorba
Validation queue job fix-1046415-2012-09-13T15-19-50.542Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 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-1046415 into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 2 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 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-1046415 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-1046415 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 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/objects-with-unordered-maps-and-const-char-star into lp:zorba
Validation queue job objects-with-unordered-maps-and-const-char-star-2012-09-13T15-44-40.281Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star/+merge/124225 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/objects-with-unordered-maps-and-const-char-star into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star/+merge/124225 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/objects-with-unordered-maps-and-const-char-star into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star/+merge/124225 -- https://code.launchpad.net/~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star/+merge/124225 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/bug-1046561 into lp:zorba
Review: Approve The error message of the following query is kind of hard to get (but I approve anyway): variable $a := [ 1, 2, 3]; insert json null into $a at position 5; JSONIQ error [jerr:JNUP0016]: 5: selector cannot be resolved against supplied array.; -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046561/+merge/123961 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/bug-1041445 into lp:zorba
Maybe we should add the change to the ChangeLog. -- https://code.launchpad.net/~zorba-coders/zorba/bug-1041445/+merge/124191 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-1046415 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 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-1046415 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-1046415 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 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-1046415 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix-1046415-2012-09-13T20-14-47.795Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 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-1046415 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/fix-1046415 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 fix-1046415-2012-09-13T20-14-47.795Z 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 -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 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-1046415 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-1046415 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 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-1046415 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-1046415 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 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/bug1010746 into lp:zorba/image-module
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1010746/+merge/118209 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/bug1010746b into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1010746b/+merge/123423 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/bug-1046559 into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/bug-1046559
into lp:zorba.
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297
Fixed bug #1046559 (dynamic resolution between function invocation and jsoniq
navigation).
Use char* instead of zstring as the hashmap key in json objects.
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-09-13 08:28:50 +
+++ ChangeLog 2012-09-13 20:54:21 +
@@ -17,6 +17,7 @@
* New memory management for compiler expressions (no more ref counting)
* Exteneded some optimization rules (variable inlining/elimination and positional
predicate rewrite) to general flwor expressions.
+ * Use char* instead of zstring as the hashmap key in json objects
Bug Fixes/Other Changes:
* Fixed bug #867227 (Improved error message for missing commas)
@@ -39,6 +40,8 @@
* Fixed bug #866984 (better error message for an eval error)
* Fixed bug #1047538 (jsoniq: SourceFinder::findLocalNodeSources missing
json expressions)
+ * Fixed bug #1046559 (dynamic resolution between function invocation and jsoniq
+navigation)
* Fixed bug #932884 (HTML and XHTML serialization of empty elements)
* Fixed bug #1045902 (file:last-modified returns current date time)
* Fixed bug #1043976 (compiler warning in serialiser code)
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2012-09-11 22:55:05 +
+++ src/compiler/translator/translator.cpp 2012-09-13 20:54:21 +
@@ -10931,7 +10931,7 @@
xqtref_t srcType = sourceExpr-get_return_type();
if (!theSctx-is_feature_set(feature::hof) ||
- (!TypeOps::is_subtype(tm, *srcType, *theRTM.ANY_FUNCTION_TYPE_STAR)))
+ (TypeOps::is_subtype(tm, *srcType, *theRTM.JSON_ITEM_TYPE_STAR)))
{
if (numArgs != 1)
{
=== modified file 'src/runtime/function_item/dynamic_fncall_iterator.cpp'
--- src/runtime/function_item/dynamic_fncall_iterator.cpp 2012-09-13 08:28:50 +
+++ src/runtime/function_item/dynamic_fncall_iterator.cpp 2012-09-13 20:54:21 +
@@ -143,7 +143,7 @@
{
store::Item_t item;
store::Item_t targetItem;
-#if 0
+#ifdef ZORBA_WITH_JSON
store::Item_t selectorItem1;
store::Item_t selectorItem2;
store::Item_t selectorItem3;
@@ -221,7 +221,7 @@
state-thePlan-close(planState);
state-theIsOpen = false;
}
-#if 0 //def ZORBA_WITH_JSON
+#ifdef ZORBA_WITH_JSON
else if (targetItem-isJSONObject() || targetItem-isJSONArray())
{
if (theChildren.size() != 2)
=== modified file 'src/store/naive/json_items.cpp'
--- src/store/naive/json_items.cpp 2012-09-11 22:55:05 +
+++ src/store/naive/json_items.cpp 2012-09-13 20:54:21 +
@@ -294,7 +294,7 @@
ASSERT_INVARIANT();
zstring lName = aName-getStringValue();
- Keys::iterator ite = theKeys.find(lName);
+ Keys::iterator ite = theKeys.find(lName.c_str());
if (ite == theKeys.end())
{
@@ -308,7 +308,7 @@
}
csize lPosition = thePairs.size();
-theKeys.insert(lName, lPosition);
+theKeys.insert(lName.c_str(), lPosition);
thePairs.push_back(std::make_pair(aName.getp(), lValue));
aName-addReference();
lValue-addReference();
@@ -363,7 +363,7 @@
csize lPosition = 0;
store::Item_t lValue;
- if (!theKeys.get(lName, lPosition))
+ if (!theKeys.get(lName.c_str(), lPosition))
{
ASSERT_INVARIANT();
return 0;
@@ -385,7 +385,7 @@
lValue-removeReference();
thePairs.erase(thePairs.begin() + lPosition);
- theKeys.erase(lName);
+ theKeys.erase(lName.c_str());
if (lPosition thePairs.size())
{
@@ -417,7 +417,7 @@
zstring lName = aName-getStringValue();
csize lPosition = 0;
- if (!theKeys.get(lName, lPosition))
+ if (!theKeys.get(lName.c_str(), lPosition))
{
ASSERT_INVARIANT();
return NULL;
@@ -464,13 +464,13 @@
zstring lName = aName-getStringValue();
zstring lNewName = aNewName-getStringValue();
- if (theKeys.exists(lNewName))
+ if (theKeys.exists(lNewName.c_str()))
{
ASSERT_INVARIANT();
return false;
}
- Keys::iterator ite = theKeys.find(lName);
+ Keys::iterator ite = theKeys.find(lName.c_str());
if (ite == theKeys.end())
{
@@ -485,7 +485,7 @@
aNewName-addReference();
thePairs[lPosition].first = aNewName.getp();
theKeys.erase(ite);
- theKeys.insert(lNewName, lPosition);
+ theKeys.insert(lNewName.c_str(), lPosition);
ASSERT_INVARIANT();
return true;
@@ -563,7 +563,7 @@
zstring lName = aKey-getStringValue();
csize lPosition = 0;
- if (!theKeys.get(lName, lPosition))
+ if (!theKeys.get(lName.c_str(), lPosition))
{
return NULL;
}
=== modified file 'src/store/naive/json_items.h'
--- src/store/naive/json_items.h 2012-09-11 22:55:05 +
+++
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1010746 into lp:zorba/image-module
The proposal to merge lp:~zorba-coders/zorba/bug1010746 into lp:zorba/image-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1010746/+merge/118209 -- https://code.launchpad.net/~zorba-coders/zorba/bug1010746/+merge/118209 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix-1046415 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix-1046415-2012-09-13T20-54-55.036Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 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/bug-1046559 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/bug-1046559 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1046559 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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-1046415 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/fix-1046415 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 fix-1046415-2012-09-13T20-54-55.036Z 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 -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 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-1046415 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-1046415 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 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/bug-1046559 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1046559-2012-09-13T21-23-06.318Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/bug-1046559 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-1046559 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 bug-1046559-2012-09-13T21-23-06.318Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/bug-1046559 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1046559 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/bug1010746 into lp:zorba/image-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1010746-2012-09-13T21-32-37.716Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1010746/+merge/118209 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1046559 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1046559 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/bug1010746 into lp:zorba/image-module
The attempt to merge lp:~zorba-coders/zorba/bug1010746 into lp:zorba/image-module 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 bug1010746-2012-09-13T21-32-37.716Z 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 -- https://code.launchpad.net/~zorba-coders/zorba/bug1010746/+merge/118209 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1010746 into lp:zorba/image-module
The proposal to merge lp:~zorba-coders/zorba/bug1010746 into lp:zorba/image-module has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1010746/+merge/118209 -- https://code.launchpad.net/~zorba-coders/zorba/bug1010746/+merge/118209 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
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1046559 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1046559-2012-09-13T22-04-08.112Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/bug-1046559 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-1046559 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 bug-1046559-2012-09-13T22-04-08.112Z 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 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/bug-1046559 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1046559 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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:~davidagraf/zorba/paging_index_probe into lp:zorba
Review: Needs Fixing Problems: - Based on the paging.xqlib module (in the tests), the following query should return the empty sequence: idml:probe-index-range-value-skip(xs:QName(data:idx-age-range-val), 10, 2, 3, true(), true(), true(), true()) But it returns all the items with age 3. This seems wrong. - idml:probe-index-range-value sorts the nodes implicitly in document order, i.e. they are not returned in the order of the index keys. The skipping is done before the sorting. This might be really confusing to the user. Essentially, he doesn't have a way to know which items are skipped. We have talked to Markos and he agreed that we remove the sorting from the range-value functions and only add it if the probe is used to answer queries. - The module in modules/com/zorba-xquery/www/modules/store/static/indexes/dml.xq doesn't contain the -skip functions. It looks like the probe-index-point-value appears twice and is missing the -skip suffix. The same seems to be the case for the probe-index-range-value function. Also, the documentation for what is probably supposed to be the -skip function is very long. Maybe it can make a reference to the original probe function and only mention the fact that it returns the values for the keys. Minor issues: - I wasn't able to merge the trunk into this branch because there are tons of merge conflicts in translator.cpp. Also, bzr reports that a criss-cross merge was encountered. Probably because the collection-skipping branch was merged in the meantime. I don't understand why the merge proposal doesn't show any conflict. Without merging the trunk, I can't link because of the uuid_generate problem. - There seem to be plenty of whitespace-only changes in src/functions/signature.cpp? I couldn't figure out whether there are actually semantic changes in that file. Are they necessary (e.g. removing tabs)? -- https://code.launchpad.net/~davidagraf/zorba/paging_index_probe/+merge/122621 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/probe-no-doc-order-sort into lp:zorba
Matthias Brantner has proposed merging
lp:~zorba-coders/zorba/probe-no-doc-order-sort into lp:zorba.
Requested reviews:
Matthias Brantner (matthias-brantner)
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/probe-no-doc-order-sort/+merge/124322
--
https://code.launchpad.net/~zorba-coders/zorba/probe-no-doc-order-sort/+merge/124322
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2012-09-13 08:28:50 +
+++ ChangeLog 2012-09-13 23:13:22 +
@@ -17,6 +17,7 @@
* New memory management for compiler expressions (no more ref counting)
* Exteneded some optimization rules (variable inlining/elimination and positional
predicate rewrite) to general flwor expressions.
+ * Removed document-order sorting after the index value probe functions.
Bug Fixes/Other Changes:
* Fixed bug #867227 (Improved error message for missing commas)
=== modified file 'src/compiler/translator/translator.cpp'
--- src/compiler/translator/translator.cpp 2012-09-11 22:55:05 +
+++ src/compiler/translator/translator.cpp 2012-09-13 23:13:22 +
@@ -10588,17 +10588,6 @@
FunctionConsts::FunctionKind lKind = f-getKind();
switch (lKind)
{
- case FunctionConsts::FN_ZORBA_XQDDF_PROBE_INDEX_RANGE_VALUE_N:
- case FunctionConsts::FN_ZORBA_XQDDF_PROBE_INDEX_POINT_VALUE_N:
- {
-FunctionConsts::FunctionKind fkind = FunctionConsts::OP_SORT_NODES_ASC_1;
-
-resultExpr = theExprManager-create_fo_expr(theRootSctx,
- foExpr-get_loc(),
- BuiltinFunctionLibrary::getFunction(fkind),
- foExpr);
-break;
- }
case FunctionConsts::FN_ZORBA_XQDDF_PROBE_INDEX_POINT_GENERAL_N:
case FunctionConsts::FN_ZORBA_XQDDF_PROBE_INDEX_RANGE_GENERAL_N:
{
=== modified file 'test/rbkt/Queries/zorba/index/auctions1.xq'
--- test/rbkt/Queries/zorba/index/auctions1.xq 2012-09-11 22:55:05 +
+++ test/rbkt/Queries/zorba/index/auctions1.xq 2012-09-13 23:13:22 +
@@ -77,7 +77,7 @@
try
{
- index_dml:probe-index-point-value($auctions:AuctionDates, xs:date(2000-12-04))
+ index_dml:probe-index-point-value($auctions:AuctionDates, xs:date(2000-12-04))/.
}
catch *
{
@@ -91,7 +91,7 @@
try
{
- index_dml:probe-index-point-value($auctions:AuctionDates, 10)
+ index_dml:probe-index-point-value($auctions:AuctionDates, 10)/.
}
catch *
{
@@ -273,7 +273,7 @@
try
{
- index_dml:probe-index-point-value($auctions:AuctionDates2, xs:date(2000-12-04))
+ index_dml:probe-index-point-value($auctions:AuctionDates2, xs:date(2000-12-04))/.
}
catch *
{
@@ -287,7 +287,7 @@
try
{
- index_dml:probe-index-point-value($auctions:AuctionDates2, 10)
+ index_dml:probe-index-point-value($auctions:AuctionDates2, 10)/.
}
catch *
{
@@ -394,7 +394,7 @@
fn:true(),
fn:false(),
fn:true(),
- fn:true())
+ fn:true())/.
return person{$person/@id, $person//@income}/person
}
catch *
@@ -414,7 +414,7 @@
fn:true(),
fn:true(),
fn:true(),
- fn:true())
+ fn:true())/.
return person{$person/@id, $person//@income}/person,
@@ -429,7 +429,7 @@
fn:true(),
fn:false(),
fn:true(),
- fn:true())
+ fn:true())/.
return person{$person/@id, $person//@income}/person,
@@ -444,7 +444,7 @@
fn:true(),
fn:true(),
fn:true(),
- fn:true())
+ fn:true())/.
return person{$person/@id, $person//@income}/person,
@@ -474,7 +474,7 @@
fn:false(),
fn:false(),
fn:true(),
- fn:false())
+ fn:false())/.
return person{$person/@id, $person//@income}/person,
=== modified file 'test/rbkt/Queries/zorba/index/auctions_module1.xqlib'
--- test/rbkt/Queries/zorba/index/auctions_module1.xqlib 2012-09-11 22:55:05
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/probe-no-doc-order-sort into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/probe-no-doc-order-sort into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/probe-no-doc-order-sort/+merge/124322 -- https://code.launchpad.net/~zorba-coders/zorba/probe-no-doc-order-sort/+merge/124322 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/probe-no-doc-order-sort into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/probe-no-doc-order-sort-2012-09-13T23-14-40.218Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/probe-no-doc-order-sort/+merge/124322 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:~davidagraf/zorba/paging_index_probe into lp:zorba
- idml:probe-index-range-value sorts the nodes implicitly in document order, i.e. they are not returned in the order of the index keys. The skipping is done before the sorting. This might be really confusing to the user. Essentially, he doesn't have a way to know which items are skipped. We have talked to Markos and he agreed that we remove the sorting from the range-value functions and only add it if the probe is used to answer queries. I have proposed the removal of the automatic sorting for merge at https://code.launchpad.net/~zorba-coders/zorba/probe-no-doc-order-sort/+merge/124322. -- https://code.launchpad.net/~davidagraf/zorba/paging_index_probe/+merge/122621 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/bug-1046559 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1046559 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/probe-no-doc-order-sort into lp:zorba
Validation queue job probe-no-doc-order-sort-2012-09-13T23-14-40.218Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/probe-no-doc-order-sort/+merge/124322 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/bug-1046559 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1046559-2012-09-13T23-39-57.835Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/probe-no-doc-order-sort into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 3 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/probe-no-doc-order-sort/+merge/124322 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/probe-no-doc-order-sort into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/probe-no-doc-order-sort into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/probe-no-doc-order-sort/+merge/124322 -- https://code.launchpad.net/~zorba-coders/zorba/probe-no-doc-order-sort/+merge/124322 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/probe-no-doc-order-sort into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/probe-no-doc-order-sort/+merge/124322 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/bug-1046559 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-1046559 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 bug-1046559-2012-09-13T23-39-57.835Z 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 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/bug-1046559 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1046559 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/bug-1046559 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1046559 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/bug-1046559 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1046559-2012-09-14T00-10-00.662Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/probe-no-doc-order-sort into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/probe-no-doc-order-sort/+merge/124322 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/probe-no-doc-order-sort into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/probe-no-doc-order-sort into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/probe-no-doc-order-sort/+merge/124322 -- https://code.launchpad.net/~zorba-coders/zorba/probe-no-doc-order-sort/+merge/124322 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/bug-1046559 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug-1046559 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 bug-1046559-2012-09-14T00-10-00.662Z 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 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/bug-1046559 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1046559 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/probe-no-doc-order-sort into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/probe-no-doc-order-sort-2012-09-14T00-37-39.869Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/probe-no-doc-order-sort/+merge/124322 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/bug-1046559 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1046559 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/probe-no-doc-order-sort into lp:zorba
Validation queue job probe-no-doc-order-sort-2012-09-14T00-37-39.869Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/probe-no-doc-order-sort/+merge/124322 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/probe-no-doc-order-sort into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/probe-no-doc-order-sort into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/probe-no-doc-order-sort/+merge/124322 -- https://code.launchpad.net/~zorba-coders/zorba/probe-no-doc-order-sort/+merge/124322 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/bug-1046559 into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in ChangeLog -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/bug-1046559 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1046559 into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/bug-1046559 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1046559 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/bug-1046559 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1046559-2012-09-14T01-26-44.442Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/bug-1046559 into lp:zorba
Validation queue job bug-1046559-2012-09-14T01-26-44.442Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/bug-1046559 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1046559 into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1046559/+merge/124297 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/objects-with-unordered-maps-and-const-char-star into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star/+merge/124225 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-1046415 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fix-1046415 into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 -- https://code.launchpad.net/~zorba-coders/zorba/fix-1046415/+merge/123283 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/objects-with-unordered-maps-and-const-char-star into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/objects-with-unordered-maps-and-const-char-star-2012-09-14T03-39-40.545Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star/+merge/124225 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/objects-with-unordered-maps-and-const-char-star into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star 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 objects-with-unordered-maps-and-const-char-star-2012-09-14T03-39-40.545Z 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 -- https://code.launchpad.net/~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star/+merge/124225 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/objects-with-unordered-maps-and-const-char-star into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star/+merge/124225 -- https://code.launchpad.net/~zorba-coders/zorba/objects-with-unordered-maps-and-const-char-star/+merge/124225 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
