[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1085408 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1085408 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063 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-1169191 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1169191-2013-04-16T06-49-41.896Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug-1169191/+merge/159035 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/bug-1085408 into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve. -- https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063 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/bug-1085408 into lp:zorba
Validation queue job bug-1085408-2013-04-16T06-25-41.622Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063 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-1169191 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1169191 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1169191/+merge/159035 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1169191/+merge/159035 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-1169191 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1169191/+merge/159035 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/bug-1085408 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1085408-2013-04-16T06-25-41.622Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063 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/bug-1085408 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1085408 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063 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/159064 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159064 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, Needs Information < 1, Resubmit < 1. Got: 1 Approve. -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159064 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-04-16T03-53-40.529Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159064 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-04-16T03-53-40.529Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159064 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/159064 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159064 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/159064 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159064 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
The attempt to merge lp:~paul-lucas/zorba/pjl-misc 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 pjl-misc-2013-04-16T02-57-42.841Z is finished. The final status was: 4 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159064 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-04-16T02-57-42.841Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159064 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/bug-1085408 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1085408 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063 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/bug-1085408 into lp:zorba
The attempt to merge lp:~paul-lucas/zorba/bug-1085408 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 bug-1085408-2013-04-16T02-33-43.66Z 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/~paul-lucas/zorba/bug-1085408/+merge/159063 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/159064 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159064 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/159064 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. Added atoll( char const *buf, char const *end, char const **last );
2. Added more aton() functions.
3. Fixed handling of integer overflow.
Requested reviews:
Paul J. Lucas (paul-lucas)
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159064
1. Added atoll( char const *buf, char const *end, char const **last );
2. Added more aton() functions.
3. Fixed handling of integer overflow.
--
https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/159064
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/util/string_util.cpp'
--- src/util/string_util.cpp 2013-03-31 15:53:11 +
+++ src/util/string_util.cpp 2013-04-16 02:34:29 +
@@ -56,14 +56,15 @@
///
-static void too_big_or_small( char const *buf, char const *last ) {
+static void throw_range_error( char const *buf, char const *last ) {
+ errno = ERANGE;
zstring const s( buf, last );
throw std::range_error( BUILD_STRING( '"', s, "\": number too big/small" ) );
}
inline void check_errno( char const *buf, char const *last ) {
if ( errno == ERANGE )
-too_big_or_small( buf, last );
+throw_range_error( buf, last );
}
static void check_trailing_chars_impl( char const *last ) {
@@ -149,20 +150,65 @@
return result;
}
+long long atoll( char const *buf, char const *end, char const **last ) {
+ aton_context const ctx( last );
+ long long n = 0;
+ char const *s0 = ascii::trim_start_whitespace( buf, end - buf );
+ char const *s = s0;
+
+ if ( s < end ) {
+bool minus = false;
+switch ( *s ) {
+ case '-':
+minus = true;
+// no break;
+ case '+':
+s0 = ++s;
+break;
+}
+for ( ; s < end && ascii::is_digit( *s ); ++s ) {
+ long long const n_prev = n;
+ n *= 10;
+ if ( n / 10 != n_prev ) // see
+throw_range_error( buf, end );
+ n += *s - '0';
+ if ( n < n_prev )
+throw_range_error( buf, end );
+}
+if ( s == s0 )
+ s = buf;
+else if ( minus )
+ n = -n;
+ }
+
+ *last = s;
+ check_parse_number( buf, *last, ctx.check_trailing_chars() );
+ return n;
+}
+
unsigned long long atoull( char const *buf, char const *end,
char const **last ) {
aton_context const ctx( last );
unsigned long long n = 0;
- char const *s = ascii::trim_start_whitespace( buf, end - buf );
+ char const *s0 = ascii::trim_start_whitespace( buf, end - buf );
+ char const *s = s0;
- for ( ; s < end && ascii::is_digit( *s ); ++s ) {
-unsigned long long const n_prev = n;
-n = n * 10 + *s - '0';
-if ( n < n_prev ) {
- errno = ERANGE;
- too_big_or_small( buf, end );
+ if ( s < end ) {
+if ( *s == '+' )
+ s0 = ++s;
+for ( ; s < end && ascii::is_digit( *s ); ++s ) {
+ unsigned long long const n_prev = n;
+ n *= 10;
+ if ( n / 10 != n_prev ) // see
+throw_range_error( buf, end );
+ n += *s - '0';
+ if ( n < n_prev )
+throw_range_error( buf, end );
}
+if ( s == s0 );
+ s = buf;
}
+
*last = s;
check_parse_number( buf, *last, ctx.check_trailing_chars() );
return n;
=== modified file 'src/util/string_util.h'
--- src/util/string_util.h 2013-03-26 00:25:41 +
+++ src/util/string_util.h 2013-04-16 02:34:29 +
@@ -414,13 +414,17 @@
* Parses the given string for a \c double.
*
* @param buf The null-terminated C string to parse. Leading and trailing
- * whitespace is ignored.
+ * whitespace is ignored. After any leading whitespace, there may be a \c + or
+ * \c - sign, followed by a sequence of decimal digits optionally containing a
+ * single single \c . (decimal-point), optionally followed by an exponent
+ * consisting of an \c e or \c E followed by an optional \c + or \c - sign
+ * followed by a sequence of decimal digits.
* @param last If not \c null, this is set to point to the character after the
* last numeric character parsed; if \c null, characters past the last numeric
* character may only be whitespace.
* @return Returns the \c double value.
- * @throws invalid_argument if \a buf contains characters other than digits or
- * leading/trailing whitespace, or contains no digits at all.
+ * @throws invalid_argument if \a buf contains characters other than as
+ * described or contains no digits at all.
* @throws range_error if the number overflows/underflows.
*/
double atod( char const *buf, char const **last = nullptr );
@@ -429,13 +433,17 @@
* Parses the given string for a \c float.
*
* @param buf The null-terminated C string to parse. Leading and trailing
- * whitespace is ignored.
+ * whitespace is ignored. After any leading whitespace, there may be a \c + or
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-1085408 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug-1085408-2013-04-16T02-33-43.66Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063 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/bug-1085408 into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/bug-1085408 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063 -- https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063 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/bug-1085408 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063 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/bug-1085408 into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/bug-1085408 into
lp:zorba.
Commit message:
Fixed signed integer overflow bug.
Requested reviews:
Paul J. Lucas (paul-lucas)
Related bugs:
Bug #1085408 in Zorba: "xs:date(): casting large year values"
https://bugs.launchpad.net/zorba/+bug/1085408
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063
Fixed signed integer overflow bug.
--
https://code.launchpad.net/~paul-lucas/zorba/bug-1085408/+merge/159063
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'ChangeLog'
--- ChangeLog 2013-04-11 18:13:48 +
+++ ChangeLog 2013-04-16 02:23:28 +
@@ -43,6 +43,7 @@
* Fixed bug #1147518 (fn:round-half-to-even (at least 11 failures))
* Fixed bug #1114228 (unrecognized options in the XQuery namespace now raise an error)
* Fixed bug #1124273 (xqdoc crash because of annotation literals)
+ * Fixed bug #1085408 (xs:date(): casting large year values)
* Fixed bug #867027 (XQST0059 error messages inconsistent)
* Fixed bug #1095889 (Improve error message for xml-parsing error).
* Fixed bug #1123163 (fn:format-integer failures)
=== modified file 'src/zorbatypes/datetime/parse.cpp'
--- src/zorbatypes/datetime/parse.cpp 2013-04-05 09:48:19 +
+++ src/zorbatypes/datetime/parse.cpp 2013-04-16 02:23:28 +
@@ -53,29 +53,37 @@
long max_digits,
size_t delta)
{
- int tmp_result = 0; // We have to downgrade the precision here from long to int so that some FOTS tests will throw a FOTD0001 date/time overflow.
- // When alternative correct results will be available, this precision downgrading can be removed.
- long digits = 0;
-
- if (position + delta >= len)
-return 1;
-
- if (str[position+delta] < '0' || str[position+delta] > '9')
-return 1;
-
- while ( position + delta < len && ascii::is_digit( str[position+delta] ) )
- {
-tmp_result = 10 * tmp_result + str[position + delta] - '0';
-position++;
-digits++;
-
-if (tmp_result < 0) // we've had an overflow
- return 2;
+ if ( position + delta >= len )
+return 1;
+
+ //
+ // We have to downgrade the precision here from sizeof(long) to sizeof(int)
+ // so that some FOTS tests will throw a FOTD0001 date/time overflow. When
+ // alternative correct results are available, this precision downgrading can
+ // be removed.
+ //
+ int tmp_result = 0;
+
+ int digits = 0;
+
+ if ( !ascii::is_digit( str[position+delta] ) )
+return 1;
+
+ while ( position + delta < len && ascii::is_digit( str[position+delta] ) ) {
+unsigned const tmp_prev = tmp_result;
+tmp_result *= 10;
+// See
+if ( tmp_result / 10 != tmp_prev )
+ return 2; // overflow
+tmp_result += str[position + delta] - '0';
+if ( tmp_result < tmp_prev )
+ return 2; // overflow
+++digits;
+++position;
}
if (min_digits >= 0 && digits < min_digits)
return 1;
-
if (max_digits >= 0 && digits > max_digits)
return 1;
--
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/bug1103819-catchAll into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1103819-catchAll into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1103819-catchAll/+merge/159053 -- https://code.launchpad.net/~zorba-coders/zorba/bug1103819-catchAll/+merge/159053 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/bug1103819-catchAll into lp:zorba
Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1, Needs Information < 1, Resubmit < 1. Got: 1 Approve, 1 Pending. -- https://code.launchpad.net/~zorba-coders/zorba/bug1103819-catchAll/+merge/159053 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/bug1103819-catchAll into lp:zorba
Validation queue job bug1103819-catchAll-2013-04-16T00-51-56.543Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug1103819-catchAll/+merge/159053 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/bug1103819-catchAll into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1103819-catchAll-2013-04-16T00-51-56.543Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1103819-catchAll/+merge/159053 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/bug1103819-catchAll into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1103819-catchAll into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1103819-catchAll/+merge/159053 -- https://code.launchpad.net/~zorba-coders/zorba/bug1103819-catchAll/+merge/159053 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/bug1103819-catchAll into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1103819-catchAll/+merge/159053 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/bug1103819-catchAll into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1103819-catchAll into lp:zorba has been updated. Commit Message changed to: Fix catch ( ... ) in XML loaders. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1103819-catchAll/+merge/159053 -- https://code.launchpad.net/~zorba-coders/zorba/bug1103819-catchAll/+merge/159053 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/bug1103819-catchAll into lp:zorba
Cezar Andrei has proposed merging lp:~zorba-coders/zorba/bug1103819-catchAll
into lp:zorba.
Commit message:
Fix catch ( ... ) in XML loaders.
Requested reviews:
Cezar Andrei (cezar-andrei)
Paul J. Lucas (paul-lucas)
Related bugs:
Bug #1103819 in Zorba: "Use of "catch (...)" should be reduced or mitigated"
https://bugs.launchpad.net/zorba/+bug/1103819
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1103819-catchAll/+merge/159053
Fix catch ( ... ) in XML loaders.
--
https://code.launchpad.net/~zorba-coders/zorba/bug1103819-catchAll/+merge/159053
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/store/naive/loader_dtd.cpp'
--- src/store/naive/loader_dtd.cpp 2013-03-05 22:57:42 +
+++ src/store/naive/loader_dtd.cpp 2013-04-16 00:50:38 +
@@ -355,6 +355,16 @@
FragmentXmlLoader::endDocument(theFragmentStream->ctxt->userData); // this would not be called otherwise
}
+ catch( std::exception const &e )
+ {
+theXQueryDiagnostics->
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR,
+ ERROR_PARAMS( e.what() )));
+
+abortload();
+thePathStack.clear();
+return NULL;
+ }
catch (...)
{
abortload();
@@ -849,8 +859,19 @@
return NULL;
}
}
+ catch( std::exception const &e )
+ {
+theXQueryDiagnostics->
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR, ERROR_PARAMS( e.what() )));
+
+abortload();
+return NULL;
+ }
catch(...)
{
+theXQueryDiagnostics->
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR));
+
abortload();
thePathStack.clear();
return NULL;
@@ -1070,6 +1091,12 @@
{
loader.theXQueryDiagnostics->add_error( e );
}
+ catch( std::exception const &e )
+ {
+loader.theXQueryDiagnostics->
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZXQP0003_INTERNAL_ERROR,
+ ERROR_PARAMS( e.what() )));
+ }
catch (...)
{
loader.theXQueryDiagnostics->add_error(
@@ -1152,6 +1179,12 @@
{
loader.theXQueryDiagnostics->add_error( e );
}
+ catch( std::exception const &e )
+ {
+loader.theXQueryDiagnostics->
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZXQP0003_INTERNAL_ERROR,
+ ERROR_PARAMS( e.what() )));
+ }
catch (...)
{
loader.theXQueryDiagnostics->add_error(
@@ -1446,6 +1479,12 @@
{
loader.theXQueryDiagnostics->add_error( e );
}
+ catch( std::exception const &e )
+ {
+loader.theXQueryDiagnostics->
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZXQP0003_INTERNAL_ERROR,
+ ERROR_PARAMS( e.what() )));
+ }
catch (...)
{
loader.theXQueryDiagnostics->
@@ -1578,6 +1617,12 @@
{
loader.theXQueryDiagnostics->add_error( e );
}
+ catch( std::exception const &e )
+ {
+loader.theXQueryDiagnostics->
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZXQP0003_INTERNAL_ERROR,
+ ERROR_PARAMS( e.what() )));
+ }
catch (...)
{
loader.theXQueryDiagnostics->add_error(
@@ -1629,6 +1674,12 @@
{
loader.theXQueryDiagnostics->add_error( e );
}
+ catch( std::exception const &e )
+ {
+loader.theXQueryDiagnostics->
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZXQP0003_INTERNAL_ERROR,
+ ERROR_PARAMS( e.what() )));
+ }
catch (...)
{
loader.theXQueryDiagnostics->add_error(
@@ -1682,6 +1733,12 @@
{
loader.theXQueryDiagnostics->add_error( e );
}
+ catch( std::exception const &e )
+ {
+loader.theXQueryDiagnostics->
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZXQP0003_INTERNAL_ERROR,
+ ERROR_PARAMS( e.what() )));
+ }
catch (...)
{
loader.theXQueryDiagnostics->add_error(
@@ -1732,6 +1789,12 @@
{
loader.theXQueryDiagnostics->add_error( e );
}
+ catch( std::exception const &e )
+ {
+loader.theXQueryDiagnostics->
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZXQP0003_INTERNAL_ERROR,
+ ERROR_PARAMS( e.what() )));
+ }
catch (...)
{
loader.theXQueryDiagnostics->add_error(
@@ -1775,6 +1838,12 @@
{
loader.theXQueryDiagnostics->add_error( e );
}
+ catch( std::exception const &e )
+ {
+loader.theXQueryDiagnostics->
+add_error(NEW_ZORBA_EXCEPTION(zerr::ZXQP0003_INTERNAL_ERROR,
+ ERROR_PARAMS( e.what() )));
+ }
catch (...)
{
loader.theXQueryDiagnostics->add_error(
=== modified file 'src/store/naive/loader_fast.cpp'
--- src/store/naive/loader_fast.cpp 2013-04-08 22:59:58 +
+++ src/store/naive/loader_fast.cpp 2013-04-16 00:50:38 +
@@ -445,7 +445,7 @@
if (numChars < 0)
{
theXQueryDiagnostics->
- add_error(NEW_ZORBA_EXCEPTION(zerr::ZSTR0020_LOADER_IO_ERROR));
+add_error(NEW_ZORBA_EXC
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1123835 into lp:zorba
Ok, maybe ignore point #1 - that function is there after all. I'm not sure how I missed it; must have been a typo in my search. Anyway, I'll review the code more thoroughly a bit later tonight. Points #2 and #3 still need to be fixed. -- https://code.launchpad.net/~zorba-coders/zorba/bug1123835/+merge/158978 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/bug1123835 into lp:zorba
Review: Needs Fixing 1. It looks like you didn't check in some changes? sequences_impl.cpp refers to a method URI::get_encoded_fragment() that doesn't exist. 2. sequences_impl.cpp now shows up on my system as "ISO-8859 English text" rather than "ASCII English text" when I use the "file" command. My editor (QtCreator) refuses to edit this file because of the encoding. This appears to be because you used some non-ASCII characters, specifically when comparing the variable "peek" to various characters. Please use \0x encodings for these characters so the result is still ASCII, to prevent those characters from being munged accidentally in the future. 3. You have some merge conflicts as well. I'll review the actual changes more closely when at least (1) is fixed up. -- https://code.launchpad.net/~zorba-coders/zorba/bug1123835/+merge/158978 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/bug1147563 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 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/bug1147563 into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug1147563 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 bug1147563-2013-04-15T23-46-04.439Z 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/bug1147563/+merge/153485 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/bug1147563 into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1147563-2013-04-15T23-46-04.439Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 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/bug1147563 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1147563 into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 -- https://code.launchpad.net/~zorba-coders/zorba/bug1147563/+merge/153485 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-1169191 into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug-1169191/+merge/159035 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-1169191 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug-1169191 into lp:zorba has been updated. Commit Message changed to: Only attempt to resolve a base URI against the entity-retrieval URI if said entity-retrieval URI itself absolute. For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug-1169191/+merge/159035 -- https://code.launchpad.net/~zorba-coders/zorba/bug-1169191/+merge/159035 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-1169191 into lp:zorba
Chris Hillery has proposed merging lp:~zorba-coders/zorba/bug-1169191 into
lp:zorba.
Commit message:
Only attempt to resolve a base URI against the entity-retrieval URI if said
entity-retrieval URI itself absolute.
Requested reviews:
Chris Hillery (ceejatec)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1169191/+merge/159035
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1169191/+merge/159035
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/context/static_context.cpp'
--- src/context/static_context.cpp 2013-04-02 21:43:27 +
+++ src/context/static_context.cpp 2013-04-15 22:37:26 +
@@ -1499,10 +1499,12 @@
if (found)
{
URI base(entityUri);
- URI resolvedURI(base, userBaseUri);
- theBaseUriInfo->theBaseUri = resolvedURI.toString();
- theBaseUriInfo->theHaveBaseUri = true;
- return;
+ if (base.is_absolute()) {
+URI resolvedURI(base, userBaseUri);
+theBaseUriInfo->theBaseUri = resolvedURI.toString();
+theBaseUriInfo->theHaveBaseUri = true;
+return;
+ }
}
URI base(get_implementation_baseuri());
--
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/hof-next into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-next into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/hof-next into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/hof-next 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 hof-next-2013-04-15T21-24-58.908Z is finished. The final status was: 4 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/hof-next/+merge/158213 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/bug1082740_fn_subsequence into lp:zorba
Review: Approve I agree with your logic, Juan; thanks for spelling it out. I hadn't realized that your new flag were not checked in the inner loop of fn:subsequence(), but looking at the implementation it appears that is the case. So I have no problem with it. Voting Approve now, although clearly the two failing FOTS tests will need to be addressed before it will merge. -- https://code.launchpad.net/~zorba-coders/zorba/bug1082740_fn_subsequence/+merge/157755 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/hof-next into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-next-2013-04-15T21-24-58.908Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/bug1082740_fn_subsequence into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1082740_fn_subsequence into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1082740_fn_subsequence/+merge/157755 -- https://code.launchpad.net/~zorba-coders/zorba/bug1082740_fn_subsequence/+merge/157755 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/bug1082740_fn_subsequence into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug1082740_fn_subsequence 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 bug1082740_fn_subsequence-2013-04-15T21-01-08.051Z 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/bug1082740_fn_subsequence/+merge/157755 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/hof-next into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-next into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/bug1082740_fn_subsequence into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1082740_fn_subsequence-2013-04-15T21-01-08.051Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1082740_fn_subsequence/+merge/157755 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/bug1082740_fn_subsequence into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1082740_fn_subsequence into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1082740_fn_subsequence/+merge/157755 -- https://code.launchpad.net/~zorba-coders/zorba/bug1082740_fn_subsequence/+merge/157755 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/bug1082740_fn_subsequence into lp:zorba
I apologize I made a mistake the numeric Value for INF and -INF is the same -9223372036854775808 (0x8000) which would make solving this issue with flags more complex than what I described. -- https://code.launchpad.net/~zorba-coders/zorba/bug1082740_fn_subsequence/+merge/157755 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/bug1082740_fn_subsequence into lp:zorba
I made some modifications and the current solution uses 1 less check which will make it 3 and 4 and the numeric solution would have 0 extra flag checks but it still has the problem that with INF values it will do extra operations. -- https://code.launchpad.net/~zorba-coders/zorba/bug1082740_fn_subsequence/+merge/157755 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/bug1082740_fn_subsequence into lp:zorba
Hi regarding the issue of not using the flag for INF values. The thing is the following whenever you ask for the value of a INF or -INF number you will get the highest positive or negative number available 9223372036854775807 or -9223372036854775807 being the case for 32 bits. So I though of using the flags to avoid unnecessary processing whenever a INF value is present. It will add 5 checks for INF values to the code that's 4 ifs that would be present in every call of the subsequence and 1 more if the length is INF each of them being done only once. A way to avoid this flags we could use the value equivalents of the INF, but even though we will need to add 2 flag checks since there is actually a bug with the implementation and whenever there is an INF in the start position (we will be moving along the whole sequence with no need since it should return an empty sequence.) other problem would be present if the length is set to INF since if we manage a numeric value for the INF it would be doing a decreasing value operation and an extra check in the while statement. That's why I thought of using the extra flags since besides we do 3 more flag checks we do them only once during the whole operation of subsequence and doesn't do unnecessary operations for INF values. Let me know your opinion. -- https://code.launchpad.net/~zorba-coders/zorba/bug1082740_fn_subsequence/+merge/157755 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/bug1082740_fn_subsequence into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1082740_fn_subsequence into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1082740_fn_subsequence/+merge/157755 -- https://code.launchpad.net/~zorba-coders/zorba/bug1082740_fn_subsequence/+merge/157755 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/bug1082740_fn_subsequence into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/bug1082740_fn_subsequence 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 bug1082740_fn_subsequence-2013-04-15T16-55-56.486Z 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/bug1082740_fn_subsequence/+merge/157755 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/bug1123835 into lp:zorba
This branch doesn't solve all the errors yet this is the list of errors missing solution with a brief description of the current problem. The missing errors are caused by 3 problems * utf-8 encoding: missing the stream suggested to Paul that can handle errors when invalid utf-8 are found. * unknown encoding: the function should be able to identify if the text has an unknown encoding, This error is currently not approachable but it may be done if request for the previous issue is available. * unparsed-text utf-8 bom issue, I sent an email proposing 2 solutions for this problem. But probably not really pretty ones main discussion name is "utf-8 byte order marks" take a look on the email reply chain for more information on this issue. Regarding this list a bunch of other errors were solved. I suggest we merge this fixes but keep the branch open until utf-8 stream that handles invalid characters is implemented or a new suggestion is made. UNPARSED-TEXT-LINES Expected Error FOUT1200: unkown encoding Expected Error 1190: utf-8 validation Expected Error 1190: utf-8 validation uses unparsed-text not unparsed-text-lines (utf-8 bom issue) UNPARSED-TEXT Expected Error FOUT1200: unkown encoding Expected Error 1190: utf-8 validation Expected Error 1190: utf-8 validation utf-8 bom problem Expected Error 1190: utf-8 validation counts one more (can be utf-8 bom) UNPARSED-TEXT-AVAILABLE unknown encoding utf-8 validation utf-8 validation -- https://code.launchpad.net/~zorba-coders/zorba/bug1123835/+merge/158978 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/bug1123835 into lp:zorba
Juan Zacarias has proposed merging lp:~zorba-coders/zorba/bug1123835 into
lp:zorba.
Commit message:
Fixes for FOTS errors in fn:unparsed-text* functions
Requested reviews:
Chris Hillery (ceejatec)
Related bugs:
Bug #1123835 in Zorba: "fn-unparsed-text* failures (at least 20 failures)"
https://bugs.launchpad.net/zorba/+bug/1123835
Bug #1167147 in Zorba: "fn-unparsed-text-036 throws wrong error"
https://bugs.launchpad.net/zorba/+bug/1167147
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1123835/+merge/158978
Fixes for FOTS errors in fn:unparsed-text* functions
--
https://code.launchpad.net/~zorba-coders/zorba/bug1123835/+merge/158978
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/runtime/sequences/sequences_impl.cpp'
--- src/runtime/sequences/sequences_impl.cpp 2013-04-11 23:37:12 +
+++ src/runtime/sequences/sequences_impl.cpp 2013-04-15 17:04:30 +
@@ -2025,7 +2025,7 @@
*/
static void readDocument(
zstring const& aUri,
- zstring const& aEncoding,
+ zstring& aEncoding,
static_context* aSctx,
PlanState& aPlanState,
QueryLoc const& loc,
@@ -2033,7 +2033,14 @@
{
//Normalize input to handle filesystem paths, etc.
zstring lNormUri;
- normalizeInputUri(aUri, aSctx, loc, &lNormUri);
+ try
+ {
+normalizeInputUri(aUri, aSctx, loc, &lNormUri);
+ }
+ catch (...)
+ {
+throw XQUERY_EXCEPTION(err::FOUT1170, ERROR_PARAMS(aUri), ERROR_LOC(loc));
+ }
//Check for a fragment identifier
//Create a zorba::URI for validating if it contains a fragment
@@ -2042,6 +2049,15 @@
{
throw XQUERY_EXCEPTION(err::FOUT1170, ERROR_PARAMS(aUri), ERROR_LOC(loc));
}
+ lUri.reset(new zorba::URI(aSctx->get_base_uri()));
+ if (lUri->get_encoded_fragment() == "UNDEFINED")
+ {
+throw XQUERY_EXCEPTION(err::XPST0001, ERROR_PARAMS("", aUri), ERROR_LOC(loc));
+ }
+ if (!transcode::is_supported(aEncoding.c_str()))
+ {
+throw XQUERY_EXCEPTION(err::FOUT1190, ERROR_PARAMS(aUri), ERROR_LOC(loc));
+ }
//Resolve URI to stream
zstring lErrorMessage;
@@ -2055,18 +2071,56 @@
{
throw XQUERY_EXCEPTION(err::FOUT1170, ERROR_PARAMS(aUri), ERROR_LOC(loc));
}
+
StreamReleaser lStreamReleaser = lStreamResource->getStreamReleaser();
std::unique_ptr lStream(lStreamResource->getStream(), lStreamReleaser);
+<<< TREE
lStreamResource->setStreamReleaser(nullptr);
+===
+
+ lStreamResource->setStreamReleaser(nullptr);
+>>> MERGE-SOURCE
+ //Check for bom utf-8 and remove the bom definition and
+ char peek = lStream.get()->peek();
+ if (peek == 'ï' )
+ {
+lStream.get()->get();
+peek = lStream.get()->peek();
+if ( peek == '»' )
+{
+ lStream.get()->get();
+ peek = lStream.get()->peek();
+ if ( peek == '¿' )
+ {
+lStream.get()->get();
+ }
+ else
+ {
+lStream.get()->unget();
+ }
+}
+else
+{
+ lStream.get()->unget();
+}
+ }
+ //check for bom of utf-16 and change encoding if no othe rencoding was specified
+ else if (peek == 'ÿ')
+ {
+lStream.get()->get();
+peek = lStream.get()->peek();
+if ( peek == 'þ' )
+{
+aEncoding = "UTF-16";
+}
+lStream.get()->unget();
+ }
+
//check if encoding is needed
if (transcode::is_necessary(aEncoding.c_str()))
{
-if (!transcode::is_supported(aEncoding.c_str()))
-{
- throw XQUERY_EXCEPTION(err::FOUT1190, ERROR_PARAMS(aUri), ERROR_LOC(loc));
-}
transcode::attach(*lStream.get(), aEncoding.c_str());
}
//creates stream item
@@ -2075,7 +2129,7 @@
*lStream.release(),
lStream.get_deleter()
);
-
+
if (oResult.isNull())
{
throw XQUERY_EXCEPTION(err::FOUT1170, ERROR_PARAMS(aUri), ERROR_LOC(loc));
@@ -2105,6 +2159,7 @@
uriItem->getStringValue2(uriString);
readDocument(uriString, encodingString, theSctx, planState, loc, result);
+
STACK_PUSH(true, state);
STACK_END(state);
@@ -2145,6 +2200,8 @@
}
catch (XQueryException const& e)
{
+if (e.diagnostic() == err::XPST0001)
+throw e;
unparsedText = NULL;
}
@@ -2156,6 +2213,88 @@
/***
14.8.6 fn:unparsed-text-lines
/
+
+template
+std::basic_istream&
+getline_no_endlines( std::basic_istream &is, rstring &s) {
+ typedef std::basic_istream istream_type;
+ typedef typename istream_type::int_type int_type;
+ typedef std::basic_streambuf streambuf_type;
+ typedef rstring string_type;
+ typedef typename string_type::size_type size_type;
+
+ std::ios_base::iostate err = std::ios_base::iostate( std::ios_base::goodbit );
+ size_type extracted = 0;
+ int_type const idelim1 = TraitsType::to_int_type( '\r' );
+ int_type const idelim2 = TraitsType::to_int_type( '\n' );
+ int_type const eof = TraitsType::eof();
+ std::st
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1082740_fn_subsequence into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1082740_fn_subsequence-2013-04-15T16-55-56.486Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1082740_fn_subsequence/+merge/157755 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/bug1082740_fn_subsequence into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1082740_fn_subsequence into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1082740_fn_subsequence/+merge/157755 -- https://code.launchpad.net/~zorba-coders/zorba/bug1082740_fn_subsequence/+merge/157755 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/hof-next into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-next into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/hof-next into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/hof-next 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 hof-next-2013-04-15T14-23-55.986Z is finished. The final status was: 919 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/hof-next/+merge/158213 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/hof-next into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-next-2013-04-15T14-23-55.986Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/hof-next into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-next into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/hof-next into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-next into lp:zorba has been updated. Status: Approved => Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/hof-next into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/hof-next 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 hof-next-2013-04-15T13-40-26.669Z 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/hof-next/+merge/158213 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/hof-next into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/hof-next-2013-04-15T13-40-26.669Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/bug1090083-deepEqual into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1090083-deepEqual into lp:zorba has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1090083-deepEqual/+merge/158509 -- https://code.launchpad.net/~zorba-coders/zorba/bug1090083-deepEqual/+merge/158509 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/hof-next into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/hof-next into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 -- https://code.launchpad.net/~zorba-coders/zorba/hof-next/+merge/158213 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/bug1090083-deepEqual into lp:zorba
Validation queue job bug1090083-deepEqual-2013-04-15T13-13-51.893Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/bug1090083-deepEqual/+merge/158509 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/bug1090083-deepEqual into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/bug1090083-deepEqual-2013-04-15T13-13-51.893Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/bug1090083-deepEqual/+merge/158509 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/bug1090083-deepEqual into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1090083-deepEqual into lp:zorba has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1090083-deepEqual/+merge/158509 -- https://code.launchpad.net/~zorba-coders/zorba/bug1090083-deepEqual/+merge/158509 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/bug1090083-deepEqual into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/bug1090083-deepEqual/+merge/158509 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
