Changeset: fd903434188a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd903434188a
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_storage.c
monetdb5/mal/Tests/tst233.stable.out
monetdb5/mal/Tests/tst234.stable.out
monetdb5/mal/Tests/tst235.stable.out
monetdb5/modules/mal/Tests/inspect05.mal
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/mal_io.h
monetdb5/modules/mal/mal_io.mal
Branch: default
Log Message:
Weeding out the various table printing options.
We keep for the time being the BAT approach to print tables.
The corresponding code BATmultiprintf still can be reduced in complexity.
diffs (truncated from 437 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1298,12 +1298,8 @@ str INSPECTgetkind(Client cntxt, MalBlkP
str INSPECTshowFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str INSPECTshowFunction3(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p);
str INSPECTtypeName(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str IOdatafile(str *ret, str *fnme);
str IOexport(bit *ret, bat *bid, str *fnme);
-str IOfotable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str IOftable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str IOimport(bat *ret, bat *bid, str *fnme);
-str IOotable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str IOprintBoth(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, int
indx, str hd, str tl, int nobat);
str IOprint_tables(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str IOprint_val(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
@@ -1312,8 +1308,6 @@ str IOprintfStream(Client cntxt, MalBlkP
str IOprompt_val(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str IOtable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str IOtableAll(stream *f, Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci, int i, int order, int printhead, int printorder);
-str IOtotable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str IOttable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ITRbunIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ITRbunNext(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str ITRnewChunk(lng *res, bat *vid, bat *bid, lng *granule);
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -1102,6 +1102,11 @@ BATmultiprintf(stream *s, int argc, BAT
assert(argc >= 2);
assert(order < argc);
assert(order >= 0);
+ // the only flags used so far
+ assert(printhead == TRUE);
+ assert(order == 0);
+ assert(printorder == TRUE);
+
argc--;
if ((bats = GDKzalloc((argc + 1) * sizeof(BAT *))) == NULL)
return GDK_FAIL;
diff --git a/monetdb5/mal/Tests/tst233.stable.out
b/monetdb5/mal/Tests/tst233.stable.out
--- a/monetdb5/mal/Tests/tst233.stable.out
+++ b/monetdb5/mal/Tests/tst233.stable.out
@@ -25,7 +25,7 @@ function user.dir():void;
dl := bbp.getLRefCount();
dn := bbp.getNames();
ds := algebra.subsort(dn,false,false);
- io.table(ds,d,dl);
+ io.print(ds,d,dl);
end user.dir;
function user.tmp1(b:bat[:any_1,:any_2]):void;
end user.tmp1;
diff --git a/monetdb5/mal/Tests/tst234.stable.out
b/monetdb5/mal/Tests/tst234.stable.out
--- a/monetdb5/mal/Tests/tst234.stable.out
+++ b/monetdb5/mal/Tests/tst234.stable.out
@@ -25,7 +25,7 @@ function user.dir():void;
dl := bbp.getLRefCount();
dn := bbp.getNames();
ds := algebra.subsort(dn,false,false);
- io.table(ds,d,dl);
+ io.print(ds,d,dl);
end user.dir;
function user.tmp1(b:bat[:any_1,:any_2]):bat[:any_1,:any_2];
tmp1 := algebra.copy(b);
diff --git a/monetdb5/mal/Tests/tst235.stable.out
b/monetdb5/mal/Tests/tst235.stable.out
--- a/monetdb5/mal/Tests/tst235.stable.out
+++ b/monetdb5/mal/Tests/tst235.stable.out
@@ -24,7 +24,7 @@ function user.dir():void;
dl := bbp.getLRefCount();
dn := bbp.getNames();
ds := algebra.subsort(dn,false,false);
- io.table(ds,d,dl);
+ io.print(ds,d,dl);
end user.dir;
function user.createBAT(name:str):bat[:oid,:int];
res := bat.new(:oid,:int);
diff --git a/monetdb5/modules/mal/Tests/inspect05.mal
b/monetdb5/modules/mal/Tests/inspect05.mal
--- a/monetdb5/modules/mal/Tests/inspect05.mal
+++ b/monetdb5/modules/mal/Tests/inspect05.mal
@@ -13,5 +13,5 @@ a0:= algebra.leftfetchjoin(m0,a);
(fv,forder):= algebra.subsort(f0,false,true);
-io.table(1,fv,k0,m1,s0,a0);
+io.print(fv,k0,m1,s0,a0);
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
@@ -32,85 +32,85 @@ function user.main():void;
a := inspect.getAddresses();
a0 := algebra.leftfetchjoin(m0,a);
(fv,forder) := algebra.subsort(f0,false,true);
- io.table(1,fv,k0,m1,s0,a0);
+ io.print(fv,k0,m1,s0,a0);
end user.main;
#--------------------------#
# t t t t t # name
# str str str str str # type
#--------------------------#
-[ "append", "command", "bat",
"(i:bat[:oid,:any_1],u:any_1):bat[:oid,:any_1] ", "BKCappend_val_wrap;" ]
-[ "append", "command", "bat", "(tt:int,heapfile:str):bat[:oid,:any_1]
", "BKCattach;" ]
-[ "append", "command", "bat",
"(i:bat[:oid,:any_1],u:any_1,force:bit):bat[:oid,:any_1] ",
"BKCappend_val_force_wrap;" ]
-[ "append", "command", "bat",
"(i:bat[:oid,:any_1],u:bat[:oid,:any_1],force:bit):bat[:oid,:any_1] ",
"BKCappend_force_wrap;" ]
-[ "attach", "command", "bat",
"(i:bat[:oid,:any_1],u:bat[:oid,:any_1]):bat[:oid,:any_1] ",
"BKCappend_wrap;" ]
-[ "delete", "command", "bat", "(sz:wrd):bat[:oid,:oid] ",
"BKCdensebat;" ]
-[ "delete", "command", "bat",
"(b:bat[:oid,:any_1],src:bat[:oid,:any_1]):bat[:oid,:any_1] ",
"BKCdelete_bat_bun;" ]
-[ "delete", "command", "bat", "(b:bat[:oid,:any_1]):bat[:oid,:any_1]
", "BKCdelete_all;" ]
-[ "densebat", "command", "bat",
"(b:bat[:oid,:any_1],h:oid):bat[:oid,:any_1] ", "BKCdelete;" ]
-[ "getAccess", "command", "bat", "(b:bat[:oid,:any_1]):str ",
"BKCgetBBPname;" ]
-[ "getCapacity", "command", "bat", "(b:bat[:oid,:any_1]):oid ",
"BKCgetSequenceBase;" ]
-[ "getColumnType", "command", "bat", "(b:bat[:oid,:any_1]):str ",
"BKCgetAccess;" ]
-[ "getName", "command", "bat", "(bid:bat[:oid,:any_1]):str ",
"BKCgetRole;" ]
-[ "getRole", "command", "bat", "(b:bat[:oid,:any_1]):str ",
"BKCgetColumnType;" ]
-[ "getSequenceBase", "command", "bat", "(b:bat[:oid,:any_1]):lng ",
"BKCgetCapacity;" ]
-[ "getSize", "command", "bat", "(b:bat[:oid,:any_1]):lng ",
"BKCgetSize;" ]
-[ "imprints", "command", "bat", "(b:bat[:oid,:hge]):lng ",
"CMDBATimprintsize;" ]
-[ "imprints", "command", "bat", "(b:bat[:oid,:hge]):void ",
"CMDBATimprints;" ]
-[ "imprints", "command", "bat", "(b:bat[:oid,:dbl]):lng ",
"CMDBATimprintsize;" ]
-[ "imprints", "command", "bat", "(b:bat[:oid,:flt]):lng ",
"CMDBATimprintsize;" ]
-[ "imprints", "command", "bat", "(b:bat[:oid,:lng]):lng ",
"CMDBATimprintsize;" ]
-[ "imprints", "command", "bat", "(b:bat[:oid,:int]):lng ",
"CMDBATimprintsize;" ]
-[ "imprints", "command", "bat", "(b:bat[:oid,:sht]):lng ",
"CMDBATimprintsize;" ]
-[ "imprintsize", "command", "bat", "(b:bat[:oid,:bte]):lng ",
"CMDBATimprintsize;" ]
-[ "imprintsize", "command", "bat", "(b:bat[:oid,:dbl]):void ",
"CMDBATimprints;" ]
-[ "imprintsize", "command", "bat", "(b:bat[:oid,:flt]):void ",
"CMDBATimprints;" ]
-[ "imprintsize", "command", "bat", "(b:bat[:oid,:lng]):void ",
"CMDBATimprints;" ]
-[ "imprintsize", "command", "bat", "(b:bat[:oid,:int]):void ",
"CMDBATimprints;" ]
-[ "imprintsize", "command", "bat", "(b:bat[:oid,:sht]):void ",
"CMDBATimprints;" ]
-[ "imprintsize", "command", "bat", "(b:bat[:oid,:bte]):void ",
"CMDBATimprints;" ]
-[ "info", "command", "bat",
"(a:bat[:oid,:oid],b:bat[:oid,:oid]):bat[:oid,:oid] ", "BKCintersectcand;" ]
-[ "intersectcand", "command", "bat",
"(b1:bat[:oid,:any_1],b2:bat[:oid,:any_2]):bit ", "BKCisSynced;" ]
-[ "isPersistent", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCisPersistent;" ]
-[ "isSorted", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCisTransient;" ]
-[ "isSortedReverse", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCisSortedReverse;" ]
-[ "isSynced", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCisSorted;" ]
-[ "isTransient", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCgetKey;" ]
-[ "isaKey", "command", "bat", "(b:bat[:oid,:any_1])
(X_2:bat[:oid,:str],X_3:bat[:oid,:str]) ", "BKCinfo;" ]
-[ "mergecand", "command", "bat",
"(a:bat[:oid,:oid],b:bat[:oid,:oid]):bat[:oid,:oid] ", "BKCmergecand;" ]
-[ "mirror", "command", "bat",
"(b:bat[:any_1,:any_2]):bat[:any_1,:any_1] ", "BKCmirror;" ]
-[ "new", "command", "bat", "(nme:str):bat[:oid,:any_1] ",
"CMDBATderivedByName;" ]
-[ "new", "pattern", "bat",
"(b:bat[:oid,:any_1],size:lng):bat[:oid,:any_1] ", "CMDBATnewDerived;" ]
-[ "new", "pattern", "bat", "(b:bat[:oid,:any_1]):bat[:oid,:any_1]
", "CMDBATnewDerived;" ]
-[ "new", "pattern", "bat",
"(ht:oid,tt:any_1,size:lng):bat[:oid,:any_1] ", "CMDBATnew_persistent;" ]
-[ "new", "pattern", "bat",
"(ht:oid,tt:any_1,size:int):bat[:oid,:any_1] ", "CMDBATnew_persistent;" ]
-[ "new", "pattern", "bat", "(ht:oid,tt:any_1):bat[:oid,:any_1] ",
"CMDBATnew_persistent;" ]
-[ "new_persistent", "pattern", "bat",
"(ht:oid,tt:any_1,size:lng):bat[:oid,:any_1] ", "CMDBATnew;" ]
-[ "new_persistent", "pattern", "bat",
"(ht:oid,tt:any_1,size:int):bat[:oid,:any_1] ", "CMDBATnew;" ]
-[ "new_persistent", "pattern", "bat",
"(ht:oid,tt:any_1):bat[:oid,:any_1] ", "CMDBATnew;" ]
-[ "order", "command", "bat", "(b:bat[:oid,:any_1]):bat[:oid,:any_1]
", "BKCorder_rev;" ]
-[ "orderReverse", "command", "bat",
"(b:bat[:oid,:any_1]):bat[:oid,:any_1] ", "BKCorder;" ]
-[ "partition", "pattern", "bat",
"(b:bat[:oid,:any_1],pieces:int,n:int):bat[:oid,:any_1] ",
"CMDBATpartition2;" ]
-[ "partition", "pattern", "bat",
"(b:bat[:oid,:any_1]):bat[:oid,:any_1]... ", "CMDBATpartition;" ]
-[ "replace", "command", "bat",
"(b:bat[:oid,:any_1],del:bat[:oid,:oid]):bat[:oid,:oid] ",
"BKCreuseBATmap;" ]
-[ "replace", "command", "bat",
"(b:bat[:oid,:any_1],del:bat[:oid,:oid]):bat[:oid,:any_1] ", "BKCreuseBAT;"
]
-[ "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;" ]
-[ "replace", "command", "bat",
"(b:bat[:oid,:any_1],rid:bat[:oid,:oid],val:bat[:oid,:any_1]):bat[:oid,:any_1]
", "BKCbat_inplace;" ]
-[ "reuse", "command", "bat",
"(b:bat[:oid,:any_1],h:oid,t:any_1,force:bit):bat[:oid,:any_1] ",
"BKCbun_inplace_force;" ]
-[ "reuseMap", "command", "bat",
"(b:bat[:oid,:any_1],h:oid,t:any_1):bat[:oid,:any_1] ", "BKCbun_inplace;" ]
-[ "reverse", "command", "bat",
"(b:bat[:any_1,:any_2]):bat[:any_2,:any_1] ", "BKCreverse;" ]
-[ "save", "pattern", "bat", "(val:any_1):bat[:oid,:any_1] ",
"CMDBATsingle;" ]
-[ "save", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCsetImprints;" ]
-[ "setAccess", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCsetHash;" ]
-[ "setColumn", "command", "bat", "(nme:str):bit ", "BKCsave;" ]
-[ "setColumn", "command", "bat", "(nme:bat[:oid,:any_1]):void ",
"BKCsave2;" ]
-[ "setHash", "command", "bat", "(b:bat[:oid,:any_1]):void ",
"BKCsetPersistent;" ]
-[ "setImprints", "command", "bat", "(b:bat[:oid,:any_1]):void ",
"BKCsetTransient;" ]
-[ "setKey", "command", "bat", "(b:bat[:oid,:any_1],h:str,t:str):void
", "BKCsetColumns;" ]
-[ "setName", "command", "bat", "(b:bat[:oid,:any_1],t:str):void ",
"BKCsetColumn;" ]
-[ "setPersistent", "command", "bat",
"(b:bat[:oid,:any_1],h:str,t:str):void ", "BKCsetRole;" ]
-[ "setRole", "command", "bat", "(b:bat[:oid,:any_1],s:str):void ",
"BKCsetName;" ]
-[ "setTransient", "command", "bat",
"(b:bat[:oid,:any_1],mode:str):bat[:oid,:any_1] ", "BKCsetAccess;" ]
-[ "single", "command", "bat",
"(b:bat[:oid,:any_1],mode:bit):bat[:oid,:any_1] ", "BKCsetkey;" ]
+[ 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],src:bat[:oid,:any_1]):bat[:oid,:any_1] ",
"BKCdelete_bat_bun;" ]
+[ 7@0, "delete", "command", "bat",
"(b:bat[:oid,:any_1]):bat[:oid,:any_1] ", "BKCdelete_all;" ]
+[ 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,:hge]):lng
", "CMDBATimprintsize;" ]
+[ 17@0, "imprints", "command", "bat",
"(b:bat[:oid,:hge]):void ", "CMDBATimprints;" ]
+[ 18@0, "imprints", "command", "bat", "(b:bat[:oid,:dbl]):lng
", "CMDBATimprintsize;" ]
+[ 19@0, "imprints", "command", "bat", "(b:bat[:oid,:flt]):lng
", "CMDBATimprintsize;" ]
+[ 20@0, "imprints", "command", "bat", "(b:bat[:oid,:lng]):lng
", "CMDBATimprintsize;" ]
+[ 21@0, "imprints", "command", "bat", "(b:bat[:oid,:int]):lng
", "CMDBATimprintsize;" ]
+[ 22@0, "imprints", "command", "bat", "(b:bat[:oid,:sht]):lng
", "CMDBATimprintsize;" ]
+[ 23@0, "imprintsize", "command", "bat", "(b:bat[:oid,:bte]):lng
", "CMDBATimprintsize;" ]
+[ 24@0, "imprintsize", "command", "bat",
"(b:bat[:oid,:dbl]):void ", "CMDBATimprints;" ]
+[ 25@0, "imprintsize", "command", "bat",
"(b:bat[:oid,:flt]):void ", "CMDBATimprints;" ]
+[ 26@0, "imprintsize", "command", "bat",
"(b:bat[:oid,:lng]):void ", "CMDBATimprints;" ]
+[ 27@0, "imprintsize", "command", "bat",
"(b:bat[:oid,:int]):void ", "CMDBATimprints;" ]
+[ 28@0, "imprintsize", "command", "bat",
"(b:bat[:oid,:sht]):void ", "CMDBATimprints;" ]
+[ 29@0, "imprintsize", "command", "bat",
"(b:bat[:oid,:bte]):void ", "CMDBATimprints;" ]
+[ 30@0, "info", "command", "bat",
"(a:bat[:oid,:oid],b:bat[:oid,:oid]):bat[:oid,:oid] ", "BKCintersectcand;" ]
+[ 31@0, "intersectcand", "command", "bat",
"(b1:bat[:oid,:any_1],b2:bat[:oid,:any_2]):bit ", "BKCisSynced;" ]
+[ 32@0, "isPersistent", "command", "bat",
"(b:bat[:oid,:any_1]):bit ", "BKCisPersistent;" ]
+[ 33@0, "isSorted", "command", "bat",
"(b:bat[:oid,:any_1]):bit ", "BKCisTransient;" ]
+[ 34@0, "isSortedReverse", "command", "bat",
"(b:bat[:oid,:any_1]):bit ", "BKCisSortedReverse;" ]
+[ 35@0, "isSynced", "command", "bat",
"(b:bat[:oid,:any_1]):bit ", "BKCisSorted;" ]
+[ 36@0, "isTransient", "command", "bat",
"(b:bat[:oid,:any_1]):bit ", "BKCgetKey;" ]
+[ 37@0, "isaKey", "command", "bat", "(b:bat[:oid,:any_1])
(X_2:bat[:oid,:str],X_3:bat[:oid,:str]) ", "BKCinfo;" ]
+[ 38@0, "mergecand", "command", "bat",
"(a:bat[:oid,:oid],b:bat[:oid,:oid]):bat[:oid,:oid] ", "BKCmergecand;" ]
+[ 39@0, "mirror", "command", "bat",
"(b:bat[:any_1,:any_2]):bat[:any_1,:any_1] ", "BKCmirror;" ]
+[ 40@0, "new", "command", "bat", "(nme:str):bat[:oid,:any_1] ",
"CMDBATderivedByName;" ]
+[ 41@0, "new", "pattern", "bat",
"(b:bat[:oid,:any_1],size:lng):bat[:oid,:any_1] ", "CMDBATnewDerived;" ]
+[ 42@0, "new", "pattern", "bat",
"(b:bat[:oid,:any_1]):bat[:oid,:any_1] ", "CMDBATnewDerived;" ]
+[ 43@0, "new", "pattern", "bat",
"(ht:oid,tt:any_1,size:lng):bat[:oid,:any_1] ", "CMDBATnew_persistent;" ]
+[ 44@0, "new", "pattern", "bat",
"(ht:oid,tt:any_1,size:int):bat[:oid,:any_1] ", "CMDBATnew_persistent;" ]
+[ 45@0, "new", "pattern", "bat",
"(ht:oid,tt:any_1):bat[:oid,:any_1] ", "CMDBATnew_persistent;" ]
+[ 46@0, "new_persistent", "pattern", "bat",
"(ht:oid,tt:any_1,size:lng):bat[:oid,:any_1] ", "CMDBATnew;" ]
+[ 47@0, "new_persistent", "pattern", "bat",
"(ht:oid,tt:any_1,size:int):bat[:oid,:any_1] ", "CMDBATnew;" ]
+[ 48@0, "new_persistent", "pattern", "bat",
"(ht:oid,tt:any_1):bat[:oid,:any_1] ", "CMDBATnew;" ]
+[ 49@0, "order", "command", "bat",
"(b:bat[:oid,:any_1]):bat[:oid,:any_1] ", "BKCorder_rev;" ]
+[ 50@0, "orderReverse", "command", "bat",
"(b:bat[:oid,:any_1]):bat[:oid,:any_1] ", "BKCorder;" ]
+[ 51@0, "partition", "pattern", "bat",
"(b:bat[:oid,:any_1],pieces:int,n:int):bat[:oid,:any_1] ",
"CMDBATpartition2;" ]
+[ 52@0, "partition", "pattern", "bat",
"(b:bat[:oid,:any_1]):bat[:oid,:any_1]... ", "CMDBATpartition;" ]
+[ 53@0, "replace", "command", "bat",
"(b:bat[:oid,:any_1],del:bat[:oid,:oid]):bat[:oid,:oid] ",
"BKCreuseBATmap;" ]
+[ 54@0, "replace", "command", "bat",
"(b:bat[:oid,:any_1],del:bat[:oid,:oid]):bat[:oid,:any_1] ", "BKCreuseBAT;"
]
+[ 55@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;" ]
+[ 56@0, "replace", "command", "bat",
"(b:bat[:oid,:any_1],rid:bat[:oid,:oid],val:bat[:oid,:any_1]):bat[:oid,:any_1]
", "BKCbat_inplace;" ]
+[ 57@0, "reuse", "command", "bat",
"(b:bat[:oid,:any_1],h:oid,t:any_1,force:bit):bat[:oid,:any_1] ",
"BKCbun_inplace_force;" ]
+[ 58@0, "reuseMap", "command", "bat",
"(b:bat[:oid,:any_1],h:oid,t:any_1):bat[:oid,:any_1] ", "BKCbun_inplace;" ]
+[ 59@0, "reverse", "command", "bat",
"(b:bat[:any_1,:any_2]):bat[:any_2,:any_1] ", "BKCreverse;" ]
+[ 60@0, "save", "pattern", "bat", "(val:any_1):bat[:oid,:any_1]
", "CMDBATsingle;" ]
+[ 61@0, "save", "command", "bat", "(b:bat[:oid,:any_1]):bit ",
"BKCsetImprints;" ]
+[ 62@0, "setAccess", "command", "bat",
"(b:bat[:oid,:any_1]):bit ", "BKCsetHash;" ]
+[ 63@0, "setColumn", "command", "bat", "(nme:str):bit ",
"BKCsave;" ]
+[ 64@0, "setColumn", "command", "bat",
"(nme:bat[:oid,:any_1]):void ", "BKCsave2;" ]
+[ 65@0, "setHash", "command", "bat",
"(b:bat[:oid,:any_1]):void ", "BKCsetPersistent;" ]
+[ 66@0, "setImprints", "command", "bat",
"(b:bat[:oid,:any_1]):void ", "BKCsetTransient;" ]
+[ 67@0, "setKey", "command", "bat",
"(b:bat[:oid,:any_1],h:str,t:str):void ", "BKCsetColumns;" ]
+[ 68@0, "setName", "command", "bat",
"(b:bat[:oid,:any_1],t:str):void ", "BKCsetColumn;" ]
+[ 69@0, "setPersistent", "command", "bat",
"(b:bat[:oid,:any_1],h:str,t:str):void ", "BKCsetRole;" ]
+[ 70@0, "setRole", "command", "bat",
"(b:bat[:oid,:any_1],s:str):void ", "BKCsetName;" ]
+[ 71@0, "setTransient", "command", "bat",
"(b:bat[:oid,:any_1],mode:str):bat[:oid,:any_1] ", "BKCsetAccess;" ]
+[ 72@0, "single", "command", "bat",
"(b:bat[:oid,:any_1],mode:bit):bat[:oid,:any_1] ", "BKCsetkey;" ]
# 08:55:30 >
# 08:55:30 > Done.
diff --git a/monetdb5/modules/mal/mal_io.c b/monetdb5/modules/mal/mal_io.c
--- a/monetdb5/modules/mal/mal_io.c
+++ b/monetdb5/modules/mal/mal_io.c
@@ -152,12 +152,6 @@ IOprint_val(Client cntxt, MalBlkPtr mb,
}
str
-IOprint_tables(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
-{
- return IOtableAll(cntxt->fdout, cntxt, mb, stk, p, 1, 0, FALSE, TRUE);
-}
-
-str
IOprompt_val(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
return IOprintBoth(cntxt, mb, stk, pci, 1, 0, 0, 1);
@@ -533,8 +527,8 @@ IOprintfStream(Client cntxt, MalBlkPtr m
* The table printing routine implementations rely on the multiprintf.
* They merely differ in destination and order prerequisite
*/
-str
-IOtableAll(stream *f, Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci,
int i, int order, int printhead, int printorder)
+static str
+IOtableAll(stream *f, Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci,
int i)
{
BAT *piv[MAXPARAMS], *b;
int nbats = 0;
@@ -559,60 +553,18 @@ IOtableAll(stream *f, Client cntxt, MalB
piv[nbats++] = b;
}
/*if(printhead) */ nbats++;
- BATmultiprintf(f, nbats, piv, printhead, order, printorder);
+ BATmultiprintf(f, nbats, piv, TRUE, 0, TRUE);
for (k = 0; k < nbats - 1; k++)
BBPunfix(piv[k]->batCacheid);
return MAL_SUCCEED;
}
str
-IOotable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+IOtable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
- int order;
- order = *getArgReference_int(stk, pci, 1);
- return IOtableAll(cntxt->fdout, cntxt, mb, stk, pci, 2, order, TRUE,
TRUE);
+ return IOtableAll(cntxt->fdout, cntxt, mb, stk, pci, 1);
}
-str
-IOtable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
