Changeset: dce0c8d5710b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dce0c8d5710b
Modified Files:
monetdb5/mal/Tests/dataflow01.malC
monetdb5/mal/Tests/tst023.malC
monetdb5/mal/Tests/tst033.malC
monetdb5/mal/Tests/tst034.malC
monetdb5/mal/Tests/tst039.malC
monetdb5/mal/Tests/tst220.malC
monetdb5/mal/Tests/tst4003.malC
monetdb5/mal/Tests/tst903.malC
monetdb5/mal/Tests/tst903.stable.out
monetdb5/mal/Tests/tst911.malC
monetdb5/mal/Tests/tst911.stable.out
monetdb5/mal/Tests/tst912.malC
monetdb5/modules/kernel/Tests/select.malC
monetdb5/modules/mal/Tests/mapi01.malC
monetdb5/modules/mal/Tests/mapi02.malC
monetdb5/modules/mal/Tests/mapi07.malC
monetdb5/modules/mal/Tests/remote04.malC
monetdb5/modules/mal/Tests/remote13.malC
monetdb5/optimizer/Tests/CRexample.malC
monetdb5/optimizer/Tests/CXexample.malC
monetdb5/optimizer/Tests/CXexample.stable.out
monetdb5/optimizer/Tests/FTexample.malC
monetdb5/optimizer/Tests/dataflow.malC
monetdb5/optimizer/Tests/dataflow.stable.out
monetdb5/optimizer/Tests/mat00.malC
monetdb5/optimizer/Tests/mat01.malC
monetdb5/optimizer/Tests/qep00.malC
monetdb5/optimizer/Tests/qep01.malC
monetdb5/optimizer/Tests/qep02.malC
monetdb5/optimizer/Tests/reorder00.malC
monetdb5/optimizer/Tests/reorder00.stable.out
monetdb5/optimizer/Tests/tst4000.malC
monetdb5/optimizer/Tests/tst4000.stable.out
monetdb5/optimizer/Tests/tst4003.malC
monetdb5/optimizer/Tests/tst4003.stable.out
monetdb5/optimizer/Tests/tst4030.malC
monetdb5/optimizer/Tests/tst4030.stable.out
monetdb5/optimizer/Tests/tst4700.malC
Branch: default
Log Message:
Turning tests into mandatory candidatelist for selects
The MAL remote implementation can not handle yet nil:bat[:oid]
diffs (truncated from 2342 to 300 lines):
diff --git a/monetdb5/mal/Tests/dataflow01.malC
b/monetdb5/mal/Tests/dataflow01.malC
--- a/monetdb5/mal/Tests/dataflow01.malC
+++ b/monetdb5/mal/Tests/dataflow01.malC
@@ -26,7 +26,7 @@ end load;
function qry(z:bat[:lng],low:int,hgh:int):lng;
l:= calc.lng(low);
h:= calc.lng(hgh);
- s:= algebra.select(z,l,h,true,true,false);
+ s:= algebra.select(z,nil:bat[:oid],l,h,true,true,false);
c:= aggr.count(s);
return qry:= c;
end qry;
diff --git a/monetdb5/mal/Tests/tst023.malC b/monetdb5/mal/Tests/tst023.malC
--- a/monetdb5/mal/Tests/tst023.malC
+++ b/monetdb5/mal/Tests/tst023.malC
@@ -14,7 +14,7 @@ bat.append(b2, 12.34);
bat.append(b2, 12.35);
io.print(b1,b2);
-s:= algebra.select(b1,2,2,true,true,false);
+s:= algebra.select(b1,nil:bat[:oid],2,2,true,true,false);
io.print(s);
bat.delete(b1,s);
diff --git a/monetdb5/mal/Tests/tst033.malC b/monetdb5/mal/Tests/tst033.malC
--- a/monetdb5/mal/Tests/tst033.malC
+++ b/monetdb5/mal/Tests/tst033.malC
@@ -4,11 +4,11 @@ bat.append(b,1);
bat.append(b,2);
bat.append(b,3);
-s := algebra.select(b,0,2,true,true,false); z := algebra.projection(s,b);
io.print(z);
-s := algebra.select(b,0,2,true,false,false); z := algebra.projection(s,b);
io.print(z);
-s := algebra.select(b,0,2,false,true,false); z := algebra.projection(s,b);
io.print(z);
-s := algebra.select(b,0,2,false,false,false); z := algebra.projection(s,b);
io.print(z);
-s := algebra.select(b,0,2,true,true,true); z := algebra.projection(s,b);
io.print(z);
-s := algebra.select(b,0,2,true,false,true); z := algebra.projection(s,b);
io.print(z);
-s := algebra.select(b,0,2,false,true,true); z := algebra.projection(s,b);
io.print(z);
-s := algebra.select(b,0,2,false,false,true); z := algebra.projection(s,b);
io.print(z);
+s := algebra.select(b,nil:bat[:oid],0,2,true,true,false); z :=
algebra.projection(s,b); io.print(z);
+s := algebra.select(b,nil:bat[:oid],0,2,true,false,false); z :=
algebra.projection(s,b); io.print(z);
+s := algebra.select(b,nil:bat[:oid],0,2,false,true,false); z :=
algebra.projection(s,b); io.print(z);
+s := algebra.select(b,nil:bat[:oid],0,2,false,false,false); z :=
algebra.projection(s,b); io.print(z);
+s := algebra.select(b,nil:bat[:oid],0,2,true,true,true); z :=
algebra.projection(s,b); io.print(z);
+s := algebra.select(b,nil:bat[:oid],0,2,true,false,true); z :=
algebra.projection(s,b); io.print(z);
+s := algebra.select(b,nil:bat[:oid],0,2,false,true,true); z :=
algebra.projection(s,b); io.print(z);
+s := algebra.select(b,nil:bat[:oid],0,2,false,false,true); z :=
algebra.projection(s,b); io.print(z);
diff --git a/monetdb5/mal/Tests/tst034.malC b/monetdb5/mal/Tests/tst034.malC
--- a/monetdb5/mal/Tests/tst034.malC
+++ b/monetdb5/mal/Tests/tst034.malC
@@ -7,13 +7,13 @@ bat.append(b,3);
i:= bbp.getLRefCount(b);
io.printf("start of selections %d [1]\n",i);
-s:= algebra.select(b,0,2,true,true,false); z:=algebra.projection(s,b);
io.print(z);
+s:= algebra.select(b,nil:bat[:oid],0,2,true,true,false);
z:=algebra.projection(s,b); io.print(z);
i:= bbp.getLRefCount(z);
io.printf("z select %d [1]\n",i);
i:= bbp.getLRefCount(b);
io.printf("select %d [1]\n",i);
-s:= algebra.select(b,0,2,true,false,false); z:=algebra.projection(s,b);
io.print(z);
+s:= algebra.select(b,nil:bat[:oid],0,2,true,false,false);
z:=algebra.projection(s,b); io.print(z);
i:= bbp.getLRefCount(b);
io.printf("select %d [1]\n",i);
-s:= algebra.select(b,0,2,false,true,false); z:=algebra.projection(s,b);
io.print(z);
-s:= algebra.select(b,0,2,false,false,false); z:=algebra.projection(s,b);
io.print(z);
+s:= algebra.select(b,nil:bat[:oid],0,2,false,true,false);
z:=algebra.projection(s,b); io.print(z);
+s:= algebra.select(b,nil:bat[:oid],0,2,false,false,false);
z:=algebra.projection(s,b); io.print(z);
diff --git a/monetdb5/mal/Tests/tst039.malC b/monetdb5/mal/Tests/tst039.malC
--- a/monetdb5/mal/Tests/tst039.malC
+++ b/monetdb5/mal/Tests/tst039.malC
@@ -3,7 +3,7 @@
function sample(nme:str, val:any_1):bit;
c := 2*3;
b:bat[:int] := bbp.bind(nme); #find a BAT
- h := algebra.select(b,val,val);
+ h := algebra.select(b,nil:bat[:oid],val,val,true,true,false);
t := aggr.count(h);
x := io.print(t);
y := io.print(val);
diff --git a/monetdb5/mal/Tests/tst220.malC b/monetdb5/mal/Tests/tst220.malC
--- a/monetdb5/mal/Tests/tst220.malC
+++ b/monetdb5/mal/Tests/tst220.malC
@@ -43,7 +43,7 @@ end createone;
io.printf("assignment refcount =%d[1]\n",i);
#re-use a bat variable
- b4:= algebra.select(b,"bat C","bat C",true,true,false);
+ b4:= algebra.select(b,nil:bat[:oid],"bat C","bat C",true,true,false);
b5:=algebra.projection(b4,b);
io.print(b5);
i:= bbp.getLRefCount(b);
diff --git a/monetdb5/mal/Tests/tst4003.malC b/monetdb5/mal/Tests/tst4003.malC
--- a/monetdb5/mal/Tests/tst4003.malC
+++ b/monetdb5/mal/Tests/tst4003.malC
@@ -4,6 +4,6 @@ optimizer.setDebug();
optimizer.commonExpressionRemoval();
b:= new(:str,:str);
c:= new(:str,:str); # identical until insert takes place
-d:= select(b,"hello","world");
-e:= select(b,"hello","world"); # mapped onto one instruction
+d:= select(b,nil:bat[:oid],"hello","world",true,true,false);
+e:= select(b,nil:bat[:oid],"hello","world",true,true,false); # mapped onto
one instruction
diff --git a/monetdb5/mal/Tests/tst903.malC b/monetdb5/mal/Tests/tst903.malC
--- a/monetdb5/mal/Tests/tst903.malC
+++ b/monetdb5/mal/Tests/tst903.malC
@@ -37,14 +37,14 @@ io.printf("#copy %d ",d0);
cnt:= aggr.count(c);
io.printf("count %d\n",cnt);
t0:= alarm.usec();
-z:= algebra.select(b,25:lng,25:lng,true,true,false);
+z:= algebra.select(b,nil:bat[:oid],25:lng,25:lng,true,true,false);
t1:= alarm.usec();
d0:= t1-t0;
io.printf("#select none %d",d0);
cnt:= aggr.count(z);
io.printf(" count %d\n",cnt);
t0:= alarm.usec();
-z2:= algebra.select(b,mi,mx,true,true,false);
+z2:= algebra.select(b,nil:bat[:oid],mi,mx,true,true,false);
t1:= alarm.usec();
d0:= t1-t0;
io.printf("#select all %d",d0);
@@ -54,7 +54,7 @@ rng:= mx-mi;
r2:= rng/20;
r3:= mi+r2;
t0:= alarm.usec();
-z3:= algebra.select(b,mi,r3,true,true,false);
+z3:= algebra.select(b,nil:bat[:oid],mi,r3,true,true,false);
t1:= alarm.usec();
d0:= t1-t0;
io.printf("#select 0.05 %d",d0);
@@ -63,7 +63,7 @@ io.printf(" count %d\n",cnt);
r2:= rng/10;
r3:= mi+r2;
t0:= alarm.usec();
-z4:= algebra.select(b,mi,r3,true,true,false);
+z4:= algebra.select(b,nil:bat[:oid],mi,r3,true,true,false);
t1:= alarm.usec();
d0:= t1-t0;
io.printf("#select 0.1 %d",d0);
@@ -72,7 +72,7 @@ io.printf(" count %d\n",cnt);
r2:= rng/5;
r3:= mi+r2;
t0:= alarm.usec();
-z5:= algebra.select(b,mi,r3,true,true,false);
+z5:= algebra.select(b,nil:bat[:oid],mi,r3,true,true,false);
t1:= alarm.usec();
d0:= t1-t0;
io.printf("#select 0.2 %d",d0);
@@ -80,7 +80,7 @@ cnt:= aggr.count(z5);
io.printf(" count %d\n",cnt);
r3:= r3+r2;
t0:= alarm.usec();
-z6:= algebra.select(b,mi,r3,true,true,false);
+z6:= algebra.select(b,nil:bat[:oid],mi,r3,true,true,false);
t1:= alarm.usec();
d0:= t1-t0;
io.printf("#select 0.4 %d",d0);
@@ -88,7 +88,7 @@ cnt:= aggr.count(z6);
io.printf(" count %d\n",cnt);
r3:= r3+r2;
t0:= alarm.usec();
-z7:= algebra.select(b,mi,r3,true,true,false);
+z7:= algebra.select(b,nil:bat[:oid],mi,r3,true,true,false);
t1:= alarm.usec();
d0:= t1-t0;
io.printf("#select 0.6 %d",d0);
@@ -96,7 +96,7 @@ cnt:= aggr.count(z7);
io.printf(" count %d\n",cnt);
r3:= r3+r2;
t0:= alarm.usec();
-z8:= algebra.select(b,mi,r3,true,true,false);
+z8:= algebra.select(b,nil:bat[:oid],mi,r3,true,true,false);
t1:= alarm.usec();
d0:= t1-t0;
io.printf("#select 0.8 %d",d0);
@@ -104,7 +104,7 @@ cnt:= aggr.count(z8);
io.printf(" count %d\n",cnt);
r3:= r3+r2;
t0:= alarm.usec();
-z9:= algebra.select(b,mi,r3,true,true,false);
+z9:= algebra.select(b,nil:bat[:oid],mi,r3,true,true,false);
t1:= alarm.usec();
d0:= t1-t0;
io.printf("#select 1.0 %d",d0);
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
@@ -56,14 +56,14 @@ exit i;
cnt := aggr.count(c);
io.printf("count %d\n", cnt);
t0 := alarm.usec();
- z := algebra.select(b, 25:lng, 25:lng, true, true, false);
+ z := algebra.select(b, nil:bat[:oid], 25:lng, 25:lng, true, true, false);
t1 := alarm.usec();
d0 := calc.-(t1, t0);
io.printf("#select none %d", d0);
cnt := aggr.count(z);
io.printf(" count %d\n", cnt);
t0 := alarm.usec();
- z2 := algebra.select(b, mi, mx, true, true, false);
+ z2 := algebra.select(b, nil:bat[:oid], mi, mx, true, true, false);
t1 := alarm.usec();
d0 := calc.-(t1, t0);
io.printf("#select all %d", d0);
@@ -73,7 +73,7 @@ exit i;
r2 := calc./(rng, 20:int);
r3 := calc.+(mi, r2);
t0 := alarm.usec();
- z3 := algebra.select(b, mi, r3, true, true, false);
+ z3 := algebra.select(b, nil:bat[:oid], mi, r3, true, true, false);
t1 := alarm.usec();
d0 := calc.-(t1, t0);
io.printf("#select 0.05 %d", d0);
@@ -82,7 +82,7 @@ exit i;
r2 := calc./(rng, 10:int);
r3 := calc.+(mi, r2);
t0 := alarm.usec();
- z4 := algebra.select(b, mi, r3, true, true, false);
+ z4 := algebra.select(b, nil:bat[:oid], mi, r3, true, true, false);
t1 := alarm.usec();
d0 := calc.-(t1, t0);
io.printf("#select 0.1 %d", d0);
@@ -91,7 +91,7 @@ exit i;
r2 := calc./(rng, 5:int);
r3 := calc.+(mi, r2);
t0 := alarm.usec();
- z5 := algebra.select(b, mi, r3, true, true, false);
+ z5 := algebra.select(b, nil:bat[:oid], mi, r3, true, true, false);
t1 := alarm.usec();
d0 := calc.-(t1, t0);
io.printf("#select 0.2 %d", d0);
@@ -99,7 +99,7 @@ exit i;
io.printf(" count %d\n", cnt);
r3 := calc.+(r3, r2);
t0 := alarm.usec();
- z6 := algebra.select(b, mi, r3, true, true, false);
+ z6 := algebra.select(b, nil:bat[:oid], mi, r3, true, true, false);
t1 := alarm.usec();
d0 := calc.-(t1, t0);
io.printf("#select 0.4 %d", d0);
@@ -107,7 +107,7 @@ exit i;
io.printf(" count %d\n", cnt);
r3 := calc.+(r3, r2);
t0 := alarm.usec();
- z7 := algebra.select(b, mi, r3, true, true, false);
+ z7 := algebra.select(b, nil:bat[:oid], mi, r3, true, true, false);
t1 := alarm.usec();
d0 := calc.-(t1, t0);
io.printf("#select 0.6 %d", d0);
@@ -115,7 +115,7 @@ exit i;
io.printf(" count %d\n", cnt);
r3 := calc.+(r3, r2);
t0 := alarm.usec();
- z8 := algebra.select(b, mi, r3, true, true, false);
+ z8 := algebra.select(b, nil:bat[:oid], mi, r3, true, true, false);
t1 := alarm.usec();
d0 := calc.-(t1, t0);
io.printf("#select 0.8 %d", d0);
@@ -123,7 +123,7 @@ exit i;
io.printf(" count %d\n", cnt);
r3 := calc.+(r3, r2);
t0 := alarm.usec();
- z9 := algebra.select(b, mi, r3, true, true, false);
+ z9 := algebra.select(b, nil:bat[:oid], mi, r3, true, true, false);
t1 := alarm.usec();
d0 := calc.-(t1, t0);
io.printf("#select 1.0 %d", d0);
@@ -139,14 +139,14 @@ exit i;
cnt := aggr.count(z9);
mdb.setDebug(dbgmsk_set);
t0 := alarm.usec();
- X_71 := bat.new(nil:lng);
-barrier (X_74, X_75) := iterator.new(b);
- X_77 := algebra.fetch(c, X_74);
- X_79 := calc.+(X_75, X_77);
- bat.append(X_71, X_79);
- redo (X_74, X_75) := iterator.next(b);
-exit (X_74, X_75);
- x:bat[:lng] := X_71;
+ X_80 := bat.new(nil:lng);
+barrier (X_83, X_84) := iterator.new(b);
+ X_86 := algebra.fetch(c, X_83);
+ X_88 := calc.+(X_84, X_86);
+ bat.append(X_80, X_88);
+ redo (X_83, X_84) := iterator.next(b);
+exit (X_83, X_84);
+ x:bat[:lng] := X_80;
t1 := alarm.usec();
mdb.setDebug(dbgmsk_restore);
d0 := calc.-(t1, t0);
diff --git a/monetdb5/mal/Tests/tst911.malC b/monetdb5/mal/Tests/tst911.malC
--- a/monetdb5/mal/Tests/tst911.malC
+++ b/monetdb5/mal/Tests/tst911.malC
@@ -12,7 +12,7 @@ function choptest(b:bat[:lng], size:lng,
mdb.setDebug(dbgmsk_set);
barrier (chk,c):= iterator.new(b,size);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
