Changeset: b80c998ffd92 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b80c998ffd92 Added Files: sql/test/BugTracker-2015/Tests/All sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3646.sql sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3646.stable.err sql/test/BugTracker-2015/Tests/inet-ordering.Bug-3646.stable.out sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.sql sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.stable.err sql/test/BugTracker-2015/Tests/sharp-alias.Bug-3467.stable.out Modified Files: NT/installer32/MonetDB-ODBC-Installer.vdproj NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB-ODBC-Installer.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj buildtools/doc/windowsbuild.rst clients/ChangeLog.Oct2014 clients/R/Tests/install.sh clients/Tests/MAL-signatures_all.stable.out clients/Tests/MAL-signatures_all.stable.out.int128 clients/Tests/MAL-signatures_fits_geom.stable.out clients/Tests/MAL-signatures_fits_geom.stable.out.int128 clients/Tests/MAL-signatures_geom.stable.out clients/Tests/MAL-signatures_geom.stable.out.int128 clients/Tests/MAL-signatures_none.stable.out clients/Tests/MAL-signatures_none.stable.out.int128 clients/Tests/exports.stable.out clients/mapilib/mapi.c clients/odbc/driver/SQLGetConnectOption.c clients/odbc/driver/SQLSetConnectOption.c clients/perl/DBD/monetdb.pm clients/perl/Mapi.pm clients/perl/MonetDB-CLI-MapiPP/MonetDB/CLI/MapiPP.pm common/stream/stream.c gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_calc_compare.h gdk/gdk_cand.h gdk/gdk_cross.c gdk/gdk_firstn.c gdk/gdk_group.c gdk/gdk_imprints.c gdk/gdk_join.c gdk/gdk_posix.c gdk/gdk_private.h gdk/gdk_qsort_impl.h gdk/gdk_select.c gdk/gdk_ssort.c gdk/gdk_storage.c monetdb5/modules/atoms/inet.c monetdb5/modules/atoms/inet.h monetdb5/modules/atoms/inet.mal monetdb5/tests/mapi/Tests/perl_dbi.stable.out sql/backends/monet5/sql_result.c sql/server/sql_scan.c sql/test/BugTracker-2014/Tests/type_resolution.Bug-3622.sql sql/test/BugTracker-2014/Tests/type_resolution.Bug-3622.stable.out sql/test/Dependencies/Tests/Dependencies.stable.err sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/leaks/Tests/check0_gsl.stable.out sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check1_bam.stable.out sql/test/leaks/Tests/check1_bam.stable.out.int128 sql/test/leaks/Tests/check1_gsl.stable.out sql/test/leaks/Tests/check1_gsl.stable.out.int128 sql/test/leaks/Tests/check1_nogeom.stable.out sql/test/leaks/Tests/check1_nogeom.stable.out.int128 sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check2_bam.stable.out sql/test/leaks/Tests/check2_bam.stable.out.int128 sql/test/leaks/Tests/check2_gsl.stable.out sql/test/leaks/Tests/check2_gsl.stable.out.int128 sql/test/leaks/Tests/check2_nogeom.stable.out sql/test/leaks/Tests/check2_nogeom.stable.out.int128 sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check3_bam.stable.out sql/test/leaks/Tests/check3_bam.stable.out.int128 sql/test/leaks/Tests/check3_gsl.stable.out sql/test/leaks/Tests/check3_gsl.stable.out.int128 sql/test/leaks/Tests/check3_nogeom.stable.out sql/test/leaks/Tests/check3_nogeom.stable.out.int128 sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check4_bam.stable.out sql/test/leaks/Tests/check4_bam.stable.out.int128 sql/test/leaks/Tests/check4_gsl.stable.out sql/test/leaks/Tests/check4_gsl.stable.out.int128 sql/test/leaks/Tests/check4_nogeom.stable.out sql/test/leaks/Tests/check4_nogeom.stable.out.int128 sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5.stable.out.int128 sql/test/leaks/Tests/check5_bam.stable.out sql/test/leaks/Tests/check5_bam.stable.out.int128 sql/test/leaks/Tests/check5_gsl.stable.out sql/test/leaks/Tests/check5_gsl.stable.out.int128 sql/test/leaks/Tests/check5_nogeom.stable.out sql/test/leaks/Tests/check5_nogeom.stable.out.int128 sql/test/leaks/Tests/drop3_gsl.stable.out sql/test/leaks/Tests/select1_gsl.stable.out sql/test/leaks/Tests/select2_gsl.stable.out sql/test/leaks/Tests/temp1_gsl.stable.out sql/test/leaks/Tests/temp2_gsl.stable.out sql/test/leaks/Tests/temp3_gsl.stable.out sql/test/mapi/Tests/perl_dbi.stable.out sql/test/pg_regress/Tests/All sql/test/pg_regress/Tests/alter_table.stable.err sql/test/pg_regress/Tests/arrays.stable.err sql/test/pg_regress/Tests/boolean.stable.err sql/test/pg_regress/Tests/box.stable.err sql/test/pg_regress/Tests/case.stable.err sql/test/pg_regress/Tests/char.stable.err sql/test/pg_regress/Tests/comments.stable.err sql/test/pg_regress/Tests/create_aggregate.stable.err sql/test/pg_regress/Tests/create_misc.stable.err sql/test/pg_regress/Tests/create_operator.stable.err sql/test/pg_regress/Tests/date.stable.err sql/test/pg_regress/Tests/drop.stable.err sql/test/pg_regress/Tests/float4.stable.err sql/test/pg_regress/Tests/float8.stable.err sql/test/pg_regress/Tests/horology.stable.err sql/test/pg_regress/Tests/inet.stable.err sql/test/pg_regress/Tests/insert.stable.err sql/test/pg_regress/Tests/int2.stable.err sql/test/pg_regress/Tests/int4.stable.err sql/test/pg_regress/Tests/int8.stable.err sql/test/pg_regress/Tests/interval.stable.err sql/test/pg_regress/Tests/limit.stable.err sql/test/pg_regress/Tests/numeric.stable.err sql/test/pg_regress/Tests/numeric_big.stable.err sql/test/pg_regress/Tests/numerology.stable.err sql/test/pg_regress/Tests/oid.stable.err sql/test/pg_regress/Tests/point.stable.err sql/test/pg_regress/Tests/polygon.sql sql/test/pg_regress/Tests/polygon.stable.err sql/test/pg_regress/Tests/polygon.stable.out sql/test/pg_regress/Tests/reltime.stable.err sql/test/pg_regress/Tests/select_into.stable.err sql/test/pg_regress/Tests/strings.stable.err sql/test/pg_regress/Tests/strings_cast.stable.err sql/test/pg_regress/Tests/strings_concat.stable.err sql/test/pg_regress/Tests/time.stable.err sql/test/pg_regress/Tests/timestamp.stable.err sql/test/pg_regress/Tests/timestamptz.stable.err sql/test/pg_regress/Tests/timetz.stable.err sql/test/pg_regress/Tests/timetz.stable.out sql/test/pg_regress/Tests/varchar.stable.err sql/test/pg_regress/Tests/without_oid.stable.err sql/test/pg_regress/postgresql2sql99.sh sql/test/testdb/Tests/testdb-dump.stable.out.Windows tools/merovingian/daemon/connections.c tools/merovingian/daemon/controlrunner.c tools/merovingian/daemon/discoveryrunner.c Branch: transaction-replication Log Message:
Merge with default branch diffs (truncated from 16989 to 300 lines): diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj b/NT/installer32/MonetDB-ODBC-Installer.vdproj --- a/NT/installer32/MonetDB-ODBC-Installer.vdproj +++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj @@ -330,7 +330,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_779449EF5BAD4B068A50802402E52278" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1j.win32\\bin\\libeay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1k.win32\\bin\\libeay32.dll" "TargetName" = "8:libeay32.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" @@ -370,7 +370,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B1B1C0011D7945F892A77F529772EA72" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1j.win32\\bin\\ssleay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1k.win32\\bin\\ssleay32.dll" "TargetName" = "8:ssleay32.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj b/NT/installer32/MonetDB5-SQL-Installer.vdproj --- a/NT/installer32/MonetDB5-SQL-Installer.vdproj +++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj @@ -1806,7 +1806,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E0FEE7726DA47369758C263666F3DB1" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1j.win32\\lib\\libeay32.lib" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1k.win32\\lib\\libeay32.lib" "TargetName" = "8:libeay32.lib" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -2066,7 +2066,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_45C820B6483D494EBFE6F9A28A30760C" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1j.win32\\bin\\ssleay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1k.win32\\bin\\ssleay32.dll" "TargetName" = "8:ssleay32.dll" "Tag" = "8:" "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24" @@ -2446,7 +2446,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_732094CE07974147A084EDD6A5F43C6F" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1j.win32\\lib\\ssleay32.lib" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1k.win32\\lib\\ssleay32.lib" "TargetName" = "8:ssleay32.lib" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -4006,7 +4006,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E80B0549492B4D76B7EB93941A6BF89D" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1j.win32\\bin\\libeay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1k.win32\\bin\\libeay32.dll" "TargetName" = "8:libeay32.dll" "Tag" = "8:" "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24" diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj b/NT/installer64/MonetDB-ODBC-Installer.vdproj --- a/NT/installer64/MonetDB-ODBC-Installer.vdproj +++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj @@ -330,7 +330,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_779449EF5BAD4B068A50802402E52278" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1j.win64\\bin\\libeay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1k.win64\\bin\\libeay32.dll" "TargetName" = "8:libeay32.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" @@ -370,7 +370,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B1B1C0011D7945F892A77F529772EA72" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1j.win64\\bin\\ssleay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1k.win64\\bin\\ssleay32.dll" "TargetName" = "8:ssleay32.dll" "Tag" = "8:" "Folder" = "8:_376EC0506E4F452CA2C78ACE11515435" diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj b/NT/installer64/MonetDB5-SQL-Installer.vdproj --- a/NT/installer64/MonetDB5-SQL-Installer.vdproj +++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj @@ -1786,7 +1786,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E0FEE7726DA47369758C263666F3DB1" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1j.win64\\lib\\libeay32.lib" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1k.win64\\lib\\libeay32.lib" "TargetName" = "8:libeay32.lib" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -2066,7 +2066,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_45C820B6483D494EBFE6F9A28A30760C" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1j.win64\\bin\\ssleay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1k.win64\\bin\\ssleay32.dll" "TargetName" = "8:ssleay32.dll" "Tag" = "8:" "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24" @@ -2426,7 +2426,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_732094CE07974147A084EDD6A5F43C6F" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1j.win64\\lib\\ssleay32.lib" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1k.win64\\lib\\ssleay32.lib" "TargetName" = "8:ssleay32.lib" "Tag" = "8:" "Folder" = "8:_A3C9BE5CA72B42628868618D180581DA" @@ -3966,7 +3966,7 @@ } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E80B0549492B4D76B7EB93941A6BF89D" { - "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1j.win64\\bin\\libeay32.dll" + "SourcePath" = "8:C:\\Libraries\\openssl-1.0.1k.win64\\bin\\libeay32.dll" "TargetName" = "8:libeay32.dll" "Tag" = "8:" "Folder" = "8:_1EC19BD0D849484790DB6A7D69758E24" diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst --- a/buildtools/doc/windowsbuild.rst +++ b/buildtools/doc/windowsbuild.rst @@ -295,17 +295,17 @@ required for the MonetDB5 component, and the clients component when it needs to talk to a MonetDB5 server. Download the source from http://www.openssl.org/. We used the latest -stable version (1.0.1j). Follow the instructions in the file +stable version (1.0.1k). Follow the instructions in the file ``INSTALL.W32`` or ``INSTALL.W64``. We used the option ``enable-static-engine`` as described in the instructions. .. The actual commands used were:: - perl Configure VC-WIN32 no-asm enable-static-engine --prefix=C:\Libraries\openssl-1.0.1j.win32 + perl Configure VC-WIN32 no-asm enable-static-engine --prefix=C:\Libraries\openssl-1.0.1k.win32 ms\do_ms.bat nmake /f ms\ntdll.mak nmake /f ms\ntdll.mak install and:: - perl Configure VC-WIN64A enable-static-engine --prefix=C:\Libraries\openssl-1.0.1j.win64 + perl Configure VC-WIN64A enable-static-engine --prefix=C:\Libraries\openssl-1.0.1k.win64 ms\do_win64a nmake /f ms\ntdll.mak nmake /f ms\ntdll.mak install diff --git a/clients/ChangeLog.Oct2014 b/clients/ChangeLog.Oct2014 --- a/clients/ChangeLog.Oct2014 +++ b/clients/ChangeLog.Oct2014 @@ -1,3 +1,30 @@ # ChangeLog file for clients # This file is updated with Maddlog +* Tue Jan 13 2015 Sjoerd Mullender <sjo...@acm.org> +- Changes to the Perl interface, thanks to Stefan O'Rear: + 1. removes "use sigtrap", because this has global effects and should + not be used by modules, only by the application. + 2. allows Perl 5.8.1+ Unicode strings to be passed to quote() and + included in statements (UTF-8 encoded, as expected by Monet's str + module) + 3. quote and unquote now use the same quoting rules as the MonetDB + server, allowing for all characters except NUL to be round-tripped + 4. several character loops have been reimplemented in regex for much + greater performance + 5. micro-optimizations to the result fetch loop + 6. block boundaries are preserved in piggyback data so that Xclose is + not appended or prepended to a SQL command + 7. diagnostic messages #foo before a result header are ignored, this + is necessary to use recycler_pipe + 8. fail quickly and loudly if we receive a continuation prompt (or any + other response that starts with a non-ASCII character) + 9. header lines must start with %, not merely contain %, fixing a bug + when querying a table where string values contain % + 10. after closing a large resultset, account for the fact that a reply + will come and do not lose sync + 11. allow a MAPI_TRACE environment variable to dump wire protocol + frames to standard output + 12. fixes maximum MAPI block size to match the server limit of 16k. + previously would crash on blocks larger than 16k + diff --git a/clients/R/Tests/install.sh b/clients/R/Tests/install.sh --- a/clients/R/Tests/install.sh +++ b/clients/R/Tests/install.sh @@ -2,10 +2,10 @@ # install local version RLIBDIR=$TSTTRGDIR/rlibdir mkdir -p $RLIBDIR -R CMD INSTALL $TSTSRCDIR/../MonetDB.R -l $RLIBDIR >> /dev/null 2>&1 +out1=$(R CMD INSTALL $TSTSRCDIR/../MonetDB.R -l $RLIBDIR 2>&1) # try loading the required packages -R --vanilla --quiet -e "library(MonetDB.R,lib.loc=\"$RLIBDIR\"); library(dplyr); library(sqlsurvey)" >> /dev/null 2>&1 +out2=$(R --vanilla --quiet -e "library(MonetDB.R,lib.loc=\"$RLIBDIR\"); library(dplyr); library(sqlsurvey)" 2>&1) RRET=$? @@ -13,5 +13,8 @@ if [ $RRET -eq 0 ]; then echo "All right, packages installed" else - echo "Something went wrong" -fi \ No newline at end of file + echo "Something went wrong" + echo "$out1" + echo + echo "$out2" +fi diff --git a/clients/Tests/MAL-signatures_all.stable.out b/clients/Tests/MAL-signatures_all.stable.out --- a/clients/Tests/MAL-signatures_all.stable.out +++ b/clients/Tests/MAL-signatures_all.stable.out @@ -2661,41 +2661,33 @@ command algebra.uselect(b:bat[:any_1,:an address ALGuselectInclusive; comment See select() but limited to head values -command alarm.alarm(secs:int,action:str):void -address ALARMsetalarm; -comment execute action in X secs - command alarm.ctime{unsafe}():str address ALARMctime; -comment current time as a string +comment Return the current time as a C-time string. command alarm.epilogue():void address ALARMepilogue; -comment Finalize alarm module +comment Finalize alarm module. command alarm.epoch{unsafe}():int address ALARMepoch; -comment current time as unix epoch +comment Return the current time as UNIX epoch. command alarm.prelude():void address ALARMprelude; -comment Initialize alarm module - -command alarm.sleep(secs:int):void +comment Initialize alarm module. + +command alarm.sleep{unsafe}(secs:int):void address ALARMsleep; -comment sleep X secs +comment Sleep a few seconds command alarm.time{unsafe}():int address ALARMtime; -comment time in millisecs - -command alarm.timers{unsafe}():bat[:str,:str] -address ALARMtimers; -comment give a list of all active timers +comment Return time in milliseconds. command alarm.usec{unsafe}():lng address ALARMusec; -comment return cpu microseconds info +comment Return time in microseconds. command batbam.bam_flag(flags:bat[:oid,:sht],name:str):bat[:oid,:bit] address bam_flag_bat; @@ -31504,7 +31496,7 @@ command bat.append(i:bat[:any_1,:any_2], address BKCappend_wrap; comment append the content of u to i -command bat.attach(tt:int,heapfile:str):bat[:void,:any_1] +command bat.attach(tt:int,heapfile:str):bat[:oid,:any_1] address BKCattach; comment Returns a new BAT with dense head and tail of the given type and uses the given file to initialize the tail. The file will be owned by the server. @@ -31524,9 +31516,9 @@ command bat.delete(b:bat[:any_1,:any_2], address BKCdelete_bun; comment Delete one specific BUN. -command bat.densebat(size:wrd):bat[:oid,:oid] +command bat.densebat(sz:wrd):bat[:oid,:oid] address BKCdensebat; -comment Creates a new [void,void] BAT of size 'size'. +comment Creates a new [void,void] BAT of size 'sz'. command bat.getHeat(b:bat[:oid,:any_2]):lng address BKCheat; @@ -31544,21 +31536,13 @@ command bat.getAlpha(b:bat[:any_1,:any_2 address BKCgetAlpha; comment Obtain the list of BUNs added -command bat.getSpaceUsed(b:bat[:any_1,:any_2]):lng -address BKCgetSpaceUsed; -comment Determine the total space (in bytes) occupied by a BAT. - -command bat.getStorageSize(b:bat[:any_1,:any_2]):lng -address BKCgetStorageSize; -comment Determine the total space (in bytes) reserved for a BAT. - command bat.getSequenceBase(b:bat[:oid,:any_1]):oid address BKCgetSequenceBase; comment Get the sequence base for the void column of a BAT. -command bat.getAccess(b:bat[:any_1,:any_2]):str +command bat.getAccess(b:bat[:oid,:any_1]):str address BKCgetAccess; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list