[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug-1053113 into lp:zorba
Validation queue job bug-1053113-2013-01-11T01-39-09.304Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug-1053113/+merge/141618 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-1053113 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1053113 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1053113/+merge/141618 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1053113/+merge/141618 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-01-11T02-12-50.591Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142823 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142823 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142823 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142823 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba.
Commit message:
1. Floating-point overflow is now reported just the same as integer overflow.
2. Removed infinity0.xq test since it tests too many things in a single test.
3. Added several smaller infinity/overflow tests in its place.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142823
1. Floating-point overflow is now reported just the same as integer overflow.
2. Removed infinity0.xq test since it tests too many things in a single test.
3. Added several smaller infinity/overflow tests in its place.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142823
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/util/string_util.cpp'
--- src/util/string_util.cpp 2013-01-10 23:39:25 +
+++ src/util/string_util.cpp 2013-01-11 01:45:26 +
@@ -56,17 +56,14 @@
///
-static void check_errno( char const *buf, char const *end ) {
+static void check_parse_number( char const *buf, char const *end,
+bool check_trailing_chars ) {
if ( errno == ERANGE ) {
zstring const s( buf, end );
throw std::range_error(
BUILD_STRING( '"', s, "\": number too big/small" )
);
}
-}
-
-static void check_parse_number( char const *buf, char const *end,
-bool check_trailing_chars ) {
if ( end == buf )
throw std::invalid_argument( BUILD_STRING( '"', buf, "\": no digits" ) );
if ( check_trailing_chars )
@@ -107,7 +104,6 @@
long long atoll( char const *buf, char const **end ) {
ATON_PREAMBLE();
long long const result = std::strtoll( buf, (char**)end, 10 );
- check_errno( buf, *end );
check_parse_number( buf, *end, check_trailing_chars );
return result;
}
@@ -121,7 +117,6 @@
bool const minus = *buf == '-';
unsigned long long const result = std::strtoull( buf, (char**)end, 10 );
- check_errno( buf, *end );
check_parse_number( buf, *end, check_trailing_chars );
if ( minus && result ) {
=== added file 'test/rbkt/ExpQueryResults/zorba/numerics/INF-1.xml.res'
--- test/rbkt/ExpQueryResults/zorba/numerics/INF-1.xml.res 1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/numerics/INF-1.xml.res 2013-01-11 01:45:26 +
@@ -0,0 +1,1 @@
+-INF INF -INF INF
=== added file 'test/rbkt/ExpQueryResults/zorba/numerics/NaN.xml.res'
--- test/rbkt/ExpQueryResults/zorba/numerics/NaN.xml.res 1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/numerics/NaN.xml.res 2013-01-11 01:45:26 +
@@ -0,0 +1,1 @@
+NaN NaN
=== removed file 'test/rbkt/ExpQueryResults/zorba/numerics/infinity0.xml.res'
--- test/rbkt/ExpQueryResults/zorba/numerics/infinity0.xml.res 2012-09-19 21:16:15 +
+++ test/rbkt/ExpQueryResults/zorba/numerics/infinity0.xml.res 1970-01-01 00:00:00 +
@@ -1,1 +0,0 @@
-INF -INF NaN -INF INF 1.0E200 INF -INF NaN INF -INF
=== added file 'test/rbkt/ExpQueryResults/zorba/numerics/overflow-1.xml.res'
--- test/rbkt/ExpQueryResults/zorba/numerics/overflow-1.xml.res 1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/numerics/overflow-1.xml.res 2013-01-11 01:45:26 +
@@ -0,0 +1,1 @@
+INF
=== added file 'test/rbkt/ExpQueryResults/zorba/numerics/overflow-2.xml.res'
--- test/rbkt/ExpQueryResults/zorba/numerics/overflow-2.xml.res 1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/numerics/overflow-2.xml.res 2013-01-11 01:45:26 +
@@ -0,0 +1,1 @@
+-INF
=== added file 'test/rbkt/ExpQueryResults/zorba/numerics/overflow-3.xml.res'
--- test/rbkt/ExpQueryResults/zorba/numerics/overflow-3.xml.res 1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/numerics/overflow-3.xml.res 2013-01-11 01:45:26 +
@@ -0,0 +1,1 @@
+INF
=== added file 'test/rbkt/ExpQueryResults/zorba/numerics/overflow-4.xml.res'
--- test/rbkt/ExpQueryResults/zorba/numerics/overflow-4.xml.res 1970-01-01 00:00:00 +
+++ test/rbkt/ExpQueryResults/zorba/numerics/overflow-4.xml.res 2013-01-11 01:45:26 +
@@ -0,0 +1,1 @@
+-INF
=== added file 'test/rbkt/Queries/zorba/numerics/INF-1.xq'
--- test/rbkt/Queries/zorba/numerics/INF-1.xq 1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/numerics/INF-1.xq 2013-01-11 01:45:26 +
@@ -0,0 +1,6 @@
+(
+ xs:float("-INF"),
+ xs:float("INF"),
+ xs:double("-INF"),
+ xs:double("INF")
+)
=== added file 'test/rbkt/Queries/zorba/numerics/NaN.xq'
--- test/rbkt/Queries/zorba/numerics/NaN.xq 1970-01-01 00:00:00 +
+++ test/rbkt/Queries/zorba/numerics/NaN.xq 2013-01-11 01:45:26 +
@@ -0,0 +1,4 @@
+(
+ xs:float("NaN"),
+ xs:double("NaN")
+)
=== modified file 'test/rbkt/Queries/zorba/numerics/format-number1.xq'
--- test/rbkt/Queries/zorba/numerics/format-number1.xq 2012-09-19 21:16:15 +
+++ test/rbkt/Queries/zorba/numerics/format-number1.xq 2013-01-11 01:45:26 +
@@ -1
[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 => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/142760 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/142760 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-1053113 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1053113 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1053113/+merge/141618 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1053113/+merge/141618 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-1053113 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1053113-2013-01-11T01-39-09.304Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1053113/+merge/141618 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-1053113 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1053113 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1053113/+merge/141618 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1053113/+merge/141618 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-1053113 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-1053113/+merge/141618 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/bug1096718 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1096718 into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1096718/+merge/142407 -- https://code.launchpad.net/~zorba-coders/zorba/bug1096718/+merge/142407 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/feature-mem_size into lp:zorba
>>> The function alloc_sizeof( rstring const &s ) does not count the >> book-keeping overhead for the various kinds of strings. For example, the >> default rep (which is used for zstrings) adds 12 bytes oberhead (on 32-bit >> machines). >> >> I changed it to: >> >>return s.capacity() + (s.is_shared() ? 0 : sizeof( RepType )); >> > > This is fine with me, but there are many other things that are shared and yet > their sharing is not taken into account (e.g. qname items in the qname pool, > or atomic items shared among the nodes of copied xml trees). I think we > should have a consistent solution about what to do with "shared" things. > There are several options, but I will let Matthias decide about this. I would vote for something inconsistent but something that seems to make sense for our use case: - don't account for QNames at all - always account for atomic items that are shared among trees -- https://code.launchpad.net/~zorba-coders/zorba/feature-mem_size/+merge/114764 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/bug1096718 into lp:zorba
Validation queue job bug1096718-2013-01-11T01-02-05.868Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug1096718/+merge/142407 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-1053113 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1053113 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1053113/+merge/141618 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1053113/+merge/141618 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/bug1096718 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1096718-2013-01-11T01-02-05.868Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1096718/+merge/142407 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142815 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142815 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-01-11T00-34-37.392Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142815 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/bug1096718 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1096718 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1096718/+merge/142407 -- https://code.launchpad.net/~zorba-coders/zorba/bug1096718/+merge/142407 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/bug1096718 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1096718/+merge/142407 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-01-11T00-34-37.392Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142815 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142815 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142815 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142815 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142815 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142815 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142815 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-01-10T23-45-42.555Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142815 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142815 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-01-10T23-45-42.555Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142815 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142815 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142815 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/pjl-misc into lp:zorba. Commit message: aton() enhancement. Requested reviews: Paul J. Lucas (paul-lucas) For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142815 aton() enhancement. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142815 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/install-fots-driver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/install-fots-driver into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/install-fots-driver/+merge/142791 -- https://code.launchpad.net/~zorba-coders/zorba/install-fots-driver/+merge/142791 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/install-fots-driver into lp:zorba
Validation queue job install-fots-driver-2013-01-10T23-00-57.245Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/install-fots-driver/+merge/142791 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/install-fots-driver into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/install-fots-driver-2013-01-10T23-00-57.245Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/install-fots-driver/+merge/142791 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/feature-mem_size into lp:zorba
> > > The function alloc_sizeof( rstring const &s ) does not count the > book-keeping overhead for the various kinds of strings. For example, the > default rep (which is used for zstrings) adds 12 bytes oberhead (on 32-bit > machines). > > I changed it to: > > return s.capacity() + (s.is_shared() ? 0 : sizeof( RepType )); > This is fine with me, but there are many other things that are shared and yet their sharing is not taken into account (e.g. qname items in the qname pool, or atomic items shared among the nodes of copied xml trees). I think we should have a consistent solution about what to do with "shared" things. There are several options, but I will let Matthias decide about this. > > Also, I think the null-terminating byte is not counted. > > The alloc_size is its capacity. The null byte is irrelevant. > capacity() does not include the null-terminating byte. The actual number of bytes allocated is capacity()+1 (plus sizeof(RepType)). -- https://code.launchpad.net/~zorba-coders/zorba/feature-mem_size/+merge/114764 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/feature-mem_size into lp:zorba
> On Dec 16, 2012, at 8:43 PM, Markos Zaharioudakis wrote: > > > The memory size of some std containers is underestimated, because the book- > keeping overhead is not taken into account. I understand we cannot be 100% > exact here, but should we try to consider some common std implementations and > measure the mem size accordingly? For example, std::map is typically > implemented as a red-black tree, which should add at least 2 pointers (or > offsets) per entry into its memory size. > > OK, I added sizeof(void*) * 2. > I guess the unordered_map (and set) should have 1 extra pointer per entry and 1 extra pointer per hash bucket? -- https://code.launchpad.net/~zorba-coders/zorba/feature-mem_size/+merge/114764 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/feature-mem_size into lp:zorba
> > > The size of XmlTree is not counted. > > Right: because it's shared by all nodes in the tree. > > > An instance of XmlTree is shared by all nodex in the same xml tree. Maybe > the size of the XmlTree should be attribute only to the root node of the tree. > > > The problem is infinite recursion. If I ask for the size of a tree, it's the > sum of all the nodes. If the root node includes the size of the tree, then it > will recurse infinitely. > > - Paul I don't understand the infinite recursion problem. What I have in mind is add an alloc_size() method to the XmlNode class, which will return 0 if the node is not a root, otherwise returm mem_sizeof(XmlTree). -- https://code.launchpad.net/~zorba-coders/zorba/feature-mem_size/+merge/114764 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/install-fots-driver into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/install-fots-driver-2013-01-10T22-22-42.546Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/install-fots-driver/+merge/142791 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142438 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142438 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-01-10T21-55-48.301Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142438 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/install-fots-driver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/install-fots-driver into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/install-fots-driver/+merge/142791 -- https://code.launchpad.net/~zorba-coders/zorba/install-fots-driver/+merge/142791 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/install-fots-driver into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/install-fots-driver/+merge/142791 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/install-fots-driver into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/install-fots-driver/+merge/142791 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/install-fots-driver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/install-fots-driver into lp:zorba has been updated. Commit Message changed to: Add INSTALL() directive for FOTS test driver. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/install-fots-driver/+merge/142791 -- https://code.launchpad.net/~zorba-coders/zorba/install-fots-driver/+merge/142791 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/install-fots-driver into lp:zorba
Chris Hillery has proposed merging lp:~zorba-coders/zorba/install-fots-driver
into lp:zorba.
Commit message:
Add INSTALL() directive for FOTS test driver.
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/install-fots-driver/+merge/142791
--
https://code.launchpad.net/~zorba-coders/zorba/install-fots-driver/+merge/142791
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'test/CMakeLists.txt'
--- test/CMakeLists.txt 2012-12-05 03:03:36 +
+++ test/CMakeLists.txt 2013-01-10 22:02:26 +
@@ -39,6 +39,9 @@
ADD_SUBDIRECTORY(fots)
+INSTALL(DIRECTORY fots_driver
+DESTINATION share/zorba-${ZORBA_MAJOR_NUMBER}.${ZORBA_MINOR_NUMBER}.${ZORBA_PATCH_NUMBER})
+
SET (TEST_PLAN_SERIALIZER_SRCS
test_plan_serializer.cpp
timer.cpp)
--
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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-01-10T21-55-48.301Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142438 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/feature-mem_size into lp:zorba
> On Dec 17, 2012, at 2:44 AM, Markos Zaharioudakis wrote:
>
> > size:size(foo) returns 101. This is wrong because just
> sizeof(ElementNode) is 52 and the tree foo consists of 2 element
> nodes, one text node and one (hidden) attribute node.
> >
> > The reason for this wrong result is in this struct:
> >
> > template
> > struct size_traits {
> > static size_t alloc_sizeof( T *p ) {
> >return p ? mem_sizeof( *p ) : 0;
> > }
> > };
> >
> > Basically, an InternalNode has a vector of XmlNode*. So, the above struct is
> instantiated with T being XmlNode. Then, mem_sizeof(XmlNode) is called
> returning just 20 (== sizeof(XmlNode)).
>
> I've looked at this a bit more and I still don't understand why it's wrong.
> Ignoring everything else, the alloc_size() specialization for pointers seems
> correct.
>
> For a vector, it should iterate through the vector's elements. For
> each element, it should call the above alloc_sizeof() for XmlNode*. That in
> turn should call mem_sizeof(XmlNode) which is sizeof(XmlNode) +
> alloc_sizeof(XmlNode).
Here is the 1st problem: inside mem_sizeof(const XmlNode& t), sizeof(T) (or
sizeof(t)) should return 52 if t is actually an ElementNode. Of course, this is
not possible since sizeof(T) is computed statically (i.e., at compile time).
> alloc_sizeof(XmlNode) turns into
> size_traits::alloc_sizeof(t).
>
And here is the 2nd problem: alloc_sizeof(XmlNode) turns into
size_traits::alloc_sizeof(t), which returns 0. Somehow, the
trick with the has_alloc_size class does not work.
> XmlNode is derived from store::Item that has a virtual alloc_size(). The
> specialization of size_traits for classes that have an alloc_size() member
> function is called. Therefore, I don't see where the mistake is.
>
> - Paul
Try stepping through this example with gdb, and you will see it yourself.
--
https://code.launchpad.net/~zorba-coders/zorba/feature-mem_size/+merge/114764
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:~nbrinza/zorba/error-messages into lp:zorba
The proposal to merge lp:~nbrinza/zorba/error-messages into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697 -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697 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:~nbrinza/zorba/error-messages into lp:zorba
Validation queue job error-messages-2013-01-10T21-28-43.79Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697 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/feature-reference_module into lp:zorba
> Perhaps we can move this if clause out of the store and into the old module > code? Good idea. I did this in the latest version (rev. 11146). -- https://code.launchpad.net/~zorba-coders/zorba/feature-reference_module/+merge/138345 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142438 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142438 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142438 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:~nbrinza/zorba/error-messages into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/error-messages-2013-01-10T21-28-43.79Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697 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:~nbrinza/zorba/error-messages into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697 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:~nbrinza/zorba/error-messages into lp:zorba
The proposal to merge lp:~nbrinza/zorba/error-messages into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697 -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142438 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142438 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142438 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-01-10T20-29-00.352Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142438 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:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-01-10T20-29-00.352Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142438 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/add-jdbc-module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 -- https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 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/add-jdbc-module into lp:zorba
Validation queue job add-jdbc-module-2013-01-10T20-00-58.599Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 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:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142438 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/142438 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/add-jdbc-module into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/add-jdbc-module-2013-01-10T20-00-58.599Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 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: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/142760 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/142760 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
The attempt to merge lp:~zorba-coders/zorba/markos-scratch into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job markos-scratch-2013-01-10T19-34-59.262Z 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/markos-scratch/+merge/142760 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/add-jdbc-module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 -- https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 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/add-jdbc-module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 -- https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 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/add-jdbc-module into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/add-jdbc-module into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 -- https://code.launchpad.net/~zorba-coders/zorba/add-jdbc-module/+merge/141866 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 merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/markos-scratch-2013-01-10T19-34-59.262Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/142760 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 => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/142760 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/142760 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/142760 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/feature-mem_size into lp:zorba
On Dec 17, 2012, at 2:44 AM, Markos Zaharioudakis wrote:
> size:size(foo) returns 101. This is wrong because just
> sizeof(ElementNode) is 52 and the tree foo consists of 2
> element nodes, one text node and one (hidden) attribute node.
>
> The reason for this wrong result is in this struct:
>
> template
> struct size_traits {
> static size_t alloc_sizeof( T *p ) {
>return p ? mem_sizeof( *p ) : 0;
> }
> };
>
> Basically, an InternalNode has a vector of XmlNode*. So, the above struct is
> instantiated with T being XmlNode. Then, mem_sizeof(XmlNode) is called
> returning just 20 (== sizeof(XmlNode)).
I've looked at this a bit more and I still don't understand why it's wrong.
Ignoring everything else, the alloc_size() specialization for pointers seems
correct.
For a vector, it should iterate through the vector's elements. For
each element, it should call the above alloc_sizeof() for XmlNode*. That in
turn should call mem_sizeof(XmlNode) which is sizeof(XmlNode) +
alloc_sizeof(XmlNode). alloc_sizeof(XmlNode) turns into
size_traits::alloc_sizeof(t).
XmlNode is derived from store::Item that has a virtual alloc_size(). The
specialization of size_traits for classes that have an alloc_size() member
function is called. Therefore, I don't see where the mistake is.
- Paul
--
https://code.launchpad.net/~zorba-coders/zorba/feature-mem_size/+merge/114764
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:~nbrinza/zorba/error-messages into lp:zorba
The proposal to merge lp:~nbrinza/zorba/error-messages into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697 -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697 Your team Zorba Coders is requested to review the proposed merge of lp:~nbrinza/zorba/error-messages 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:~nbrinza/zorba/error-messages into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697 Your team Zorba Coders is requested to review the proposed merge of lp:~nbrinza/zorba/error-messages 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:~nbrinza/zorba/error-messages into lp:zorba
Validation queue job error-messages-2013-01-10T15-29-49.206Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697 Your team Zorba Coders is requested to review the proposed merge of lp:~nbrinza/zorba/error-messages 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:~nbrinza/zorba/error-messages into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/error-messages-2013-01-10T15-29-49.206Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697 Your team Zorba Coders is requested to review the proposed merge of lp:~nbrinza/zorba/error-messages 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:~nbrinza/zorba/error-messages into lp:zorba
The proposal to merge lp:~nbrinza/zorba/error-messages into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697 -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697 Your team Zorba Coders is requested to review the proposed merge of lp:~nbrinza/zorba/error-messages 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:~nbrinza/zorba/error-messages into lp:zorba
The proposal to merge lp:~nbrinza/zorba/error-messages into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697 -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697 Your team Zorba Coders is requested to review the proposed merge of lp:~nbrinza/zorba/error-messages 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:~nbrinza/zorba/error-messages into lp:zorba
The attempt to merge lp:~nbrinza/zorba/error-messages into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job error-messages-2013-01-10T14-11-42.339Z 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/~nbrinza/zorba/error-messages/+merge/142697 Your team Zorba Coders is requested to review the proposed merge of lp:~nbrinza/zorba/error-messages 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:~nbrinza/zorba/error-messages into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/error-messages-2013-01-10T14-11-42.339Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697 Your team Zorba Coders is requested to review the proposed merge of lp:~nbrinza/zorba/error-messages 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:~nbrinza/zorba/error-messages into lp:zorba
The proposal to merge lp:~nbrinza/zorba/error-messages into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697 -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697 Your team Zorba Coders is requested to review the proposed merge of lp:~nbrinza/zorba/error-messages 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:~nbrinza/zorba/error-messages into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697 Your team Zorba Coders is requested to review the proposed merge of lp:~nbrinza/zorba/error-messages 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:~nbrinza/zorba/error-messages into lp:zorba
Nicolae Brinza has proposed merging lp:~nbrinza/zorba/error-messages into
lp:zorba.
Commit message:
Parser error messages contain the actual offending QName.
Requested reviews:
Nicolae Brinza (nbrinza)
Zorba Coders (zorba-coders)
Related bugs:
Bug #867227 in Zorba: "Confusing error message"
https://bugs.launchpad.net/zorba/+bug/867227
Bug #867357 in Zorba: "Improved parser error message"
https://bugs.launchpad.net/zorba/+bug/867357
Bug #949064 in Zorba: "The faulty QName should be printed in the parser error
messages"
https://bugs.launchpad.net/zorba/+bug/949064
Bug #997045 in Zorba: "EQName regressions"
https://bugs.launchpad.net/zorba/+bug/997045
Bug #1072644 in Zorba: "broken error location"
https://bugs.launchpad.net/zorba/+bug/1072644
For more details, see:
https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697
Parser error messages contain the actual offending QName.
--
https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142697
Your team Zorba Coders is requested to review the proposed merge of
lp:~nbrinza/zorba/error-messages into lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2013-01-10 10:44:36 +
+++ ChangeLog 2013-01-10 14:11:27 +
@@ -31,6 +31,7 @@
* Convert LET vars whose domain sequence has exactly one item to FOR vars.
Bug Fixes/Other Changes:
+ * Fixed bug #949064 (faulty QName should be printed in the error message)
* Fixed bug #1072644 (broken parser error location)
* Change XQXQ (XQuery-for-XQuery) module now part of Zorba core
* Fixed mustCopyInputNodes() method of no-copy, and jsoniq functions.
=== modified file 'src/compiler/parser/symbol_table.cpp'
--- src/compiler/parser/symbol_table.cpp 2012-09-19 21:16:15 +
+++ src/compiler/parser/symbol_table.cpp 2013-01-10 14:11:27 +
@@ -56,8 +56,9 @@
}
symbol_table::symbol_table(uint32_t initial_heapsize)
-:
- heap(initial_heapsize)
+ :
+ heap(initial_heapsize),
+ last_qname(-1)
{
}
@@ -107,7 +108,8 @@
off_t symbol_table::put_ncname(char const* text, uint32_t length)
{
- return heap.put(text, 0, length);
+ last_qname = heap.put(text, 0, length);
+ return last_qname;
}
off_t symbol_table::put_qname(char const* text, uint32_t length, bool do_trim_start, bool do_trim_end, bool is_eqname)
@@ -125,7 +127,9 @@
}
if (!is_eqname)
-return heap.put(text, 0, length);
+ {
+last_qname = heap.put(text, 0, length);
+ }
else
{
// EQName: Q{prefix}name
@@ -138,8 +142,10 @@
off_t uri = put_uri(prefix.c_str(), prefix.size());
name = get(uri) + ":" + name;
-return heap.put(name.c_str(), 0, name.size());
+last_qname = heap.put(name.c_str(), 0, name.size());
}
+
+ return last_qname;
}
off_t symbol_table::put_uri(char const* text, uint32_t length)
@@ -226,15 +232,19 @@
std::string symbol_table::get(off_t id)
{
- uint32_t n = heap.get_length0(id);
- char *buf;
- buf = (char*)malloc(n+1);
- heap.get0(id, buf, 0, n+1);
- std::string retstr = string(buf, 0, n);
- free(buf);
- return retstr;
+ uint32_t n = heap.get_length0(id);
+ char *buf;
+ buf = (char*)malloc(n+1);
+ heap.get0(id, buf, 0, n+1);
+ std::string retstr = string(buf, 0, n);
+ free(buf);
+ return retstr;
}
+std::string symbol_table::get_last_qname()
+{
+ return get(last_qname);
+}
} /* namespace zorba */
/* vim:set et sw=2 ts=2: */
=== modified file 'src/compiler/parser/symbol_table.h'
--- src/compiler/parser/symbol_table.h 2012-09-19 21:16:15 +
+++ src/compiler/parser/symbol_table.h 2013-01-10 14:11:27 +
@@ -28,14 +28,15 @@
class ZORBA_DLL_PUBLIC symbol_table
{
-protected: // state
- fxcharheap heap;
-
-public: // ctor,dtor
- symbol_table(uint32_t initial_heapsize=1024);
- ~symbol_table();
-
-public: // table interface
+protected: // state
+ fxcharheap heap;
+ off_t last_qname; // will store the offset of the last added qname or ncname
+
+public: // ctor,dtor
+ symbol_table(uint32_t initial_heapsize=1024);
+ ~symbol_table();
+
+public: // table interface
off_t put(char const* text);
/* Accepted values for normalizationType:
@@ -43,22 +44,25 @@
* normalizationType = 1 -- EOL normalization
* normalizationType = 2 -- Attribute value normalization
*/
- off_t put(char const* text, uint32_t length, int normalizationType = 0);
+ off_t put(char const* text, uint32_t length, int normalizationType = 0);
- off_t put_ncname(char const* text, uint32_t length);
- off_t put_qname(char const* text, uint32_t length,
+ off_t put_ncname(char const* text, uint32_t length);
+ off_t put_qname(char const* text, uint32_t length,
bool do_trim_start = false, bool do_trim_end = false, bool is_eqname = false);
- off_t put_uri(char const* text, uint32_t length);
- off_t put_varname(char const* text, uint32_t length);
- off_t put_entityref(char const* text, uint32_t length);
- off_t put_charref(char const* text, uint32_t length);
- off_t put_stringlit(char const* tex
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/cast-to-simple-type into lp:zorba
Validation queue job cast-to-simple-type-2013-01-10T13-29-48.847Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/cast-to-simple-type/+merge/142685 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/cast-to-simple-type into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/cast-to-simple-type into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/cast-to-simple-type/+merge/142685 -- https://code.launchpad.net/~zorba-coders/zorba/cast-to-simple-type/+merge/142685 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/cast-to-simple-type into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/cast-to-simple-type-2013-01-10T13-29-48.847Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/cast-to-simple-type/+merge/142685 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/cast-to-simple-type into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/cast-to-simple-type into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/cast-to-simple-type/+merge/142685 -- https://code.launchpad.net/~zorba-coders/zorba/cast-to-simple-type/+merge/142685 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/cast-to-simple-type into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/cast-to-simple-type/+merge/142685 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/cast-to-simple-type into lp:zorba
Markos Zaharioudakis has proposed merging
lp:~zorba-coders/zorba/cast-to-simple-type into lp:zorba.
Commit message:
fixed performance regression due to unconditional schema creation
Requested reviews:
Markos Zaharioudakis (markos-za)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/cast-to-simple-type/+merge/142685
fixed performance regression due to unconditional schema creation
--
https://code.launchpad.net/~zorba-coders/zorba/cast-to-simple-type/+merge/142685
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/core/sequencetypes.cpp'
--- src/runtime/core/sequencetypes.cpp 2012-12-29 06:48:09 +
+++ src/runtime/core/sequencetypes.cpp 2013-01-10 13:18:51 +
@@ -230,7 +230,7 @@
const UserDefinedXQType* udt;
store::SchemaTypeCode targetType;
- const TypeManager* tm = theSctx->get_typemanager();
+ TypeManager* tm = theSctx->get_typemanager();
CastIteratorState* state;
DEFAULT_STACK_INIT(CastIteratorState, state, planState);
@@ -336,7 +336,7 @@
bool res;
store::Item_t item;
- const TypeManager* tm = theSctx->get_typemanager();
+ TypeManager* tm = theSctx->get_typemanager();
PlanIteratorState* state;
DEFAULT_STACK_INIT(PlanIteratorState, state, planState);
=== modified file 'src/runtime/numerics/format_integer_impl.cpp'
--- src/runtime/numerics/format_integer_impl.cpp 2012-09-19 21:16:15 +
+++ src/runtime/numerics/format_integer_impl.cpp 2013-01-10 13:18:51 +
@@ -762,7 +762,7 @@
utf8_string utf8_picture(pictureString);
xs_integer valueInteger;
bool is_neg = false;
- const TypeManager* tm = theSctx->get_typemanager();
+ TypeManager* tm = theSctx->get_typemanager();
const RootTypeManager& rtm = GENV_TYPESYSTEM;
PlanIteratorState* state;
@@ -788,10 +788,11 @@
{
consumeNext(language_item, theChildren[2].getp(), planState);
languageString = language_item->getStringValue();
+
if(!GenericCast::isCastable(languageString, &*rtm.LANGUAGE_TYPE_ONE, tm))
{
-throw XQUERY_EXCEPTION(err::FOFI0001, ERROR_PARAMS( languageString ), ERROR_LOC( loc )
-);
+throw XQUERY_EXCEPTION(err::FOFI0001,
+ERROR_PARAMS(languageString), ERROR_LOC(loc));
}
}
=== modified file 'src/types/casting.cpp'
--- src/types/casting.cpp 2013-01-08 11:07:41 +
+++ src/types/casting.cpp 2013-01-10 13:18:51 +
@@ -2043,7 +2043,7 @@
const xqtref_t& targetType,
const namespace_context* nsCtx,
std::vector& resultList,
-const TypeManager* tm,
+TypeManager* tm,
const QueryLoc& loc)
{
const TypeManager* ttm = targetType->get_manager();
@@ -2075,6 +2075,9 @@
{
ZORBA_ASSERT(targetType->type_kind() == XQType::USER_DEFINED_KIND);
+#ifndef ZORBA_NO_XMLSCHEMA
+tm->initializeSchema();
+
Schema* schema = tm->getSchema();
const UserDefinedXQType* udt =
@@ -2129,6 +2132,7 @@
RAISE_ERROR(err::FORG0001, loc,
ERROR_PARAMS(item->getStringValue(), ZED(NoCastTo_34o), udt->toSchemaString()));
} // union
+#endif // ZORBA_NO_XMLSCHEMA
} // list or union
}
@@ -2692,7 +2696,7 @@
bool GenericCast::isCastable(
const store::Item_t& aItem,
const XQType* targetType,
-const TypeManager* tm)
+TypeManager* tm)
{
#ifndef ZORBA_NO_XMLSCHEMA
if (targetType->type_kind() == XQType::USER_DEFINED_KIND )
@@ -2700,6 +2704,8 @@
const UserDefinedXQType* udt = static_cast(targetType);
if (!udt->isComplex())
{
+ tm->initializeSchema();
+
return tm->getSchema()->
isCastableUserSimpleTypes(aItem->getStringValue(), targetType);
}
@@ -2746,7 +2752,7 @@
bool GenericCast::isCastable(
const zstring& str,
const XQType* aTargetType,
-const TypeManager* tm)
+TypeManager* tm)
{
#ifndef ZORBA_NO_XMLSCHEMA
if (aTargetType->type_kind() == XQType::USER_DEFINED_KIND )
@@ -2754,6 +2760,8 @@
const UserDefinedXQType* udt = static_cast(aTargetType);
if (!udt->isComplex())
{
+ tm->initializeSchema();
+
return tm->getSchema()->
isCastableUserSimpleTypes(str,
udt->getBaseType().getp());
=== modified file 'src/types/casting.h'
--- src/types/casting.h 2012-12-28 11:53:57 +
+++ src/types/casting.h 2013-01-10 13:18:51 +
@@ -89,7 +89,7 @@
const xqtref_t& targetType,
const namespace_context* nsCtx,
std::vector& resultList,
-const TypeManager* tm,
+TypeManager* tm,
const QueryLoc& loc);
static bool castStringToAtomic(
@@ -138,12 +138,12 @@
static bool isCastable(
const store::Item_t& item,
const XQType* targetType,
- const TypeManager* tm);
+ TypeManager* tm);
static bool isCastable(
const zstring& stringValue,
const XQType* targetType,
- const TypeManager* tm);
+ TypeManager* tm);
};
} /* namespace zorba */
=== modified file 'src/types/
[Zorba-coders] [Merge] lp:~nbrinza/zorba/error-messages into lp:zorba
The proposal to merge lp:~nbrinza/zorba/error-messages into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142504 -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142504 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:~nbrinza/zorba/error-messages into lp:zorba
Validation queue job error-messages-2013-01-10T10-18-55.066Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142504 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/feature-reference_module into lp:zorba
Perhaps we can move this if clause out of the store and into the old module code? -- https://code.launchpad.net/~zorba-coders/zorba/feature-reference_module/+merge/138345 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:~nbrinza/zorba/error-messages into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142504 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:~nbrinza/zorba/error-messages into lp:zorba
The proposal to merge lp:~nbrinza/zorba/error-messages into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142504 -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142504 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:~nbrinza/zorba/error-messages into lp:zorba
Review: Needs Fixing -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142504 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:~nbrinza/zorba/error-messages into lp:zorba
Review: Approve -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142504 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:~nbrinza/zorba/error-messages into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/error-messages-2013-01-10T10-18-55.066Z/log.html -- https://code.launchpad.net/~nbrinza/zorba/error-messages/+merge/142504 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/couchbase-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/couchbase-trunk into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/couchbase-trunk/+merge/135779 -- https://code.launchpad.net/~zorba-coders/zorba/couchbase-trunk/+merge/135779 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/couchbase-trunk into lp:zorba
Validation queue job couchbase-trunk-2013-01-10T08-10-43.928Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/couchbase-trunk/+merge/135779 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/couchbase-trunk into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/couchbase-trunk-2013-01-10T08-10-43.928Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/couchbase-trunk/+merge/135779 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/couchbase-trunk into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/couchbase-trunk into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/couchbase-trunk/+merge/135779 -- https://code.launchpad.net/~zorba-coders/zorba/couchbase-trunk/+merge/135779 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
