Changeset: 9265aa8a2174 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/9265aa8a2174 Modified Files: sql/backends/monet5/sql.c sql/server/sql_parser.y Branch: default Log Message:
Merged simplify_scenario into default. diffs (truncated from 7994 to 300 lines): diff --git a/clients/Tests/MAL-signatures-hge.test b/clients/Tests/MAL-signatures-hge.test --- a/clients/Tests/MAL-signatures-hge.test +++ b/clients/Tests/MAL-signatures-hge.test @@ -44719,11 +44719,6 @@ unsafe pattern clients.setquerytimeout(X CLTqueryTimeout; A query is aborted after q seconds (q=0 means run undisturbed). clients -setsession -unsafe pattern clients.setsession(X_0:lng):void -CLTsetSessionTimeout; -Abort a session after n seconds. -clients setsessiontimeout unsafe pattern clients.setsessiontimeout(X_0:int):void CLTsessionTimeout; @@ -44734,16 +44729,6 @@ unsafe pattern clients.setsessiontimeout CLTsessionTimeout; Set the session timeout for a particulat session id clients -settimeout -unsafe pattern clients.settimeout(X_0:lng):void -CLTsetTimeout; -Abort a query after n seconds. -clients -settimeout -unsafe pattern clients.settimeout(X_0:lng, X_1:lng):void -CLTsetTimeout; -Abort a query after q seconds (q=0 means run undisturbed).@The session timeout aborts the connection after spending too@many seconds on query processing. -clients setworkerlimit unsafe pattern clients.setworkerlimit(X_0:int):void CLTsetworkerlimit; @@ -44923,36 +44908,6 @@ thetaselect pattern dict.thetaselect(X_0:bat[:any], X_1:bat[:oid], X_2:bat[:any_1], X_3:any_1, X_4:str):bat[:oid] DICTthetaselect; thetaselect on a dictionary -factories -getArrival -command factories.getArrival():bat[:timestamp] -FCTgetArrival; -Retrieve the time stamp the last call was made. -factories -getCaller -command factories.getCaller():int -FCTgetCaller; -Retrieve the unique identity of the factory caller. -factories -getDeparture -command factories.getDeparture():bat[:timestamp] -FCTgetDeparture; -Retrieve the time stamp the last answer was returned. -factories -getOwners -command factories.getOwners():bat[:str] -FCTgetOwners; -Retrieve the factory owners table. -factories -getPlants -command factories.getPlants() (X_0:bat[:str], X_1:bat[:str]) -FCTgetPlants; -Retrieve the names for all active factories. -factories -shutdown -pattern factories.shutdown(X_0:str, X_1:str):void -FCTshutdown; -Close a factory. fits attach unsafe pattern fits.attach(X_0:str):void @@ -47199,11 +47154,6 @@ pattern mdb.List():void MDBlistDetail; Dump the current routine on standard out. mdb -dump -pattern mdb.dump():void -MDBdump; -Dump instruction, stacktrace, and stack -mdb getContext command mdb.getContext(X_0:str):str MDBgetExceptionContext; @@ -47259,11 +47209,6 @@ pattern mdb.getVMsize():lng MDBgetVMsize; Retrieve the max VM size mdb -inspect -pattern mdb.inspect(X_0:str, X_1:str):void -MDBinspect; -Run the debugger on a specific function -mdb list pattern mdb.list(X_0:str, X_1:str):void MDBlist3; @@ -47284,11 +47229,6 @@ command mdb.modules():bat[:str] CMDmodules; List available modules mdb -setCatch -pattern mdb.setCatch(X_0:bit):void -MDBsetCatch; -Turn on/off catching exceptions -mdb setDebug pattern mdb.setDebug(X_0:int):int MDBsetDebug; @@ -47299,41 +47239,11 @@ pattern mdb.setDebug(X_0:str):int MDBsetDebugStr; Set the kernel debugging bit-set and return its previous value.@The recognized options are: threads, memory, properties,@io, transactions, modules, algorithms, estimates. mdb -setTrace -pattern mdb.setTrace(X_0:bit):void -MDBsetTrace; -Turn on/off tracing of current routine -mdb -setTrace -pattern mdb.setTrace(X_0:str):void -MDBsetVarTrace; -Turn on/off tracing of a variable -mdb setVMsize pattern mdb.setVMsize(X_0:lng):lng MDBsetVMsize; Manipulate the VM max size in MBs mdb -start -pattern mdb.start():void -MDBstart; -Start interactive debugger -mdb -start -pattern mdb.start(X_0:int):void -MDBstart; -Start interactive debugger on a client -mdb -start -pattern mdb.start(X_0:str, X_1:str):void -MDBstartFactory; -Start interactive debugger on a running factory -mdb -stop -pattern mdb.stop():void -MDBstop; -Stop the interactive debugger -mdb var pattern mdb.var(X_0:str, X_1:str):void MDBvar3; diff --git a/clients/Tests/MAL-signatures.test b/clients/Tests/MAL-signatures.test --- a/clients/Tests/MAL-signatures.test +++ b/clients/Tests/MAL-signatures.test @@ -33214,11 +33214,6 @@ unsafe pattern clients.setquerytimeout(X CLTqueryTimeout; A query is aborted after q seconds (q=0 means run undisturbed). clients -setsession -unsafe pattern clients.setsession(X_0:lng):void -CLTsetSessionTimeout; -Abort a session after n seconds. -clients setsessiontimeout unsafe pattern clients.setsessiontimeout(X_0:int):void CLTsessionTimeout; @@ -33229,16 +33224,6 @@ unsafe pattern clients.setsessiontimeout CLTsessionTimeout; Set the session timeout for a particulat session id clients -settimeout -unsafe pattern clients.settimeout(X_0:lng):void -CLTsetTimeout; -Abort a query after n seconds. -clients -settimeout -unsafe pattern clients.settimeout(X_0:lng, X_1:lng):void -CLTsetTimeout; -Abort a query after q seconds (q=0 means run undisturbed).@The session timeout aborts the connection after spending too@many seconds on query processing. -clients setworkerlimit unsafe pattern clients.setworkerlimit(X_0:int):void CLTsetworkerlimit; @@ -33418,36 +33403,6 @@ thetaselect pattern dict.thetaselect(X_0:bat[:any], X_1:bat[:oid], X_2:bat[:any_1], X_3:any_1, X_4:str):bat[:oid] DICTthetaselect; thetaselect on a dictionary -factories -getArrival -command factories.getArrival():bat[:timestamp] -FCTgetArrival; -Retrieve the time stamp the last call was made. -factories -getCaller -command factories.getCaller():int -FCTgetCaller; -Retrieve the unique identity of the factory caller. -factories -getDeparture -command factories.getDeparture():bat[:timestamp] -FCTgetDeparture; -Retrieve the time stamp the last answer was returned. -factories -getOwners -command factories.getOwners():bat[:str] -FCTgetOwners; -Retrieve the factory owners table. -factories -getPlants -command factories.getPlants() (X_0:bat[:str], X_1:bat[:str]) -FCTgetPlants; -Retrieve the names for all active factories. -factories -shutdown -pattern factories.shutdown(X_0:str, X_1:str):void -FCTshutdown; -Close a factory. fits attach unsafe pattern fits.attach(X_0:str):void @@ -35629,11 +35584,6 @@ pattern mdb.List():void MDBlistDetail; Dump the current routine on standard out. mdb -dump -pattern mdb.dump():void -MDBdump; -Dump instruction, stacktrace, and stack -mdb getContext command mdb.getContext(X_0:str):str MDBgetExceptionContext; @@ -35689,11 +35639,6 @@ pattern mdb.getVMsize():lng MDBgetVMsize; Retrieve the max VM size mdb -inspect -pattern mdb.inspect(X_0:str, X_1:str):void -MDBinspect; -Run the debugger on a specific function -mdb list pattern mdb.list(X_0:str, X_1:str):void MDBlist3; @@ -35714,11 +35659,6 @@ command mdb.modules():bat[:str] CMDmodules; List available modules mdb -setCatch -pattern mdb.setCatch(X_0:bit):void -MDBsetCatch; -Turn on/off catching exceptions -mdb setDebug pattern mdb.setDebug(X_0:int):int MDBsetDebug; @@ -35729,41 +35669,11 @@ pattern mdb.setDebug(X_0:str):int MDBsetDebugStr; Set the kernel debugging bit-set and return its previous value.@The recognized options are: threads, memory, properties,@io, transactions, modules, algorithms, estimates. mdb -setTrace -pattern mdb.setTrace(X_0:bit):void -MDBsetTrace; -Turn on/off tracing of current routine -mdb -setTrace -pattern mdb.setTrace(X_0:str):void -MDBsetVarTrace; -Turn on/off tracing of a variable -mdb setVMsize pattern mdb.setVMsize(X_0:lng):lng MDBsetVMsize; Manipulate the VM max size in MBs mdb -start -pattern mdb.start():void -MDBstart; -Start interactive debugger -mdb -start -pattern mdb.start(X_0:int):void -MDBstart; -Start interactive debugger on a client -mdb -start -pattern mdb.start(X_0:str, X_1:str):void -MDBstartFactory; -Start interactive debugger on a running factory -mdb -stop -pattern mdb.stop():void -MDBstop; -Stop the interactive debugger -mdb var pattern mdb.var(X_0:str, X_1:str):void MDBvar3; 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 @@ -740,15 +740,12 @@ str COPYrejects_clear(Client cntxt, MalB str GRPgroup1(bat *ngid, bat *next, bat *nhis, const bat *bid); str GRPsubgroup5(bat *ngid, bat *next, bat *nhis, const bat *bid, const bat *sid, const bat *gid, const bat *eid, const bat *hid); _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
