Changeset: 35ad331b1fd5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=35ad331b1fd5
Modified Files:
Branch: default
Log Message:
merging
diffs (truncated from 364 to 300 lines):
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out
b/monetdb5/modules/mal/Tests/inspect05.stable.out
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out
@@ -28,6 +28,12 @@
# str str str str
str
# type
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------#
[ "main", "function", "user", "():void;",
"nil"
]
+[ "angsep", "command", "lsst",
"(ra1:dbl,dec1:dbl,ra2:dbl,dec2:dbl):dbl ",
"qserv_angSep;"
]
+[ "ptinsphpoly", "pattern", "lsst",
"(ra:dbl,dec:dbl,list:dbl...):int ",
"qserv_ptInSphPoly;"
]
+[ "ptinsphellipse", "command", "lsst",
"(ra:dbl,dec:dbl,ra_cen:dbl,dec_cen:dbl,smaa:dbl,smia:dbl,ang:dbl):int ",
"qserv_ptInSphEllipse;"
]
+[ "ptinsphcircle", "command", "lsst",
"(ra:dbl,dec:dbl,ra_cen:dbl,dec_cen:dbl,radius:dbl):int ",
"qserv_ptInSphCircle;"
]
+[ "ptinsphbox", "command", "lsst",
"(ra:dbl,dec:dbl,ra_min:dbl,dec_min:dbl,ra_max:dbl,dec_max:dbl):int ",
"qserv_ptInSphBox;"
]
+[ "xmatch", "command", "lsst",
"(l:bat[:oid,:lng],r:bat[:oid,:lng],depth:int):bat[:oid,:oid] ",
"LSSTxmatch;"
]
[ "attach", "pattern", "fits",
"(fname:str):void ",
"FITSattach;" ]
[ "fitstest", "command", "fits",
"(filename:str):int ",
"FITStest;" ]
[ "load", "pattern", "fits",
"(tablename:str):void ",
"FITSloadTable;" ]
@@ -184,21 +190,21 @@
[ "multiplex", "pattern", "mal",
"(a:any...):any ",
"OPTremapMultiplex;"
]
[ "argRecord", "pattern", "sql",
"(a:any...):str ",
"SQLargRecord;" ]
[ "argRecord", "pattern", "sql", "():str ",
"SQLargRecord;" ]
-[ "affectedRows", "pattern", "sql",
"(nr:wrd,w:str):void ",
"mvc_affected_rows_wrap;" ]
-[ "append", "pattern", "sql",
"(mvc:ptr,sname:str,tname:str,cname:str,ins:any):ptr ",
"mvc_append_wrap;" ]
+[ "affectedRows", "pattern", "sql",
"(mvc:int,nr:wrd,w:str):int ",
"mvc_affected_rows_wrap;"
]
+[ "append", "pattern", "sql",
"(mvc:int,sname:str,tname:str,cname:str,ins:any):int ",
"mvc_append_wrap;"
]
[ "assert", "pattern", "sql",
"(b:lng,msg:str):void ",
"SQLassertLng;" ]
[ "assert", "pattern", "sql",
"(b:wrd,msg:str):void ",
"SQLassertWrd;" ]
[ "assert", "pattern", "sql",
"(b:int,msg:str):void ",
"SQLassertInt;" ]
[ "assert", "pattern", "sql",
"(b:bit,msg:str):void ",
"SQLassert;" ]
[ "bbp", "function", "sql",
"():bat[:str,:BAT];",
"nil" ]
[ "bind_dbat", "command", "sql",
"(clientid:int,schema:str,table:str,access:int,oldversion:lng,version:lng):bat[:oid,:oid]
", "mvc_diff_dbat_wrap;" ]
-[ "bind", "pattern", "sql",
"(mvc:ptr,schema:str,table:str,column:str,access:int,part_nr:int,nr_parts:int):bat[:oid,:any_1]
", "mvc_bind_wrap;" ]
-[ "bind", "pattern", "sql",
"(mvc:ptr,schema:str,table:str,column:str,access:int,low:oid,hgh:oid):bat[:oid,:any_1]
", "mvc_bind_wrap;" ]
-[ "bind", "pattern", "sql",
"(mvc:ptr,schema:str,table:str,column:str,access:int):bat[:oid,:any_1] ",
"mvc_bind_wrap;" ]
-[ "bind_idxbat", "pattern", "sql",
"(mvc:ptr,schema:str,table:str,index:str,access:int,part_nr:int,nr_parts:int):bat[:oid,:any_1]
", "mvc_bind_idxbat_wrap;" ]
-[ "bind_idxbat", "pattern", "sql",
"(mvc:ptr,schema:str,table:str,index:str,access:int,low:oid,hgh:oid):bat[:oid,:any_1]
", "mvc_bind_idxbat_wrap;" ]
-[ "bind_idxbat", "pattern", "sql",
"(mvc:ptr,schema:str,table:str,index:str,access:int):bat[:oid,:any_1] ",
"mvc_bind_idxbat_wrap;" ]
-[ "bind_dbat", "pattern", "sql",
"(mvc:ptr,schema:str,table:str,access:int):bat[:oid,:oid] ",
"mvc_bind_dbat_wrap;" ]
+[ "bind", "pattern", "sql",
"(mvc:int,schema:str,table:str,column:str,access:int,part_nr:int,nr_parts:int):bat[:oid,:any_1]
", "mvc_bind_wrap;" ]
+[ "bind", "pattern", "sql",
"(mvc:int,schema:str,table:str,column:str,access:int,low:oid,hgh:oid):bat[:oid,:any_1]
", "mvc_bind_wrap;" ]
+[ "bind", "pattern", "sql",
"(mvc:int,schema:str,table:str,column:str,access:int):bat[:oid,:any_1] ",
"mvc_bind_wrap;"
]
+[ "bind_idxbat", "pattern", "sql",
"(mvc:int,schema:str,table:str,index:str,access:int,part_nr:int,nr_parts:int):bat[:oid,:any_1]
", "mvc_bind_idxbat_wrap;" ]
+[ "bind_idxbat", "pattern", "sql",
"(mvc:int,schema:str,table:str,index:str,access:int,low:oid,hgh:oid):bat[:oid,:any_1]
", "mvc_bind_idxbat_wrap;" ]
+[ "bind_idxbat", "pattern", "sql",
"(mvc:int,schema:str,table:str,index:str,access:int):bat[:oid,:any_1] ",
"mvc_bind_idxbat_wrap;"
]
+[ "bind_dbat", "pattern", "sql",
"(mvc:int,schema:str,table:str,access:int):bat[:oid,:oid] ",
"mvc_bind_dbat_wrap;"
]
[ "cluster2", "pattern", "sql",
"(sch:str,tbl:str):void ",
"SQLcluster2;" ]
[ "cluster1", "pattern", "sql",
"(sch:str,tbl:str):void ",
"SQLcluster1;" ]
[ "clients", "function", "sql",
"():bat[:str,:BAT];",
"nil" ]
@@ -231,7 +237,7 @@
[ "dropDeclaredTable", "pattern", "sql",
"(name:str):void ",
"mvc_drop_declared_table_wrap;" ]
[ "dtColumn", "pattern", "sql",
"(rs:int,tname:str,name:str,typename:str,digits:int,scale:int):void ",
"mvc_declared_table_column_wrap;" ]
[ "declaredTable", "pattern", "sql",
"(name:str):int ",
"mvc_declared_table_wrap;" ]
-[ "delete", "pattern", "sql",
"(mvc:ptr,sname:str,tname:str,b:any):ptr ",
"mvc_delete_wrap;" ]
+[ "delete", "pattern", "sql",
"(mvc:int,sname:str,tname:str,b:any):int ",
"mvc_delete_wrap;"
]
[ "epilogue", "command", "sql", "():void ",
"SQLepilogue;" ]
[ "exportValue", "pattern", "sql",
"(qtype:int,tname:str,name:str,typename:str,digits:int,scale:int,eclass:int,val:any_1,w:str):void
", "mvc_export_value_wrap;" ]
[ "exportOperation", "pattern", "sql", "(w:str):void
",
"mvc_export_operation_wrap;" ]
@@ -248,7 +254,7 @@
[ "gzcompress", "pattern", "sql",
"(sch:str,tbl:str):void ",
"SQLgzcompress;" ]
[ "getVersion", "command", "sql",
"(clientid:int):lng ",
"mvc_getVersion;" ]
[ "get_value", "pattern", "sql",
"(sname:str,sequence:str):lng ",
"mvc_get_value;" ]
-[ "getVariable", "pattern", "sql",
"(mvc:ptr,varname:str):any_1 ",
"getVariable;"
]
+[ "getVariable", "pattern", "sql",
"(mvc:int,varname:str):any_1 ",
"getVariable;"
]
[ "importTable", "pattern", "sql",
"(sname:str,tname:str,fname:str...):bat[:str,:BAT] ",
"mvc_bin_import_table_wrap;" ]
[ "importTable", "pattern", "sql",
"(s:bstream,sname:str,tname:str,sep:str,rsep:str,ssep:str,ns:str,nr:lng,offset:lng,locked:int):bat[:str,:BAT]
", "mvc_import_table_wrap;" ]
[ "include", "pattern", "sql",
"(fname:str):void ",
"SQLinclude;" ]
@@ -257,7 +263,7 @@
[ "logfile", "pattern", "sql",
"(filename:str):void ",
"mvc_logfile;" ]
[ "ms_trunc", "command", "sql",
"(v:dbl,r:int):dbl ",
"dbl_trunc_wrap;" ]
[ "ms_trunc", "command", "sql",
"(v:flt,r:int):flt ",
"flt_trunc_wrap;" ]
-[ "mvc", "pattern", "sql", "():ptr ",
"SQLmvc;" ]
+[ "mvc", "pattern", "sql", "():int ",
"SQLmvc;" ]
[ "newdictionary", "pattern", "sql",
"(sch:str,tbl:str):void ",
"SQLnewDictionary;" ]
[ "not_uniques", "command", "sql",
"(b:bat[:oid,:wrd]):bat[:oid,:oid] ",
"not_unique_oids;" ]
[ "not_uniques", "command", "sql",
"(b:bat[:oid,:oid]):bat[:oid,:oid] ",
"not_unique_oids;" ]
@@ -288,25 +294,25 @@
[ "sql_variables", "pattern", "sql",
"():bat[:str,:BAT] ",
"sql_variables;" ]
[ "sql_environment", "function", "sql",
"():bat[:str,:BAT];",
"nil" ]
[ "single", "function", "sql",
"(x:any_2):bat[:oid,:any_2];",
"nil" ]
-[ "setVariable", "pattern", "sql",
"(mvc:ptr,varname:str,value:any_1):ptr ",
"setVariable;"
]
+[ "setVariable", "pattern", "sql",
"(mvc:int,varname:str,value:any_1):int ",
"setVariable;"
]
[ "start2", "pattern", "sql", "():void ",
"SQLsession2;" ]
[ "start", "pattern", "sql", "():void ",
"SQLsession;" ]
[ "times", "factory", "sql", "():void;",
"nil"
]
[ "times", "function", "sql",
"(elaps:int,inblock:lng,oublock:lng):void;",
"nil" ]
[ "trans", "pattern", "sql",
"(type:int,chain:int,name:str):void ",
"SQLtransaction;" ]
-[ "update", "pattern", "sql",
"(mvc:ptr,sname:str,tname:str,cname:str,ins:any):ptr ",
"mvc_update_wrap;" ]
+[ "update", "pattern", "sql",
"(mvc:int,sname:str,tname:str,cname:str,ins:any):int ",
"mvc_update_wrap;"
]
[ "vacuum", "pattern", "sql",
"(sch:str,tbl:str):void ",
"SQLvacuum;" ]
[ "zero_or_one", "function", "sql",
"(b:bat[:oid,:any_1],gp:bat[:oid,:oid],gpe:bat[:oid,:oid]):bat[:oid,:any_1];",
"nil" ]
[ "zero_or_one", "command", "sql",
"(col:bat[:any_2,:any_1]):any_1 ",
"zero_or_one;" ]
[ "bind_idxbat", "function", "octopus",
"(conn:str,sch:str,tab:str,index:str,access:int,low:oid,hgh:oid,version:int):bat[:oid,:oid];",
"nil" ]
[ "bind_idxbat", "function", "octopus",
"(conn:str,sch:str,tab:str,index:str,access:int,version:int):bat[:oid,:oid];",
"nil" ]
-[ "bind_idxbat", "function", "octopus",
"(mvc:ptr,sch:str,tab:str,index:str,access:int,version:int):bat[:oid,:oid];",
"nil" ]
+[ "bind_idxbat", "function", "octopus",
"(mvc:int,sch:str,tab:str,index:str,access:int,version:int):bat[:oid,:oid];",
"nil"
]
[ "bind_dbat", "function", "octopus",
"(conn:str,sch:str,tab:str,access:int,version:int):bat[:oid,:oid];",
"nil" ]
-[ "bind_dbat", "function", "octopus",
"(mvc:ptr,sch:str,tab:str,access:int,version:int):bat[:oid,:oid];",
"nil" ]
+[ "bind_dbat", "function", "octopus",
"(mvc:int,sch:str,tab:str,access:int,version:int):bat[:oid,:oid];",
"nil"
]
[ "bind", "function", "octopus",
"(conn:str,sch:str,tab:str,col:str,kind:int,version:int):bat[:oid,:any_1];",
"nil" ]
[ "bind", "function", "octopus",
"(conn:str,sch:str,tab:str,col:str,kind:int,low:oid,hgh:oid,version:int):bat[:oid,:any_1];",
"nil" ]
-[ "bind", "function", "octopus",
"(mvc:ptr,sch:str,tab:str,col:str,kind:int,version:int):bat[:oid,:any_1];",
"nil" ]
-[ "bind", "function", "octopus",
"(mvc:ptr,sch:str,tab:str,col:str,kind:int,low:oid,hgh:oid,version:int):bat[:oid,:any_1];",
"nil" ]
+[ "bind", "function", "octopus",
"(mvc:int,sch:str,tab:str,col:str,kind:int,version:int):bat[:oid,:any_1];",
"nil"
]
+[ "bind", "function", "octopus",
"(mvc:int,sch:str,tab:str,col:str,kind:int,low:oid,hgh:oid,version:int):bat[:oid,:any_1];",
"nil" ]
[ "connect", "command", "octopus",
"(dbname:str):str ",
"OCTOPUSconnect;"
]
[ "getBid", "function", "octopus",
"(dbname:str,fn:str,bidtype:sht):lng;",
"nil" ]
[ "getVariable", "function", "octopus",
"(conn:str,name:str):any_1;",
"nil" ]
@@ -5344,6 +5350,7 @@
[ "new", "pattern", "bat",
"(ht:oid,tt:any_2,size:int):bat[:oid,:any_2] ",
"CMDBATnewint;"
]
[ "new", "pattern", "bat",
"(ht:any_1,tt:any_2,size:lng):bat[:any_1,:any_2] ",
"CMDBATnew;"
]
[ "new", "pattern", "bat",
"(ht:any_1,tt:any_2,size:int):bat[:any_1,:any_2] ",
"CMDBATnewint;"
]
+[ "new", "pattern", "bat",
"(ht:any_1,tt:bat[:any_2,:any_3]):bat[:any_1,:BAT] ",
"CMDBATnew;"
]
[ "new", "pattern", "bat",
"(ht:any_1,tt:any_2):bat[:any_1,:any_2] ",
"CMDBATnew;"
]
[ "new", "pattern", "bat",
"(ht:any_1,tt:any_2,b:bat[:any_3,:any_4]):bat[:any_1,:any_2] ",
"CMDBATclone;"
]
[ "orderReverse", "command", "bat",
"(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"BKCorder_rev;"
]
diff --git a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
--- a/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
+++ b/sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
@@ -35,44 +35,44 @@
| mal |
+========+
| function user.s2_1{autoCommit=true}():void; |
-| _2 := sql.mvc(); |
-| _37:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",0); |
-| _39 := algebra.thetauselect(_37,2:sht,"<"); |
-| _35:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",2); |
-| _41 := algebra.kdifference(_39,_35); |
-| _36 := algebra.thetauselect(_35,2:sht,"<"); |
-| _42 := algebra.kunion(_41,_36); |
-| _31:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",1); |
-| _34 := algebra.thetauselect(_31,2:sht,"<"); |
-| _43 := algebra.kunion(_42,_34); |
-| _28:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","_tables",1); |
-| _30 := bat.reverse(_28); |
-| _44 := algebra.kdifference(_43,_30); |
-| _45 := algebra.markT(_44,0@0:oid); |
-| _46 := bat.reverse(_45); |
-| _24:bat[:oid,:str] := sql.bind(_2,"sys","_tables","name",0); |
-| _22:bat[:oid,:str] := sql.bind(_2,"sys","_tables","name",2); |
-| _25 := algebra.kdifference(_24,_22); |
-| _26 := algebra.kunion(_25,_22); |
-| _20:bat[:oid,:str] := sql.bind(_2,"sys","_tables","name",1); |
-| _27 := algebra.kunion(_26,_20); |
-| _47 := algebra.leftjoin(_46,_27); |
-| _12:bat[:oid,:sht] := sql.bind(_2,"tmp","_tables","type",0); |
-| _13 := algebra.thetauselect(_12,2:sht,"<"); |
-| _9:bat[:oid,:oid] := sql.bind_dbat(_2,"tmp","_tables",1); |
-| _11 := bat.reverse(_9); |
-| _15 := algebra.kdifference(_13,_11); |
-| _16 := algebra.markT(_15,0@0:oid); |
-| _17 := bat.reverse(_16); |
-| _4:bat[:oid,:str] := sql.bind(_2,"tmp","_tables","name",0); |
-| _18 := algebra.leftjoin(_17,_4); |
-| _48:bat[:oid,:str] := bat.new(nil:oid,nil:str); |
-| _51 := bat.append(_48,_47,true); |
-| _53 := bat.append(_51,_18,true); |
-| _54 := sql.resultSet(1,1,_53); |
-| sql.rsColumn(_54,".tables","name":str,"varchar",1024,0,_53); |
-| _60 := io.stdout(); |
-| sql.exportResult(_60,_54); |
+| X_2 := sql.mvc(); |
+| X_37:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",0); |
+| X_39 := algebra.thetauselect(X_37,2:sht,"<"); |
+| X_35:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",2); |
+| X_41 := algebra.kdifference(X_39,X_35); |
+| X_36 := algebra.thetauselect(X_35,2:sht,"<"); |
+| X_42 := algebra.kunion(X_41,X_36); |
+| X_31:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",1); |
+| X_34 := algebra.thetauselect(X_31,2:sht,"<"); |
+| X_43 := algebra.kunion(X_42,X_34); |
+| X_28:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","_tables",1); |
+| X_30 := bat.reverse(X_28); |
+| X_44 := algebra.kdifference(X_43,X_30); |
+| X_45 := algebra.markT(X_44,0@0:oid); |
+| X_46 := bat.reverse(X_45); |
+| X_24:bat[:oid,:str] := sql.bind(X_2,"sys","_tables","name",0); |
+| X_22:bat[:oid,:str] := sql.bind(X_2,"sys","_tables","name",2); |
+| X_25 := algebra.kdifference(X_24,X_22); |
+| X_26 := algebra.kunion(X_25,X_22); |
+| X_20:bat[:oid,:str] := sql.bind(X_2,"sys","_tables","name",1); |
+| X_27 := algebra.kunion(X_26,X_20); |
+| X_47 := algebra.leftjoin(X_46,X_27); |
+| X_12:bat[:oid,:sht] := sql.bind(X_2,"tmp","_tables","type",0); |
+| X_13 := algebra.thetauselect(X_12,2:sht,"<"); |
+| X_9:bat[:oid,:oid] := sql.bind_dbat(X_2,"tmp","_tables",1); |
+| X_11 := bat.reverse(X_9); |
+| X_15 := algebra.kdifference(X_13,X_11); |
+| X_16 := algebra.markT(X_15,0@0:oid); |
+| X_17 := bat.reverse(X_16); |
+| X_4:bat[:oid,:str] := sql.bind(X_2,"tmp","_tables","name",0); |
+| X_18 := algebra.leftjoin(X_17,X_4); |
+| X_48:bat[:oid,:str] := bat.new(nil:oid,nil:str); |
+| X_51 := bat.append(X_48,X_47,true); |
+| X_53 := bat.append(X_51,X_18,true); |
+| X_54 := sql.resultSet(1,1,X_53); |
+| sql.rsColumn(X_54,".tables","name":str,"varchar",1024,0,X_53); |
+| X_60 := io.stdout(); |
+| sql.exportResult(X_60,X_54); |
| end s2_1; |
+--------+
40 rows
diff --git a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
@@ -58,42 +58,42 @@
| mal |
+========+
| function user.s3_1{autoCommit=true}():void; |
-| _2 := sql.mvc(); |
-| _37:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",0); |
-| _39 := algebra.thetauselect(_37,2:sht,"<"); |
-| _35:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",2); |
-| _41 := algebra.kdifference(_39,_35); |
-| _36 := algebra.thetauselect(_35,2:sht,"<"); |
-| _42 := algebra.kunion(_41,_36); |
-| _31:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",1); |
-| _34 := algebra.thetauselect(_31,2:sht,"<"); |
-| _43 := algebra.kunion(_42,_34); |
-| _28:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","_tables",1); |
-| _30 := bat.reverse(_28); |
-| _44 := algebra.kdifference(_43,_30); |
-| _45 := algebra.markT(_44,0@0:oid); |
-| _46 := bat.reverse(_45); |
-| _24:bat[:oid,:int] := sql.bind(_2,"sys","_tables","id",0); |
-| _22:bat[:oid,:int] := sql.bind(_2,"sys","_tables","id",2); |
-| _25 := algebra.kdifference(_24,_22); |
-| _26 := algebra.kunion(_25,_22); |
-| _20:bat[:oid,:int] := sql.bind(_2,"sys","_tables","id",1); |
-| _27 := algebra.kunion(_26,_20); |
-| _47 := algebra.leftjoin(_46,_27); |
-| _12:bat[:oid,:sht] := sql.bind(_2,"tmp","_tables","type",0); |
-| _13 := algebra.thetauselect(_12,2:sht,"<"); |
-| _9:bat[:oid,:oid] := sql.bind_dbat(_2,"tmp","_tables",1); |
-| _11 := bat.reverse(_9); |
-| _15 := algebra.kdifference(_13,_11); |
-| _16 := algebra.markT(_15,0@0:oid); |
-| _17 := bat.reverse(_16); |
-| _4:bat[:oid,:int] := sql.bind(_2,"tmp","_tables","id",0); |
-| _18 := algebra.leftjoin(_17,_4); |
-| _48:bat[:oid,:int] := bat.new(nil:oid,nil:int); |
-| _51 := bat.append(_48,_47,true); |
-| _53 := bat.append(_51,_18,true); |
-| _54 := aggr.count(_53); |
-| sql.exportValue(1,".tables","L2":str,"wrd",64,0,6,_54,""); |
+| X_2 := sql.mvc(); |
+| X_37:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",0); |
+| X_39 := algebra.thetauselect(X_37,2:sht,"<"); |
+| X_35:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",2); |
+| X_41 := algebra.kdifference(X_39,X_35); |
+| X_36 := algebra.thetauselect(X_35,2:sht,"<"); |
+| X_42 := algebra.kunion(X_41,X_36); |
+| X_31:bat[:oid,:sht] := sql.bind(X_2,"sys","_tables","type",1); |
+| X_34 := algebra.thetauselect(X_31,2:sht,"<"); |
+| X_43 := algebra.kunion(X_42,X_34); |
+| X_28:bat[:oid,:oid] := sql.bind_dbat(X_2,"sys","_tables",1); |
+| X_30 := bat.reverse(X_28); |
+| X_44 := algebra.kdifference(X_43,X_30); |
+| X_45 := algebra.markT(X_44,0@0:oid); |
+| X_46 := bat.reverse(X_45); |
+| X_24:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",0); |
+| X_22:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",2); |
+| X_25 := algebra.kdifference(X_24,X_22); |
+| X_26 := algebra.kunion(X_25,X_22); |
+| X_20:bat[:oid,:int] := sql.bind(X_2,"sys","_tables","id",1); |
+| X_27 := algebra.kunion(X_26,X_20); |
+| X_47 := algebra.leftjoin(X_46,X_27); |
+| X_12:bat[:oid,:sht] := sql.bind(X_2,"tmp","_tables","type",0); |
+| X_13 := algebra.thetauselect(X_12,2:sht,"<"); |
+| X_9:bat[:oid,:oid] := sql.bind_dbat(X_2,"tmp","_tables",1); |
+| X_11 := bat.reverse(X_9); |
+| X_15 := algebra.kdifference(X_13,X_11); |
+| X_16 := algebra.markT(X_15,0@0:oid); |
+| X_17 := bat.reverse(X_16); |
+| X_4:bat[:oid,:int] := sql.bind(X_2,"tmp","_tables","id",0); |
+| X_18 := algebra.leftjoin(X_17,X_4); |
+| X_48:bat[:oid,:int] := bat.new(nil:oid,nil:int); |
+| X_51 := bat.append(X_48,X_47,true); |
+| X_53 := bat.append(X_51,X_18,true); |
+| X_54 := aggr.count(X_53); |
+| sql.exportValue(1,".tables","L2":str,"wrd",64,0,6,X_54,""); |
| end s3_1; |
+--------+
38 rows
diff --git
a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
--- a/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
+++ b/sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
@@ -58,42 +58,42 @@
| mal |
+========+
| function user.s3_1{autoCommit=true}():void; |
-| _2 := sql.mvc(); |
-| _37:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",0); |
-| _39 := algebra.thetauselect(_37,2:sht,"<"); |
-| _35:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",2); |
-| _41 := algebra.kdifference(_39,_35); |
-| _36 := algebra.thetauselect(_35,2:sht,"<"); |
-| _42 := algebra.kunion(_41,_36); |
-| _31:bat[:oid,:sht] := sql.bind(_2,"sys","_tables","type",1); |
-| _34 := algebra.thetauselect(_31,2:sht,"<"); |
-| _43 := algebra.kunion(_42,_34); |
-| _28:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","_tables",1); |
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
