Changeset: 1e7ec1650311 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1e7ec1650311
Added Files:
sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.err
sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.out
sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.out.int128
sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.sql
sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.err
sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out
sql/test/BugTracker-2018/Tests/ilike.Bug-6547.sql
sql/test/BugTracker-2018/Tests/ilike.Bug-6547.stable.err
sql/test/BugTracker-2018/Tests/ilike.Bug-6547.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-group-by-having-in-count.Bug-6524.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-group-by-having-in-count.Bug-6524.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-in-cast-null.Bug-6529.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-in-cast-null.Bug-6529.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-in-query.Bug-6545.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-in-with-division.Bug-6546.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.out
sql/test/BugTracker-2018/Tests/truncate_add_user.sql
sql/test/BugTracker-2018/Tests/truncate_add_user.stable.err
sql/test/BugTracker-2018/Tests/truncate_add_user.stable.out
sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.reqtests
sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.sql
sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.stable.err
sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.stable.out
sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.sql
sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.stable.err
sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.stable.out
sql/test/BugTracker-2018/Tests/truncate_remove_user.sql
sql/test/BugTracker-2018/Tests/truncate_remove_user.stable.err
sql/test/BugTracker-2018/Tests/truncate_remove_user.stable.out
sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.reqtests
sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.sql
sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.stable.err
sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.stable.out
sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.reqtests
sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.sql
sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.stable.err
sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.stable.out
sql/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.sql
sql/test/Tests/copy-from-lz4.py
sql/test/Tests/copy-from-lz4.stable.err
sql/test/Tests/copy-from-lz4.stable.out
sql/test/Tests/copy-into-lz4.sql.in
sql/test/Tests/copy-into-lz4.stable.err
sql/test/Tests/copy-into-lz4.stable.out
sql/test/Tests/lz4-dump.sql
sql/test/Tests/testlz4.lz4
sql/test/Users/Tests/grantAndRevokeUserLoggedIN.Bug-3476.SQL.py
sql/test/Users/Tests/grantAndRevokeUserLoggedIN.Bug-3476.stable.err
sql/test/Users/Tests/grantAndRevokeUserLoggedIN.Bug-3476.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64
Removed Files:
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.FreeBSD
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows
sql/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.SQL.py
sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.SQL.py
sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.err
sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out
Modified Files:
ChangeLog
ChangeLog.Mar2018
NT/monetdb_config.h.in
README-Debian
README-Fedora
buildtools/ChangeLog.Jul2017
clients/Tests/exports.stable.out
clients/Tests/mclient-uri.SQL.bat
clients/Tests/mclient-uri.SQL.sh
clients/mapiclient/Tests/mclient--help.stable.err
clients/mapiclient/Tests/mclient--help.stable.err.Windows
clients/mapiclient/dump.c
clients/mapiclient/eventparser.c
clients/mapiclient/eventparser.h
clients/mapiclient/mclient.1
clients/mapiclient/mclient.c
clients/mapiclient/mhelp.c
clients/mapiclient/stethoscope.c
clients/mapiclient/tachograph.c
clients/mapiclient/tomograph.c
clients/mapilib/mapi.c
clients/odbc/driver/ODBCConvert.c
clients/odbc/driver/ODBCDbc.c
clients/odbc/driver/ODBCDesc.c
clients/odbc/driver/ODBCEnv.c
clients/odbc/driver/ODBCStmt.c
clients/odbc/driver/ODBCUtil.h
clients/odbc/driver/SQLAllocConnect.c
clients/odbc/driver/SQLAllocHandle.c
clients/odbc/driver/SQLAllocStmt.c
clients/odbc/driver/SQLBindCol.c
clients/odbc/driver/SQLBindParameter.c
clients/odbc/driver/SQLBrowseConnect.c
clients/odbc/driver/SQLBulkOperations.c
clients/odbc/driver/SQLCancel.c
clients/odbc/driver/SQLCloseCursor.c
clients/odbc/driver/SQLColAttribute.c
clients/odbc/driver/SQLColAttributes.c
clients/odbc/driver/SQLColumnPrivileges.c
clients/odbc/driver/SQLColumns.c
clients/odbc/driver/SQLConnect.c
clients/odbc/driver/SQLCopyDesc.c
clients/odbc/driver/SQLDataSources.c
clients/odbc/driver/SQLDescribeCol.c
clients/odbc/driver/SQLDescribeParam.c
clients/odbc/driver/SQLDisconnect.c
clients/odbc/driver/SQLDriverConnect.c
clients/odbc/driver/SQLEndTran.c
clients/odbc/driver/SQLError.c
clients/odbc/driver/SQLExecDirect.c
clients/odbc/driver/SQLExecute.c
clients/odbc/driver/SQLExtendedFetch.c
clients/odbc/driver/SQLFetch.c
clients/odbc/driver/SQLFetchScroll.c
clients/odbc/driver/SQLForeignKeys.c
clients/odbc/driver/SQLFreeConnect.c
clients/odbc/driver/SQLFreeEnv.c
clients/odbc/driver/SQLFreeHandle.c
clients/odbc/driver/SQLFreeStmt.c
clients/odbc/driver/SQLGetConnectAttr.c
clients/odbc/driver/SQLGetConnectOption.c
clients/odbc/driver/SQLGetCursorName.c
clients/odbc/driver/SQLGetData.c
clients/odbc/driver/SQLGetDescField.c
clients/odbc/driver/SQLGetDescRec.c
clients/odbc/driver/SQLGetDiagField.c
clients/odbc/driver/SQLGetDiagRec.c
clients/odbc/driver/SQLGetEnvAttr.c
clients/odbc/driver/SQLGetFunctions.c
clients/odbc/driver/SQLGetInfo.c
clients/odbc/driver/SQLGetStmtAttr.c
clients/odbc/driver/SQLGetStmtOption.c
clients/odbc/driver/SQLGetTypeInfo.c
clients/odbc/driver/SQLMoreResults.c
clients/odbc/driver/SQLNativeSql.c
clients/odbc/driver/SQLNumParams.c
clients/odbc/driver/SQLNumResultCols.c
clients/odbc/driver/SQLParamData.c
clients/odbc/driver/SQLParamOptions.c
clients/odbc/driver/SQLPrepare.c
clients/odbc/driver/SQLPrimaryKeys.c
clients/odbc/driver/SQLProcedureColumns.c
clients/odbc/driver/SQLProcedures.c
clients/odbc/driver/SQLPutData.c
clients/odbc/driver/SQLRowCount.c
clients/odbc/driver/SQLSetConnectAttr.c
clients/odbc/driver/SQLSetConnectOption.c
clients/odbc/driver/SQLSetCursorName.c
clients/odbc/driver/SQLSetDescField.c
clients/odbc/driver/SQLSetDescRec.c
clients/odbc/driver/SQLSetEnvAttr.c
clients/odbc/driver/SQLSetParam.c
clients/odbc/driver/SQLSetPos.c
clients/odbc/driver/SQLSetScrollOptions.c
clients/odbc/driver/SQLSetStmtAttr.c
clients/odbc/driver/SQLSetStmtOption.c
clients/odbc/driver/SQLSpecialColumns.c
clients/odbc/driver/SQLStatistics.c
clients/odbc/driver/SQLTablePrivileges.c
clients/odbc/driver/SQLTables.c
clients/odbc/driver/SQLTransact.c
clients/odbc/setup/drvcfg.h
common/stream/stream.c
common/stream/stream.h
common/utils/msabaoth.c
configure.ag
gdk/ChangeLog.Mar2018
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_align.c
gdk/gdk_atomic.h
gdk/gdk_atoms.c
gdk/gdk_atoms.h
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_delta.c
gdk/gdk_delta.h
gdk/gdk_heap.c
gdk/gdk_interprocess.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_project.c
gdk/gdk_qsort.c
gdk/gdk_select.c
gdk/gdk_ssort_impl.h
gdk/gdk_storage.c
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_utils.c
gdk/gdk_utils.h
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_function.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_readline.c
monetdb5/mal/mal_resource.c
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/mcurl.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/inspect.c
monetdb5/modules/mal/iterator.c
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/mkey.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/wlc.c
monetdb5/optimizer/opt_candidates.c
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_pushselect.c
sql/ChangeLog.Mar2018
sql/backends/monet5/UDF/pyapi/emit.c
sql/backends/monet5/UDF/pyapi/pyapi.c
sql/backends/monet5/UDF/udf/udf.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_basket.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_cquery.c
sql/backends/monet5/sql_fround_impl.h
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_optimizer.h
sql/backends/monet5/sql_rank.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_round_impl.h
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/vaults/bam/85_bam.sql
sql/backends/monet5/vaults/netcdf/74_netcdf.sql
sql/backends/monet5/vaults/netcdf/netcdf.c
sql/backends/monet5/wlr.c
sql/include/sql_mem.h
sql/scripts/97_comments.sql
sql/server/rel_optimizer.c
sql/server/rel_psm.c
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/rel_sequence.c
sql/server/rel_trans.c
sql/server/rel_updates.c
sql/server/rel_xml.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_symbol.c
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_table.c
sql/storage/bat/bat_utils.c
sql/storage/bat/bat_utils.h
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.bat
sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe-mclient.SF-1146092.SQL.sh
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err.powerpc64
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.sql
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/BugTracker-2017/Tests/All
sql/test/BugTracker-2017/Tests/case.Bug-6386.stable.out
sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD
sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows
sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.sql
sql/test/BugTracker-2017/Tests/statistics_nils_not_eq_zero.Bug-6331.stable.out
sql/test/BugTracker-2018/Tests/All
sql/test/BugTracker/Tests/All
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Tests/All
sql/test/Tests/comment-auth.stable.err
sql/test/Tests/comment-auth.stable.out
sql/test/Tests/comment-on.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/Users/Tests/All
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.SQL.py
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/mapi/Tests/utf8test.SQL.py
sql/test/mapi/Tests/utf8test.stable.out
sql/test/pg_regress/Tests/float8.stable.err
sql/test/remote/Tests/partition_elim.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
testing/Mtest.py.in
testing/README
tools/merovingian/daemon/controlrunner.c
tools/merovingian/utils/database.c
tools/mserver/monet_version.c.in
tools/mserver/mserver5.c
tools/mserver/shutdowntest.c
Branch: trails
Log Message:
Merge with default
diffs (truncated from 45153 to 300 lines):
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,5 @@
# ChangeLog file for devel
# This file is updated with Maddlog
+* Tue Feb 13 2018 Pedro Ferreira <pedro.ferre...@monetdbsolutions.com>
+- Added support for lz4 compressed files on stream library
diff --git a/ChangeLog.Mar2018 b/ChangeLog.Mar2018
--- a/ChangeLog.Mar2018
+++ b/ChangeLog.Mar2018
@@ -1,3 +1,40 @@
# ChangeLog file for devel
# This file is updated with Maddlog
+* Wed Feb 14 2018 Stefan Manegold <stefan.maneg...@cwi.nl>
+- mclient's executing time profiling options and output format have
+ been changed. Instead of implicitly via the "--interactive"/"-i"
+ option (or when using and interactive mclient console), execution time
+ profiling is now controlled via an explicit "--timer=timermode"/"-t
+ timermode" command-line option, or a "\t timermode" command in the
+ interactive mclient console. The default (also in the interactive
+ mclient console) is now timermode "none", i.e., no timing information
+ is given. Timermode "clock" activates client-side wall-clock timing
+ ("clk") in "human-friendly" format much like the interactive mode did
+ before. Timermode "performance" also provides detailed server-side
+ timings: "sql" is the time to parse the SQL query, optimize the
+ logical relational plan and create the initial physical (MAL) plan;
+ "opt" is the time to optimize the physical (MAL) plan; "run" is the
+ time to execute the physical (MAL) plan. With timermode "performance"
+ all server-side timings and the client-side wall-clock time are given
+ in milliseconds (ms). Note that the client-measured wall-clock time
+ "clk" is reported per query only when options "--interactive" or
+ "--echo" are used, because only then does mclient send individual
+ lines (statements) of the SQL script to the server. Otherwise, mclient
+ sends the SQL script in large(r) batch(es) to the server, and, thus,
+ only the total wall-clock time per batch is measured and reported. The
+ server-measured detailed performance timings "sql", "opt", "run" are
+ always measured and reported per query. Also, all timing information
+ is now given on a separate line and set to stderr rather than stdout.
+
+* Fri Feb 9 2018 Sjoerd Mullender <sjo...@acm.org>
+- Some types and constants were moved from configure (and hence
+ monetdb_config.h) to gdk.h. In particular, the types "lng" and
+ "ulng" have been moved and can therefore no longer be used by code
+ that doesn't (ultimately) include gdk.h. Just use int64_t instead.
+ A bunch of format defines have been removed: SZFMT, SSZFMT, PTRFMT,
+ PDFMT. Just use the C standard codes for those (%zu, %zd, %p, %td).
+ The define for printing a lng (LLFMT) was also moved. Use PRId64 for
+ printing int64_t in code not using gdk.h. Removed all references to
+ __int64 and long long (use int64_t instead).
+
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
@@ -71,6 +71,12 @@
#define NATIVE_WIN32 1
+#ifdef __INTEL_COMPILER
+/* Definition of NAN is seriously broken on Intel compiler (at least
+ * in some versions), so we work around it. */
+#define NAN_CANNOT_BE_USED_AS_INITIALIZER
+#endif
+
/* Define if building universal (internal helper macro) */
/* #undef AC_APPLE_UNIVERSAL_BUILD */
@@ -295,9 +301,6 @@
/* Define to 1 if you have the `lockf' function. */
/* #undef HAVE_LOCKF */
-/* Define to 1 if the system has the type `long long'. */
-#define HAVE_LONG_LONG 1
-
/* Define to 1 if you have the <mach/mach_init.h> header file. */
/* #undef HAVE_MACH_MACH_INIT_H */
@@ -586,9 +589,6 @@
/* Define to 1 if the system has the type `__int128_t'. */
/* #undef HAVE___INT128_T */
-/* Define to 1 if the system has the type `__int64'. */
-#define HAVE___INT64 1
-
/* Define to 1 if the system has the type `__uint128_t'. */
/* #undef HAVE___UINT128_T */
@@ -686,11 +686,6 @@
/* The size of `long', as computed by sizeof. */
#define SIZEOF_LONG 4
-/* The size of `long long', as computed by sizeof. */
-#ifdef HAVE_LONG_LONG
-#define SIZEOF_LONG_LONG 8
-#endif
-
/* The size of `ptrdiff_t', as computed by sizeof. */
#ifdef _WIN64
#define SIZEOF_PTRDIFF_T 8
@@ -887,15 +882,11 @@ c99_snprintf(char *outBuf, size_t size,
/* Define to `int' if <sys/types.h> does not define. */
#ifdef _WIN64
-#define ssize_t __int64
+#define ssize_t int64_t
#else
#define ssize_t int
#endif
-typedef int64_t lng;
-typedef uint64_t ulng;
-#define SIZEOF_LNG 8
-
#ifdef HAVE___INT128
typedef __int128 hge;
typedef unsigned __int128 uhge;
@@ -910,23 +901,6 @@ typedef __uint128_t uhge;
# endif
#endif
-/* Format to print 64 bit signed integers. */
-#define LLFMT "%" PRId64
-
-/* Format to print 64 bit unsigned integers. */
-#define ULLFMT "%" PRIu64
-
-/* define printf formats for printing size_t and ssize_t variables */
-/* In Visual Studio 2017 we can finally use %zu and %td, but %Iu/%Id
- * also works */
-#define SZFMT "%Iu"
-#define SSZFMT "%Id"
-
-#define PDFMT SSZFMT
-
-#define PTRFMT "%p"
-#define PTRFMTCAST
-
#ifdef HAVE_EMBEDDED_R
#define _MSC_EXTENSIONS 1
#undef HAVE_CTIME_R
diff --git a/README-Debian b/README-Debian
--- a/README-Debian
+++ b/README-Debian
@@ -35,7 +35,7 @@ zlib1g-dev # optional: read and write .
These packages are optional.
libcfitsio-dev # optional: read FITS files
-liblz4-dev # optional: compression in new (unused) MAPI protocol
+liblz4-dev # optional: compression in new (unused) MAPI protocol,
also used to read and write .lz4 compressed files
libsnappy-dev # optional: compression in new (unused) MAPI protocol
python3-dev # optional, needed for Python 3 integration
python3-numpy # optional, needed for Python 3 integration
diff --git a/README-Fedora b/README-Fedora
--- a/README-Fedora
+++ b/README-Fedora
@@ -36,7 +36,7 @@ These packages are optional.
cfitsio-devel # optional: read FITS files
libasan # optional: --enable-sanitizer configuration
(debug)
liblas-devel # optional: read LIDAR files
-lz4-devel # optional: compression in new (unused) MAPI protocol
+lz4-devel # optional: compression in new (unused) MAPI protocol,
also used to read and write .lz4 compressed files
netcdf-devel # optional: read NetCDF files
proj-devel # optional, only optionally used in geom module
python3-devel # optional, needed for Python 3 integration
diff --git a/buildtools/ChangeLog.Jul2017 b/buildtools/ChangeLog.Jul2017
--- a/buildtools/ChangeLog.Jul2017
+++ b/buildtools/ChangeLog.Jul2017
@@ -1,3 +1,7 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Mon Feb 12 2018 Sjoerd Mullender <sjo...@acm.org>
+- Added the .pdb files needed for debug symbols to the Windows installer
+ for MonetDB/SQL.
+
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -6,8 +6,6 @@ stdout of test 'exports` in directory 'c
# 21:40:57 >
# gdk
-void ALIGNsetH(BAT *b1, BAT *b2);
-void ALIGNsetT(BAT *b1, BAT *b2);
int ALIGNsynced(BAT *b1, BAT *b2);
int ATOMallocate(const char *nme);
ptr ATOMdup(int id, const void *val);
@@ -161,7 +159,7 @@ BAT *BATproject(BAT *l, BAT *r);
BAT *BATprojectchain(BAT **bats);
gdk_return BATrangejoin(BAT **r1p, BAT **r2p, BAT *l, BAT *rl, BAT *rh, BAT
*sl, BAT *sr, int li, int hi, BUN estimate)
__attribute__((__warn_unused_result__));
gdk_return BATreplace(BAT *b, BAT *p, BAT *n, bit force)
__attribute__((__warn_unused_result__));
-void BATroles(BAT *b, const char *tnme);
+gdk_return BATroles(BAT *b, const char *tnme);
BAT *BATsample(BAT *b, BUN n);
BAT *BATselect(BAT *b, BAT *s, const void *tl, const void *th, int li, int hi,
int anti);
gdk_return BATsemijoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
int nil_matches, BUN estimate) __attribute__((__warn_unused_result__));
@@ -255,8 +253,8 @@ gdk_return GDKmmapfile(str buffer, size_
int GDKms(void);
int GDKnr_threads;
void GDKprepareExit(void);
-void GDKqsort(void *h, void *t, const void *base, size_t n, int hs, int ts,
int tpe);
-void GDKqsort_rev(void *h, void *t, const void *base, size_t n, int hs, int
ts, int tpe);
+void GDKqsort(void *restrict h, void *restrict t, const void *restrict base,
size_t n, int hs, int ts, int tpe);
+void GDKqsort_rev(void *restrict h, void *restrict t, const void *restrict
base, size_t n, int hs, int ts, int tpe);
void *GDKrealloc(void *pold, size_t size)
__attribute__((__warn_unused_result__));
void GDKregister(MT_Id pid);
gdk_return GDKreleasemmap(void *ptr, size_t size, size_t id, str *msg);
@@ -362,9 +360,10 @@ gdk_return VARcalcxor(ValPtr ret, const
gdk_return VARconvert(ValPtr ret, const ValRecord *v, int abort_on_error);
void VIEWbounds(BAT *b, BAT *view, BUN l, BUN h);
BAT *VIEWcreate(oid seq, BAT *b);
-BAT *VIEWcreate_(oid seq, BAT *b, int stable);
size_t _MT_npages;
size_t _MT_pagesize;
+const union _dbl_nil_t _dbl_nil_;
+const union _flt_nil_t _flt_nil_;
ssize_t batFromStr(const char *src, size_t *len, bat **dst);
ssize_t batToStr(str *dst, size_t *len, const bat *src);
ssize_t bitFromStr(const char *src, size_t *len, bit **dst);
@@ -377,7 +376,7 @@ cqfix_fptr cqfix_get(void);
void cqfix_set(cqfix_fptr);
ssize_t dblFromStr(const char *src, size_t *len, dbl **dst);
ssize_t dblToStr(str *dst, size_t *len, const dbl *src);
-NANCONST dbl dbl_nil;
+const dbl dbl_nil;
char *dirname(char *path);
int dlclose(void *handle);
char *dlerror(void);
@@ -387,7 +386,7 @@ size_t escapedStr(char *restrict dst, co
size_t escapedStrlen(const char *restrict src, const char *sep1, const char
*sep2, int quote);
ssize_t fltFromStr(const char *src, size_t *len, flt **dst);
ssize_t fltToStr(str *dst, size_t *len, const flt *src);
-NANCONST flt flt_nil;
+const flt flt_nil;
geomcatalogfix_fptr geomcatalogfix_get(void);
void geomcatalogfix_set(geomcatalogfix_fptr);
geomsqlfix_fptr geomsqlfix_get(void);
@@ -482,7 +481,7 @@ size_t strLen(const char *s);
int strNil(const char *s);
const char str_nil[2];
gdk_return void_inplace(BAT *b, oid id, const void *val, bit force)
__attribute__((__warn_unused_result__));
-BUN void_replace_bat(BAT *b, BAT *p, BAT *u, bit force)
__attribute__((__warn_unused_result__));
+gdk_return void_replace_bat(BAT *b, BAT *p, BAT *u, bit force)
__attribute__((__warn_unused_result__));
int win_mkdir(const char *, const int mode);
int win_rename(const char *, const char *);
int win_rmdir(const char *);
@@ -2685,10 +2684,10 @@ int mnstr_readHge(stream *restrict s, hg
int mnstr_readHgeArray(stream *restrict s, hge *restrict val, size_t cnt);
int mnstr_readInt(stream *restrict s, int *restrict val);
int mnstr_readIntArray(stream *restrict s, int *restrict val, size_t cnt);
-int mnstr_readLng(stream *restrict s, lng *restrict val);
-int mnstr_readLngArray(stream *restrict s, lng *restrict val, size_t cnt);
-int mnstr_readSht(stream *restrict s, short *restrict val);
-int mnstr_readShtArray(stream *restrict s, short *restrict val, size_t cnt);
+int mnstr_readLng(stream *restrict s, int64_t *restrict val);
+int mnstr_readLngArray(stream *restrict s, int64_t *restrict val, size_t cnt);
+int mnstr_readSht(stream *restrict s, int16_t *restrict val);
+int mnstr_readShtArray(stream *restrict s, int16_t *restrict val, size_t cnt);
int mnstr_readStr(stream *restrict s, char *restrict val);
ssize_t mnstr_read_block(stream *restrict s, void *restrict buf, size_t
elmsize, size_t cnt);
ssize_t mnstr_readline(stream *restrict s, void *restrict buf, size_t maxcnt);
@@ -2705,10 +2704,10 @@ int mnstr_writeHge(stream *s, hge val);
int mnstr_writeHgeArray(stream *restrict s, const hge *restrict val, size_t
cnt);
int mnstr_writeInt(stream *s, int val);
int mnstr_writeIntArray(stream *restrict s, const int *restrict val, size_t
cnt);
-int mnstr_writeLng(stream *s, lng val);
-int mnstr_writeLngArray(stream *restrict s, const lng *restrict val, size_t
cnt);
-int mnstr_writeSht(stream *s, short val);
-int mnstr_writeShtArray(stream *restrict s, const short *restrict val, size_t
cnt);
+int mnstr_writeLng(stream *s, int64_t val);
+int mnstr_writeLngArray(stream *restrict s, const int64_t *restrict val,
size_t cnt);
+int mnstr_writeSht(stream *s, int16_t val);
+int mnstr_writeShtArray(stream *restrict s, const int16_t *restrict val,
size_t cnt);
int mnstr_writeStr(stream *restrict s, const char *restrict val);
stream *open_rastream(const char *filename);
stream *open_rastream_and_create(const char *filename);
diff --git a/clients/Tests/mclient-uri.SQL.bat
b/clients/Tests/mclient-uri.SQL.bat
--- a/clients/Tests/mclient-uri.SQL.bat
+++ b/clients/Tests/mclient-uri.SQL.bat
@@ -3,4 +3,4 @@
@rem Windows doesn't do UNIX domain sockets, so only the one test here.
-mclient -d
"mapi:monetdb://%HOST%:%MAPIPORT%/%TSTDB%?language=sql&user=monetdb" -f test -E
utf-8 -s "select 1"
+mclient -d
"mapi:monetdb://%HOST%:%MAPIPORT%/%TSTDB%?language=sql&user=monetdb" -f test -t
none -E utf-8 -s "select 1"
diff --git a/clients/Tests/mclient-uri.SQL.sh b/clients/Tests/mclient-uri.SQL.sh
--- a/clients/Tests/mclient-uri.SQL.sh
+++ b/clients/Tests/mclient-uri.SQL.sh
@@ -2,8 +2,8 @@
# test the URI parsing capabilities of the MAPI library
-Mlog "mclient -d
mapi:monetdb://$HOST:$MAPIPORT/$TSTDB?language=sql&user=monetdb -f test -t
none-E utf-8 -s select 1"
-mclient -d "mapi:monetdb://$HOST:$MAPIPORT/$TSTDB?language=sql&user=monetdb"
-f test -E utf-8 -s 'select 1'
+Mlog "mclient -d
mapi:monetdb://$HOST:$MAPIPORT/$TSTDB?language=sql&user=monetdb -f test -t none
-E utf-8 -s select 1"
+mclient -d "mapi:monetdb://$HOST:$MAPIPORT/$TSTDB?language=sql&user=monetdb"
-f test -t none -E utf-8 -s 'select 1'
Mlog "mclient -d
mapi:monetdb://$MAPIHOST/.s.monetdb.$MAPIPORT?database=$TSTDB&language=sql&user=monetdb
-f test -t none -E utf-8 -s select 1"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
