MonetDB: default - This is how you disable code.
Changeset: 1ad2b2a3cc3e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1ad2b2a3cc3e
Modified Files:
monetdb5/optimizer/opt_postfix.c
Branch: default
Log Message:
This is how you disable code.
diffs (31 lines):
diff --git a/monetdb5/optimizer/opt_postfix.c b/monetdb5/optimizer/opt_postfix.c
--- a/monetdb5/optimizer/opt_postfix.c
+++ b/monetdb5/optimizer/opt_postfix.c
@@ -18,6 +18,7 @@
str
OPTpostfixImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
{
+#if 0 // Don't use this right
now
int i, j, slimit, limit, actions=0;
InstrPtr *old = 0;
InstrPtr q, *vars = 0;
@@ -28,7 +29,6 @@ OPTpostfixImplementation(Client cntxt, M
(void) stk;
(void) cntxt;
- return MAL_SUCCEED; // Don't use this right now
limit = mb->stop;
slimit = mb->ssize;
/* the first postfix concerns pushing projections into the count() we
check if it is needed*/
@@ -90,4 +90,11 @@ finished:
wrapup:
if(vars) GDKfree(vars);
return msg;
+#else
+ (void) cntxt;
+ (void) mb;
+ (void) stk;
+ (void) p;
+ return MAL_SUCCEED;
+#endif
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jul2017 branch, not changing any f...
Changeset: 68a03fd134c2 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=68a03fd134c2 Modified Files: MonetDB.spec NT/monetdb_config.h.in NT/rules.msc clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag gdk/libbat.rc monetdb5/tools/libmonetdb5.rc vertoo.data Branch: default Log Message: Merge with Jul2017 branch, not changing any files.. ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jul2017 - Post release build.
Changeset: 47a18f3620fb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=47a18f3620fb
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: Jul2017
Log Message:
Post release build.
diffs (229 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%define name MonetDB
-%define version 11.27.13
+%define version 11.27.14
%{!?buildno: %global buildno %(date +%Y%m%d)}
# groups of related archs
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -745,7 +745,7 @@
#define MONETDB5_PASSWDHASH_TOKEN SHA512
/* Release name or "unreleased" */
-#define MONETDB_RELEASE "Jul2017-SP4"
+#define MONETDB_RELEASE "unreleased"
/* Define if you do not want assertions */
/* #undef NDEBUG */
@@ -754,7 +754,7 @@
#define PACKAGE "MonetDB"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.27.13"
+#define PACKAGE_VERSION "11.27.14"
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "https://bugs.monetdb.org/;
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -6,7 +6,7 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
-VERSION=11.27.13
+VERSION=11.27.14
# ^^
# Maintained via vertoo. Please don't modify by hand!
# Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,27,13,1
- PRODUCTVERSION 11,27,13,1
+ FILEVERSION 11,27,14,1
+ PRODUCTVERSION 11,27,14,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", "11.27.13\0"
+ VALUE "FileVersion", "11.27.14\0"
//
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
@@ -28,7 +28,7 @@ BEGIN
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", "11.27.13\0"
+ VALUE "ProductVersion", "11.27.14\0"
//
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,27,13,1
- PRODUCTVERSION 11,27,13,1
+ FILEVERSION 11,27,14,1
+ PRODUCTVERSION 11,27,14,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", "11.27.13\0"
+ VALUE "FileVersion", "11.27.14\0"
//
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
@@ -28,7 +28,7 @@ BEGIN
VALUE "OriginalFilename", "libMonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", "11.27.13\0"
+ VALUE "ProductVersion", "11.27.14\0"
//
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -62,8 +62,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 11,27,13,1
- PRODUCTVERSION 11,27,13,1
+ FILEVERSION 11,27,14,1
+ PRODUCTVERSION 11,27,14,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -80,12 +80,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", "11.27.13"
+VALUE "FileVersion", "11.27.14"
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright ©
MonetDB: default - Merge with Jul2017 branch.
Changeset: 9b780e568d35 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9b780e568d35
Modified Files:
.hgtags
MonetDB.spec
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Jul2017
debian/changelog
libversions
Branch: default
Log Message:
Merge with Jul2017 branch.
diffs (181 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -687,3 +687,5 @@ fce449d5af88de715fde36624815a56ef34c56bb
3d26c58579a18157659b590899a8f73f45954ec6 Jul2017_SP2_release
b9276cb02ced7d98bcb27b5e6df600b2791f1fcd Jul2017_11
b9276cb02ced7d98bcb27b5e6df600b2791f1fcd Jul2017_SP3_release
+4fd4a5c7b66747468a2b41930d1b987a4b0efff4 Jul2017_13
+4fd4a5c7b66747468a2b41930d1b987a4b0efff4 Jul2017_SP4_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -132,7 +132,7 @@ Vendor: MonetDB BV <i...@monetdb.org>
Group: Applications/Databases
License: MPLv2.0
URL: https://www.monetdb.org/
-Source:
https://www.monetdb.org/downloads/sources/Jul2017-SP3/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Jul2017-SP4/%{name}-%{version}.tar.bz2
# we need systemd for the _unitdir macro to exist
# we need checkpolicy and selinux-policy-devel for the SELinux policy
@@ -1046,6 +1046,54 @@ done
%postun -p /sbin/ldconfig
%changelog
+* Fri Feb 02 2018 Sjoerd Mullender <sjo...@acm.org> - 11.27.13-20180202
+- Rebuilt.
+- BZ#3470: Support setClob without length restrictions
+- BZ#6468: JDBC 2.27 fails with year < 1000
+- BZ#6482: Query failures on order by on union
+- BZ#6483: Monetdb crashes, on query
+- BZ#6487: UNION of NULLs with several tables fails
+- BZ#6488: Semijoin returns duplicate values from a column with unique
+ values
+- BZ#6489: Sqlitelogictest - Wrong result set of complex conditional query
+- BZ#6490: Sqlitelogictest - Select query with an IN clause parse error
+- BZ#6491: SELECT IN returns NULL instead of false when not found
+- BZ#6492: Persistent hashes stored and then ignored. Storage info not
+ in sync with actual indices.
+- BZ#6493: Sqlitelogictest - Aggregation query on empty table with
+ DISTINCT clause
+- BZ#6494: Sqlitelogictest - Algebra operators priority in select query
+- BZ#6495: Sqlitelogictest - Omitting AS in a result set column alias name
+- BZ#6496: Sqlitelogictest - Select interval comparisons between
+ floating-points and NULL
+- BZ#6497: Sqlitelogictest - Select not between query producing wrong
+ results
+- BZ#6498: large virtual memory spike on BLOB column COUNT
+- BZ#6499: Crash when trying to replace a function defined in sys from
+ a different schema
+- BZ#6502: Query with multiple limit clauses does not return anything
+- BZ#6508: Segmentation fault in mserver5 on Python2 UDF with TIMESTAMP
+ column input that has NULL values (conversion.c:438, PyNullMask_FromBAT)
+- BZ#6510: Sqlitelogictest: Wrong output in aggregation query
+- BZ#6512: Monetdb crashes on query with limit after sort with case
+- BZ#6514: Sqlitelogictest: Range query between NULL values not possible
+- BZ#6515: Insert null second interval value results in 0
+- BZ#6516: Sqlitelogictest unknown bat append operation
+- BZ#6517: Sqlitelogictest overflow in conversion during MAL plan
+ execution
+- BZ#6518: Sqlitelogictest: count aggregation with not in operator
+- BZ#6519: Sqlitelogictest: algebra join between lng and int BATs
+ undefined
+- BZ#6520: UPDATE with correlated subquery causes assertion (or segfault)
+- BZ#6522: Sqlitelogictest: IN operator return a single column
+- BZ#6523: Sqlitelogictest: Case statement subquery missing
+- BZ#6524: Sqlitelogictest: Crash in aggregation query with IN operator
+- BZ#6527: Crash using order by alias in subquery
+
+* Tue Jan 16 2018 Sjoerd Mullender <sjo...@acm.org> - 11.27.13-20180202
+- buildtools: Added the .lib and .h files needed for building extensions to the
+ Windows installer.
+
* Mon Dec 04 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.11-20171204
- Rebuilt.
- BZ#3898: Deadlock on insertion
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Tue Jan 16 2018 Sjoerd Mullender <sjo...@acm.org> - 11.27.13-20180202
+- Added the .lib and .h files needed for building extensions to the
+ Windows installer.
+
* Mon Jul 24 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
- The Debian and Ubuntu installers have been fixed: there was a file
missing in the Jul2017 release.
diff --git a/buildtools/ChangeLog.Jul2017 b/buildtools/ChangeLog.Jul2017
--- a/buildtools/ChangeLog.Jul2017
+++ b/buildtools/ChangeLog.Jul2017
@@ -1,7 +1,3 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
-* Tue Jan 16 2018 Sjoerd Mullender <sjo...@acm.org>
-- Added the .li
MonetDB: Jul2017 - Setting tags Jul2017_13 and Jul2017_SP4 for t...
Changeset: ef3d8bab7222 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef3d8bab7222 Modified Files: .hgtags Branch: Jul2017 Log Message: Setting tags Jul2017_13 and Jul2017_SP4 for the release build. diffs (9 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -687,3 +687,5 @@ fce449d5af88de715fde36624815a56ef34c56bb 3d26c58579a18157659b590899a8f73f45954ec6 Jul2017_SP2_release b9276cb02ced7d98bcb27b5e6df600b2791f1fcd Jul2017_11 b9276cb02ced7d98bcb27b5e6df600b2791f1fcd Jul2017_SP3_release +4fd4a5c7b66747468a2b41930d1b987a4b0efff4 Jul2017_13 +4fd4a5c7b66747468a2b41930d1b987a4b0efff4 Jul2017_SP4_release ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jul2017 - Moved contents of ChangeLog.Jul2017 to MonetD...
Changeset: 4fd4a5c7b667 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4fd4a5c7b667
Modified Files:
MonetDB.spec
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Jul2017
debian/changelog
Branch: Jul2017
Log Message:
Moved contents of ChangeLog.Jul2017 to MonetDB.spec, debian/changelog and
ChangeLog-Archive.
diffs (153 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -132,7 +132,7 @@ Vendor: MonetDB BV <i...@monetdb.org>
Group: Applications/Databases
License: MPLv2.0
URL: https://www.monetdb.org/
-Source:
https://www.monetdb.org/downloads/sources/Jul2017-SP3/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Jul2017-SP4/%{name}-%{version}.tar.bz2
# we need systemd for the _unitdir macro to exist
# we need checkpolicy and selinux-policy-devel for the SELinux policy
@@ -1046,6 +1046,54 @@ done
%postun -p /sbin/ldconfig
%changelog
+* Fri Feb 02 2018 Sjoerd Mullender <sjo...@acm.org> - 11.27.13-20180202
+- Rebuilt.
+- BZ#3470: Support setClob without length restrictions
+- BZ#6468: JDBC 2.27 fails with year < 1000
+- BZ#6482: Query failures on order by on union
+- BZ#6483: Monetdb crashes, on query
+- BZ#6487: UNION of NULLs with several tables fails
+- BZ#6488: Semijoin returns duplicate values from a column with unique
+ values
+- BZ#6489: Sqlitelogictest - Wrong result set of complex conditional query
+- BZ#6490: Sqlitelogictest - Select query with an IN clause parse error
+- BZ#6491: SELECT IN returns NULL instead of false when not found
+- BZ#6492: Persistent hashes stored and then ignored. Storage info not
+ in sync with actual indices.
+- BZ#6493: Sqlitelogictest - Aggregation query on empty table with
+ DISTINCT clause
+- BZ#6494: Sqlitelogictest - Algebra operators priority in select query
+- BZ#6495: Sqlitelogictest - Omitting AS in a result set column alias name
+- BZ#6496: Sqlitelogictest - Select interval comparisons between
+ floating-points and NULL
+- BZ#6497: Sqlitelogictest - Select not between query producing wrong
+ results
+- BZ#6498: large virtual memory spike on BLOB column COUNT
+- BZ#6499: Crash when trying to replace a function defined in sys from
+ a different schema
+- BZ#6502: Query with multiple limit clauses does not return anything
+- BZ#6508: Segmentation fault in mserver5 on Python2 UDF with TIMESTAMP
+ column input that has NULL values (conversion.c:438, PyNullMask_FromBAT)
+- BZ#6510: Sqlitelogictest: Wrong output in aggregation query
+- BZ#6512: Monetdb crashes on query with limit after sort with case
+- BZ#6514: Sqlitelogictest: Range query between NULL values not possible
+- BZ#6515: Insert null second interval value results in 0
+- BZ#6516: Sqlitelogictest unknown bat append operation
+- BZ#6517: Sqlitelogictest overflow in conversion during MAL plan
+ execution
+- BZ#6518: Sqlitelogictest: count aggregation with not in operator
+- BZ#6519: Sqlitelogictest: algebra join between lng and int BATs
+ undefined
+- BZ#6520: UPDATE with correlated subquery causes assertion (or segfault)
+- BZ#6522: Sqlitelogictest: IN operator return a single column
+- BZ#6523: Sqlitelogictest: Case statement subquery missing
+- BZ#6524: Sqlitelogictest: Crash in aggregation query with IN operator
+- BZ#6527: Crash using order by alias in subquery
+
+* Tue Jan 16 2018 Sjoerd Mullender <sjo...@acm.org> - 11.27.13-20180202
+- buildtools: Added the .lib and .h files needed for building extensions to the
+ Windows installer.
+
* Mon Dec 04 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.11-20171204
- Rebuilt.
- BZ#3898: Deadlock on insertion
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,10 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Tue Jan 16 2018 Sjoerd Mullender <sjo...@acm.org> - 11.27.13-20180202
+- Added the .lib and .h files needed for building extensions to the
+ Windows installer.
+
* Mon Jul 24 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
- The Debian and Ubuntu installers have been fixed: there was a file
missing in the Jul2017 release.
diff --git a/buildtools/ChangeLog.Jul2017 b/buildtools/ChangeLog.Jul2017
--- a/buildtools/ChangeLog.Jul2017
+++ b/buildtools/ChangeLog.Jul2017
@@ -1,7 +1,3 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
-* Tue Jan 16 2018 Sjoerd Mullender <sjo...@acm.org>
-- Added the .lib and .h files needed for building extensions to the
- Windows installer.
-
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,57 @@
+monetdb (11.27.13) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#3470: Support setClob without length restrictions
+ * BZ#6468: JDBC 2.27 fails with year < 1000
+ * BZ#6482: Query fai
MonetDB: Jul2017 - Updated library versions.
Changeset: 98716b779af5 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=98716b779af5 Modified Files: libversions Branch: Jul2017 Log Message: Updated library versions. diffs (19 lines): diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -36,13 +36,13 @@ # version of the GDK library (subdirectory gdk; also includes # common/options and common/utils) -GDK_VERSION=15:5:0 +GDK_VERSION=15:6:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=9:2:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=23:5:0 +MONETDB5_VERSION=23:6:0 # version of the STREAM library (subdirectory common/stream) STREAM_VERSION=10:3:2 ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jul2017 branch, not changing any f...
Changeset: cdf50b47f7f6 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cdf50b47f7f6 Modified Files: MonetDB.spec NT/monetdb_config.h.in NT/rules.msc clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag gdk/libbat.rc monetdb5/tools/libmonetdb5.rc vertoo.data Branch: default Log Message: Merge with Jul2017 branch, not changing any files. ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jul2017 - Pre-release version number update.
Changeset: 75e659f68f1f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=75e659f68f1f
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: Jul2017
Log Message:
Pre-release version number update.
diffs (229 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%define name MonetDB
-%define version 11.27.12
+%define version 11.27.13
%{!?buildno: %global buildno %(date +%Y%m%d)}
# groups of related archs
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -745,7 +745,7 @@
#define MONETDB5_PASSWDHASH_TOKEN SHA512
/* Release name or "unreleased" */
-#define MONETDB_RELEASE "unreleased"
+#define MONETDB_RELEASE "Jul2017-SP4"
/* Define if you do not want assertions */
/* #undef NDEBUG */
@@ -754,7 +754,7 @@
#define PACKAGE "MonetDB"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.27.12"
+#define PACKAGE_VERSION "11.27.13"
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "https://bugs.monetdb.org/;
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -6,7 +6,7 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
-VERSION=11.27.12
+VERSION=11.27.13
# ^^
# Maintained via vertoo. Please don't modify by hand!
# Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,27,12,1
- PRODUCTVERSION 11,27,12,1
+ FILEVERSION 11,27,13,1
+ PRODUCTVERSION 11,27,13,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", "11.27.12\0"
+ VALUE "FileVersion", "11.27.13\0"
//
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
@@ -28,7 +28,7 @@ BEGIN
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", "11.27.12\0"
+ VALUE "ProductVersion", "11.27.13\0"
//
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,27,12,1
- PRODUCTVERSION 11,27,12,1
+ FILEVERSION 11,27,13,1
+ PRODUCTVERSION 11,27,13,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", "11.27.12\0"
+ VALUE "FileVersion", "11.27.13\0"
//
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
@@ -28,7 +28,7 @@ BEGIN
VALUE "OriginalFilename", "libMonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", "11.27.12\0"
+ VALUE "ProductVersion", "11.27.13\0"
//
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -62,8 +62,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 11,27,12,1
- PRODUCTVERSION 11,27,12,1
+ FILEVERSION 11,27,13,1
+ PRODUCTVERSION 11,27,13,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -80,12 +80,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", "11.27.12"
+VALUE "FileVersion", "11.27.13"
VALUE "InternalName", "libMonetODBCs.dll"
VALUE
MonetDB: default - Avoid time-of-check, time-of-use race.
Changeset: b58e8eb242fd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b58e8eb242fd
Modified Files:
monetdb5/mal/mal_profiler.c
Branch: default
Log Message:
Avoid time-of-check, time-of-use race.
diffs (26 lines):
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -585,7 +585,6 @@ str
startTrace(str path)
{
char buf[FILENAME_MAX];
- struct stat sb;
if( path && eventstream == NULL){
// create a file to keep the events, unless we
@@ -593,11 +592,9 @@ startTrace(str path)
MT_lock_set(_profileLock );
if(eventstream == NULL && offlinestore ==0){
snprintf(buf,FILENAME_MAX,"%s%c%s",GDKgetenv("gdk_dbpath"), DIR_SEP, path);
- if (stat(buf, ) < 0) { //create directory only when
it does not exist
- if (mkdir(buf, 0755) < 0) {
- MT_lock_unset(_profileLock);
- throw(MAL, "profiler.startTrace",
SQLSTATE(42000) "Failed to create directory %s", buf);
- }
+ if (mkdir(buf, 0755) < 0 && errno != EEXIST) {
+ MT_lock_unset(_profileLock);
+ throw(MAL, "profiler.startTrace",
SQLSTATE(42000) "Failed to create directory %s", buf);
}
snprintf(buf,FILENAME_MAX,"%s%c%s%ctrace_%d",GDKgetenv("gdk_dbpath"), DIR_SEP,
path,DIR_SEP,tracecounter++ % MAXTRACEFILES);
if((eventstream = open_wastream(buf)) == NULL) {
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jul2017 branch.
Changeset: 444cbbf4e85a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=444cbbf4e85a
Added Files:
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.powerpc64
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
Modified Files:
gdk/gdk_batop.c
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Jul2017 branch.
diffs (truncated from 5673 to 300 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1309,8 +1309,6 @@ do_sort(void *h, void *t, const void *ba
* parameters may be NULL. If they're all NULL, this function does
* nothing.
*
- * All BATs involved must be dense-headed.
- *
* If o is specified, it is used to first rearrange b according to the
* order specified in o, after which b is sorted taking g into
* account.
@@ -1332,7 +1330,7 @@ do_sort(void *h, void *t, const void *ba
* sorted results in (col1s, col2s, col3s):
* BATsort(, , , col1, NULL, NULL, 0, 0);
* BATsort(, , , col2, ord1, grp1, 0, 0);
- * BATsort(, NULL, NULL, col3, ord2, grp2, 0, 0);
+ * BATsort(, NULL, NULL, col3, ord2, grp2, 0, 0);
* Note that the "reverse" parameter can be different for each call.
*/
gdk_return
@@ -1358,7 +1356,7 @@ BATsort(BAT **sorted, BAT **order, BAT *
(o->ttype == TYPE_void && /* no nil tail */
BATcount(o) != 0 &&
is_oid_nil(o->tseqbase {
- GDKerror("BATsort: o must be [dense,oid] and same size as b\n");
+ GDKerror("BATsort: o must have type oid and same size as b\n");
return GDK_FAIL;
}
if (g != NULL &&
@@ -1368,7 +1366,7 @@ BATsort(BAT **sorted, BAT **order, BAT *
(g->ttype == TYPE_void && /* no nil tail */
BATcount(g) != 0 &&
is_oid_nil(g->tseqbase {
- GDKerror("BATsort: g must be [dense,oid], sorted on the tail,
and same size as b\n");
+ GDKerror("BATsort: g must have type oid, sorted on the tail,
and same size as b\n");
return GDK_FAIL;
}
assert(reverse == 0 || reverse == 1);
@@ -1437,7 +1435,7 @@ BATsort(BAT **sorted, BAT **order, BAT *
/* if we want a stable sort, the order index must be
* stable, if we don't want stable, we don't care */
(!stable || ((oid *) pb->torderidx->base)[2])) {
- /* there is a order index that we can use */
+ /* there is an order index that we can use */
on = COLnew(pb->hseqbase, TYPE_oid, BATcount(pb), TRANSIENT);
if (on == NULL)
goto error;
@@ -1689,8 +1687,8 @@ BATsort(BAT **sorted, BAT **order, BAT *
return GDK_FAIL;
}
-/* return a new BAT of length n with a dense head with seqbase hseq,
- * and the constant v in the tail */
+/* return a new BAT of length n with seqbase hseq, and the constant v
+ * in the tail */
BAT *
BATconstant(oid hseq, int tailtype, const void *v, BUN n, int role)
{
diff --git
a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.powerpc64
b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.powerpc64
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.powerpc64
@@ -0,0 +1,77 @@
+stderr of test 'overflow.SF-2853458` in directory 'sql/test/BugTracker-2009`
itself:
+
+
+# 22:26:13 >
+# 22:26:13 > mserver5
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=35561 --set
xrpc_port=42240 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit=
include sql;" ; echo ; echo Over..
+# 22:26:13 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.32.0
+# builtin opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = tst
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
+# builtin opt gdk_debug = 8
+# builtin opt gdk_alloc_map = yes
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt = >
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path = ${exec_prefix}/lib/MonetDB
+# builtin opt monet_daemon = yes
+# builtin opt host = localhost
+# builtin opt mapi_port = 5
+# builtin opt mapi_noheaders = no
+# builtin opt mapi_debug = 0
+# builtin opt mapi_clients = 2
+# builtin opt sql_debug = 0
+# builtin opt
MonetDB: Jul2017 - Fix some comments.
Changeset: 377d5d058f0c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=377d5d058f0c
Modified Files:
gdk/gdk_batop.c
Branch: Jul2017
Log Message:
Fix some comments.
diffs (59 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1342,8 +1342,6 @@ do_sort(void *h, void *t, const void *ba
* parameters may be NULL. If they're all NULL, this function does
* nothing.
*
- * All BATs involved must be dense-headed.
- *
* If o is specified, it is used to first rearrange b according to the
* order specified in o, after which b is sorted taking g into
* account.
@@ -1365,7 +1363,7 @@ do_sort(void *h, void *t, const void *ba
* sorted results in (col1s, col2s, col3s):
* BATsort(, , , col1, NULL, NULL, 0, 0);
* BATsort(, , , col2, ord1, grp1, 0, 0);
- * BATsort(, NULL, NULL, col3, ord2, grp2, 0, 0);
+ * BATsort(, NULL, NULL, col3, ord2, grp2, 0, 0);
* Note that the "reverse" parameter can be different for each call.
*/
gdk_return
@@ -1391,7 +1389,7 @@ BATsort(BAT **sorted, BAT **order, BAT *
(o->ttype == TYPE_void && /* no nil tail */
BATcount(o) != 0 &&
o->tseqbase == oid_nil))) {
- GDKerror("BATsort: o must be [dense,oid] and same size as b\n");
+ GDKerror("BATsort: o must have type oid and same size as b\n");
return GDK_FAIL;
}
if (g != NULL &&
@@ -1401,7 +1399,7 @@ BATsort(BAT **sorted, BAT **order, BAT *
(g->ttype == TYPE_void && /* no nil tail */
BATcount(g) != 0 &&
g->tseqbase == oid_nil))) {
- GDKerror("BATsort: g must be [dense,oid], sorted on the tail,
and same size as b\n");
+ GDKerror("BATsort: g must have type oid, sorted on the tail,
and same size as b\n");
return GDK_FAIL;
}
assert(reverse == 0 || reverse == 1);
@@ -1469,7 +1467,7 @@ BATsort(BAT **sorted, BAT **order, BAT *
/* if we want a stable sort, the order index must be
* stable, if we don't want stable, we don't care */
(!stable || ((oid *) pb->torderidx->base)[2])) {
- /* there is a order index that we can use */
+ /* there is an order index that we can use */
on = COLnew(pb->hseqbase, TYPE_oid, BATcount(pb), TRANSIENT);
if (on == NULL)
goto error;
@@ -1721,8 +1719,8 @@ BATsort(BAT **sorted, BAT **order, BAT *
return GDK_FAIL;
}
-/* return a new BAT of length n with a dense head with seqbase hseq,
- * and the constant v in the tail */
+/* return a new BAT of length n with seqbase hseq, and the constant v
+ * in the tail */
BAT *
BATconstant(oid hseq, int tailtype, const void *v, BUN n, int role)
{
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jul2017 - Fix for changeset 9413a8098bfb.
Changeset: c61d3254f234 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c61d3254f234
Modified Files:
testing/Mtest.py.in
Branch: Jul2017
Log Message:
Fix for changeset 9413a8098bfb.
diffs (16 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -3983,10 +3983,11 @@ def main(argv) :
w = {}
for i in 'SYST', 'RELEASE', 'DIST', 'VERSION', 'BITS', 'ARCH',
'INT128', 'SINGLE':
w[i] = re.escape(v[i])
-for i in 'INT128', 'SINGLE':
+for i in 'BITS', 'ARCH', 'INT128', 'SINGLE':
j = 'TST_'+i
env[j] = v[i]
os.environ[j] = v[i]
+for i in 'INT128', 'SINGLE':
if v[i]:
v[i] = '(.%s)?' % v[i]
w[i] = '(\.%s)?' % w[i]
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Properly check for trace directory
Changeset: e84d8d8dba20 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e84d8d8dba20
Modified Files:
monetdb5/mal/mal_profiler.c
sql/backends/monet5/sql_execute.c
Branch: default
Log Message:
Properly check for trace directory
diffs (75 lines):
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -585,18 +585,21 @@ str
startTrace(str path)
{
char buf[FILENAME_MAX];
+ struct stat sb;
if( path && eventstream == NULL){
// create a file to keep the events, unless we
// already have a profiler stream
MT_lock_set(_profileLock );
if(eventstream == NULL && offlinestore ==0){
-
snprintf(buf,FILENAME_MAX,"%s%c%s",GDKgetenv("gdk_dbname"), DIR_SEP, path);
- if(mkdir(buf,0755) < 0) {
- MT_lock_unset(_profileLock );
- throw(MAL,"profiler.startTrace",
SQLSTATE(42000) "Failed to create directory %s", buf);
+
snprintf(buf,FILENAME_MAX,"%s%c%s",GDKgetenv("gdk_dbpath"), DIR_SEP, path);
+ if (stat(buf, ) < 0) { //create directory only when
it does not exist
+ if (mkdir(buf, 0755) < 0) {
+ MT_lock_unset(_profileLock);
+ throw(MAL, "profiler.startTrace",
SQLSTATE(42000) "Failed to create directory %s", buf);
+ }
}
-
snprintf(buf,FILENAME_MAX,"%s%c%s%ctrace_%d",GDKgetenv("gdk_dbname"), DIR_SEP,
path,DIR_SEP,tracecounter++ % MAXTRACEFILES);
+
snprintf(buf,FILENAME_MAX,"%s%c%s%ctrace_%d",GDKgetenv("gdk_dbpath"), DIR_SEP,
path,DIR_SEP,tracecounter++ % MAXTRACEFILES);
if((eventstream = open_wastream(buf)) == NULL) {
MT_lock_unset(_profileLock );
throw(MAL,"profiler.startTrace",
SQLSTATE(HY001) MAL_MALLOC_FAIL);
diff --git a/sql/backends/monet5/sql_execute.c
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -67,14 +67,16 @@
* and creates a secondary result set upon termination
* of the query.
*/
-static void
+static str
SQLsetTrace(Client cntxt, MalBlkPtr mb)
{
InstrPtr q, resultset;
InstrPtr tbls, cols, types, clen, scale;
+ str msg = MAL_SUCCEED;
int k;
- startTrace("sql_traces");
+ if((msg = startTrace("sql_traces")) != MAL_SUCCEED)
+ return msg;
clearTrace();
for(k= mb->stop-1; k>0; k--)
@@ -183,6 +185,8 @@ SQLsetTrace(Client cntxt, MalBlkPtr mb)
pushInstruction(mb,resultset);
pushEndInstruction(mb);
chkTypes(cntxt->usermodule, mb, TRUE);
+
+ return msg;
}
/*
@@ -362,9 +366,10 @@ SQLrun(Client c, backend *be, mvc *m)
msg = runMALDebugger(c, mb);
} else {
if( m->emod & mod_trace){
- SQLsetTrace(c,mb);
- msg = runMAL(c, mb, 0, 0);
- stopTrace(0);
+ if((msg = SQLsetTrace(c,mb)) == MAL_SUCCEED) {
+ msg = runMAL(c, mb, 0, 0);
+ stopTrace(0);
+ }
} else {
msg = runMAL(c, mb, 0, 0);
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Revert change.
Changeset: 6eb925eb3484 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6eb925eb3484
Modified Files:
monetdb5/optimizer/opt_pipes.c
Branch: default
Log Message:
Revert change.
diffs (71 lines):
diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c
--- a/monetdb5/optimizer/opt_pipes.c
+++ b/monetdb5/optimizer/opt_pipes.c
@@ -70,8 +70,6 @@ static struct PIPELINES {
"optimizer.coercions();"
"optimizer.evaluate();"
"optimizer.emptybind();"
-"optimizer.candidates();"
-"optimizer.postfix();"
"optimizer.pushselect();"
"optimizer.aliases();"
"optimizer.mitosis();"
@@ -91,6 +89,7 @@ static struct PIPELINES {
"optimizer.generator();"
"optimizer.profiler();"
"optimizer.candidates();"
+"optimizer.postfix();"
"optimizer.deadcode();"
// "optimizer.jit();" awaiting the new batcalc api
// "optimizer.oltp();"awaiting the autocommit front-end changes
@@ -107,8 +106,6 @@ static struct PIPELINES {
"optimizer.coercions();"
"optimizer.evaluate();"
"optimizer.emptybind();"
-"optimizer.candidates();"
-"optimizer.postfix();"
"optimizer.pushselect();"
"optimizer.aliases();"
"optimizer.mitosis();"
@@ -129,6 +126,7 @@ static struct PIPELINES {
"optimizer.volcano();"
"optimizer.profiler();"
"optimizer.candidates();"
+"optimizer.postfix();"
"optimizer.deadcode();"
// "optimizer.jit();" awaiting the new batcalc api
// "optimizer.oltp();"awaiting the autocommit front-end changes
@@ -152,8 +150,6 @@ static struct PIPELINES {
"optimizer.coercions();"
"optimizer.evaluate();"
"optimizer.emptybind();"
-"optimizer.candidates();"
-"optimizer.postfix();"
"optimizer.pushselect();"
"optimizer.aliases();"
"optimizer.mergetable();"
@@ -172,6 +168,7 @@ static struct PIPELINES {
"optimizer.generator();"
"optimizer.profiler();"
"optimizer.candidates();"
+"optimizer.postfix();"
"optimizer.deadcode();"
// "optimizer.jit();" awaiting the new batcalc api
// "optimizer.oltp();"awaiting the autocommit front-end changes
@@ -195,8 +192,6 @@ static struct PIPELINES {
"optimizer.coercions();"
"optimizer.evaluate();"
"optimizer.emptybind();"
-"optimizer.candidates();"
-"optimizer.postfix();"
"optimizer.pushselect();"
"optimizer.aliases();"
"optimizer.mergetable();"
@@ -214,6 +209,7 @@ static struct PIPELINES {
"optimizer.generator();"
"optimizer.profiler();"
"optimizer.candidates();"
+"optimizer.postfix();"
"optimizer.deadcode();"
// "optimizer.jit();" awaiting the new batcalc api
// "optimizer.oltp();"awaiting the autocommit front-end changes
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jul2017 - Specific output for powerpc64.
Changeset: 895d06bd4c36 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=895d06bd4c36
Added Files:
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.powerpc64
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.powerpc64
Branch: Jul2017
Log Message:
Specific output for powerpc64.
diffs (129 lines):
diff --git
a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.powerpc64
b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.powerpc64
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.powerpc64
@@ -0,0 +1,77 @@
+stderr of test 'overflow.SF-2853458` in directory 'sql/test/BugTracker-2009`
itself:
+
+
+# 22:26:13 >
+# 22:26:13 > mserver5
"--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10
--set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=35561 --set
xrpc_port=42240 --set monet_prompt= --trace
"--dbname=mTests_src_test_BugTracker-2009" --set mal_listing=0 "--dbinit=
include sql;" ; echo ; echo Over..
+# 22:26:13 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.32.0
+# builtin opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = tst
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB
+# builtin opt gdk_debug = 8
+# builtin opt gdk_alloc_map = yes
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_admin = adm
+# builtin opt monet_prompt = >
+# builtin opt monet_welcome = yes
+# builtin opt monet_mod_path = ${exec_prefix}/lib/MonetDB
+# builtin opt monet_daemon = yes
+# builtin opt host = localhost
+# builtin opt mapi_port = 5
+# builtin opt mapi_noheaders = no
+# builtin opt mapi_debug = 0
+# builtin opt mapi_clients = 2
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns = http://monetdb.cwi.nl/standoff
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt gdk_dbname = demo
+# config opt gdk_alloc_map = no
+# config opt gdk_embedded = no
+# config opt gdk_debug = 0
+# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
+# config opt monet_daemon = no
+# config opt monet_welcome = yes
+# config opt mero_msglog = ${prefix}/var/log/MonetDB/merovingian.log
+# config opt mero_errlog = ${prefix}/var/log/MonetDB/merovingian.log
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mal_init = ${exec_prefix}/lib/MonetDB5/mal_init.mal
+# config opt mal_listing = 2
+# config opt mapi_port = 5
+# config opt mapi_autosense = false
+# config opt mapi_open = false
+# config opt sql_optimizer =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,garbageCollector,dataflow,history,multiplex
+# cmdline opt config = /ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt monet_mod_path =
/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin
+# cmdline opt gdk_dbfarm =
/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt xrpc_open = true
+# cmdline opt mapi_port = 35561
+# cmdline opt xrpc_port = 42240
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbname = mTests_src_test_BugTracker-2009
+# cmdline opt mal_listing = 0
+#warning: please don't forget to set your vault key!
+#(see /ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf)
+
+# 22:26:13 >
+# 22:26:13 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=35561
+# 22:26:13 >
+
+MAPI = (monetdb) /var/tmp/mtest-65872/.s.monetdb.34890
+QUERY = select cast(power(2,64) as bigint);
+ERROR = !overflow in conversion of 1.8446744073709552e+19 to lng.
+
+# 22:26:13 >
+# 22:26:13 > Done.
+# 22:26:13 >
+
diff --git
a/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.powerpc64
b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.powerpc64
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.out.powerpc64
@@ -0,0 +1,42 @@
+stdout of test 'overflow.SF-2853458` in directory 'sql/test/BugTracker-2009`
itself:
+
+
MonetDB: default - Remove depricated option
Changeset: ef6394c4c2e2 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef6394c4c2e2 Modified Files: monetdb5/mal/mal_debugger.c Branch: default Log Message: Remove depricated option diffs (11 lines): diff --git a/monetdb5/mal/mal_debugger.c b/monetdb5/mal/mal_debugger.c --- a/monetdb5/mal/mal_debugger.c +++ b/monetdb5/mal/mal_debugger.c @@ -1383,7 +1383,6 @@ mdbHelp(stream *f) mnstr_printf(f, "break []-- set breakpoint on current instruction or \n"); mnstr_printf(f, "delete [] -- remove break/trace point \n"); mnstr_printf(f, "debug -- set kernel debugging mask\n"); - mnstr_printf(f, "dot [] -- generate the dependency graph\n"); mnstr_printf(f, "step -- advance to next MAL instruction\n"); mnstr_printf(f, "module -- display a module signatures\n"); mnstr_printf(f, "atom -- show atom list\n"); ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Move postfix to beginning of the plan
Changeset: 35dfbb06f7b4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=35dfbb06f7b4
Modified Files:
monetdb5/optimizer/opt_pipes.c
Branch: default
Log Message:
Move postfix to beginning of the plan
diffs (71 lines):
diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c
--- a/monetdb5/optimizer/opt_pipes.c
+++ b/monetdb5/optimizer/opt_pipes.c
@@ -70,6 +70,8 @@ static struct PIPELINES {
"optimizer.coercions();"
"optimizer.evaluate();"
"optimizer.emptybind();"
+"optimizer.candidates();"
+"optimizer.postfix();"
"optimizer.pushselect();"
"optimizer.aliases();"
"optimizer.mitosis();"
@@ -89,7 +91,6 @@ static struct PIPELINES {
"optimizer.generator();"
"optimizer.profiler();"
"optimizer.candidates();"
-"optimizer.postfix();"
"optimizer.deadcode();"
// "optimizer.jit();" awaiting the new batcalc api
// "optimizer.oltp();"awaiting the autocommit front-end changes
@@ -106,6 +107,8 @@ static struct PIPELINES {
"optimizer.coercions();"
"optimizer.evaluate();"
"optimizer.emptybind();"
+"optimizer.candidates();"
+"optimizer.postfix();"
"optimizer.pushselect();"
"optimizer.aliases();"
"optimizer.mitosis();"
@@ -126,7 +129,6 @@ static struct PIPELINES {
"optimizer.volcano();"
"optimizer.profiler();"
"optimizer.candidates();"
-"optimizer.postfix();"
"optimizer.deadcode();"
// "optimizer.jit();" awaiting the new batcalc api
// "optimizer.oltp();"awaiting the autocommit front-end changes
@@ -150,6 +152,8 @@ static struct PIPELINES {
"optimizer.coercions();"
"optimizer.evaluate();"
"optimizer.emptybind();"
+"optimizer.candidates();"
+"optimizer.postfix();"
"optimizer.pushselect();"
"optimizer.aliases();"
"optimizer.mergetable();"
@@ -168,7 +172,6 @@ static struct PIPELINES {
"optimizer.generator();"
"optimizer.profiler();"
"optimizer.candidates();"
-"optimizer.postfix();"
"optimizer.deadcode();"
// "optimizer.jit();" awaiting the new batcalc api
// "optimizer.oltp();"awaiting the autocommit front-end changes
@@ -192,6 +195,8 @@ static struct PIPELINES {
"optimizer.coercions();"
"optimizer.evaluate();"
"optimizer.emptybind();"
+"optimizer.candidates();"
+"optimizer.postfix();"
"optimizer.pushselect();"
"optimizer.aliases();"
"optimizer.mergetable();"
@@ -209,7 +214,6 @@ static struct PIPELINES {
"optimizer.generator();"
"optimizer.profiler();"
"optimizer.candidates();"
-"optimizer.postfix();"
"optimizer.deadcode();"
// "optimizer.jit();" awaiting the new batcalc api
// "optimizer.oltp();"awaiting the autocommit front-end changes
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jul2017 - Specific output for powerpc64.
Changeset: f605f7a9ee26 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f605f7a9ee26 Added Files: sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 Branch: Jul2017 Log Message: Specific output for powerpc64. diffs (truncated from 5365 to 300 lines): diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 new file mode 100644 --- /dev/null +++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64 @@ -0,0 +1,5360 @@ +stdout of test 'upgrade` in directory 'sql/test/emptydb-upgrade-chain` itself: + + +# 16:53:35 > +# 16:53:35 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39660" "--set" "mapi_usock=/var/tmp/mtest-30908/.s.monetdb.39660" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-stable/var/MonetDB/mTests_sql_test_emptydb-upgrade-chain" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 16:53:35 > + +# MonetDB 5 server v11.21.16 (hg id: c20b591c1c70+) +# This is an unreleased version +# Serving database 'mTests_sql_test_emptydb-upgrade-chain', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked +# Found 15.589 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2015 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://madrid.da.cwi.nl:39660/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-30908/.s.monetdb.39660 +# MonetDB/GIS module loaded +# Start processing logs sql/sql_logs version 52200 +# Start reading the write-ahead log 'sql_logs/sql/log.31' +# Finished reading the write-ahead log 'sql_logs/sql/log.31' +# Finished processing logs sql/sql_logs +# MonetDB/SQL module loaded +# MonetDB/R module loaded + +Ready. +Running database upgrade commands: +set schema "sys"; +delete from sys.dependencies where id < 2000; +delete from sys.types where id < 2000; +insert into sys.types values (0, 'void', 'any', 0, 0, 0, 0, 2000); +insert into sys.types values (1, 'bat', 'table', 0, 0, 0, 1, 2000); +insert into sys.types values (2, 'ptr', 'ptr', 0, 0, 0, 1, 2000); +insert into sys.types values (3, 'bit', 'boolean', 1, 0, 2, 2, 2000); +insert into sys.types values (4, 'str', 'char', 0, 0, 0, 3, 2000); +insert into sys.types values (5, 'str', 'varchar', 0, 0, 0, 4, 2000); +insert into sys.types values (6, 'str', 'clob', 0, 0, 0, 4, 2000); +insert into sys.types values (7, 'oid', 'oid', 63, 0, 2, 6, 2000); +insert into sys.types values (8, 'bte', 'tinyint', 8, 1, 2, 7, 2000); +insert into sys.types values (9, 'sht', 'smallint', 16, 1, 2, 7, 2000); +insert into sys.types values (10, 'int', 'int', 32, 1, 2, 7, 2000); +insert into sys.types values (11, 'lng', 'bigint', 64, 1, 2, 7, 2000); +insert into sys.types values (12, 'lng', 'wrd', 64, 1, 2, 7, 2000); +insert into sys.types values (13, 'hge', 'hugeint', 128, 1, 2, 7, 2000); +insert into sys.types values (14, 'bte', 'decimal', 2, 1, 10, 10, 2000); +insert into sys.types values (15, 'sht', 'decimal', 4, 1, 10, 10, 2000); +insert into sys.types values (16, 'int', 'decimal', 9, 1, 10, 10, 2000); +insert into sys.types values (17, 'lng', 'decimal', 18, 1, 10, 10, 2000); +insert into sys.types values (18, 'hge', 'decimal', 38, 1, 10, 10, 2000); +insert into sys.types values (19, 'flt', 'real', 24, 2, 2, 11, 2000); +insert into sys.types values (20, 'dbl', 'double', 53, 2, 2, 11, 2000); +insert into sys.types values (21, 'int', 'month_interval', 32, 0, 2, 8, 2000); +insert into sys.types values (22, 'lng', 'sec_interval', 13, 1, 10, 9, 2000); +insert into sys.types values (23, 'daytime', 'time', 7, 0, 0, 12, 2000); +insert into sys.types values (24, 'daytime', 'timetz', 7, 1, 0, 12, 2000); +insert into sys.types values (25, 'date', 'date', 0, 0, 0, 13, 2000); +insert into sys.types values (26, 'timestamp', 'timestamp', 7, 0, 0, 14, 2000); +insert into sys.types values (27, 'timestamp', 'timestamptz', 7, 1, 0, 14, 2000); +insert into sys.types values (28, 'sqlblob', 'blob', 0, 0, 0, 5, 2000); +insert into sys.types values (29, 'wkb', 'geometry', 0, 0, 0, 15, 2000); +insert into sys.types values (30, 'wkba', 'geometrya', 0, 0, 0, 16, 2000); +insert into sys.types values (31, 'mbr', 'mbr', 0, 0, 0, 16, 2000); +delete from sys.functions where id < 2000; +delete from sys.args where func_id not in (select id from sys.functions); +insert into sys.functions values (32, 'mbr_overlap', 'mbrOverlaps', 'geom', 0, 1, false, false, false, 2000); +insert into sys.args values (14756, 32, 'res_0', 'boolean', 1, 0, 0, 0); +insert into sys.args values (14757, 32, 'arg_1', 'geometry', 0, 0, 1, 1); +insert into sys.args values (14758, 32, 'arg_2', 'geometry', 0, 0, 1, 2); +insert into sys.functions
MonetDB: Jul2017 - Make it possible to have specific output for ...
Changeset: 9413a8098bfb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9413a8098bfb
Modified Files:
testing/Mtest.py.in
Branch: Jul2017
Log Message:
Make it possible to have specific output for a CPU architecture.
Since the architecture implies the number of bits (32 or 64), you
can only specify one or the other. See Mapprove.py --help.
diffs (119 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -1710,18 +1710,23 @@ def GetBitsAndModsAndThreads(env) :
env['TST_INT128'] = ""
env['TST_SINGLE'] = ""
env['TST_THREADS'] = ""
+env['TST_ARCH'] = ""
if qOut:
-tbos = re.compile("^# Compiled for .*/([63][42]bit)( with 128bit
integers|)", re.MULTILINE)
+tbos = re.compile("^# Compiled for
(?P[^-]+).*/(?P[63][42]bit)(?P with 128bit integers|)",
re.MULTILINE)
tt = re.compile("^# Serving database .*, using ([0-9]+) threads?",
re.MULTILINE)
tm = re.compile("^Modules: (.+)$", re.MULTILINE)
for l in qOut.split('\n'):
obs = tbos.match(l)
-if obs:
-env['TST_BITS'] = obs.group(1)
+if obs is not None:
+env['TST_BITS'] = obs.group('bits')
os.environ['TST_BITS'] = env['TST_BITS']
-if obs.group(2) == " with 128bit integers":
+if obs.group('int128') == " with 128bit integers":
env['TST_INT128'] = "int128"
os.environ['TST_INT128'] = env['TST_INT128']
+arch = obs.group('arch')
+if arch == 'amd64':
+arch = 'x86_64' # normalize name
+env['TST_ARCH'] = arch
t = tt.match(l)
if t:
if t.group(1) == "1":
@@ -1796,8 +1801,9 @@ def StableOutErr(env,par,TST,SYST,RELEAS
SINGLE = env['TST_SINGLE']
if SINGLE:
SINGLE = r"(\.single)?"
+ARCH = env['TST_ARCH']
dir,file = os.path.split(TST)
-outre =
re.compile(r'^%s\.stable\.(?Pout|err)(\.(%s(%s)?|%s(%s)?))?(\.%s)?%s%s$' %
(re.escape(file), re.escape(SYST), re.escape(RELEASE), re.escape(DIST),
re.escape(VERSION), BITS, INT128, SINGLE))
+outre =
re.compile(r'^%s\.stable\.(?Pout|err)(\.(%s(%s)?|%s(%s)?))?(\.(%s|%s))?%s%s$'
% (re.escape(file), re.escape(SYST), re.escape(RELEASE), re.escape(DIST),
re.escape(VERSION), BITS, ARCH, INT128, SINGLE))
bestout = besterr = ''
for f in listdir(dir or os.curdir):
res = outre.match(f)
@@ -3341,6 +3347,7 @@ def ReadMapproveRc(f) :
v['BITS'] = ''
v['INT128'] = ''
v['SINGLE'] = ''
+v['ARCH'] = ''
if os.path.isfile(f):
r = re.compile('^([A-Z][A-Z0-9_]*) = "(.*)".*$')
for l in open(f):
@@ -3648,7 +3655,7 @@ def main(argv) :
elif THISFILE == 'Mapprove.py':
f = _configure(os.path.join('@QXprefix@',dftTSTPREF,'.Mapprove.rc'))
v = ReadMapproveRc(f)
-for i in 'BITS', 'INT128', 'SINGLE':
+for i in 'INT128', 'SINGLE':
if v[i]:
v[i] = '[.%s]' % v[i]
options = cmd_options + [
@@ -3657,9 +3664,9 @@ def main(argv) :
"(default: = 'out' & 'err')"),
(None, 'S', 'sys', '',
"approve specific output *.\n"
- "( =
'[.([]|[])][.(32|64)bit][.int128][.single]',\n"
- "(default: longest match for = '[.(%s[%s]|%s[%s])]%s%s%s')"
- % (v['SYST'], v['RELEASE'], v['DIST'], v['VERSION'], v['BITS'],
v['INT128'], v['SINGLE'])),
+ "( =
'[.([]|[])][.((32|64)bit|)][.int128][.single]',\n"
+ "(default: longest match for =
'[.(%s[%s]|%s[%s])][.(%s|%s)%s%s')"
+ % (v['SYST'], v['RELEASE'], v['DIST'], v['VERSION'], v['BITS'],
v['ARCH'], v['INT128'], v['SINGLE'])),
(None, 'f', 'force', None,
"force approval of error messages (i.e., lines starting with
'!')"),
('nopatch', None, 'nopatch', None,
@@ -3974,17 +3981,17 @@ def main(argv) :
os.environ['DISTVER'] = DISTVER
os.environ['VERSION'] = VERSION
w = {}
-for i in 'SYST', 'RELEASE', 'DIST', 'VERSION', 'BITS', 'INT128',
'SINGLE':
+for i in 'SYST', 'RELEASE', 'DIST', 'VERSION', 'BITS', 'ARCH',
'INT128', 'SINGLE':
w[i] = re.escape(v[i])
-for i in 'BITS', 'INT128', 'SINGLE':
+for i in 'INT128', 'SINGLE':
j = 'TST_'+i
env[j] = v[i]
os.environ[j] = v[i]
if v[i]:
v[i] = '(.%s)?' % v[i]
w[i] = '(\.%s)?' % w[i]
-sv = '^(.(%s(%s)?|%s(%s)?))?%s%s%s$' % (v['SYST'], v['RELEASE'],
v['DIST'], v['VERSION'], v['BITS'], v['INT128'], v['SINGLE'])
-sw = '^(\.(%s(%s)?|%s(%s)?))?%s%s%s$' % (w['SYST'], w['RELEASE'],
w['DIST'], w['VERSION'], w['BITS'], w['INT128'], w['SINGLE'])
+sv = '^(.(%s(%s)?|%s(%s)?))?(.(%s|%s))?%s%s$' %
