Changeset: 84515ec7052a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=84515ec7052a
Added Files:
sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.sql
sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.stable.err
sql/test/BugTracker-2019/Tests/prepare-types.Bug-6724.stable.out
Modified Files:
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
sql/server/rel_exp.c
sql/server/rel_optimizer.c
sql/server/rel_propagate.c
sql/server/rel_psm.c
sql/server/rel_select.c
sql/server/rel_updates.c
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2019/Tests/All
sql/test/BugTracker-2019/Tests/prepare-non-existing-function.Bug-6725.stable.out
Branch: context
Log Message:
merged with default
diffs (truncated from 1056 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
@@ -35,68 +35,69 @@ stdout of test 'inspect05` in directory
[ 4@0, "append", "command", "bat", "(i:bat[:any_1], u:bat[:any_1],
s:bat[:oid]):bat[:any_1] ", "BKCappend_cand_wrap;" ]
[ 5@0, "append", "command", "bat", "(i:bat[:any_1], u:bat[:any_1],
force:bit):bat[:any_1] ", "BKCappend_force_wrap;" ]
[ 6@0, "attach", "command", "bat", "(i:bat[:any_1],
u:bat[:any_1]):bat[:any_1] ", "BKCappend_wrap;" ]
-[ 7@0, "delete", "command", "bat", "(sz:lng):bat[:oid] ",
"BKCdensebat;" ]
-[ 8@0, "delete", "command", "bat", "(b:bat[:any_1]):bat[:any_1] ",
"BKCdelete_all;" ]
-[ 9@0, "delete", "command", "bat", "(b:bat[:any_1],
d:bat[:oid]):bat[:any_1] ", "BKCdelete_multi;" ]
-[ 10@0, "densebat", "command", "bat", "(b:bat[:any_1],
h:oid):bat[:any_1] ", "BKCdelete;" ]
-[ 11@0, "getAccess", "pattern", "bat",
"(bv:bat[:any_1]):bat[:oid] ", "OIDXgetorderidx;" ]
-[ 12@0, "getCapacity", "command", "bat", "(b:bat[:any_1]):str ",
"BKCgetBBPname;" ]
-[ 13@0, "getColumnType", "command", "bat",
"(b:bat[:any_1]):oid ", "BKCgetSequenceBase;" ]
-[ 14@0, "getName", "command", "bat", "(b:bat[:any_1]):str ",
"BKCgetAccess;" ]
-[ 15@0, "getRole", "command", "bat", "(bid:bat[:any_1]):str
", "BKCgetRole;" ]
-[ 16@0, "getSequenceBase", "command", "bat",
"(b:bat[:any_1]):str ", "BKCgetColumnType;" ]
-[ 17@0, "getSize", "command", "bat", "(b:bat[:any_1]):lng ",
"BKCgetCapacity;" ]
-[ 18@0, "getorderidx", "command", "bat", "(b:bat[:any_1]):lng ",
"BKCgetSize;" ]
-[ 19@0, "hasorderidx", "pattern", "bat", "(bv:bat[:any_1]):bit
", "OIDXhasorderidx;" ]
-[ 20@0, "imprints", "command", "bat", "(b:bat[:dbl]):lng ",
"CMDBATimprintsize;" ]
-[ 21@0, "imprints", "command", "bat", "(b:bat[:flt]):lng ",
"CMDBATimprintsize;" ]
-[ 22@0, "imprints", "command", "bat", "(b:bat[:lng]):lng ",
"CMDBATimprintsize;" ]
-[ 23@0, "imprints", "command", "bat", "(b:bat[:int]):lng ",
"CMDBATimprintsize;" ]
-[ 24@0, "imprints", "command", "bat", "(b:bat[:sht]):lng ",
"CMDBATimprintsize;" ]
-[ 25@0, "imprints", "command", "bat", "(b:bat[:bte]):lng ",
"CMDBATimprintsize;" ]
-[ 26@0, "imprintsize", "command", "bat", "(b:bat[:dbl]):void ",
"CMDBATimprints;" ]
-[ 27@0, "imprintsize", "command", "bat", "(b:bat[:flt]):void ",
"CMDBATimprints;" ]
-[ 28@0, "imprintsize", "command", "bat", "(b:bat[:lng]):void ",
"CMDBATimprints;" ]
-[ 29@0, "imprintsize", "command", "bat", "(b:bat[:int]):void ",
"CMDBATimprints;" ]
-[ 30@0, "imprintsize", "command", "bat", "(b:bat[:sht]):void ",
"CMDBATimprints;" ]
-[ 31@0, "imprintsize", "command", "bat", "(b:bat[:bte]):void ",
"CMDBATimprints;" ]
-[ 32@0, "info", "command", "bat", "(a:bat[:oid],
b:bat[:oid]):bat[:oid] ", "BKCintersectcand;" ]
-[ 33@0, "intersectcand", "command", "bat",
"(b1:bat[:any_1], b2:bat[:any_2]):bit ", "BKCisSynced;" ]
-[ 34@0, "isPersistent", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCisPersistent;" ]
-[ 35@0, "isSorted", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCisTransient;" ]
-[ 36@0, "isSortedReverse", "command", "bat",
"(b:bat[:any_1]):bit ", "BKCisSortedReverse;" ]
-[ 37@0, "isSynced", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCisSorted;" ]
-[ 38@0, "isTransient", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCgetKey;" ]
-[ 39@0, "isaKey", "command", "bat", "(b:bat[:any_1])
(X_0:bat[:str], X_1:bat[:str]) ", "BKCinfo;" ]
-[ 40@0, "mergecand", "command", "bat", "(a:bat[:oid],
b:bat[:oid]):bat[:oid] ", "BKCmergecand;" ]
-[ 41@0, "mirror", "command", "bat",
"(b:bat[:any_2]):bat[:oid] ", "BKCmirror;" ]
-[ 42@0, "new", "pattern", "bat", "(tt:any_1,
size:lng):bat[:any_1] ", "CMDBATnew;" ]
-[ 43@0, "new", "pattern", "bat", "(tt:any_1, size:int,
persist:bit):bat[:any_1] ", "CMDBATnew;" ]
-[ 44@0, "new", "pattern", "bat", "(tt:any_1, size:lng,
persist:bit):bat[:any_1] ", "CMDBATnew;" ]
-[ 45@0, "new", "pattern", "bat", "(tt:any_1,
size:int):bat[:any_1] ", "CMDBATnew;" ]
-[ 46@0, "new", "pattern", "bat", "(tt:any_1):bat[:any_1] ",
"CMDBATnew;" ]
-[ 47@0, "orderidx", "pattern", "bat", "(bv:bat[:any_1],
l:bat[:any_1]...):void ", "OIDXmerge;" ]
-[ 48@0, "orderidx", "pattern", "bat", "(bv:bat[:any_1],
pieces:int):void ", "OIDXcreate;" ]
-[ 49@0, "orderidx", "pattern", "bat", "(bv:bat[:any_1]):void
", "OIDXcreate;" ]
-[ 50@0, "partition", "pattern", "bat", "(b:bat[:any_1],
pieces:int, n:int):bat[:any_1] ", "CMDBATpartition2;" ]
-[ 51@0, "partition", "pattern", "bat",
"(b:bat[:any_1]):bat[:any_1]... ", "CMDBATpartition;" ]
-[ 52@0, "replace", "command", "bat", "(b:bat[:any_1],
del:bat[:oid]):bat[:oid] ", "BKCreuseBATmap;" ]
-[ 53@0, "replace", "command", "bat", "(b:bat[:any_1],
del:bat[:oid]):bat[:any_1] ", "BKCreuseBAT;" ]
-[ 54@0, "replace", "command", "bat", "(b:bat[:any_1],
rid:bat[:oid], val:bat[:any_1], force:bit):bat[:any_1] ",
"BKCbat_inplace_force;" ]
-[ 55@0, "replace", "command", "bat", "(b:bat[:any_1],
rid:bat[:oid], val:bat[:any_1]):bat[:any_1] ", "BKCbat_inplace;" ]
-[ 56@0, "reuse", "command", "bat", "(b:bat[:any_1], h:oid,
t:any_1, force:bit):bat[:any_1] ", "BKCbun_inplace_force;" ]
-[ 57@0, "reuseMap", "command", "bat", "(b:bat[:any_1], h:oid,
t:any_1):bat[:any_1] ", "BKCbun_inplace;" ]
-[ 58@0, "save", "pattern", "bat", "(val:any_1):bat[:any_1] ",
"CMDBATsingle;" ]
-[ 59@0, "save", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCsetImprints;" ]
-[ 60@0, "setAccess", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCsetHash;" ]
-[ 61@0, "setColumn", "command", "bat", "(nme:str):bit ",
"BKCsave;" ]
-[ 62@0, "setHash", "command", "bat", "(nme:bat[:any_1]):void
", "BKCsave2;" ]
-[ 63@0, "setImprints", "command", "bat", "(b:bat[:any_1]):void
", "BKCsetPersistent;" ]
-[ 64@0, "setKey", "command", "bat", "(b:bat[:any_1]):void
", "BKCsetTransient;" ]
-[ 65@0, "setName", "command", "bat", "(b:bat[:any_1],
t:str):void ", "BKCsetColumn;" ]
-[ 66@0, "setPersistent", "command", "bat",
"(b:bat[:any_1], s:str):void ", "BKCsetName;" ]
-[ 67@0, "setTransient", "command", "bat", "(b:bat[:any_1],
mode:str):bat[:any_1] ", "BKCsetAccess;" ]
-[ 68@0, "single", "command", "bat", "(b:bat[:any_1],
mode:bit):bat[:any_1] ", "BKCsetkey;" ]
+[ 7@0, "delete", "command", "bat", "(a:bat[:oid],
b:bat[:oid]):bat[:oid] ", "BKCdiffcand;" ]
+[ 8@0, "delete", "command", "bat", "(sz:lng):bat[:oid] ",
"BKCdensebat;" ]
+[ 9@0, "delete", "command", "bat", "(b:bat[:any_1]):bat[:any_1] ",
"BKCdelete_all;" ]
+[ 10@0, "densebat", "command", "bat", "(b:bat[:any_1],
d:bat[:oid]):bat[:any_1] ", "BKCdelete_multi;" ]
+[ 11@0, "diffcand", "command", "bat", "(b:bat[:any_1],
h:oid):bat[:any_1] ", "BKCdelete;" ]
+[ 12@0, "getAccess", "pattern", "bat",
"(bv:bat[:any_1]):bat[:oid] ", "OIDXgetorderidx;" ]
+[ 13@0, "getCapacity", "command", "bat", "(b:bat[:any_1]):str ",
"BKCgetBBPname;" ]
+[ 14@0, "getColumnType", "command", "bat",
"(b:bat[:any_1]):oid ", "BKCgetSequenceBase;" ]
+[ 15@0, "getName", "command", "bat", "(b:bat[:any_1]):str ",
"BKCgetAccess;" ]
+[ 16@0, "getRole", "command", "bat", "(bid:bat[:any_1]):str
", "BKCgetRole;" ]
+[ 17@0, "getSequenceBase", "command", "bat",
"(b:bat[:any_1]):str ", "BKCgetColumnType;" ]
+[ 18@0, "getSize", "command", "bat", "(b:bat[:any_1]):lng ",
"BKCgetCapacity;" ]
+[ 19@0, "getorderidx", "command", "bat", "(b:bat[:any_1]):lng ",
"BKCgetSize;" ]
+[ 20@0, "hasorderidx", "pattern", "bat", "(bv:bat[:any_1]):bit
", "OIDXhasorderidx;" ]
+[ 21@0, "imprints", "command", "bat", "(b:bat[:dbl]):lng ",
"CMDBATimprintsize;" ]
+[ 22@0, "imprints", "command", "bat", "(b:bat[:flt]):lng ",
"CMDBATimprintsize;" ]
+[ 23@0, "imprints", "command", "bat", "(b:bat[:lng]):lng ",
"CMDBATimprintsize;" ]
+[ 24@0, "imprints", "command", "bat", "(b:bat[:int]):lng ",
"CMDBATimprintsize;" ]
+[ 25@0, "imprints", "command", "bat", "(b:bat[:sht]):lng ",
"CMDBATimprintsize;" ]
+[ 26@0, "imprints", "command", "bat", "(b:bat[:bte]):lng ",
"CMDBATimprintsize;" ]
+[ 27@0, "imprintsize", "command", "bat", "(b:bat[:dbl]):void ",
"CMDBATimprints;" ]
+[ 28@0, "imprintsize", "command", "bat", "(b:bat[:flt]):void ",
"CMDBATimprints;" ]
+[ 29@0, "imprintsize", "command", "bat", "(b:bat[:lng]):void ",
"CMDBATimprints;" ]
+[ 30@0, "imprintsize", "command", "bat", "(b:bat[:int]):void ",
"CMDBATimprints;" ]
+[ 31@0, "imprintsize", "command", "bat", "(b:bat[:sht]):void ",
"CMDBATimprints;" ]
+[ 32@0, "imprintsize", "command", "bat", "(b:bat[:bte]):void ",
"CMDBATimprints;" ]
+[ 33@0, "info", "command", "bat", "(a:bat[:oid],
b:bat[:oid]):bat[:oid] ", "BKCintersectcand;" ]
+[ 34@0, "intersectcand", "command", "bat",
"(b1:bat[:any_1], b2:bat[:any_2]):bit ", "BKCisSynced;" ]
+[ 35@0, "isPersistent", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCisPersistent;" ]
+[ 36@0, "isSorted", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCisTransient;" ]
+[ 37@0, "isSortedReverse", "command", "bat",
"(b:bat[:any_1]):bit ", "BKCisSortedReverse;" ]
+[ 38@0, "isSynced", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCisSorted;" ]
+[ 39@0, "isTransient", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCgetKey;" ]
+[ 40@0, "isaKey", "command", "bat", "(b:bat[:any_1])
(X_0:bat[:str], X_1:bat[:str]) ", "BKCinfo;" ]
+[ 41@0, "mergecand", "command", "bat", "(a:bat[:oid],
b:bat[:oid]):bat[:oid] ", "BKCmergecand;" ]
+[ 42@0, "mirror", "command", "bat",
"(b:bat[:any_2]):bat[:oid] ", "BKCmirror;" ]
+[ 43@0, "new", "pattern", "bat", "(tt:any_1,
size:lng):bat[:any_1] ", "CMDBATnew;" ]
+[ 44@0, "new", "pattern", "bat", "(tt:any_1, size:int,
persist:bit):bat[:any_1] ", "CMDBATnew;" ]
+[ 45@0, "new", "pattern", "bat", "(tt:any_1, size:lng,
persist:bit):bat[:any_1] ", "CMDBATnew;" ]
+[ 46@0, "new", "pattern", "bat", "(tt:any_1,
size:int):bat[:any_1] ", "CMDBATnew;" ]
+[ 47@0, "new", "pattern", "bat", "(tt:any_1):bat[:any_1] ",
"CMDBATnew;" ]
+[ 48@0, "orderidx", "pattern", "bat", "(bv:bat[:any_1],
l:bat[:any_1]...):void ", "OIDXmerge;" ]
+[ 49@0, "orderidx", "pattern", "bat", "(bv:bat[:any_1],
pieces:int):void ", "OIDXcreate;" ]
+[ 50@0, "orderidx", "pattern", "bat", "(bv:bat[:any_1]):void
", "OIDXcreate;" ]
+[ 51@0, "partition", "pattern", "bat", "(b:bat[:any_1],
pieces:int, n:int):bat[:any_1] ", "CMDBATpartition2;" ]
+[ 52@0, "partition", "pattern", "bat",
"(b:bat[:any_1]):bat[:any_1]... ", "CMDBATpartition;" ]
+[ 53@0, "replace", "command", "bat", "(b:bat[:any_1],
del:bat[:oid]):bat[:oid] ", "BKCreuseBATmap;" ]
+[ 54@0, "replace", "command", "bat", "(b:bat[:any_1],
del:bat[:oid]):bat[:any_1] ", "BKCreuseBAT;" ]
+[ 55@0, "replace", "command", "bat", "(b:bat[:any_1],
rid:bat[:oid], val:bat[:any_1], force:bit):bat[:any_1] ",
"BKCbat_inplace_force;" ]
+[ 56@0, "replace", "command", "bat", "(b:bat[:any_1],
rid:bat[:oid], val:bat[:any_1]):bat[:any_1] ", "BKCbat_inplace;" ]
+[ 57@0, "reuse", "command", "bat", "(b:bat[:any_1], h:oid,
t:any_1, force:bit):bat[:any_1] ", "BKCbun_inplace_force;" ]
+[ 58@0, "reuseMap", "command", "bat", "(b:bat[:any_1], h:oid,
t:any_1):bat[:any_1] ", "BKCbun_inplace;" ]
+[ 59@0, "save", "pattern", "bat", "(val:any_1):bat[:any_1] ",
"CMDBATsingle;" ]
+[ 60@0, "save", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCsetImprints;" ]
+[ 61@0, "setAccess", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCsetHash;" ]
+[ 62@0, "setColumn", "command", "bat", "(nme:str):bit ",
"BKCsave;" ]
+[ 63@0, "setHash", "command", "bat", "(nme:bat[:any_1]):void
", "BKCsave2;" ]
+[ 64@0, "setImprints", "command", "bat", "(b:bat[:any_1]):void
", "BKCsetPersistent;" ]
+[ 65@0, "setKey", "command", "bat", "(b:bat[:any_1]):void
", "BKCsetTransient;" ]
+[ 66@0, "setName", "command", "bat", "(b:bat[:any_1],
t:str):void ", "BKCsetColumn;" ]
+[ 67@0, "setPersistent", "command", "bat",
"(b:bat[:any_1], s:str):void ", "BKCsetName;" ]
+[ 68@0, "setTransient", "command", "bat", "(b:bat[:any_1],
mode:str):bat[:any_1] ", "BKCsetAccess;" ]
+[ 69@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/inspect05.stable.out.int128
b/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.int128
@@ -35,70 +35,71 @@ stdout of test 'inspect05` in directory
[ 4@0, "append", "command", "bat", "(i:bat[:any_1], u:bat[:any_1],
s:bat[:oid]):bat[:any_1] ", "BKCappend_cand_wrap;" ]
[ 5@0, "append", "command", "bat", "(i:bat[:any_1], u:bat[:any_1],
force:bit):bat[:any_1] ", "BKCappend_force_wrap;" ]
[ 6@0, "attach", "command", "bat", "(i:bat[:any_1],
u:bat[:any_1]):bat[:any_1] ", "BKCappend_wrap;" ]
-[ 7@0, "delete", "command", "bat", "(sz:lng):bat[:oid] ",
"BKCdensebat;" ]
-[ 8@0, "delete", "command", "bat", "(b:bat[:any_1]):bat[:any_1] ",
"BKCdelete_all;" ]
-[ 9@0, "delete", "command", "bat", "(b:bat[:any_1],
d:bat[:oid]):bat[:any_1] ", "BKCdelete_multi;" ]
-[ 10@0, "densebat", "command", "bat", "(b:bat[:any_1],
h:oid):bat[:any_1] ", "BKCdelete;" ]
-[ 11@0, "getAccess", "pattern", "bat",
"(bv:bat[:any_1]):bat[:oid] ", "OIDXgetorderidx;" ]
-[ 12@0, "getCapacity", "command", "bat", "(b:bat[:any_1]):str ",
"BKCgetBBPname;" ]
-[ 13@0, "getColumnType", "command", "bat",
"(b:bat[:any_1]):oid ", "BKCgetSequenceBase;" ]
-[ 14@0, "getName", "command", "bat", "(b:bat[:any_1]):str ",
"BKCgetAccess;" ]
-[ 15@0, "getRole", "command", "bat", "(bid:bat[:any_1]):str
", "BKCgetRole;" ]
-[ 16@0, "getSequenceBase", "command", "bat",
"(b:bat[:any_1]):str ", "BKCgetColumnType;" ]
-[ 17@0, "getSize", "command", "bat", "(b:bat[:any_1]):lng ",
"BKCgetCapacity;" ]
-[ 18@0, "getorderidx", "command", "bat", "(b:bat[:any_1]):lng ",
"BKCgetSize;" ]
-[ 19@0, "hasorderidx", "pattern", "bat", "(bv:bat[:any_1]):bit
", "OIDXhasorderidx;" ]
-[ 20@0, "imprints", "command", "bat", "(b:bat[:hge]):lng ",
"CMDBATimprintsize;" ]
-[ 21@0, "imprints", "command", "bat", "(b:bat[:hge]):void ",
"CMDBATimprints;" ]
-[ 22@0, "imprints", "command", "bat", "(b:bat[:dbl]):lng ",
"CMDBATimprintsize;" ]
-[ 23@0, "imprints", "command", "bat", "(b:bat[:flt]):lng ",
"CMDBATimprintsize;" ]
-[ 24@0, "imprints", "command", "bat", "(b:bat[:lng]):lng ",
"CMDBATimprintsize;" ]
-[ 25@0, "imprints", "command", "bat", "(b:bat[:int]):lng ",
"CMDBATimprintsize;" ]
-[ 26@0, "imprints", "command", "bat", "(b:bat[:sht]):lng ",
"CMDBATimprintsize;" ]
-[ 27@0, "imprintsize", "command", "bat", "(b:bat[:bte]):lng ",
"CMDBATimprintsize;" ]
-[ 28@0, "imprintsize", "command", "bat", "(b:bat[:dbl]):void ",
"CMDBATimprints;" ]
-[ 29@0, "imprintsize", "command", "bat", "(b:bat[:flt]):void ",
"CMDBATimprints;" ]
-[ 30@0, "imprintsize", "command", "bat", "(b:bat[:lng]):void ",
"CMDBATimprints;" ]
-[ 31@0, "imprintsize", "command", "bat", "(b:bat[:int]):void ",
"CMDBATimprints;" ]
-[ 32@0, "imprintsize", "command", "bat", "(b:bat[:sht]):void ",
"CMDBATimprints;" ]
-[ 33@0, "imprintsize", "command", "bat", "(b:bat[:bte]):void ",
"CMDBATimprints;" ]
-[ 34@0, "info", "command", "bat", "(a:bat[:oid],
b:bat[:oid]):bat[:oid] ", "BKCintersectcand;" ]
-[ 35@0, "intersectcand", "command", "bat",
"(b1:bat[:any_1], b2:bat[:any_2]):bit ", "BKCisSynced;" ]
-[ 36@0, "isPersistent", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCisPersistent;" ]
-[ 37@0, "isSorted", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCisTransient;" ]
-[ 38@0, "isSortedReverse", "command", "bat",
"(b:bat[:any_1]):bit ", "BKCisSortedReverse;" ]
-[ 39@0, "isSynced", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCisSorted;" ]
-[ 40@0, "isTransient", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCgetKey;" ]
-[ 41@0, "isaKey", "command", "bat", "(b:bat[:any_1])
(X_0:bat[:str], X_1:bat[:str]) ", "BKCinfo;" ]
-[ 42@0, "mergecand", "command", "bat", "(a:bat[:oid],
b:bat[:oid]):bat[:oid] ", "BKCmergecand;" ]
-[ 43@0, "mirror", "command", "bat",
"(b:bat[:any_2]):bat[:oid] ", "BKCmirror;" ]
-[ 44@0, "new", "pattern", "bat", "(tt:any_1,
size:lng):bat[:any_1] ", "CMDBATnew;" ]
-[ 45@0, "new", "pattern", "bat", "(tt:any_1, size:int,
persist:bit):bat[:any_1] ", "CMDBATnew;" ]
-[ 46@0, "new", "pattern", "bat", "(tt:any_1, size:lng,
persist:bit):bat[:any_1] ", "CMDBATnew;" ]
-[ 47@0, "new", "pattern", "bat", "(tt:any_1,
size:int):bat[:any_1] ", "CMDBATnew;" ]
-[ 48@0, "new", "pattern", "bat", "(tt:any_1):bat[:any_1] ",
"CMDBATnew;" ]
-[ 49@0, "orderidx", "pattern", "bat", "(bv:bat[:any_1],
l:bat[:any_1]...):void ", "OIDXmerge;" ]
-[ 50@0, "orderidx", "pattern", "bat", "(bv:bat[:any_1],
pieces:int):void ", "OIDXcreate;" ]
-[ 51@0, "orderidx", "pattern", "bat", "(bv:bat[:any_1]):void
", "OIDXcreate;" ]
-[ 52@0, "partition", "pattern", "bat", "(b:bat[:any_1],
pieces:int, n:int):bat[:any_1] ", "CMDBATpartition2;" ]
-[ 53@0, "partition", "pattern", "bat",
"(b:bat[:any_1]):bat[:any_1]... ", "CMDBATpartition;" ]
-[ 54@0, "replace", "command", "bat", "(b:bat[:any_1],
del:bat[:oid]):bat[:oid] ", "BKCreuseBATmap;" ]
-[ 55@0, "replace", "command", "bat", "(b:bat[:any_1],
del:bat[:oid]):bat[:any_1] ", "BKCreuseBAT;" ]
-[ 56@0, "replace", "command", "bat", "(b:bat[:any_1],
rid:bat[:oid], val:bat[:any_1], force:bit):bat[:any_1] ",
"BKCbat_inplace_force;" ]
-[ 57@0, "replace", "command", "bat", "(b:bat[:any_1],
rid:bat[:oid], val:bat[:any_1]):bat[:any_1] ", "BKCbat_inplace;" ]
-[ 58@0, "reuse", "command", "bat", "(b:bat[:any_1], h:oid,
t:any_1, force:bit):bat[:any_1] ", "BKCbun_inplace_force;" ]
-[ 59@0, "reuseMap", "command", "bat", "(b:bat[:any_1], h:oid,
t:any_1):bat[:any_1] ", "BKCbun_inplace;" ]
-[ 60@0, "save", "pattern", "bat", "(val:any_1):bat[:any_1] ",
"CMDBATsingle;" ]
-[ 61@0, "save", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCsetImprints;" ]
-[ 62@0, "setAccess", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCsetHash;" ]
-[ 63@0, "setColumn", "command", "bat", "(nme:str):bit ",
"BKCsave;" ]
-[ 64@0, "setHash", "command", "bat", "(nme:bat[:any_1]):void
", "BKCsave2;" ]
-[ 65@0, "setImprints", "command", "bat", "(b:bat[:any_1]):void
", "BKCsetPersistent;" ]
-[ 66@0, "setKey", "command", "bat", "(b:bat[:any_1]):void
", "BKCsetTransient;" ]
-[ 67@0, "setName", "command", "bat", "(b:bat[:any_1],
t:str):void ", "BKCsetColumn;" ]
-[ 68@0, "setPersistent", "command", "bat",
"(b:bat[:any_1], s:str):void ", "BKCsetName;" ]
-[ 69@0, "setTransient", "command", "bat", "(b:bat[:any_1],
mode:str):bat[:any_1] ", "BKCsetAccess;" ]
-[ 70@0, "single", "command", "bat", "(b:bat[:any_1],
mode:bit):bat[:any_1] ", "BKCsetkey;" ]
+[ 7@0, "delete", "command", "bat", "(a:bat[:oid],
b:bat[:oid]):bat[:oid] ", "BKCdiffcand;" ]
+[ 8@0, "delete", "command", "bat", "(sz:lng):bat[:oid] ",
"BKCdensebat;" ]
+[ 9@0, "delete", "command", "bat", "(b:bat[:any_1]):bat[:any_1] ",
"BKCdelete_all;" ]
+[ 10@0, "densebat", "command", "bat", "(b:bat[:any_1],
d:bat[:oid]):bat[:any_1] ", "BKCdelete_multi;" ]
+[ 11@0, "diffcand", "command", "bat", "(b:bat[:any_1],
h:oid):bat[:any_1] ", "BKCdelete;" ]
+[ 12@0, "getAccess", "pattern", "bat",
"(bv:bat[:any_1]):bat[:oid] ", "OIDXgetorderidx;" ]
+[ 13@0, "getCapacity", "command", "bat", "(b:bat[:any_1]):str ",
"BKCgetBBPname;" ]
+[ 14@0, "getColumnType", "command", "bat",
"(b:bat[:any_1]):oid ", "BKCgetSequenceBase;" ]
+[ 15@0, "getName", "command", "bat", "(b:bat[:any_1]):str ",
"BKCgetAccess;" ]
+[ 16@0, "getRole", "command", "bat", "(bid:bat[:any_1]):str
", "BKCgetRole;" ]
+[ 17@0, "getSequenceBase", "command", "bat",
"(b:bat[:any_1]):str ", "BKCgetColumnType;" ]
+[ 18@0, "getSize", "command", "bat", "(b:bat[:any_1]):lng ",
"BKCgetCapacity;" ]
+[ 19@0, "getorderidx", "command", "bat", "(b:bat[:any_1]):lng ",
"BKCgetSize;" ]
+[ 20@0, "hasorderidx", "pattern", "bat", "(bv:bat[:any_1]):bit
", "OIDXhasorderidx;" ]
+[ 21@0, "imprints", "command", "bat", "(b:bat[:hge]):lng ",
"CMDBATimprintsize;" ]
+[ 22@0, "imprints", "command", "bat", "(b:bat[:hge]):void ",
"CMDBATimprints;" ]
+[ 23@0, "imprints", "command", "bat", "(b:bat[:dbl]):lng ",
"CMDBATimprintsize;" ]
+[ 24@0, "imprints", "command", "bat", "(b:bat[:flt]):lng ",
"CMDBATimprintsize;" ]
+[ 25@0, "imprints", "command", "bat", "(b:bat[:lng]):lng ",
"CMDBATimprintsize;" ]
+[ 26@0, "imprints", "command", "bat", "(b:bat[:int]):lng ",
"CMDBATimprintsize;" ]
+[ 27@0, "imprints", "command", "bat", "(b:bat[:sht]):lng ",
"CMDBATimprintsize;" ]
+[ 28@0, "imprintsize", "command", "bat", "(b:bat[:bte]):lng ",
"CMDBATimprintsize;" ]
+[ 29@0, "imprintsize", "command", "bat", "(b:bat[:dbl]):void ",
"CMDBATimprints;" ]
+[ 30@0, "imprintsize", "command", "bat", "(b:bat[:flt]):void ",
"CMDBATimprints;" ]
+[ 31@0, "imprintsize", "command", "bat", "(b:bat[:lng]):void ",
"CMDBATimprints;" ]
+[ 32@0, "imprintsize", "command", "bat", "(b:bat[:int]):void ",
"CMDBATimprints;" ]
+[ 33@0, "imprintsize", "command", "bat", "(b:bat[:sht]):void ",
"CMDBATimprints;" ]
+[ 34@0, "imprintsize", "command", "bat", "(b:bat[:bte]):void ",
"CMDBATimprints;" ]
+[ 35@0, "info", "command", "bat", "(a:bat[:oid],
b:bat[:oid]):bat[:oid] ", "BKCintersectcand;" ]
+[ 36@0, "intersectcand", "command", "bat",
"(b1:bat[:any_1], b2:bat[:any_2]):bit ", "BKCisSynced;" ]
+[ 37@0, "isPersistent", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCisPersistent;" ]
+[ 38@0, "isSorted", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCisTransient;" ]
+[ 39@0, "isSortedReverse", "command", "bat",
"(b:bat[:any_1]):bit ", "BKCisSortedReverse;" ]
+[ 40@0, "isSynced", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCisSorted;" ]
+[ 41@0, "isTransient", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCgetKey;" ]
+[ 42@0, "isaKey", "command", "bat", "(b:bat[:any_1])
(X_0:bat[:str], X_1:bat[:str]) ", "BKCinfo;" ]
+[ 43@0, "mergecand", "command", "bat", "(a:bat[:oid],
b:bat[:oid]):bat[:oid] ", "BKCmergecand;" ]
+[ 44@0, "mirror", "command", "bat",
"(b:bat[:any_2]):bat[:oid] ", "BKCmirror;" ]
+[ 45@0, "new", "pattern", "bat", "(tt:any_1,
size:lng):bat[:any_1] ", "CMDBATnew;" ]
+[ 46@0, "new", "pattern", "bat", "(tt:any_1, size:int,
persist:bit):bat[:any_1] ", "CMDBATnew;" ]
+[ 47@0, "new", "pattern", "bat", "(tt:any_1, size:lng,
persist:bit):bat[:any_1] ", "CMDBATnew;" ]
+[ 48@0, "new", "pattern", "bat", "(tt:any_1,
size:int):bat[:any_1] ", "CMDBATnew;" ]
+[ 49@0, "new", "pattern", "bat", "(tt:any_1):bat[:any_1] ",
"CMDBATnew;" ]
+[ 50@0, "orderidx", "pattern", "bat", "(bv:bat[:any_1],
l:bat[:any_1]...):void ", "OIDXmerge;" ]
+[ 51@0, "orderidx", "pattern", "bat", "(bv:bat[:any_1],
pieces:int):void ", "OIDXcreate;" ]
+[ 52@0, "orderidx", "pattern", "bat", "(bv:bat[:any_1]):void
", "OIDXcreate;" ]
+[ 53@0, "partition", "pattern", "bat", "(b:bat[:any_1],
pieces:int, n:int):bat[:any_1] ", "CMDBATpartition2;" ]
+[ 54@0, "partition", "pattern", "bat",
"(b:bat[:any_1]):bat[:any_1]... ", "CMDBATpartition;" ]
+[ 55@0, "replace", "command", "bat", "(b:bat[:any_1],
del:bat[:oid]):bat[:oid] ", "BKCreuseBATmap;" ]
+[ 56@0, "replace", "command", "bat", "(b:bat[:any_1],
del:bat[:oid]):bat[:any_1] ", "BKCreuseBAT;" ]
+[ 57@0, "replace", "command", "bat", "(b:bat[:any_1],
rid:bat[:oid], val:bat[:any_1], force:bit):bat[:any_1] ",
"BKCbat_inplace_force;" ]
+[ 58@0, "replace", "command", "bat", "(b:bat[:any_1],
rid:bat[:oid], val:bat[:any_1]):bat[:any_1] ", "BKCbat_inplace;" ]
+[ 59@0, "reuse", "command", "bat", "(b:bat[:any_1], h:oid,
t:any_1, force:bit):bat[:any_1] ", "BKCbun_inplace_force;" ]
+[ 60@0, "reuseMap", "command", "bat", "(b:bat[:any_1], h:oid,
t:any_1):bat[:any_1] ", "BKCbun_inplace;" ]
+[ 61@0, "save", "pattern", "bat", "(val:any_1):bat[:any_1] ",
"CMDBATsingle;" ]
+[ 62@0, "save", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCsetImprints;" ]
+[ 63@0, "setAccess", "command", "bat", "(b:bat[:any_1]):bit ",
"BKCsetHash;" ]
+[ 64@0, "setColumn", "command", "bat", "(nme:str):bit ",
"BKCsave;" ]
+[ 65@0, "setHash", "command", "bat", "(nme:bat[:any_1]):void
", "BKCsave2;" ]
+[ 66@0, "setImprints", "command", "bat", "(b:bat[:any_1]):void
", "BKCsetPersistent;" ]
+[ 67@0, "setKey", "command", "bat", "(b:bat[:any_1]):void
", "BKCsetTransient;" ]
+[ 68@0, "setName", "command", "bat", "(b:bat[:any_1],
t:str):void ", "BKCsetColumn;" ]
+[ 69@0, "setPersistent", "command", "bat",
"(b:bat[:any_1], s:str):void ", "BKCsetName;" ]
+[ 70@0, "setTransient", "command", "bat", "(b:bat[:any_1],
mode:str):bat[:any_1] ", "BKCsetAccess;" ]
+[ 71@0, "single", "command", "bat", "(b:bat[:any_1],
mode:bit):bat[:any_1] ", "BKCsetkey;" ]
# 08:55:30 >
# 08:55:30 > Done.
diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -106,7 +106,7 @@ exp_compare(sql_allocator *sa, sql_exp *
sql_exp *e = exp_create(sa, e_cmp);
if (e == NULL)
return NULL;
- e->card = l->card;
+ e->card = MAX(l->card,r->card);
if (e->card == CARD_ATOM && !exp_is_atom(l))
e->card = CARD_AGGR;
e->l = l;
@@ -460,28 +460,6 @@ have_nil(list *exps)
}
sql_exp *
-exp_alias(sql_allocator *sa, const char *arname, const char *acname, const
char *org_rname, const char *org_cname, sql_subtype *t, int card, int has_nils,
int intern)
-{
- sql_exp *e = exp_create(sa, e_column);
-
- if (e == NULL)
- return NULL;
- assert(acname && org_cname);
- e->card = card;
- e->rname = (arname)?arname:org_rname;
- e->name = acname;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
