Changeset: ecf00991af5b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ecf00991af5b
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/remote03.stable.err
monetdb5/modules/mal/Tests/remote03.stable.out
monetdb5/optimizer/Tests/All
monetdb5/optimizer/Tests/manifold2.stable.out.single
sql/backends/monet5/generator/Tests/joins00.sql
sql/backends/monet5/generator/Tests/joins01.sql
sql/backends/monet5/generator/Tests/joins01.stable.out
sql/benchmarks/ssbm/Tests/01-explain.stable.out
sql/benchmarks/ssbm/Tests/02-explain.stable.out
sql/benchmarks/ssbm/Tests/03-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/06-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/12-explain.stable.out
sql/benchmarks/tpch/Tests/14-explain.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
sql/test/BugTracker-2011/Tests/bulk_rotate_xor_hash-error.Bug-2734.stable.out
sql/test/BugTracker-2011/Tests/cast-crash.Bug-2678.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2011/Tests/predicate.Bug-2908.stable.out
sql/test/BugTracker-2011/Tests/sqltables.Bug-2921.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
sql/test/Tests/median_stdev.sql
Branch: mosaic
Log Message:
Merge with default
diffs (truncated from 4856 to 300 lines):
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
---
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
+++
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
@@ -61,16 +61,16 @@ Ready.
% .explain # table_name
% mal # name
% clob # type
-% 133 # length
-function user.s4_1{autoCommit=true}():void;
- X_26:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","default_pipe",10);
- X_2 := sql.mvc();
- (X_12:bat[:oid,:int],X_13:bat[:oid,:int],X_14:bat[:oid,:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0);
- X_15 := sql.append(X_2,"sys","ttt","a",X_12);
- X_19 := sql.append(X_15,"sys","ttt","b",X_13);
- X_21 := sql.append(X_19,"sys","ttt","c",X_14);
- X_23 := aggr.count(X_14);
- sql.affectedRows(X_21,X_23,"");
+% 118 # length
+function user.s4_1():void;
+ X_24:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","default_pipe",10);
+ X_1 := sql.mvc();
+ (X_11:bat[:int],X_12:bat[:int],X_13:bat[:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0);
+ X_14 := sql.append(X_1,"sys","ttt","a",X_11);
+ X_18 := sql.append(X_14,"sys","ttt","b",X_12);
+ X_20 := sql.append(X_18,"sys","ttt","c",X_13);
+ X_22 := aggr.count(X_13);
+ sql.affectedRows(X_20,X_22);
end user.s4_1;
#declare opt_pipe_name string;
#set opt_pipe_name = ( select optimizer );
@@ -93,16 +93,16 @@ end user.s4_1;
% .explain # table_name
% mal # name
% clob # type
-% 133 # length
-function user.s12_1{autoCommit=true}():void;
- X_26:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","user_1",10);
- X_2 := sql.mvc();
- (X_12:bat[:oid,:int],X_13:bat[:oid,:int],X_14:bat[:oid,:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0);
- X_15 := sql.append(X_2,"sys","ttt","a",X_12);
- X_19 := sql.append(X_15,"sys","ttt","b",X_13);
- X_23 := aggr.count(X_14);
- X_21 := sql.append(X_19,"sys","ttt","c",X_14);
- sql.affectedRows(X_21,X_23,"");
+% 118 # length
+function user.s12_1():void;
+ X_24:void := querylog.define("explain copy into ttt from
\\'/tmp/xyz\\';","user_1",10);
+ X_1 := sql.mvc();
+ (X_11:bat[:int],X_12:bat[:int],X_13:bat[:int]) :=
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0);
+ X_14 := sql.append(X_1,"sys","ttt","a",X_11);
+ X_18 := sql.append(X_14,"sys","ttt","b",X_12);
+ X_22 := aggr.count(X_13);
+ X_20 := sql.append(X_18,"sys","ttt","c",X_13);
+ sql.affectedRows(X_20,X_22);
end user.s12_1;
#drop table ttt;
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
@@ -29,74 +29,74 @@ Ready.
# t t t t t # name
# str str str str str # type
#--------------------------#
-[ 0@0, "append", "command", "bat",
"(i:bat[:oid,:any_1],u:any_1):bat[:oid,:any_1] ", "BKCappend_val_wrap;" ]
-[ 1@0, "append", "command", "bat",
"(tt:int,heapfile:str):bat[:oid,:any_1] ", "BKCattach;" ]
-[ 2@0, "append", "command", "bat",
"(i:bat[:oid,:any_1],u:any_1,force:bit):bat[:oid,:any_1] ",
"BKCappend_val_force_wrap;" ]
-[ 3@0, "append", "command", "bat",
"(i:bat[:oid,:any_1],u:bat[:oid,:any_1],force:bit):bat[:oid,:any_1] ",
"BKCappend_force_wrap;" ]
-[ 4@0, "attach", "command", "bat",
"(i:bat[:oid,:any_1],u:bat[:oid,:any_1]):bat[:oid,:any_1] ",
"BKCappend_wrap;" ]
-[ 5@0, "delete", "command", "bat", "(sz:wrd):bat[:oid,:oid] ",
"BKCdensebat;" ]
-[ 6@0, "delete", "command", "bat",
"(b:bat[:oid,:any_1]):bat[:oid,:any_1] ", "BKCdelete_all;" ]
-[ 7@0, "delete", "command", "bat",
"(b:bat[:oid,:any_1],d:bat[:oid,:oid]):bat[:oid,:any_1] ",
"BKCdelete_multi;" ]
-[ 8@0, "densebat", "command", "bat",
"(b:bat[:oid,:any_1],h:oid):bat[:oid,:any_1] ", "BKCdelete;" ]
-[ 9@0, "getAccess", "command", "bat", "(b:bat[:oid,:any_1]):str ",
"BKCgetBBPname;" ]
-[ 10@0, "getCapacity", "command", "bat",
"(b:bat[:oid,:any_1]):oid ", "BKCgetSequenceBase;" ]
-[ 11@0, "getColumnType", "command", "bat",
"(b:bat[:oid,:any_1]):str ", "BKCgetAccess;" ]
-[ 12@0, "getName", "command", "bat",
"(bid:bat[:oid,:any_1]):str ", "BKCgetRole;" ]
-[ 13@0, "getRole", "command", "bat",
"(b:bat[:oid,:any_1]):str ", "BKCgetColumnType;" ]
-[ 14@0, "getSequenceBase", "command", "bat",
"(b:bat[:oid,:any_1]):lng ", "BKCgetCapacity;" ]
-[ 15@0, "getSize", "command", "bat",
"(b:bat[:oid,:any_1]):lng ", "BKCgetSize;" ]
-[ 16@0, "imprints", "command", "bat", "(b:bat[:oid,:dbl]):lng
", "CMDBATimprintsize;" ]
-[ 17@0, "imprints", "command", "bat", "(b:bat[:oid,:flt]):lng
", "CMDBATimprintsize;" ]
-[ 18@0, "imprints", "command", "bat", "(b:bat[:oid,:lng]):lng
", "CMDBATimprintsize;" ]
-[ 19@0, "imprints", "command", "bat", "(b:bat[:oid,:int]):lng
", "CMDBATimprintsize;" ]
-[ 20@0, "imprints", "command", "bat", "(b:bat[:oid,:sht]):lng
", "CMDBATimprintsize;" ]
-[ 21@0, "imprints", "command", "bat", "(b:bat[:oid,:bte]):lng
", "CMDBATimprintsize;" ]
-[ 22@0, "imprintsize", "command", "bat",
"(b:bat[:oid,:dbl]):void ", "CMDBATimprints;" ]
-[ 23@0, "imprintsize", "command", "bat",
"(b:bat[:oid,:flt]):void ", "CMDBATimprints;" ]
-[ 24@0, "imprintsize", "command", "bat",
"(b:bat[:oid,:lng]):void ", "CMDBATimprints;" ]
-[ 25@0, "imprintsize", "command", "bat",
"(b:bat[:oid,:int]):void ", "CMDBATimprints;" ]
-[ 26@0, "imprintsize", "command", "bat",
"(b:bat[:oid,:sht]):void ", "CMDBATimprints;" ]
-[ 27@0, "imprintsize", "command", "bat",
"(b:bat[:oid,:bte]):void ", "CMDBATimprints;" ]
-[ 28@0, "info", "command", "bat",
"(a:bat[:oid,:oid],b:bat[:oid,:oid]):bat[:oid,:oid] ", "BKCintersectcand;" ]
-[ 29@0, "intersectcand", "command", "bat",
"(b1:bat[:oid,:any_1],b2:bat[:oid,:any_2]):bit ", "BKCisSynced;" ]
-[ 30@0, "isPersistent", "command", "bat",
"(b:bat[:oid,:any_1]):bit ", "BKCisPersistent;" ]
-[ 31@0, "isSorted", "command", "bat",
"(b:bat[:oid,:any_1]):bit ", "BKCisTransient;" ]
-[ 32@0, "isSortedReverse", "command", "bat",
"(b:bat[:oid,:any_1]):bit ", "BKCisSortedReverse;" ]
-[ 33@0, "isSynced", "command", "bat",
"(b:bat[:oid,:any_1]):bit ", "BKCisSorted;" ]
-[ 34@0, "isTransient", "command", "bat",
"(b:bat[:oid,:any_1]):bit ", "BKCgetKey;" ]
-[ 35@0, "isaKey", "command", "bat", "(b:bat[:oid,:any_1])
(X_2:bat[:oid,:str],X_3:bat[:oid,:str]) ", "BKCinfo;" ]
-[ 36@0, "mergecand", "command", "bat",
"(a:bat[:oid,:oid],b:bat[:oid,:oid]):bat[:oid,:oid] ", "BKCmergecand;" ]
-[ 37@0, "mirror", "command", "bat",
"(b:bat[:oid,:any_2]):bat[:oid,:oid] ", "BKCmirror;" ]
-[ 38@0, "new", "command", "bat", "(nme:str):bat[:oid,:any_1] ",
"CMDBATderivedByName;" ]
-[ 39@0, "new", "pattern", "bat",
"(b:bat[:oid,:any_1],size:lng):bat[:oid,:any_1] ", "CMDBATnewDerived;" ]
-[ 40@0, "new", "pattern", "bat",
"(b:bat[:oid,:any_1]):bat[:oid,:any_1] ", "CMDBATnewDerived;" ]
-[ 41@0, "new", "pattern", "bat",
"(ht:oid,tt:any_1,size:lng):bat[:oid,:any_1] ", "CMDBATnew_persistent;" ]
-[ 42@0, "new", "pattern", "bat",
"(ht:oid,tt:any_1,size:int):bat[:oid,:any_1] ", "CMDBATnew_persistent;" ]
-[ 43@0, "new", "pattern", "bat",
"(ht:oid,tt:any_1):bat[:oid,:any_1] ", "CMDBATnew_persistent;" ]
-[ 44@0, "new_persistent", "pattern", "bat",
"(ht:oid,tt:any_1,size:lng):bat[:oid,:any_1] ", "CMDBATnew;" ]
-[ 45@0, "new_persistent", "pattern", "bat",
"(ht:oid,tt:any_1,size:int):bat[:oid,:any_1] ", "CMDBATnew;" ]
-[ 46@0, "new_persistent", "pattern", "bat",
"(ht:oid,tt:any_1):bat[:oid,:any_1] ", "CMDBATnew;" ]
-[ 47@0, "partition", "pattern", "bat",
"(b:bat[:oid,:any_1],pieces:int,n:int):bat[:oid,:any_1] ",
"CMDBATpartition2;" ]
-[ 48@0, "partition", "pattern", "bat",
"(b:bat[:oid,:any_1]):bat[:oid,:any_1]... ", "CMDBATpartition;" ]
-[ 49@0, "replace", "command", "bat",
"(b:bat[:oid,:any_1],del:bat[:oid,:oid]):bat[:oid,:oid] ",
"BKCreuseBATmap;" ]
-[ 50@0, "replace", "command", "bat",
"(b:bat[:oid,:any_1],del:bat[:oid,:oid]):bat[:oid,:any_1] ", "BKCreuseBAT;"
]
-[ 51@0, "replace", "command", "bat",
"(b:bat[:oid,:any_1],rid:bat[:oid,:oid],val:bat[:oid,:any_1],force:bit):bat[:oid,:any_1]
", "BKCbat_inplace_force;" ]
-[ 52@0, "replace", "command", "bat",
"(b:bat[:oid,:any_1],rid:bat[:oid,:oid],val:bat[:oid,:any_1]):bat[:oid,:any_1]
", "BKCbat_inplace;" ]
-[ 53@0, "reuse", "command", "bat",
"(b:bat[:oid,:any_1],h:oid,t:any_1,force:bit):bat[:oid,:any_1] ",
"BKCbun_inplace_force;" ]
-[ 54@0, "reuseMap", "command", "bat",
"(b:bat[:oid,:any_1],h:oid,t:any_1):bat[:oid,:any_1] ", "BKCbun_inplace;" ]
-[ 55@0, "save", "pattern", "bat", "(val:any_1):bat[:oid,:any_1]
", "CMDBATsingle;" ]
-[ 56@0, "save", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCsetImprints;" ]
-[ 57@0, "setAccess", "command", "bat",
"(b:bat[:oid,:any_1]):bit ", "BKCsetHash;" ]
+[ 0@0, "append", "command", "bat",
"(i:bat[:any_1],u:any_1):bat[:any_1] ", "BKCappend_val_wrap;" ]
+[ 1@0, "append", "command", "bat",
"(tt:int,heapfile:str):bat[:any_1] ", "BKCattach;" ]
+[ 2@0, "append", "command", "bat",
"(i:bat[:any_1],u:any_1,force:bit):bat[:any_1] ",
"BKCappend_val_force_wrap;" ]
+[ 3@0, "append", "command", "bat",
"(i:bat[:any_1],u:bat[:any_1],force:bit):bat[:any_1] ", "BKCappend_force_wrap;"
]
+[ 4@0, "attach", "command", "bat",
"(i:bat[:any_1],u:bat[:any_1]):bat[:any_1] ", "BKCappend_wrap;" ]
+[ 5@0, "delete", "command", "bat", "(sz:wrd):bat[:oid] ",
"BKCdensebat;" ]
+[ 6@0, "delete", "command", "bat", "(b:bat[:any_1]):bat[:any_1] ",
"BKCdelete_all;" ]
+[ 7@0, "delete", "command", "bat",
"(b:bat[:any_1],d:bat[:oid]):bat[:any_1] ", "BKCdelete_multi;" ]
+[ 8@0, "densebat", "command", "bat",
"(b:bat[:any_1],h:oid):bat[:any_1] ", "BKCdelete;" ]
+[ 9@0, "getAccess", "command", "bat", "(b:bat[:any_1]):str ",
"BKCgetBBPname;" ]
+[ 10@0, "getCapacity", "command", "bat", "(b:bat[:any_1]):oid ",
"BKCgetSequenceBase;" ]
+[ 11@0, "getColumnType", "command", "bat",
"(b:bat[:any_1]):str ", "BKCgetAccess;" ]
+[ 12@0, "getName", "command", "bat", "(bid:bat[:any_1]):str
", "BKCgetRole;" ]
+[ 13@0, "getRole", "command", "bat", "(b:bat[:any_1]):str ",
"BKCgetColumnType;" ]
+[ 14@0, "getSequenceBase", "command", "bat",
"(b:bat[:any_1]):lng ", "BKCgetCapacity;" ]
+[ 15@0, "getSize", "command", "bat", "(b:bat[:any_1]):lng ",
"BKCgetSize;" ]
+[ 16@0, "imprints", "command", "bat", "(b:bat[:dbl]):lng ",
"CMDBATimprintsize;" ]
+[ 17@0, "imprints", "command", "bat", "(b:bat[:flt]):lng ",
"CMDBATimprintsize;" ]
+[ 18@0, "imprints", "command", "bat", "(b:bat[:lng]):lng ",
"CMDBATimprintsize;" ]
+[ 19@0, "imprints", "command", "bat", "(b:bat[:int]):lng ",
"CMDBATimprintsize;" ]
+[ 20@0, "imprints", "command", "bat", "(b:bat[:sht]):lng ",
"CMDBATimprintsize;" ]
+[ 21@0, "imprints", "command", "bat", "(b:bat[:bte]):lng ",
"CMDBATimprintsize;" ]
+[ 22@0, "imprintsize", "command", "bat", "(b:bat[:dbl]):void ",
"CMDBATimprints;" ]
+[ 23@0, "imprintsize", "command", "bat", "(b:bat[:flt]):void ",
"CMDBATimprints;" ]
+[ 24@0, "imprintsize", "command", "bat", "(b:bat[:lng]):void ",
"CMDBATimprints;" ]
+[ 25@0, "imprintsize", "command", "bat", "(b:bat[:int]):void ",
"CMDBATimprints;" ]
+[ 26@0, "imprintsize", "command", "bat", "(b:bat[:sht]):void ",
"CMDBATimprints;" ]
+[ 27@0, "imprintsize", "command", "bat", "(b:bat[:bte]):void ",
"CMDBATimprints;" ]
+[ 28@0, "info", "command", "bat",
"(a:bat[:oid],b:bat[:oid]):bat[:oid] ", "BKCintersectcand;" ]
+[ 29@0, "intersectcand", "command", "bat",
"(b1:bat[:any_1],b2:bat[:any_2]):bit ", "BKCisSynced;" ]
+[ 30@0, "isPersistent", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCisPersistent;" ]
+[ 31@0, "isSorted", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCisTransient;" ]
+[ 32@0, "isSortedReverse", "command", "bat",
"(b:bat[:any_1]):bit ", "BKCisSortedReverse;" ]
+[ 33@0, "isSynced", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCisSorted;" ]
+[ 34@0, "isTransient", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCgetKey;" ]
+[ 35@0, "isaKey", "command", "bat", "(b:bat[:any_1])
(X_2:bat[:str],X_3:bat[:str]) ", "BKCinfo;" ]
+[ 36@0, "mergecand", "command", "bat",
"(a:bat[:oid],b:bat[:oid]):bat[:oid] ", "BKCmergecand;" ]
+[ 37@0, "mirror", "command", "bat",
"(b:bat[:any_2]):bat[:oid] ", "BKCmirror;" ]
+[ 38@0, "new", "pattern", "bat",
"(ht:oid,tt:any_1,size:lng):bat[:any_1] ", "CMDBATnew_persistent;" ]
+[ 39@0, "new", "pattern", "bat",
"(ht:oid,tt:any_1,size:int):bat[:any_1] ", "CMDBATnew_persistent;" ]
+[ 40@0, "new", "pattern", "bat", "(ht:oid,tt:any_1):bat[:any_1]
", "CMDBATnew_persistent;" ]
+[ 41@0, "new", "pattern", "bat",
"(ht:oid,tt:any_1,size:lng):bat[:any_1] ", "CMDBATnew;" ]
+[ 42@0, "new", "pattern", "bat",
"(ht:oid,tt:any_1,size:int):bat[:any_1] ", "CMDBATnew;" ]
+[ 43@0, "new", "pattern", "bat", "(ht:oid,tt:any_1):bat[:any_1]
", "CMDBATnew;" ]
+[ 44@0, "new_persistent", "pattern", "bat",
"(tt:any_1,size:lng):bat[:any_1] ", "CMDBATnewColumn;" ]
+[ 45@0, "new_persistent", "pattern", "bat",
"(tt:any_1,size:int):bat[:any_1] ", "CMDBATnewColumn;" ]
+[ 46@0, "new_persistent", "pattern", "bat",
"(tt:any_1):bat[:any_1] ", "CMDBATnewColumn;" ]
+[ 47@0, "partition", "pattern", "bat",
"(b:bat[:any_1],pieces:int,n:int):bat[:any_1] ", "CMDBATpartition2;"
]
+[ 48@0, "partition", "pattern", "bat",
"(b:bat[:any_1]):bat[:any_1]... ", "CMDBATpartition;" ]
+[ 49@0, "replace", "command", "bat",
"(b:bat[:any_1],del:bat[:oid]):bat[:oid] ", "BKCreuseBATmap;" ]
+[ 50@0, "replace", "command", "bat",
"(b:bat[:any_1],del:bat[:oid]):bat[:any_1] ", "BKCreuseBAT;" ]
+[ 51@0, "replace", "command", "bat",
"(b:bat[:any_1],rid:bat[:oid],val:bat[:any_1],force:bit):bat[:any_1] ",
"BKCbat_inplace_force;" ]
+[ 52@0, "replace", "command", "bat",
"(b:bat[:any_1],rid:bat[:oid],val:bat[:any_1]):bat[:any_1] ",
"BKCbat_inplace;" ]
+[ 53@0, "reuse", "command", "bat",
"(b:bat[:any_1],h:oid,t:any_1,force:bit):bat[:any_1] ", "BKCbun_inplace_force;"
]
+[ 54@0, "reuseMap", "command", "bat",
"(b:bat[:any_1],h:oid,t:any_1):bat[:any_1] ", "BKCbun_inplace;" ]
+[ 55@0, "save", "pattern", "bat", "(val:any_1):bat[:any_1] ",
"CMDBATsingle;" ]
+[ 56@0, "save", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCsetImprints;" ]
+[ 57@0, "setAccess", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCsetHash;" ]
[ 58@0, "setColumn", "command", "bat", "(nme:str):bit ",
"BKCsave;" ]
-[ 59@0, "setColumn", "command", "bat",
"(nme:bat[:oid,:any_1]):void ", "BKCsave2;" ]
-[ 60@0, "setHash", "command", "bat",
"(b:bat[:oid,:any_1]):void ", "BKCsetPersistent;" ]
-[ 61@0, "setImprints", "command", "bat",
"(b:bat[:oid,:any_1]):void ", "BKCsetTransient;" ]
-[ 62@0, "setKey", "command", "bat",
"(b:bat[:oid,:any_1],h:str,t:str):void ", "BKCsetColumns;" ]
-[ 63@0, "setName", "command", "bat",
"(b:bat[:oid,:any_1],t:str):void ", "BKCsetColumn;" ]
-[ 64@0, "setPersistent", "command", "bat",
"(b:bat[:oid,:any_1],h:str,t:str):void ", "BKCsetRole;" ]
-[ 65@0, "setRole", "command", "bat",
"(b:bat[:oid,:any_1],s:str):void ", "BKCsetName;" ]
-[ 66@0, "setTransient", "command", "bat",
"(b:bat[:oid,:any_1],mode:str):bat[:oid,:any_1] ", "BKCsetAccess;" ]
-[ 67@0, "single", "command", "bat",
"(b:bat[:oid,:any_1],mode:bit):bat[:oid,:any_1] ", "BKCsetkey;" ]
+[ 59@0, "setColumn", "command", "bat", "(nme:bat[:any_1]):void
", "BKCsave2;" ]
+[ 60@0, "setHash", "command", "bat", "(b:bat[:any_1]):void
", "BKCsetPersistent;" ]
+[ 61@0, "setImprints", "command", "bat", "(b:bat[:any_1]):void
", "BKCsetTransient;" ]
+[ 62@0, "setKey", "command", "bat",
"(b:bat[:any_1],h:str,t:str):void ", "BKCsetColumns;" ]
+[ 63@0, "setName", "command", "bat",
"(b:bat[:any_1],t:str):void ", "BKCsetColumn;" ]
+[ 64@0, "setPersistent", "command", "bat",
"(b:bat[:any_1],h:str,t:str):void ", "BKCsetRole;" ]
+[ 65@0, "setRole", "command", "bat",
"(b:bat[:any_1],s:str):void ", "BKCsetName;" ]
+[ 66@0, "setTransient", "command", "bat",
"(b:bat[:any_1],mode:str):bat[:any_1] ", "BKCsetAccess;" ]
+[ 67@0, "single", "command", "bat",
"(b:bat[:any_1],mode:bit):bat[:any_1] ", "BKCsetkey;" ]
# 08:55:30 >
# 08:55:30 > Done.
diff --git a/monetdb5/modules/mal/Tests/remote03.stable.err
b/monetdb5/modules/mal/Tests/remote03.stable.err
--- a/monetdb5/modules/mal/Tests/remote03.stable.err
+++ b/monetdb5/modules/mal/Tests/remote03.stable.err
@@ -98,6 +98,7 @@ QUERY = # let connect figure out itself
ERROR =
!SyntaxException:remote.exec:(mapi:monetdb://mone...@lab02.da.cwi.nl/mTests_monetdb5_modules_mal)
rmt0_X_3_void := io.print.bla();
+
# 23:12:09 >
# 23:12:09 > "Done."
# 23:12:09 >
diff --git a/monetdb5/modules/mal/Tests/remote03.stable.out
b/monetdb5/modules/mal/Tests/remote03.stable.out
--- a/monetdb5/modules/mal/Tests/remote03.stable.out
+++ b/monetdb5/modules/mal/Tests/remote03.stable.out
@@ -18,100 +18,15 @@ stdout of test 'remote03` in directory '
# MonetDB/GIS module loaded
# MonetDB/JAQL module loaded
# MonetDB/SQL module loaded
-function user.main():void;
-# let connect figure out itself how to connect to the running db
- uri := sabaoth.getLocalConnectionURI();
- conn:str := remote.connect(uri,"monetdb","monetdb");
-# this is invalid, as io.print is an invalid module, and bla will be
-# taken as function
- res:str := remote.put(conn,:void);
- res:str := remote.exec(conn,"io.print","bla");
-catch SyntaxException:str;
- io.print("Received first error from the remote site");
- io.printf("!%s\n",SyntaxException);
-exit SyntaxException:str;
-# now do it with a function that returns something (a BAT in this case)
- bn := bat.new(:oid,:str);
- b := remote.put(conn,bn);
-catch MALException:str;
- io.print("Received second init error from the remote site");
- io.printf("!%s\n",MALException);
-exit MALException:str;
- io.print(b);
- b := remote.exec(conn,"inspect","getAtomNames");
-catch MALException:str;
- io.print("Received second error from the remote site");
- io.printf("!%s\n",MALException);
-exit MALException:str;
- io.print(b);
- c:bat[:oid,:str] := remote.get(conn,b);
- io.print(c);
-catch MALException:str;
- io.print("Received third error from the remote site");
- io.printf("!%s\n",MALException);
-exit MALException:str;
-# io.print only outputs things, but returns nothing
- ah:str := remote.put(conn,:void);
- io.print(ah);
- ah:str := remote.exec(conn,"io","print",b);
-catch MALException:str;
- io.print("Received fourth error from the remote site");
- io.printf("!%s\n",MALException);
-exit MALException:str;
- d:void := remote.get(conn,ah);
- io.print(d);
-catch MALException:str;
- io.print("Received fifth error from the remote site");
- io.printf("!%s\n",MALException);
-exit MALException:str;
-# help testweb a bit, since currently no cleanup is done on server
-# shutdown
- remote.disconnect(conn);
-end user.main;
-[ "Received first error from the remote site" ]
+# MonetDB/R module loaded
-SyntaxException:parseError: ^'(' expected
+Ready.
-[ "rmt1_bn_bat_oid_str" ]
-[ "rmt1_bn_bat_oid_str" ]
-#--------------------------#
-# h t # name
-# void str # type
-#--------------------------#
-[ 0@0, "void" ]
-[ 1@0, "bit" ]
-[ 2@0, "bte" ]
-[ 3@0, "sht" ]
-[ 4@0, "BAT" ]
-[ 5@0, "int" ]
-[ 6@0, "oid" ]
-[ 7@0, "wrd" ]
-[ 8@0, "ptr" ]
-[ 9@0, "flt" ]
-[ 10@0, "dbl" ]
-[ 11@0, "lng" ]
-[ 12@0, "str" ]
-[ 13@0, "streams" ]
-[ 14@0, "bstream" ]
-[ 15@0, "blob" ]
-[ 16@0, "sqlblob" ]
-[ 17@0, "color" ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
