Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/paging_index_probe into lp:zorba
- the probe-index-point-value-skip and probe-index-range-value-skip functions in dml.xq don't declare the $skip parameters (but their documentation does) Fixed. - idml:probe-index-range-value-skip(xs:QName(data:idx-age-range-val), 2, 3, true(), true(), true(), true()) reports 'data:idx-age-range-val: invalid number of arguments to index operation; given 5 expected multiple of 6;' but I'm counting 7 parameters Fixed (was not my fault :-) ). Unfortunately, when trying to write a test for this, I found a bug: https://bugs.launchpad.net/zorba/+bug/1051897 Can you please double check if it is really a bug? - the branch seems to undo some changes in the trunk (see diagnostic_en.xml) - value$1: does not reference a node in collection $2./value + valueNode reference $1 doesn't reference a node in collection $2./value Fixed. - It would be great if the iterator plan could mention if the iterator does skipping and/or counting. For example, ./test/apitest -i paging.xq contains the following snippet ProbeIndexRangeValueIterator id=0x1a2fb50 SingletonIterator value=xs:QName(http://www.test.com/,data,idx-age-range- val) id=0x1a146a0/ SingletonIterator value=xs:integer(7) id=0x1a2c830/ SingletonIterator value=xs:integer(2) id=0x1a2c880/ SingletonIterator value=xs:integer(3) id=0x1a2c8d0/ SingletonIterator value=xs:boolean(true) id=0x1a2c920/ SingletonIterator value=xs:boolean(true) id=0x1a2c970/ SingletonIterator value=xs:boolean(true) id=0x1a2c9c0/ SingletonIterator value=xs:boolean(true) id=0x1a2ca10/ /ProbeIndexRangeValueIterator for count(idml:probe-index-range-value-skip(xs:QName(data:idx-age-range-val), 7, 2, 3, true(), true(), true(), true())) Is it ok to create a bug entry for this? Because this has to be done in the collection iterator too. It can be assigned to me. But I would like to get those merge proposals thru. -- https://code.launchpad.net/~davidagraf/zorba/paging_index_probe/+merge/122621 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba. Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124712 Fixed bug #866994 (a better error message when collection iterator not open) -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124712 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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/124712 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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/124712 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124712 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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-2012-09-17T15-37-23.082Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124712 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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 job markos-scratch-2012-09-17T15-37-23.082Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124712 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/markos-scratch into lp:zorba
Markos Zaharioudakis has proposed merging lp:~zorba-coders/zorba/markos-scratch into lp:zorba. Requested reviews: Markos Zaharioudakis (markos-za) For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124792 Fixed bug #1039254 (allow empty sequence as position value in positional LET var iterator) -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124792 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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/124792 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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/124792 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124792 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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 job markos-scratch-2012-09-17T20-48-51.181Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124792 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://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 = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124792 -- https://code.launchpad.net/~zorba-coders/zorba/markos-scratch/+merge/124792 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~davidagraf/zorba/paging_index_probe into lp:zorba
- the probe-index-point-value-skip and probe-index-range-value-skip functions in dml.xq don't declare the $skip parameters (but their documentation does) Fixed. - idml:probe-index-range-value-skip(xs:QName(data:idx-age-range-val), 2, 3, true(), true(), true(), true()) reports 'data:idx-age-range-val: invalid number of arguments to index operation; given 5 expected multiple of 6;' but I'm counting 7 parameters Fixed (was not my fault :-) ). Unfortunately, when trying to write a test for this, I found a bug: https://bugs.launchpad.net/zorba/+bug/1051897 Can you please double check if it is really a bug? I commented on the bug. - It would be great if the iterator plan could mention if the iterator does skipping and/or counting. For example, ./test/apitest -i paging.xq contains the following snippet ProbeIndexRangeValueIterator id=0x1a2fb50 SingletonIterator value=xs:QName(http://www.test.com/,data,idx-age- range- val) id=0x1a146a0/ SingletonIterator value=xs:integer(7) id=0x1a2c830/ SingletonIterator value=xs:integer(2) id=0x1a2c880/ SingletonIterator value=xs:integer(3) id=0x1a2c8d0/ SingletonIterator value=xs:boolean(true) id=0x1a2c920/ SingletonIterator value=xs:boolean(true) id=0x1a2c970/ SingletonIterator value=xs:boolean(true) id=0x1a2c9c0/ SingletonIterator value=xs:boolean(true) id=0x1a2ca10/ /ProbeIndexRangeValueIterator for count(idml:probe-index-range-value-skip(xs:QName(data:idx-age-range-val), 7, 2, 3, true(), true(), true(), true())) Is it ok to create a bug entry for this? Because this has to be done in the collection iterator too. It can be assigned to me. But I would like to get those merge proposals thru. Does it take long to do this. It would be really nice and I'm afraid it will not get done if we create a bug for it. ;-) - Should a negative skip value be an error? If not, some documentation is missing here. - ChangeLog entry is missing. -- https://code.launchpad.net/~davidagraf/zorba/paging_index_probe/+merge/122621 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1052242 into lp:zorba
Rodolfo Ochoa has proposed merging lp:~zorba-coders/zorba/bug1052242 into
lp:zorba.
Requested reviews:
Chris Hillery (ceejatec)
Related bugs:
Bug #1052242 in Zorba: Windows compiling errors
https://bugs.launchpad.net/zorba/+bug/1052242
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug1052242/+merge/124823
Fixing all compilation errors for Windows:
- fixing precompiled headers
- fixing errors on CSharp binding
- fixing errors on stdint.h
--
https://code.launchpad.net/~zorba-coders/zorba/bug1052242/+merge/124823
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'src/compiler/expression/expr_manager.cpp'
--- src/compiler/expression/expr_manager.cpp 2012-09-17 00:36:37 +
+++ src/compiler/expression/expr_manager.cpp 2012-09-17 23:35:21 +
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#include stdafx.h
#include expr_manager.h
#include mem_manager.h
=== modified file 'src/compiler/expression/mem_manager.cpp'
--- src/compiler/expression/mem_manager.cpp 2012-09-17 00:36:37 +
+++ src/compiler/expression/mem_manager.cpp 2012-09-17 23:35:21 +
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#include stdafx.h
#include mem_manager.h
#include iostream
=== modified file 'src/precompiled/stdafx.h'
--- src/precompiled/stdafx.h 2012-09-17 00:36:37 +
+++ src/precompiled/stdafx.h 2012-09-17 23:35:21 +
@@ -24,11 +24,8 @@
#include memory
#include sstream
- #include xfwrap
- #include xfwrap1
#include istream
#include cstdio
- #include xxshared
#include crtdefs.h
#include map
#include set
@@ -62,7 +59,6 @@
#include zorbatypes/rclock.h
#include zorbatypes/schema_types.h
#include zorbatypes/timezone.h
- #include zorbatypes/transcoder.h
#include zorbatypes/URI.h
#include zorbatypes/xerces_xmlcharray.h
#include zorbatypes/zorbatypes_decl.h
=== modified file 'src/util/json_util.cpp'
--- src/util/json_util.cpp 2012-07-26 04:31:37 +
+++ src/util/json_util.cpp 2012-09-17 23:35:21 +
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#include stdafx.h
#include iomanip
#include iostream
=== modified file 'src/util/uuid.cpp'
--- src/util/uuid.cpp 2012-09-06 23:55:13 +
+++ src/util/uuid.cpp 2012-09-17 23:35:21 +
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+#include stdafx.h
#include zorba/config.h
#include cstdio /* for sprintf(3) */
=== modified file 'src/zorbamisc/config/stdint.h'
--- src/zorbamisc/config/stdint.h 2012-09-17 00:36:37 +
+++ src/zorbamisc/config/stdint.h 2012-09-17 23:35:21 +
@@ -29,17 +29,17 @@
//
///
+#ifndef _MSC_STDINT_H_ // [
+#define _MSC_STDINT_H_
+
#ifndef _MSC_VER // [
#include stdint.h
#else
-#ifndef _MSC_STDINT_H_ // [
-#define _MSC_STDINT_H_
-
// Exclude this file for Visual Studio 2010 (_MSC_VER == 1600 for Visual Studio 2010)
-#if _MSC_VER = 1600 // [
+//#if _MSC_VER = 1600 // [
-#if _MSC_VER 1000
+#if (_MSC_VER 1000)
#pragma once
#endif
@@ -51,7 +51,7 @@
#if (_MSC_VER 1300) defined(__cplusplus)
extern C++ {
#endif
-# include wchar.h
+#include wchar.h
#if (_MSC_VER 1300) defined(__cplusplus)
}
#endif
@@ -60,7 +60,7 @@
// 7.18.1.1 Exact-width integer types
#ifndef U_HAVE_INT8_T
-#if _MSC_VER 1600 // Visual Studio 10 already defines this type
+#if (_MSC_VER 1600) // Visual Studio 10 already defines this type
typedef __int8int8_t;
#endif //_MSC_VER 1600
#define U_HAVE_INT8_T 1
@@ -75,7 +75,9 @@
typedef unsigned __int64 uint64_t;
// 7.18.1.2 Minimum-width integer types
+#if (_MSC_VER 1600) // Visual Studio 10 already defines this type
typedef int8_tint_least8_t;
+#endif
typedef int16_t int_least16_t;
typedef int32_t int_least32_t;
typedef int64_t int_least64_t;
@@ -239,7 +241,7 @@
#endif // __STDC_CONSTANT_MACROS ]
-#endif // _MSC_VER 1600 ]
+//#endif // _MSC_VER 1600 ]
#endif // _MSC_STDINT_H_ ]
=== modified file 'swig/csharp/CMakeLists.txt'
--- swig/csharp/CMakeLists.txt 2012-09-17 00:36:37 +
+++ swig/csharp/CMakeLists.txt 2012-09-17 23:35:21 +
@@ -32,7 +32,7 @@
FILE(GLOB ZORBA_API_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/../ ${CMAKE_CURRENT_SOURCE_DIR}/../*.h)
FOREACH(ZORBA_API_HEADER ${ZORBA_API_HEADERS})
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../${ZORBA_API_HEADER} ${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_API_HEADER} COPYONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../${ZORBA_API_HEADER} ${CMAKE_CURRENT_BINARY_DIR}/${ZORBA_API_HEADER})
ENDFOREACH(ZORBA_API_HEADER ${ZORBA_API_HEADERS})
IF (MSVC_IDE)
=== modified file 'swig/csharp/zorba_api.i'
--- swig/csharp/zorba_api.i 2012-07-30 20:09:08 +
+++ swig/csharp/zorba_api.i 2012-09-17 23:35:21 +
@@ -14,4 +14,5 @@
* limitations under the License.
*/
+%include std_string.i
%include ../zorba_api.i
--
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1052242 into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/bug1052242 into lp:zorba has been updated. Commit Message changed to: Fixing all compilation errors for Windows: - fixing precompiled headers - fixing errors on CSharp binding - fixing errors on stdint.h For more details, see: https://code.launchpad.net/~zorba-coders/zorba/bug1052242/+merge/124823 -- https://code.launchpad.net/~zorba-coders/zorba/bug1052242/+merge/124823 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
