Changeset: 8c9c7883d7e5 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8c9c7883d7e5 Added Files: sql/test/BugTracker-2016/Tests/querylog.stable.err sql/test/BugTracker-2016/Tests/querylog.stable.out sql/test/malloc_fail/Tests/setmemorylimit-fail.sql sql/test/malloc_fail/Tests/setmemorylimit-fail.stable.err sql/test/malloc_fail/Tests/setmemorylimit-fail.stable.out sql/test/malloc_fail/Tests/setmemorylimit-fail2.sql Removed Files: debian/python-monetdb.install debian/python3-monetdb.install Modified Files: NT/installer32/MonetDB5-SQL-Installer.vdproj NT/installer64/MonetDB5-SQL-Installer.vdproj clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out clients/Tests/exports.stable.out common/stream/stream.h debian/control debian/rules gdk/gdk.h gdk/gdk_utils.c gdk/gdk_utils.h monetdb5/mal/mal_client.c monetdb5/mal/mal_exception.c monetdb5/mal/mal_exception.h monetdb5/mal/mal_instruction.c monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_interpreter.h monetdb5/mal/mal_listing.c monetdb5/mal/mal_scenario.c monetdb5/mal/mal_session.c monetdb5/modules/atoms/xml.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/tablet.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_scenario.c sql/common/sql_list.c sql/common/sql_mem.c sql/server/rel_select.c sql/server/rel_semantic.c sql/storage/sql_catalog.c sql/test/BugTracker-2016/Tests/All sql/test/BugTracker-2016/Tests/storagemodel.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit sql/test/malloc_fail/Tests/All sql/test/malloc_fail/Tests/setmemorylimit.sql testing/MkillUsers.in testing/Mtest.py.in tools/merovingian/daemon/argvcmds.c tools/merovingian/daemon/controlrunner.c tools/merovingian/daemon/discoveryrunner.c tools/merovingian/daemon/merovingian.c tools/merovingian/utils/utils.c tools/merovingian/utils/utils.h Branch: jit Log Message:
Merge with default branch. diffs (truncated from 2923 to 300 lines): 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 @@ -891,12 +891,6 @@ } "Entry" { - "MsmKey" = "8:_E8534226BFAE4A2B872E1E20D3283276" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_EC1D2673E41648D1A0365DCCBC13211F" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -3950,26 +3944,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E8534226BFAE4A2B872E1E20D3283276" - { - "SourcePath" = "8:lib\\monetdb5\\recycle.mal" - "TargetName" = "8:recycle.mal" - "Tag" = "8:" - "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EC1D2673E41648D1A0365DCCBC13211F" { "SourcePath" = "8:lib\\monetdb5\\createdb\\09_like.sql" 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 @@ -891,12 +891,6 @@ } "Entry" { - "MsmKey" = "8:_E8534226BFAE4A2B872E1E20D3283276" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_EC1D2673E41648D1A0365DCCBC13211F" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" @@ -3950,26 +3944,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E8534226BFAE4A2B872E1E20D3283276" - { - "SourcePath" = "8:lib\\monetdb5\\recycle.mal" - "TargetName" = "8:recycle.mal" - "Tag" = "8:" - "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_EC1D2673E41648D1A0365DCCBC13211F" { "SourcePath" = "8:lib\\monetdb5\\createdb\\09_like.sql" diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -20,7 +20,7 @@ Ready. # 17:25:33 > "mclient" "-lmal" "-ftest" "-Eutf-8" "--host=/var/tmp/mtest-25210" "--port=34276" # 17:25:33 > -command aggr.avg(b:bat[:dbl],g:bat[:oid],e:bat[:any_1]) (X_4:bat[:dbl],X_5:bat[:lng]) +command aggr.avg(b:bat[:dbl],g:bat[:oid],e:bat[:any_1]) (X_0:bat[:dbl],X_1:bat[:lng]) address AGGRavg23_dbl; comment Grouped tail average on dbl, also returns count @@ -28,7 +28,7 @@ command aggr.avg(b:bat[:dbl],g:bat[:oid] address AGGRavg13_dbl; comment Grouped tail average on dbl -command aggr.avg(b:bat[:flt],g:bat[:oid],e:bat[:any_1]) (X_4:bat[:dbl],X_5:bat[:lng]) +command aggr.avg(b:bat[:flt],g:bat[:oid],e:bat[:any_1]) (X_0:bat[:dbl],X_1:bat[:lng]) address AGGRavg23_dbl; comment Grouped tail average on flt, also returns count @@ -36,7 +36,7 @@ command aggr.avg(b:bat[:flt],g:bat[:oid] address AGGRavg13_dbl; comment Grouped tail average on flt -command aggr.avg(b:bat[:lng],g:bat[:oid],e:bat[:any_1]) (X_4:bat[:dbl],X_5:bat[:lng]) +command aggr.avg(b:bat[:lng],g:bat[:oid],e:bat[:any_1]) (X_0:bat[:dbl],X_1:bat[:lng]) address AGGRavg23_dbl; comment Grouped tail average on lng, also returns count @@ -44,7 +44,7 @@ command aggr.avg(b:bat[:lng],g:bat[:oid] address AGGRavg13_dbl; comment Grouped tail average on lng -command aggr.avg(b:bat[:int],g:bat[:oid],e:bat[:any_1]) (X_4:bat[:dbl],X_5:bat[:lng]) +command aggr.avg(b:bat[:int],g:bat[:oid],e:bat[:any_1]) (X_0:bat[:dbl],X_1:bat[:lng]) address AGGRavg23_dbl; comment Grouped tail average on int, also returns count @@ -52,7 +52,7 @@ command aggr.avg(b:bat[:int],g:bat[:oid] address AGGRavg13_dbl; comment Grouped tail average on int -command aggr.avg(b:bat[:sht],g:bat[:oid],e:bat[:any_1]) (X_4:bat[:dbl],X_5:bat[:lng]) +command aggr.avg(b:bat[:sht],g:bat[:oid],e:bat[:any_1]) (X_0:bat[:dbl],X_1:bat[:lng]) address AGGRavg23_dbl; comment Grouped tail average on sht, also returns count @@ -60,7 +60,7 @@ command aggr.avg(b:bat[:sht],g:bat[:oid] address AGGRavg13_dbl; comment Grouped tail average on sht -command aggr.avg(b:bat[:bte],g:bat[:oid],e:bat[:any_1]) (X_4:bat[:dbl],X_5:bat[:lng]) +command aggr.avg(b:bat[:bte],g:bat[:oid],e:bat[:any_1]) (X_0:bat[:dbl],X_1:bat[:lng]) address AGGRavg23_dbl; comment Grouped tail average on bte, also returns count @@ -868,11 +868,11 @@ command aggr.stdev(b:bat[:dbl],g:bat[:oi address AGGRstdev3_dbl; comment Grouped tail standard deviation (sample/non-biased) on dbl -command aggr.subavg(b:bat[:dbl],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) (X_7:bat[:dbl],X_8:bat[:lng]) +command aggr.subavg(b:bat[:dbl],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) (X_0:bat[:dbl],X_1:bat[:lng]) address AGGRsubavg2cand_dbl; comment Grouped average aggregate with candidates list, also returns count -command aggr.subavg(b:bat[:dbl],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) (X_6:bat[:dbl],X_7:bat[:lng]) +command aggr.subavg(b:bat[:dbl],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) (X_0:bat[:dbl],X_1:bat[:lng]) address AGGRsubavg2_dbl; comment Grouped average aggregate, also returns count @@ -924,11 +924,11 @@ command aggr.stdev(b:bat[:flt],g:bat[:oi address AGGRstdev3_dbl; comment Grouped tail standard deviation (sample/non-biased) on flt -command aggr.subavg(b:bat[:flt],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) (X_7:bat[:dbl],X_8:bat[:lng]) +command aggr.subavg(b:bat[:flt],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) (X_0:bat[:dbl],X_1:bat[:lng]) address AGGRsubavg2cand_dbl; comment Grouped average aggregate with candidates list, also returns count -command aggr.subavg(b:bat[:flt],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) (X_6:bat[:dbl],X_7:bat[:lng]) +command aggr.subavg(b:bat[:flt],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) (X_0:bat[:dbl],X_1:bat[:lng]) address AGGRsubavg2_dbl; comment Grouped average aggregate, also returns count @@ -980,11 +980,11 @@ command aggr.stdev(b:bat[:lng],g:bat[:oi address AGGRstdev3_dbl; comment Grouped tail standard deviation (sample/non-biased) on lng -command aggr.subavg(b:bat[:lng],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) (X_7:bat[:dbl],X_8:bat[:lng]) +command aggr.subavg(b:bat[:lng],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) (X_0:bat[:dbl],X_1:bat[:lng]) address AGGRsubavg2cand_dbl; comment Grouped average aggregate with candidates list, also returns count -command aggr.subavg(b:bat[:lng],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) (X_6:bat[:dbl],X_7:bat[:lng]) +command aggr.subavg(b:bat[:lng],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) (X_0:bat[:dbl],X_1:bat[:lng]) address AGGRsubavg2_dbl; comment Grouped average aggregate, also returns count @@ -1036,11 +1036,11 @@ command aggr.stdev(b:bat[:int],g:bat[:oi address AGGRstdev3_dbl; comment Grouped tail standard deviation (sample/non-biased) on int -command aggr.subavg(b:bat[:int],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) (X_7:bat[:dbl],X_8:bat[:lng]) +command aggr.subavg(b:bat[:int],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) (X_0:bat[:dbl],X_1:bat[:lng]) address AGGRsubavg2cand_dbl; comment Grouped average aggregate with candidates list, also returns count -command aggr.subavg(b:bat[:int],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) (X_6:bat[:dbl],X_7:bat[:lng]) +command aggr.subavg(b:bat[:int],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) (X_0:bat[:dbl],X_1:bat[:lng]) address AGGRsubavg2_dbl; comment Grouped average aggregate, also returns count @@ -1092,11 +1092,11 @@ command aggr.stdev(b:bat[:sht],g:bat[:oi address AGGRstdev3_dbl; comment Grouped tail standard deviation (sample/non-biased) on sht -command aggr.subavg(b:bat[:sht],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) (X_7:bat[:dbl],X_8:bat[:lng]) +command aggr.subavg(b:bat[:sht],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) (X_0:bat[:dbl],X_1:bat[:lng]) address AGGRsubavg2cand_dbl; comment Grouped average aggregate with candidates list, also returns count -command aggr.subavg(b:bat[:sht],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) (X_6:bat[:dbl],X_7:bat[:lng]) +command aggr.subavg(b:bat[:sht],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) (X_0:bat[:dbl],X_1:bat[:lng]) address AGGRsubavg2_dbl; comment Grouped average aggregate, also returns count @@ -1148,11 +1148,11 @@ command aggr.stdev(b:bat[:bte],g:bat[:oi address AGGRstdev3_dbl; comment Grouped tail standard deviation (sample/non-biased) on bte -command aggr.subavg(b:bat[:bte],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) (X_7:bat[:dbl],X_8:bat[:lng]) +command aggr.subavg(b:bat[:bte],g:bat[:oid],e:bat[:any_1],s:bat[:oid],skip_nils:bit,abort_on_error:bit) (X_0:bat[:dbl],X_1:bat[:lng]) address AGGRsubavg2cand_dbl; comment Grouped average aggregate with candidates list, also returns count -command aggr.subavg(b:bat[:bte],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) (X_6:bat[:dbl],X_7:bat[:lng]) +command aggr.subavg(b:bat[:bte],g:bat[:oid],e:bat[:any_1],skip_nils:bit,abort_on_error:bit) (X_0:bat[:dbl],X_1:bat[:lng]) address AGGRsubavg2_dbl; comment Grouped average aggregate, also returns count @@ -1516,15 +1516,15 @@ command algebra.exist(b:bat[:any_1],val: address ALGexist; comment Returns whether 'val' occurs in b. -pattern algebra.firstn(b:bat[:any],s:bat[:oid],g:bat[:oid],n:lng,asc:bit,distinct:bit) (X_7:bat[:oid],X_8:bat[:oid]) +pattern algebra.firstn(b:bat[:any],s:bat[:oid],g:bat[:oid],n:lng,asc:bit,distinct:bit) (X_0:bat[:oid],X_1:bat[:oid]) address ALGfirstn; comment Calculate first N values of B with candidate list S -pattern algebra.firstn(b:bat[:any],s:bat[:oid],n:lng,asc:bit,distinct:bit) (X_6:bat[:oid],X_7:bat[:oid]) +pattern algebra.firstn(b:bat[:any],s:bat[:oid],n:lng,asc:bit,distinct:bit) (X_0:bat[:oid],X_1:bat[:oid]) address ALGfirstn; comment Calculate first N values of B with candidate list S -pattern algebra.firstn(b:bat[:any],n:lng,asc:bit,distinct:bit) (X_5:bat[:oid],X_6:bat[:oid]) +pattern algebra.firstn(b:bat[:any],n:lng,asc:bit,distinct:bit) (X_0:bat[:oid],X_1:bat[:oid]) address ALGfirstn; comment Calculate first N values of B @@ -1552,9 +1552,9 @@ command algebra.groupby(gids:bat[:oid],c address ALGgroupby; comment Produces a new BAT with groups identified by the head column. The result contains tail times the head value, ie the tail contains the result group sizes. -command algebra.ilikesubjoin(l:bat[:str],r:bat[:str],sl:bat[:oid],sr:bat[:oid],nil_matches:bit,estimate:lng) (X_7:bat[:oid],X_8:bat[:oid]) +command algebra.ilikesubjoin(l:bat[:str],r:bat[:str],sl:bat[:oid],sr:bat[:oid],nil_matches:bit,estimate:lng) (X_0:bat[:oid],X_1:bat[:oid]) address ILIKEsubjoin1; -command algebra.ilikesubjoin(l:bat[:str],r:bat[:str],esc:str,sl:bat[:oid],sr:bat[:oid],nil_matches:bit,estimate:lng) (X_8:bat[:oid],X_9:bat[:oid]) +command algebra.ilikesubjoin(l:bat[:str],r:bat[:str],esc:str,sl:bat[:oid],sr:bat[:oid],nil_matches:bit,estimate:lng) (X_0:bat[:oid],X_1:bat[:oid]) address ILIKEsubjoin; comment Join the string bat L with the pattern bat Rwith optional candidate lists SL and SR using pattern escape string ESCand doing a case insensitive match.The result is two aligned bats with oids of matching rows. @@ -1566,9 +1566,9 @@ command algebra.ilike(s:str,pat:str):bit address PCREilike2; command algebra.ilike(s:str,pat:str,esc:str):bit address PCREilike3; -command algebra.likesubjoin(l:bat[:str],r:bat[:str],sl:bat[:oid],sr:bat[:oid],nil_matches:bit,estimate:lng) (X_7:bat[:oid],X_8:bat[:oid]) +command algebra.likesubjoin(l:bat[:str],r:bat[:str],sl:bat[:oid],sr:bat[:oid],nil_matches:bit,estimate:lng) (X_0:bat[:oid],X_1:bat[:oid]) address LIKEsubjoin1; -command algebra.likesubjoin(l:bat[:str],r:bat[:str],esc:str,sl:bat[:oid],sr:bat[:oid],nil_matches:bit,estimate:lng) (X_8:bat[:oid],X_9:bat[:oid]) +command algebra.likesubjoin(l:bat[:str],r:bat[:str],esc:str,sl:bat[:oid],sr:bat[:oid],nil_matches:bit,estimate:lng) (X_0:bat[:oid],X_1:bat[:oid]) address LIKEsubjoin; comment Join the string bat L with the pattern bat Rwith optional candidate lists SL and SR using pattern escape string ESCand doing a case sensitive match.The result is two aligned bats with oids of matching rows. @@ -1640,32 +1640,32 @@ command algebra.subdiff(l:bat[:any_1],r: address ALGsubdiff; comment Difference of l and r with candidate lists -command algebra.subrangejoin(l:bat[:any_1],r1:bat[:any_1],r2:bat[:any_1],sl:bat[:oid],sr:bat[:oid],li:bit,hi:bit,estimate:lng) (X_9:bat[:oid],X_10:bat[:oid]) +command algebra.subrangejoin(l:bat[:any_1],r1:bat[:any_1],r2:bat[:any_1],sl:bat[:oid],sr:bat[:oid],li:bit,hi:bit,estimate:lng) (X_0:bat[:oid],X_1:bat[:oid]) address ALGsubrangejoin; comment Range join: values in l and r1/r2 match if r1 <[=] l <[=] r2 -command algebra.subbandjoin(l:bat[:any_1],r:bat[:any_1],sl:bat[:oid],sr:bat[:oid],c1:any_1,c2:any_1,li:bit,hi:bit,estimate:lng) (X_10:bat[:oid],X_11:bat[:oid]) +command algebra.subbandjoin(l:bat[:any_1],r:bat[:any_1],sl:bat[:oid],sr:bat[:oid],c1:any_1,c2:any_1,li:bit,hi:bit,estimate:lng) (X_0:bat[:oid],X_1:bat[:oid]) address ALGsubbandjoin; comment Band join: values in l and r match if r - c1 <[=] l <[=] r + c2 -function algebra.subantijoin(l:bat[:any_1],r:bat[:any_1],sl:bat[:oid],sr:bat[:oid],nil_matches:bit,estimate:lng) (X_7:bat[:oid],X_8:bat[:oid]); -command algebra.subthetajoin(l:bat[:any_1],r:bat[:any_1],sl:bat[:oid],sr:bat[:oid],op:int,nil_matches:bit,estimate:lng) (X_8:bat[:oid],X_9:bat[:oid]) +function algebra.subantijoin(l:bat[:any_1],r:bat[:any_1],sl:bat[:oid],sr:bat[:oid],nil_matches:bit,estimate:lng) (X_0:bat[:oid],X_1:bat[:oid]); +command algebra.subthetajoin(l:bat[:any_1],r:bat[:any_1],sl:bat[:oid],sr:bat[:oid],op:int,nil_matches:bit,estimate:lng) (X_0:bat[:oid],X_1:bat[:oid]) address ALGsubthetajoin; comment Theta join with candidate lists -command algebra.subsemijoin(l:bat[:any_1],r:bat[:any_1],sl:bat[:oid],sr:bat[:oid],nil_matches:bit,estimate:lng) (X_7:bat[:oid],X_8:bat[:oid]) +command algebra.subsemijoin(l:bat[:any_1],r:bat[:any_1],sl:bat[:oid],sr:bat[:oid],nil_matches:bit,estimate:lng) (X_0:bat[:oid],X_1:bat[:oid]) address ALGsubsemijoin; comment Semi join with candidate lists -command algebra.subouterjoin(l:bat[:any_1],r:bat[:any_1],sl:bat[:oid],sr:bat[:oid],nil_matches:bit,estimate:lng) (X_7:bat[:oid],X_8:bat[:oid]) +command algebra.subouterjoin(l:bat[:any_1],r:bat[:any_1],sl:bat[:oid],sr:bat[:oid],nil_matches:bit,estimate:lng) (X_0:bat[:oid],X_1:bat[:oid]) address ALGsubouterjoin; comment Left outer join with candidate lists _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list