Changeset: 60942e23e88f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=60942e23e88f
Modified Files:
monetdb5/mal/Tests/tst661.stable.out
monetdb5/mal/Tests/tst903.stable.out
monetdb5/mal/mal_listing.c
monetdb5/modules/mal/Tests/call00.stable.out
monetdb5/optimizer/Tests/ARexample.stable.out
monetdb5/optimizer/Tests/dataflow4.stable.out
monetdb5/optimizer/Tests/dataflow5.stable.out
monetdb5/optimizer/Tests/inlineFunction.stable.out
monetdb5/optimizer/Tests/inlineFunction2.stable.out
monetdb5/optimizer/Tests/inlineFunction4.stable.out
monetdb5/optimizer/Tests/projectionchain.stable.out
monetdb5/optimizer/Tests/reorder00.stable.out
monetdb5/optimizer/Tests/tst4004.stable.out
monetdb5/optimizer/Tests/tst4030.stable.out
sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out
sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err
sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.stable.err
sql/test/mapi/Tests/sql_int128.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: default
Log Message:
merge with default
diffs (truncated from 2819 to 300 lines):
diff --git a/monetdb5/mal/Tests/tst661.stable.out
b/monetdb5/mal/Tests/tst661.stable.out
--- a/monetdb5/mal/Tests/tst661.stable.out
+++ b/monetdb5/mal/Tests/tst661.stable.out
@@ -26,11 +26,11 @@ Ready.
#mdb.list("user","tst");
function user.tst():void;
- a := user.fi(1);
- (a,b) := user.fi(1);
- (a,b,c) := user.fi(1);
- z := user.fs(1);
- (y,z) := user.fs(1);
+ a := user.fi(1:int);
+ (a,b) := user.fi(1:int);
+ (a,b,c) := user.fi(1:int);
+ z := user.fs(1:int);
+ (y,z) := user.fs(1:int);
end user.tst;
function user.tst():void; #[0] (0) 0
a:int := user.fi(1:int); #[1] (0) MDBdummy 1 <- 2
diff --git a/monetdb5/mal/Tests/tst903.stable.out
b/monetdb5/mal/Tests/tst903.stable.out
--- a/monetdb5/mal/Tests/tst903.stable.out
+++ b/monetdb5/mal/Tests/tst903.stable.out
@@ -26,13 +26,13 @@ Ready.
function user.foo():void;
t0 := alarm.usec();
b := bat.new(:lng);
- INT_MAX := 2147483647;
+ INT_MAX := 2147483647:int;
dbgmsk_restore := mdb.getDebug();
- dbgmsk_unset := calc.+(8,8388608);
+ dbgmsk_unset := calc.+(8:int,8388608:int);
dbgmsk_keep := calc.xor(INT_MAX,dbgmsk_unset);
dbgmsk_set := calc.and(dbgmsk_restore,dbgmsk_keep);
mdb.setDebug(dbgmsk_set);
- r := mmath.srand(0);
+ r := mmath.srand(0:int);
barrier i := 0:lng;
k := mmath.rand();
l := calc.lng(k);
@@ -70,7 +70,7 @@ exit i;
cnt := aggr.count(z2);
io.printf(" count %d\n",cnt);
rng := calc.-(mx,mi);
- r2 := calc./(rng,20);
+ r2 := calc./(rng,20:int);
r3 := calc.+(mi,r2);
t0 := alarm.usec();
z3 := algebra.subselect(b,mi,r3,true,true,false);
@@ -79,7 +79,7 @@ exit i;
io.printf("#select 0.05 %d",d0);
cnt := aggr.count(z3);
io.printf(" count %d\n",cnt);
- r2 := calc./(rng,10);
+ r2 := calc./(rng,10:int);
r3 := calc.+(mi,r2);
t0 := alarm.usec();
z4 := algebra.subselect(b,mi,r3,true,true,false);
@@ -88,7 +88,7 @@ exit i;
io.printf("#select 0.1 %d",d0);
cnt := aggr.count(z4);
io.printf(" count %d\n",cnt);
- r2 := calc./(rng,5);
+ r2 := calc./(rng,5:int);
r3 := calc.+(mi,r2);
t0 := alarm.usec();
z5 := algebra.subselect(b,mi,r3,true,true,false);
diff --git a/monetdb5/mal/mal_listing.c b/monetdb5/mal/mal_listing.c
--- a/monetdb5/mal/mal_listing.c
+++ b/monetdb5/mal/mal_listing.c
@@ -37,7 +37,7 @@ renderTerm(MalBlkPtr mb, MalStkPtr stk,
{
char *buf =0;
char *nme =0;
- int nameused= 0;
+ int nameused = 0;
size_t len = 0, maxlen = BUFSIZ;
ValRecord *val = 0;
char *cv =0;
@@ -64,9 +64,10 @@ renderTerm(MalBlkPtr mb, MalStkPtr stk,
}
// locate value record
- if (isVarConstant(mb,varid))
+ if (isVarConstant(mb,varid)){
val = &getVarConstant(mb, varid);
- else if( stk)
+ showtype= getVarType(mb,varid) != TYPE_str &&
getVarType(mb,varid) != TYPE_bit;
+ } else if( stk)
val = &stk->stk[varid];
VALformat(&cv, val);
@@ -77,11 +78,12 @@ renderTerm(MalBlkPtr mb, MalStkPtr stk,
GDKerror("renderTerm:Failed to allocate");
return NULL;
}
+
if( strcmp(cv,"nil") == 0){
strcat(buf+len,cv);
len += strlen(buf+len);
GDKfree(cv);
- showtype =getBatType(getVarType(mb,varid)) > TYPE_str
||
+ showtype = showtype || getBatType(getVarType(mb,varid))
> TYPE_str ||
((isVarUDFtype(mb,varid) ||
isVarTypedef(mb,varid)) && isVarConstant(mb,varid)) ||
isaBatType(getVarType(mb,varid));
} else{
if ( !isaBatType(getVarType(mb,varid)) &&
getBatType(getVarType(mb,varid)) > TYPE_str ){
@@ -97,7 +99,7 @@ renderTerm(MalBlkPtr mb, MalStkPtr stk,
strcat(buf+len,"\"");
len++;
}
- showtype =closequote > TYPE_str ||
((isVarUDFtype(mb,varid) || isVarTypedef(mb,varid) || (flg & LIST_MAL_REMOTE))
&& isVarConstant(mb,varid)) ||
+ showtype = showtype || closequote > TYPE_str ||
((isVarUDFtype(mb,varid) || isVarTypedef(mb,varid) || (flg & LIST_MAL_REMOTE))
&& isVarConstant(mb,varid)) ||
(isaBatType(getVarType(mb,varid)) && idx <
p->retc);
if (stk && isaBatType(getVarType(mb,varid)) &&
stk->stk[varid].val.bval ){
diff --git a/monetdb5/modules/mal/Tests/call00.stable.out
b/monetdb5/modules/mal/Tests/call00.stable.out
--- a/monetdb5/modules/mal/Tests/call00.stable.out
+++ b/monetdb5/modules/mal/Tests/call00.stable.out
@@ -36,7 +36,7 @@ Ready.
[ 0@0, "(i:int,s:str):bit;" ]
[ 2 ]
hello world
-[ "function user.tst(i:int,s:str):bit;\n j := calc.+(i,1);\n
io.print(j);\n# ignore comments \n format := \"hello %s\\n\";\n
io.printf(format,s);\n return tst := true;\nend user.tst;\n" ]
+[ "function user.tst(i:int,s:str):bit;\n j := calc.+(i,1:int);\n
io.print(j);\n# ignore comments \n format := \"hello %s\\n\";\n
io.printf(format,s);\n return tst := true;\nend user.tst;\n" ]
#--------------------------#
# view input # name
# void str # type
diff --git a/monetdb5/optimizer/Tests/ARexample.stable.out
b/monetdb5/optimizer/Tests/ARexample.stable.out
--- a/monetdb5/optimizer/Tests/ARexample.stable.out
+++ b/monetdb5/optimizer/Tests/ARexample.stable.out
@@ -29,23 +29,23 @@ Ready.
#mdb.list("user","foo");
function user.foo():void;
- i := 0;
+ i := 0:int;
barrier go := true;
- c := calc.+(i,1);
+ c := calc.+(i,1:int);
io.print("step");
i := c;
- redo go := calc.<(i,2);
+ redo go := calc.<(i,2:int);
exit go;
io.print("done");
end user.foo;
#mdb.list("user","foo");
function user.foo():void;
- i := 0;
+ i := 0:int;
barrier go := true;
- c := calc.+(i,1);
+ c := calc.+(i,1:int);
io.print("step");
i := c;
- redo go := calc.<(i,2);
+ redo go := calc.<(i,2:int);
exit go;
io.print("done");
end user.foo;
diff --git a/monetdb5/optimizer/Tests/dataflow4.stable.out
b/monetdb5/optimizer/Tests/dataflow4.stable.out
--- a/monetdb5/optimizer/Tests/dataflow4.stable.out
+++ b/monetdb5/optimizer/Tests/dataflow4.stable.out
@@ -29,12 +29,12 @@ Ready.
#mdb.list("user","tst");
function user.tst():void;
barrier X_12 := language.dataflow();
- i := 1;
+ i := 1:int;
b := bat.new(:int);
a := bat.new(:int);
exit X_12;
barrier X_15 := language.dataflow();
- i := 2;
+ i := 2:int;
b := bat.new(:int);
c := bat.new(:int);
a := bat.new(:int);
@@ -50,12 +50,12 @@ end user.tst;
#mdb.list("user","tst");
function user.tst():void;
barrier X_12 := language.dataflow();
- i := 1;
+ i := 1:int;
b := bat.new(:int);
a := bat.new(:int);
exit X_12;
barrier X_15 := language.dataflow();
- i := 2;
+ i := 2:int;
b := bat.new(:int);
c := bat.new(:int);
a := bat.new(:int);
diff --git a/monetdb5/optimizer/Tests/dataflow5.stable.out
b/monetdb5/optimizer/Tests/dataflow5.stable.out
--- a/monetdb5/optimizer/Tests/dataflow5.stable.out
+++ b/monetdb5/optimizer/Tests/dataflow5.stable.out
@@ -29,17 +29,17 @@ Ready.
#mdb.list("user","tst");
function user.tst():void;
b := bat.new(:int);
- bat.append(b,1);
- bat.append(b,2);
- bat.append(b,3);
+ bat.append(b,1:int);
+ bat.append(b,2:int);
+ bat.append(b,3:int);
io.print(b);
end user.tst;
#mdb.list("user","tst");
function user.tst():void;
b := bat.new(:int);
- bat.append(b,1);
- bat.append(b,2);
- bat.append(b,3);
+ bat.append(b,1:int);
+ bat.append(b,2:int);
+ bat.append(b,3:int);
io.print(b);
end user.tst;
diff --git a/monetdb5/optimizer/Tests/inlineFunction.stable.out
b/monetdb5/optimizer/Tests/inlineFunction.stable.out
--- a/monetdb5/optimizer/Tests/inlineFunction.stable.out
+++ b/monetdb5/optimizer/Tests/inlineFunction.stable.out
@@ -30,8 +30,8 @@ Ready.
#result of inline
function user.tst():void;
true:bit;
- X_4:int := 0;
- X_4:int := 100;
+ X_4:int := 0:int;
+ X_4:int := 100:int;
z := X_4;
end user.tst;
diff --git a/monetdb5/optimizer/Tests/inlineFunction2.stable.out
b/monetdb5/optimizer/Tests/inlineFunction2.stable.out
--- a/monetdb5/optimizer/Tests/inlineFunction2.stable.out
+++ b/monetdb5/optimizer/Tests/inlineFunction2.stable.out
@@ -30,7 +30,7 @@ function user.tst():void;
b := bat.new(:int);
X_4 := bat.new(nil:int);
barrier (X_7,X_8) := iterator.new(b);
- X_19 := calc.+(X_8,1);
+ X_19 := calc.+(X_8,1:int);
X_10 := X_19;
bat.append(X_4,X_10);
redo (X_7,X_8) := iterator.next(b);
diff --git a/monetdb5/optimizer/Tests/inlineFunction4.stable.out
b/monetdb5/optimizer/Tests/inlineFunction4.stable.out
--- a/monetdb5/optimizer/Tests/inlineFunction4.stable.out
+++ b/monetdb5/optimizer/Tests/inlineFunction4.stable.out
@@ -30,7 +30,7 @@ Ready.
#result of inline
function user.tst():void;
false:bit;
- X_5:int := 0;
+ X_5:int := 0:int;
false:bit;
-1:int;
X_5:int := -1:int;
diff --git a/monetdb5/optimizer/Tests/projectionchain.stable.out
b/monetdb5/optimizer/Tests/projectionchain.stable.out
--- a/monetdb5/optimizer/Tests/projectionchain.stable.out
+++ b/monetdb5/optimizer/Tests/projectionchain.stable.out
@@ -33,18 +33,18 @@ function user.qry():void;
c := bat.new(:oid);
d := bat.new(:str);
k := bat.new(:int);
- bat.append(a,0@0);
- bat.append(a,3@0);
- bat.append(b,0@0);
- bat.append(b,1@0);
- bat.append(b,2@0);
- bat.append(b,3@0);
- bat.append(b,4@0);
- bat.append(c,0@0);
- bat.append(c,1@0);
- bat.append(c,2@0);
- bat.append(c,4@0);
- bat.append(c,5@0);
+ bat.append(a,0@0:oid);
+ bat.append(a,3@0:oid);
+ bat.append(b,0@0:oid);
+ bat.append(b,1@0:oid);
+ bat.append(b,2@0:oid);
+ bat.append(b,3@0:oid);
+ bat.append(b,4@0:oid);
+ bat.append(c,0@0:oid);
+ bat.append(c,1@0:oid);
+ bat.append(c,2@0:oid);
+ bat.append(c,4@0:oid);
+ bat.append(c,5@0:oid);
bat.append(d,"The");
bat.append(d,"quick");
bat.append(d,"brown");
@@ -54,15 +54,15 @@ function user.qry():void;
bat.append(d,"the");
bat.append(d,"lazy");
bat.append(d,"dog");
- bat.append(k,1);
- bat.append(k,2);
- bat.append(k,3);
- bat.append(k,4);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
