Changeset: 6ec969866714 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6ec969866714 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures_nocfitsio.stable.out clients/Tests/MAL-signatures_nogeom.stable.out clients/Tests/exports.stable.out monetdb5/modules/mal/recycle.mal monetdb5/optimizer/opt_centipede.h monetdb5/optimizer/optimizer.mal sql/backends/monet5/sql.mx Branch: default Log Message:
Removed references to non-existing addresses, fixed typo, added implementation. diffs (243 lines): 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 @@ -38615,10 +38615,6 @@ pattern calc.xor(v1:bit,v2:bit):bit address CMDvarXOR; comment Return V1 XOR V2 -command centipede.materialize(b:bat[:any_1,:any_2],low:any_2,high:any_2):bat[:any_1,:any_2] -address OPTcentipedeMaterialize; -comment Implement the centipede partition operation. Throw an exception if the partition was empty,because then the subquery should produce a NIL - pattern centipede.vector(b:bat[:oid,:any_1]) (X_2:oid,X_3:oid...) address OPTvectorOid; comment Derive a series of slices values based on sampling @@ -40226,10 +40222,6 @@ pattern mdb.List():void address MDBlistDetail; comment Dump the current routine on standard out. -pattern mdb.collect(v:any_1):void -address OPTtraceCall; -comment Dump the previous instruction to a temporary file - pattern mdb.dump():void address MDBdump; comment Dump instruction, stacktrace, and stack @@ -41797,14 +41789,6 @@ pattern recycle.dump():void address RECYCLEdumpWrap; comment Dump summary of recycle table -pattern recycle.epilogue():void -address RECYCLEepilogueWrap; -comment To be called when recycler is not needed anymore - -pattern recycle.prologue():void -address RECYCLEprologueWrap; -comment Called at the start of a recycle controlled function - pattern recycle.reset(bid:bat[:oid,:any]):void address RECYCLEresetBATwrap; comment Reset a recycled bat variable @@ -42305,7 +42289,7 @@ comment Return column bat with delta's a command sql.querylog_disable():void address QLOGdisable; command sql.querylog_enable(thres:int):void -address QLOGenablehreshold; +address QLOGenableThreshold; command sql.querylog_enable():void address QLOGenable; pattern sql.querylog_empty():void diff --git a/clients/Tests/MAL-signatures_nocfitsio.stable.out b/clients/Tests/MAL-signatures_nocfitsio.stable.out --- a/clients/Tests/MAL-signatures_nocfitsio.stable.out +++ b/clients/Tests/MAL-signatures_nocfitsio.stable.out @@ -38615,10 +38615,6 @@ pattern calc.xor(v1:bit,v2:bit):bit address CMDvarXOR; comment Return V1 XOR V2 -command centipede.materialize(b:bat[:any_1,:any_2],low:any_2,high:any_2):bat[:any_1,:any_2] -address OPTcentipedeMaterialize; -comment Implement the centipede partition operation. Throw an exception if the partition was empty,because then the subquery should produce a NIL - pattern centipede.vector(b:bat[:oid,:any_1]) (X_2:oid,X_3:oid...) address OPTvectorOid; comment Derive a series of slices values based on sampling @@ -40202,10 +40198,6 @@ pattern mdb.List():void address MDBlistDetail; comment Dump the current routine on standard out. -pattern mdb.collect(v:any_1):void -address OPTtraceCall; -comment Dump the previous instruction to a temporary file - pattern mdb.dump():void address MDBdump; comment Dump instruction, stacktrace, and stack @@ -41773,14 +41765,6 @@ pattern recycle.dump():void address RECYCLEdumpWrap; comment Dump summary of recycle table -pattern recycle.epilogue():void -address RECYCLEepilogueWrap; -comment To be called when recycler is not needed anymore - -pattern recycle.prologue():void -address RECYCLEprologueWrap; -comment Called at the start of a recycle controlled function - pattern recycle.reset(bid:bat[:oid,:any]):void address RECYCLEresetBATwrap; comment Reset a recycled bat variable @@ -42281,7 +42265,7 @@ comment Return column bat with delta's a command sql.querylog_disable():void address QLOGdisable; command sql.querylog_enable(thres:int):void -address QLOGenablehreshold; +address QLOGenableThreshold; command sql.querylog_enable():void address QLOGenable; pattern sql.querylog_empty():void diff --git a/clients/Tests/MAL-signatures_nogeom.stable.out b/clients/Tests/MAL-signatures_nogeom.stable.out --- a/clients/Tests/MAL-signatures_nogeom.stable.out +++ b/clients/Tests/MAL-signatures_nogeom.stable.out @@ -38587,10 +38587,6 @@ pattern calc.xor(v1:bit,v2:bit):bit address CMDvarXOR; comment Return V1 XOR V2 -command centipede.materialize(b:bat[:any_1,:any_2],low:any_2,high:any_2):bat[:any_1,:any_2] -address OPTcentipedeMaterialize; -comment Implement the centipede partition operation. Throw an exception if the partition was empty,because then the subquery should produce a NIL - pattern centipede.vector(b:bat[:oid,:any_1]) (X_2:oid,X_3:oid...) address OPTvectorOid; comment Derive a series of slices values based on sampling @@ -40040,10 +40036,6 @@ pattern mdb.List():void address MDBlistDetail; comment Dump the current routine on standard out. -pattern mdb.collect(v:any_1):void -address OPTtraceCall; -comment Dump the previous instruction to a temporary file - pattern mdb.dump():void address MDBdump; comment Dump instruction, stacktrace, and stack @@ -41611,14 +41603,6 @@ pattern recycle.dump():void address RECYCLEdumpWrap; comment Dump summary of recycle table -pattern recycle.epilogue():void -address RECYCLEepilogueWrap; -comment To be called when recycler is not needed anymore - -pattern recycle.prologue():void -address RECYCLEprologueWrap; -comment Called at the start of a recycle controlled function - pattern recycle.reset(bid:bat[:oid,:any]):void address RECYCLEresetBATwrap; comment Reset a recycled bat variable @@ -42119,7 +42103,7 @@ comment Return column bat with delta's a command sql.querylog_disable():void address QLOGdisable; command sql.querylog_enable(thres:int):void -address QLOGenablehreshold; +address QLOGenableThreshold; command sql.querylog_enable():void address QLOGenable; pattern sql.querylog_empty():void 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 @@ -1766,7 +1766,6 @@ int OPTaccumulatorsImplementation(Client void OPTaliasRemap(InstrPtr p, int *alias); int OPTaliasesImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); int OPTcentipedeImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str OPTcentipedeMaterialize(int *result, int *bid, ptr low, ptr high); int OPTclusterImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); int OPTcoercionImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); int OPTcommonTermsImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); diff --git a/monetdb5/modules/mal/recycle.mal b/monetdb5/modules/mal/recycle.mal --- a/monetdb5/modules/mal/recycle.mal +++ b/monetdb5/modules/mal/recycle.mal @@ -41,10 +41,10 @@ pattern drop():void address RECYCLEdropWrap comment "Remove the recycle cache"; -pattern prologue():void -address RECYCLEprologueWrap -comment "Called at the start of a recycle controlled function"; +# pattern prologue():void +# address RECYCLEprologueWrap +# comment "Called at the start of a recycle controlled function"; -pattern epilogue():void -address RECYCLEepilogueWrap -comment "To be called when recycler is not needed anymore"; +# pattern epilogue():void +# address RECYCLEepilogueWrap +# comment "To be called when recycler is not needed anymore"; diff --git a/monetdb5/optimizer/opt_centipede.h b/monetdb5/optimizer/opt_centipede.h --- a/monetdb5/optimizer/opt_centipede.h +++ b/monetdb5/optimizer/opt_centipede.h @@ -25,7 +25,6 @@ opt_export str OPTvector(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); opt_export str OPTvectorOid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -opt_export str OPTcentipedeMaterialize(int *result, int *bid, ptr low, ptr high); opt_export str OPTpeers(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); opt_export int OPTcentipedeImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); diff --git a/monetdb5/optimizer/optimizer.mal b/monetdb5/optimizer/optimizer.mal --- a/monetdb5/optimizer/optimizer.mal +++ b/monetdb5/optimizer/optimizer.mal @@ -39,10 +39,10 @@ pattern optimizer.centipede(mod:str, fcn address OPTwrapper comment "Modify the plan to exploit parallel processing on multiple cores"; -command centipede.materialize(b:bat[:any_1,:any_2], low:any_2, high:any_2) :bat[:any_1,:any_2] -address OPTcentipedeMaterialize -comment "Implement the centipede partition operation. Throw an exception if the partition was empty, -because then the subquery should produce a NIL "; +# command centipede.materialize(b:bat[:any_1,:any_2], low:any_2, high:any_2) :bat[:any_1,:any_2] +# address OPTcentipedeMaterialize +# comment "Implement the centipede partition operation. Throw an exception if the partition was empty, +# because then the subquery should produce a NIL "; pattern centipede.vector(b:bat[:oid,:any_1]) (:oid,:oid...) address OPTvectorOid @@ -494,9 +494,9 @@ pattern optimizer.trace(mod:str, fcn:str address OPTwrapper comment "Collect trace of a specific operation"; -pattern mdb.collect(v:any_1):void -address OPTtraceCall -comment "Dump the previous instruction to a temporary file"; +# pattern mdb.collect(v:any_1):void +# address OPTtraceCall +# comment "Dump the previous instruction to a temporary file"; #opt_pushranges.mal diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx --- a/sql/backends/monet5/sql.mx +++ b/sql/backends/monet5/sql.mx @@ -610,7 +610,7 @@ address sql_querylog_empty; command querylog_enable() address QLOGenable; command querylog_enable(thres:int) -address QLOGenablehreshold; +address QLOGenableThreshold; command querylog_disable() address QLOGdisable; @@ -5169,8 +5169,10 @@ bat@2_2time_@1( int *res, int *bid, int @c @:bat2time(timestamp,str,char,&v)@ @:bat2time(timestamp,timestamp,timestamp,v)@ +@:bat2time(timestamp,nil,void,v)@ @:bat2time(daytime,str,char,&v)@ @:bat2time(daytime,daytime,daytime,v)@ +@:bat2time(daytime,nil,void,v)@ @= fround static inline @1 _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
