Changeset: d19bd8556c80 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d19bd8556c80
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/exports.stable.out
monetdb5/mal/Tests/tst042.mal
monetdb5/mal/Tests/tst042.stable.out
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/return_types_of_head_and_tail.SF-701641.mal
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/return_types_of_head_and_tail.SF-701641.stable.out
monetdb5/tests/BugReports/Tests/gettype_in_function.mal
monetdb5/tests/BugReports/Tests/gettype_in_function.stable.out
Branch: default
Log Message:
Approve the outputs
diffs (256 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -39330,22 +39330,6 @@ command inspect.getAtomNames():bat[:oid,
address INSPECTatom_names;
comment Collect a BAT with the atom names.
-pattern inspect.getTypeIndex(v:any_1):int
-address INSPECTtypeIndex;
-comment Return the type index of a variable. For BATs, returnthe type index
for its tail.
-
-pattern inspect.getTypeIndex(v:bat[:oid,:any_2]) (ht:int,tt:int)
-address INSPECTtypeIndex;
-comment Return the type index of a BAT head and tail.
-
-command inspect.getTypeName(v:int):str
-address INSPECTtypename;
-comment Get the type name associated with a type id.
-
-pattern inspect.getType(v:bat[:oid,:any_2]) (ht:str,tt:str)
-address INSPECTtypeName;
-comment Return the concrete type of a variable (expression).
-
pattern inspect.getType(v:any_1):str
address INSPECTtypeName;
comment Return the concrete type of a variable (expression).
@@ -40199,10 +40183,6 @@ pattern mat.packIncrement(b:bat[:oid,:an
address MATpackIncrement;
comment Prepare incremental mat pack
-pattern mat.pack3(b:bat[:oid,:any_2]...):bat[:oid,:any_2]
-address MATpack3;
-comment Materialize the MAT into a BAT by considering the heads as void. (used
in centipede)
-
pattern mat.pack2(b:bat[:oid,:any_2]...):bat[:oid,:any_2]
address MATpack2;
comment Materialize the MAT into a BAT (by an append all)
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
@@ -1039,7 +1039,6 @@ str BOXrelease(Client cntxt, MalBlkPtr m
str BOXreleaseAll(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str BOXtake(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str BOXtoString(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CALCbat2int(int *ret, bat *b);
str CALCmax(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str CALCmax_no_nil(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str CALCmin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
@@ -1432,10 +1431,7 @@ str INSPECTgetSource(Client cntxt, MalBl
str INSPECTgetkind(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str INSPECTshowFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str INSPECTshowFunction3(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p);
-str INSPECTtype(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str INSPECTtypeIndex(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str INSPECTtypeName(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str INSPECTtypename(str *ret, int *tpe);
str IOdatafile(str *ret, str *fnme);
str IOexport(bit *ret, int *bid, str *fnme);
str IOfotable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -1488,6 +1484,12 @@ int JSONtoString(str *s, int *len, json
str JSONunfold(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str JSONvalueArray(json *ret, json *arg);
str JSONvalueTable(int *ret, json *j);
+str KVdatabase(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str KVepilogue(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str KVget(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str KVgetAll(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str KVprelude(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str KVput(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str LCKcreate(monet_lock *l);
str LCKdestroy(int *res, monet_lock *l);
str LCKset(int *res, monet_lock *l);
@@ -1543,7 +1545,6 @@ str MATmergepack(Client cntxt, MalBlkPtr
str MATnewIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MATpack(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MATpack2(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MATpack3(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MATpackIncrement(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MATpackSlice(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str MATpackValues(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
diff --git a/monetdb5/mal/Tests/tst042.mal b/monetdb5/mal/Tests/tst042.mal
--- a/monetdb5/mal/Tests/tst042.mal
+++ b/monetdb5/mal/Tests/tst042.mal
@@ -12,8 +12,7 @@ ft:= inspect.getType(f); io.printf("%s\n
bt:= inspect.getType(b); io.printf("%s\n",bt);
wt:= inspect.getType(w); io.printf("%s\n",wt);
Bt:= inspect.getType(B); io.printf("%s\n",Bt);
-(ht,tt):= inspect.getType(bb);
-io.printf("bat head %s\n",ht);
+tt:= inspect.getType(bb);
io.printf("bat head %s\n",tt);
diff --git a/monetdb5/mal/Tests/tst042.stable.out
b/monetdb5/mal/Tests/tst042.stable.out
--- a/monetdb5/mal/Tests/tst042.stable.out
+++ b/monetdb5/mal/Tests/tst042.stable.out
@@ -56,8 +56,7 @@ function user.main():void;
io.printf("%s\n",wt);
Bt := inspect.getType(B);
io.printf("%s\n",Bt);
- (ht,tt) := inspect.getType(bb);
- io.printf("bat head %s\n",ht);
+ tt := inspect.getType(bb);
io.printf("bat head %s\n",tt);
end main;
str
@@ -66,8 +65,7 @@ flt
bit
wrd
bte
-bat head oid
-bat head str
+bat head bat[:oid,:str]
# 07:58:44 >
# 07:58:44 > Done.
diff --git
a/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/return_types_of_head_and_tail.SF-701641.mal
b/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/return_types_of_head_and_tail.SF-701641.mal
---
a/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/return_types_of_head_and_tail.SF-701641.mal
+++
b/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/return_types_of_head_and_tail.SF-701641.mal
@@ -1,8 +1,5 @@
x := bat.new(:oid,:int);
-(ht,tt):= inspect.getType(x); io.print(ht); io.print(tt);
-
-hi:= inspect.getTypeIndex(ht); io.print(hi);
-hs:= inspect.getTypeName(hi); io.print(hs);
+tt:= inspect.getType(x); io.print(tt);
s:= "hello";
st:= inspect.getType(s); io.print(st);
diff --git
a/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/return_types_of_head_and_tail.SF-701641.stable.out
b/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/return_types_of_head_and_tail.SF-701641.stable.out
---
a/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/return_types_of_head_and_tail.SF-701641.stable.out
+++
b/monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/return_types_of_head_and_tail.SF-701641.stable.out
@@ -14,21 +14,13 @@ stdout of test 'return_types_of_head_and
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:30579/
function user.main():void;
x := bat.new(:oid,:int);
- (ht,tt) := inspect.getType(x);
- io.print(ht);
+ tt := inspect.getType(x);
io.print(tt);
- hi := inspect.getTypeIndex(ht);
- io.print(hi);
- hs := inspect.getTypeName(hi);
- io.print(hs);
s := "hello";
st := inspect.getType(s);
io.print(st);
end main;
-[ "oid" ]
-[ "int" ]
-[ 12 ]
-[ "str" ]
+[ "bat[:oid,:int]" ]
[ "str" ]
# 17:35:43 >
diff --git a/monetdb5/tests/BugReports/Tests/gettype_in_function.mal
b/monetdb5/tests/BugReports/Tests/gettype_in_function.mal
--- a/monetdb5/tests/BugReports/Tests/gettype_in_function.mal
+++ b/monetdb5/tests/BugReports/Tests/gettype_in_function.mal
@@ -16,7 +16,7 @@ user.typetest(p);
# more fun with a BAT
b := bat.new(:oid, :int);
-(h,t) := inspect.getType(b);
+t := inspect.getType(b);
# here it is what we expect
io.print(t);
# now it is "any" even though the above problem was fixed
@@ -25,26 +25,9 @@ user.typetest(b);
# even cooler, now suddenly a string is "any" too
user.typetest(p);
-# extended
+#type tests
i:=1:int;
-d:=bat.new(:oid, :flt);
-tii:=inspect.getTypeIndex(i);
-io.print(tii);
-tni:=inspect.getTypeName(tii);
-io.print(tni);
-
-tib:=inspect.getTypeIndex(d);
-io.print(tib);
-(ht,tt):= inspect.getTypeIndex(d);
-io.print(ht,tt);
-tnb:=inspect.getTypeName(tib);
-io.print(tnb);
-rev:= bat.reverse(d);
-rid:= inspect.getTypeIndex(rev);
-tns:=inspect.getTypeName(rid);
-io.print(tns);
-
-#type tests
+d:=i;
z1:= inspect.equalType(i,:int);
io.print(z1);
z1:= inspect.equalType(d,:bat[:str,:flt]);
diff --git a/monetdb5/tests/BugReports/Tests/gettype_in_function.stable.out
b/monetdb5/tests/BugReports/Tests/gettype_in_function.stable.out
--- a/monetdb5/tests/BugReports/Tests/gettype_in_function.stable.out
+++ b/monetdb5/tests/BugReports/Tests/gettype_in_function.stable.out
@@ -31,31 +31,16 @@ function user.main():void;
user.typetest(p);
# more fun with a BAT
b := bat.new(:oid,:int);
- (h,t) := inspect.getType(b);
+ t := inspect.getType(b);
# here it is what we expect
io.print(t);
# now it is "any" even though the above problem was fixed
user.typetest(b);
# even cooler, now suddenly a string is "any" too
user.typetest(p);
-# extended
+#type tests
i := 1:int;
- d := bat.new(:oid,:flt);
- tii := inspect.getTypeIndex(i);
- io.print(tii);
- tni := inspect.getTypeName(tii);
- io.print(tni);
- tib := inspect.getTypeIndex(d);
- io.print(tib);
- (ht,tt) := inspect.getTypeIndex(d);
- io.print(ht,tt);
- tnb := inspect.getTypeName(tib);
- io.print(tnb);
- rev := bat.reverse(d);
- rid := inspect.getTypeIndex(rev);
- tns := inspect.getTypeName(rid);
- io.print(tns);
-#type tests
+ d := i;
z1 := inspect.equalType(i,:int);
io.print(z1);
z1 := inspect.equalType(d,:bat[:str,:flt]);
@@ -65,18 +50,12 @@ function user.main():void;
end main;
[ "str" ]
[ "str" ]
-[ "int" ]
+[ "bat[:oid,:int]" ]
[ "bat[:oid,:int]" ]
[ "str" ]
-[ 5 ]
-[ "int" ]
-[ 9 ]
-[ 6, 9]
-[ "flt" ]
-[ "oid" ]
[ true ]
[ false ]
-[ false ]
+[ true ]
# 12:26:33 >
# 12:26:33 > Done.
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
