Changeset: 099c43d22fe2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=099c43d22fe2
Modified Files:
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/remote03.stable.err
monetdb5/modules/mal/Tests/remote03.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/03-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out
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/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/22-explain.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
Branch: no-wrd
Log Message:
Merge with default branch.
diffs (truncated from 3345 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
@@ -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
@@ -96,7 +96,10 @@ QUERY = # let connect figure out itself
ERROR =
!SyntaxException:remote.exec:(mapi:monetdb://[email protected]/mTests_monetdb5_modules_mal)
rmt0_X_3_void := io.print.bla();
-# 13:32:05 >
-# 13:32:05 > "Done."
-# 13:32:05 >
+ERROR =
!SyntaxException:remote.exec:(mapi:monetdb://[email protected]/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
@@ -22,9 +22,9 @@ stdout of test 'remote03` in directory '
Ready.
-# 13:32:05 >
-# 13:32:05 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-30987" "--port=38272"
-# 13:32:05 >
+# 11:26:09 >
+# 11:26:09 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-23931" "--port=33516"
+# 11:26:09 >
[ "Received first error from the remote site" ]
diff --git a/sql/benchmarks/ssbm/Tests/01-explain.stable.out
b/sql/benchmarks/ssbm/Tests/01-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/01-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/01-explain.stable.out
@@ -40,43 +40,43 @@ Ready.
function user.s2_1(A0:int,A1:int,A2:int,A3:int):void;
X_63:void := querylog.define("explain\nselect
sum(lo_extendedprice*lo_discount) as revenue\n\tfrom lineorder, dwdate\n\twhere
lo_orderdate = d_datekey\n\t\tand d_year = 1993\n\t\tand lo_discount between 1
and 3\n\t\tand lo_quantity < 25;","sequential_pipe",43);
X_5 := sql.mvc();
- X_9:bat[:oid,:int] := sql.bind(X_5,"sys","lineorder","lo_quantity",0);
- X_17:bat[:oid,:int] := sql.bind(X_5,"sys","lineorder","lo_discount",0);
- C_6:bat[:oid,:oid] := sql.tid(X_5,"sys","lineorder");
+ X_9:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_quantity",0);
+ X_17:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_discount",0);
+ C_6:bat[:oid] := sql.tid(X_5,"sys","lineorder");
C_72 := algebra.subselect(X_17,C_6,A1,A2,true,true,false);
(C_19,r1_22) := sql.bind(X_5,"sys","lineorder","lo_discount",2);
- C_73 := algebra.subselect(r1_22,nil:bat[:oid,:oid],A1,A2,true,true,false);
- X_21:bat[:oid,:int] := sql.bind(X_5,"sys","lineorder","lo_discount",1);
+ C_73 := algebra.subselect(r1_22,nil:bat[:oid],A1,A2,true,true,false);
+ X_21:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_discount",1);
C_75 := algebra.subselect(X_21,C_6,A1,A2,true,true,false);
C_22 := sql.subdelta(C_72,C_6,C_19,C_73,C_75);
C_76 := algebra.thetasubselect(X_9,C_22,A3,"<");
(C_12,r1_12) := sql.bind(X_5,"sys","lineorder","lo_quantity",2);
- C_77 := algebra.thetasubselect(r1_12,nil:bat[:oid,:oid],A3,"<");
- X_15:bat[:oid,:int] := sql.bind(X_5,"sys","lineorder","lo_quantity",1);
+ C_77 := algebra.thetasubselect(r1_12,nil:bat[:oid],A3,"<");
+ X_15:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_quantity",1);
C_78 := algebra.thetasubselect(X_15,C_22,A3,"<");
C_25 := sql.subdelta(C_76,C_22,C_12,C_77,C_78);
- X_27:bat[:oid,:oid] :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
+ X_27:bat[:oid] :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_29,r1_37) :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
- X_31:bat[:oid,:oid] :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
+ X_31:bat[:oid] :=
sql.bind_idxbat(X_5,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
X_32 := sql.projectdelta(C_25,X_27,X_29,r1_37,X_31);
- X_35:bat[:oid,:int] := sql.bind(X_5,"sys","dwdate","d_year",0);
- C_33:bat[:oid,:oid] := sql.tid(X_5,"sys","dwdate");
+ X_35:bat[:int] := sql.bind(X_5,"sys","dwdate","d_year",0);
+ C_33:bat[:oid] := sql.tid(X_5,"sys","dwdate");
C_79 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
(C_37,r1_47) := sql.bind(X_5,"sys","dwdate","d_year",2);
- C_80 := algebra.subselect(r1_47,nil:bat[:oid,:oid],A0,A0,true,false,false);
- X_39:bat[:oid,:int] := sql.bind(X_5,"sys","dwdate","d_year",1);
+ C_80 := algebra.subselect(r1_47,nil:bat[:oid],A0,A0,true,false,false);
+ X_39:bat[:int] := sql.bind(X_5,"sys","dwdate","d_year",1);
C_81 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
C_40 := sql.subdelta(C_79,C_33,C_37,C_80,C_81);
(X_41,r1_55) := algebra.subjoin(X_32,C_40,nil:BAT,nil:BAT,false,nil:lng);
- X_45:bat[:oid,:int] :=
sql.bind(X_5,"sys","lineorder","lo_extendedprice",0);
+ X_45:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_extendedprice",0);
(C_47,r1_62) := sql.bind(X_5,"sys","lineorder","lo_extendedprice",2);
- X_49:bat[:oid,:int] :=
sql.bind(X_5,"sys","lineorder","lo_extendedprice",1);
+ X_49:bat[:int] := sql.bind(X_5,"sys","lineorder","lo_extendedprice",1);
X_50 := sql.projectdelta(C_25,X_45,C_47,r1_62,X_49);
X_51 := algebra.projection(X_41,X_50);
X_52 := batcalc.lng(X_51);
X_53 := sql.projectdelta(C_25,X_17,C_19,r1_22,X_21);
X_54 := algebra.projection(X_41,X_53);
- X_55:bat[:oid,:lng] := batcalc.*(X_52,X_54);
+ X_55:bat[:lng] := batcalc.*(X_52,X_54);
X_56:lng := aggr.sum(X_55);
sql.resultSet("sys.L1","revenue","bigint",64,0,7,X_56);
end user.s2_1;
diff --git a/sql/benchmarks/ssbm/Tests/02-explain.stable.out
b/sql/benchmarks/ssbm/Tests/02-explain.stable.out
--- a/sql/benchmarks/ssbm/Tests/02-explain.stable.out
+++ b/sql/benchmarks/ssbm/Tests/02-explain.stable.out
@@ -40,43 +40,43 @@ Ready.
function user.s2_1(A0:int,A1:int,A2:int,A3:int,A4:int):void;
X_63:void := querylog.define("explain\nselect
sum(lo_extendedprice*lo_discount) as revenue\n\tfrom lineorder, dwdate\n\twhere
lo_orderdate = d_datekey\n\t\tand d_yearmonthnum = 199401\n\t\tand lo_discount
between 4 and 6\n\t\tand lo_quantity between 26 and 35;","sequential_pipe",43);
X_6 := sql.mvc();
- X_10:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",0);
- X_18:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_discount",0);
- C_7:bat[:oid,:oid] := sql.tid(X_6,"sys","lineorder");
+ X_10:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",0);
+ X_18:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_discount",0);
+ C_7:bat[:oid] := sql.tid(X_6,"sys","lineorder");
C_72 := algebra.subselect(X_18,C_7,A1,A2,true,true,false);
(C_20,r1_24) := sql.bind(X_6,"sys","lineorder","lo_discount",2);
- C_73 := algebra.subselect(r1_24,nil:bat[:oid,:oid],A1,A2,true,true,false);
- X_22:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_discount",1);
+ C_73 := algebra.subselect(r1_24,nil:bat[:oid],A1,A2,true,true,false);
+ X_22:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_discount",1);
C_75 := algebra.subselect(X_22,C_7,A1,A2,true,true,false);
C_23 := sql.subdelta(C_72,C_7,C_20,C_73,C_75);
C_76 := algebra.subselect(X_10,C_23,A3,A4,true,true,false);
(C_13,r1_13) := sql.bind(X_6,"sys","lineorder","lo_quantity",2);
- C_77 := algebra.subselect(r1_13,nil:bat[:oid,:oid],A3,A4,true,true,false);
- X_16:bat[:oid,:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",1);
+ C_77 := algebra.subselect(r1_13,nil:bat[:oid],A3,A4,true,true,false);
+ X_16:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_quantity",1);
C_78 := algebra.subselect(X_16,C_23,A3,A4,true,true,false);
C_26 := sql.subdelta(C_76,C_23,C_13,C_77,C_78);
- X_27:bat[:oid,:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
+ X_27:bat[:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",0);
(X_29,r1_38) :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",2);
- X_31:bat[:oid,:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
+ X_31:bat[:oid] :=
sql.bind_idxbat(X_6,"sys","lineorder","lineorder_lo_orderdate_fkey",1);
X_32 := sql.projectdelta(C_26,X_27,X_29,r1_38,X_31);
- X_35:bat[:oid,:int] := sql.bind(X_6,"sys","dwdate","d_yearmonthnum",0);
- C_33:bat[:oid,:oid] := sql.tid(X_6,"sys","dwdate");
+ X_35:bat[:int] := sql.bind(X_6,"sys","dwdate","d_yearmonthnum",0);
+ C_33:bat[:oid] := sql.tid(X_6,"sys","dwdate");
C_79 := algebra.subselect(X_35,C_33,A0,A0,true,false,false);
(C_37,r1_48) := sql.bind(X_6,"sys","dwdate","d_yearmonthnum",2);
- C_80 := algebra.subselect(r1_48,nil:bat[:oid,:oid],A0,A0,true,false,false);
- X_39:bat[:oid,:int] := sql.bind(X_6,"sys","dwdate","d_yearmonthnum",1);
+ C_80 := algebra.subselect(r1_48,nil:bat[:oid],A0,A0,true,false,false);
+ X_39:bat[:int] := sql.bind(X_6,"sys","dwdate","d_yearmonthnum",1);
C_81 := algebra.subselect(X_39,C_33,A0,A0,true,false,false);
C_40 := sql.subdelta(C_79,C_33,C_37,C_80,C_81);
(X_41,r1_56) := algebra.subjoin(X_32,C_40,nil:BAT,nil:BAT,false,nil:lng);
- X_45:bat[:oid,:int] :=
sql.bind(X_6,"sys","lineorder","lo_extendedprice",0);
+ X_45:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_extendedprice",0);
(C_47,r1_63) := sql.bind(X_6,"sys","lineorder","lo_extendedprice",2);
- X_49:bat[:oid,:int] :=
sql.bind(X_6,"sys","lineorder","lo_extendedprice",1);
+ X_49:bat[:int] := sql.bind(X_6,"sys","lineorder","lo_extendedprice",1);
X_50 := sql.projectdelta(C_26,X_45,C_47,r1_63,X_49);
X_51 := algebra.projection(X_41,X_50);
X_52 := batcalc.lng(X_51);
X_53 := sql.projectdelta(C_26,X_18,C_20,r1_24,X_22);
X_54 := algebra.projection(X_41,X_53);
- X_55:bat[:oid,:lng] := batcalc.*(X_52,X_54);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
