Changeset: 0f39085b7aaf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0f39085b7aaf
Modified Files:
clients/Tests/exports.stable.out
monetdb5/optimizer/Tests/inline05.stable.out
monetdb5/optimizer/Tests/inline08.stable.out
monetdb5/optimizer/Tests/inlineIfthen.stable.out
monetdb5/optimizer/Tests/remap.stable.out
sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
Branch: default
Log Message:
Approved after changeset 521416a9ac2e.
diffs (127 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
@@ -1533,6 +1533,7 @@ str MALreader(Client c);
void MALresourceFairness(lng usec);
str MALstartDataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MANIFOLDevaluate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str MANIFOLDremapMultiplex(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p);
MALfcn MANIFOLDtypecheck(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str MANUALcompletion(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MANUALcreate0(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -1818,7 +1819,6 @@ int OPTquerylogImplementation(Client cnt
int OPTrecyclerImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTreduceImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
int OPTremapImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str OPTremapMultiplex(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
int OPTremoteQueriesImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
int OPTreorderImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
str OPTsetDebugStr(int *ret, str *nme);
@@ -2023,9 +2023,6 @@ str QOTshowPlan(Client cntxt, MalBlkPtr
void QOTstatisticsExit(void);
void QOTupdateStatistics(str nme, int prop, lng val);
QueryQueue QRYqueue;
-str RAPIeval(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str RAPIpostlude(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str RAPIprelude(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str RECYCLEappendSQL(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str RECYCLEcolumn(Client cntxt, str sch, str tbl, str col);
str RECYCLEdeleteSQL(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
@@ -2061,7 +2058,6 @@ str RUNcostPrediction(Client cntxt, MalB
str RUNisolation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str RUNpickResult(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str RUNvolumeCost(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-char *R_HomeDir();
str SABAOTHdeserialise(sabdb **ret, str *sabdb);
str SABAOTHfreeStatus(sabdb **ret);
str SABAOTHgetDBfarm(str *ret);
@@ -2727,6 +2723,7 @@ str mal_quote(const char *msg, size_t si
MT_Lock mal_remoteLock;
char *mal_trace;
void mal_unquote(char *msg);
+str manifoldRef;
str mapiRef;
str markHRef;
str markTRef;
diff --git a/monetdb5/optimizer/Tests/inline05.stable.out
b/monetdb5/optimizer/Tests/inline05.stable.out
--- a/monetdb5/optimizer/Tests/inline05.stable.out
+++ b/monetdb5/optimizer/Tests/inline05.stable.out
@@ -31,8 +31,8 @@ end main;
function user.qry():void; # 0 qry:void := user.qry() {G}
b := bat.new(:oid,:int); # 1 b:bat[:oid,:int] :=
CMDBATnew(_2:oid, _3:int) {G}
bat.insert(b,0@0,1); # 2 _4:bat[:oid,:int] :=
BKCinsert_bun(b:bat[:oid,:int], _5:oid, _6:int) {G}
- z:bat[:oid,:dbl] {inline} := mal.multiplex("user","foo",b,b);# 3
z:bat[:oid,:dbl] := OPTremapMultiplex(_8:str, _9:str, b:bat[:oid,:int],
b:bat[:oid,:int]) {G}
- z:bat[:oid,:dbl] {inline} := mal.multiplex("user","foo",b,2);# 4
z:bat[:oid,:dbl] := OPTremapMultiplex(_8:str, _9:str, b:bat[:oid,:int],
_10:int) {G}
+ z:bat[:oid,:dbl] {inline} := mal.multiplex("user","foo",b,b);# 3
z:bat[:oid,:dbl] := MANIFOLDremapMultiplex(_8:str, _9:str, b:bat[:oid,:int],
b:bat[:oid,:int]) {G}
+ z:bat[:oid,:dbl] {inline} := mal.multiplex("user","foo",b,2);# 4
z:bat[:oid,:dbl] := MANIFOLDremapMultiplex(_8:str, _9:str, b:bat[:oid,:int],
_10:int) {G}
end qry; # 5
# 18:00:44 >
diff --git a/monetdb5/optimizer/Tests/inline08.stable.out
b/monetdb5/optimizer/Tests/inline08.stable.out
--- a/monetdb5/optimizer/Tests/inline08.stable.out
+++ b/monetdb5/optimizer/Tests/inline08.stable.out
@@ -39,7 +39,7 @@ end main;
function user.qry():void; # 0 qry:void := user.qry() {G}
b := bat.new(:oid,:str); # 1 b:bat[:oid,:str] :=
CMDBATnew(_2:oid, _3:str) {G}
bat.insert(b,0@0,1); # 2 _4:any :=
bat.insert(b:bat[:oid,:str], _5:oid, _6:int) {U}
- z:bat[:oid,:str] := mal.multiplex("user","bar",b,b);# 3 z:bat[:oid,:str]
:= OPTremapMultiplex(_8:str, _9:str, b:bat[:oid,:str], b:bat[:oid,:str]) {G}
+ z:bat[:oid,:str] := mal.multiplex("user","bar",b,b);# 3 z:bat[:oid,:str]
:= MANIFOLDremapMultiplex(_8:str, _9:str, b:bat[:oid,:str], b:bat[:oid,:str])
{G}
end qry; # 4
# 20:02:17 >
diff --git a/monetdb5/optimizer/Tests/inlineIfthen.stable.out
b/monetdb5/optimizer/Tests/inlineIfthen.stable.out
--- a/monetdb5/optimizer/Tests/inlineIfthen.stable.out
+++ b/monetdb5/optimizer/Tests/inlineIfthen.stable.out
@@ -34,7 +34,7 @@ function user.qry():void;
bat.append(b,1); # 2 _4:bat[:oid,:int] :=
BKCappend_val_wrap(b:bat[:oid,:int], _5:int) {G}
bat.append(b,10); # 3 _6:bat[:oid,:int] :=
BKCappend_val_wrap(b:bat[:oid,:int], _7:int) {G}
bat.append(b,20); # 4 _8:bat[:oid,:int] :=
BKCappend_val_wrap(b:bat[:oid,:int], _9:int) {G}
- r:bat[:oid,:int] {inline} := mal.multiplex("user","foo",b);# 5
r:bat[:oid,:int] := OPTremapMultiplex(_11:str, _12:str, b:bat[:oid,:int]) {G}
+ r:bat[:oid,:int] {inline} := mal.multiplex("user","foo",b);# 5
r:bat[:oid,:int] := MANIFOLDremapMultiplex(_11:str, _12:str, b:bat[:oid,:int])
{G}
io.print(r{inline}); # 6 _13:void :=
IOprint_val(r:bat[:oid,:int]) {G}
end qry; # 7
diff --git a/monetdb5/optimizer/Tests/remap.stable.out
b/monetdb5/optimizer/Tests/remap.stable.out
--- a/monetdb5/optimizer/Tests/remap.stable.out
+++ b/monetdb5/optimizer/Tests/remap.stable.out
@@ -35,7 +35,7 @@ function user.tst():void;
d := bat.new(:oid,:str); # 6 d:bat[:oid,:str] :=
CMDBATnew(_2:oid, _13:str) {G}
a:bat[:oid,:bit] := batcalc.isnil(d);# 7 a:bat[:oid,:bit] :=
CMDbatISNIL(d:bat[:oid,:str]) {G}
# demonstrate an error
- y:bat[:int,:int] := mal.multiplex("calc","+",b,1);# 9 y:bat[:int,:int]
:= OPTremapMultiplex(_6:str, _7:str, b:bat[:oid,:int], _8:int) {G}
+ y:bat[:int,:int] := mal.multiplex("calc","+",b,1);# 9 y:bat[:int,:int]
:= MANIFOLDremapMultiplex(_6:str, _7:str, b:bat[:oid,:int], _8:int) {G}
end tst; # 10
# 22:31:17 >
diff --git
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
---
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
+++
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
@@ -10,9 +10,9 @@ stderr of test 'select_from_env.SF-12407
# 22:29:10 > mclient -lsql -i -umonetdb -Pmonetdb --host=pegasus --port=30332
# 22:29:10 >
-MAPI = (monetdb) /var/tmp/mtest-23209/.s.monetdb.33225
+MAPI = (monetdb) /var/tmp/mtest-3452/.s.monetdb.38942
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
-ERROR = !cardinality violation (21>1)
+ERROR = !cardinality violation (20>1)
# 13:22:15 >
# 13:22:15 > Done.
diff --git
a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
--- a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
+++ b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
@@ -80,10 +80,10 @@ stderr of test 'cardinality_violation.SF
# 21:00:43 > mclient -lsql -umonetdb -Pmonetdb --host=alf --port=38808
# 21:00:43 >
-MAPI = (monetdb) /var/tmp/mtest-32368/.s.monetdb.30670
+MAPI = (monetdb) /var/tmp/mtest-1945/.s.monetdb.37119
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
-ERROR = !cardinality violation (21>1)
-MAPI = (monetdb) /var/tmp/mtest-32368/.s.monetdb.30670
+ERROR = !cardinality violation (20>1)
+MAPI = (monetdb) /var/tmp/mtest-1945/.s.monetdb.37119
QUERY = select * from columns where name = (select columns.name from _tables,
columns where _tables.id = columns.table_id);
ERROR = !cardinality violation (418>1)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
