Changeset: a3746ba851f1 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a3746ba851f1 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err Branch: jit Log Message:
Approve output diffs (121 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 @@ -31365,11 +31365,11 @@ comment Evaluate constant expressions on pattern optimizer.evaluate():str address OPTwrapper; -pattern optimizer.emptybind(mod:str,fcn:str):str +pattern optimizer.emptycolumn(mod:str,fcn:str):str address OPTwrapper; comment Evaluate empty set expressions. -pattern optimizer.emptybind():str +pattern optimizer.emptycolumn():str address OPTwrapper; pattern optimizer.factorize(mod:str,fcn:str):str address OPTwrapper; @@ -32225,14 +32225,22 @@ pattern sql.export_table(fname:str,fmt:s address mvc_export_row_wrap; comment Prepare a table result set for the COPY INTO stream -pattern sql.emptybind(mvc:int,schema:str,table:str,column:str,access:int,part_nr:int,nr_parts:int) (uid:bat[:oid],uval:bat[:any_1]) +pattern sql.emptycolumn(mvc:int,schema:str,table:str,column:str,access:int,part_nr:int,nr_parts:int) (uid:bat[:oid],uval:bat[:any_1]) address mvc_bind_wrap; -pattern sql.emptybind(mvc:int,schema:str,table:str,column:str,access:int,part_nr:int,nr_parts:int):bat[:any_1] +pattern sql.emptycolumn(mvc:int,schema:str,table:str,column:str,access:int,part_nr:int,nr_parts:int):bat[:any_1] address mvc_bind_wrap; -pattern sql.emptybind(mvc:int,schema:str,table:str,column:str,access:int) (uid:bat[:oid],uval:bat[:any_1]) +pattern sql.emptycolumn(mvc:int,schema:str,table:str,column:str,access:int) (uid:bat[:oid],uval:bat[:any_1]) address mvc_bind_wrap; -pattern sql.emptybind(mvc:int,schema:str,table:str,column:str,access:int):bat[:any_1] +pattern sql.emptycolumn(mvc:int,schema:str,table:str,column:str,access:int):bat[:any_1] address mvc_bind_wrap; +pattern sql.emptycolumnidx(mvc:int,schema:str,table:str,index:str,access:int,part_nr:int,nr_parts:int) (uid:bat[:oid],uval:bat[:any_1]) +address mvc_bind_idxbat_wrap; +pattern sql.emptycolumnidx(mvc:int,schema:str,table:str,index:str,access:int,part_nr:int,nr_parts:int):bat[:any_1] +address mvc_bind_idxbat_wrap; +pattern sql.emptycolumnidx(mvc:int,schema:str,table:str,index:str,access:int) (uid:bat[:oid],uval:bat[:any_1]) +address mvc_bind_idxbat_wrap; +pattern sql.emptycolumnidx(mvc:int,schema:str,table:str,index:str,access:int):bat[:any_1] +address mvc_bind_idxbat_wrap; pattern sql.evalAlgebra(cmd:str,optimize:bit):void address RAstatement; comment Compile and execute a single 'relational algebra' statement diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -40786,11 +40786,11 @@ comment Evaluate constant expressions on pattern optimizer.evaluate():str address OPTwrapper; -pattern optimizer.emptybind(mod:str,fcn:str):str +pattern optimizer.emptycolumn(mod:str,fcn:str):str address OPTwrapper; comment Evaluate empty set expressions. -pattern optimizer.emptybind():str +pattern optimizer.emptycolumn():str address OPTwrapper; pattern optimizer.factorize(mod:str,fcn:str):str address OPTwrapper; @@ -41650,14 +41650,22 @@ pattern sql.export_table(fname:str,fmt:s address mvc_export_row_wrap; comment Prepare a table result set for the COPY INTO stream -pattern sql.emptybind(mvc:int,schema:str,table:str,column:str,access:int,part_nr:int,nr_parts:int) (uid:bat[:oid],uval:bat[:any_1]) +pattern sql.emptycolumn(mvc:int,schema:str,table:str,column:str,access:int,part_nr:int,nr_parts:int) (uid:bat[:oid],uval:bat[:any_1]) address mvc_bind_wrap; -pattern sql.emptybind(mvc:int,schema:str,table:str,column:str,access:int,part_nr:int,nr_parts:int):bat[:any_1] +pattern sql.emptycolumn(mvc:int,schema:str,table:str,column:str,access:int,part_nr:int,nr_parts:int):bat[:any_1] address mvc_bind_wrap; -pattern sql.emptybind(mvc:int,schema:str,table:str,column:str,access:int) (uid:bat[:oid],uval:bat[:any_1]) +pattern sql.emptycolumn(mvc:int,schema:str,table:str,column:str,access:int) (uid:bat[:oid],uval:bat[:any_1]) address mvc_bind_wrap; -pattern sql.emptybind(mvc:int,schema:str,table:str,column:str,access:int):bat[:any_1] +pattern sql.emptycolumn(mvc:int,schema:str,table:str,column:str,access:int):bat[:any_1] address mvc_bind_wrap; +pattern sql.emptycolumnidx(mvc:int,schema:str,table:str,index:str,access:int,part_nr:int,nr_parts:int) (uid:bat[:oid],uval:bat[:any_1]) +address mvc_bind_idxbat_wrap; +pattern sql.emptycolumnidx(mvc:int,schema:str,table:str,index:str,access:int,part_nr:int,nr_parts:int):bat[:any_1] +address mvc_bind_idxbat_wrap; +pattern sql.emptycolumnidx(mvc:int,schema:str,table:str,index:str,access:int) (uid:bat[:oid],uval:bat[:any_1]) +address mvc_bind_idxbat_wrap; +pattern sql.emptycolumnidx(mvc:int,schema:str,table:str,index:str,access:int):bat[:any_1] +address mvc_bind_idxbat_wrap; pattern sql.evalAlgebra(cmd:str,optimize:bit):void address RAstatement; comment Compile and execute a single 'relational algebra' statement 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 @@ -1541,7 +1541,7 @@ int OPTcostModelImplementation(Client cn int OPTdataflowImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); int OPTdeadcodeImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); int OPTdumpQEPImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); -int OPTemptybindImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); +int OPTemptycolumnImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); int OPTevaluateImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); int OPTfactorizeImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); int OPTgarbageCollectorImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -2048,7 +2048,8 @@ str divRef; void dumpExceptionsToStream(stream *out, str msg); void dumpHelpTable(stream *f, Module s, str text, int flag); void dumpSearchTable(stream *f, str text); -str emptybindRef; +str emptycolumnRef; +str emptycolumnidxRef; str eqRef; str escape_str(str *retval, str s); str evalFile(Client c, str fname, int listing); diff --git a/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err b/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err --- a/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err +++ b/sql/test/BugTracker-2010/Tests/prepare_stmt.Bug-2533.Bug-2534.stable.err @@ -31,6 +31,7 @@ stderr of test 'prepare_stmt.Bug-2533.Bu MAPI = (monetdb) /var/tmp/mtest-7551/.s.monetdb.35003 QUERY = exec 3(2.3); +ERROR = !wrong type for argument 1 of function call: decimal, expected bigint # 23:36:35 > _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
