Changeset: f48d6dd32fc8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f48d6dd32fc8
Modified Files:
monetdb5/optimizer/Tests/AEexample.mal
monetdb5/optimizer/Tests/CMexample.mal
monetdb5/optimizer/Tests/CRexample.mal
monetdb5/optimizer/Tests/CXerror1.mal
monetdb5/optimizer/Tests/CXexample.mal
monetdb5/optimizer/Tests/DCexample.mal
monetdb5/optimizer/Tests/DCexample2.mal
monetdb5/optimizer/Tests/ESexample.mal
monetdb5/optimizer/Tests/FTexample.mal
monetdb5/optimizer/Tests/GCexample.mal
monetdb5/optimizer/Tests/GCexample01.mal
monetdb5/optimizer/Tests/JPexample.mal
monetdb5/optimizer/Tests/Mexample.mal
monetdb5/optimizer/Tests/PHexample.mal
monetdb5/optimizer/Tests/RMexample.mal
monetdb5/optimizer/Tests/STexample.mal
monetdb5/optimizer/Tests/basket00.mal
monetdb5/optimizer/Tests/common.mal
monetdb5/optimizer/Tests/dataflow.mal
monetdb5/optimizer/Tests/dataflow3.mal
monetdb5/optimizer/Tests/dataflow4.mal
monetdb5/optimizer/Tests/derivePath00.mal
monetdb5/optimizer/Tests/dictionary00.mal
monetdb5/optimizer/Tests/dictionary01.mal
monetdb5/optimizer/Tests/emptyset00.mal
monetdb5/optimizer/Tests/emptyset01.mal
monetdb5/optimizer/Tests/garbage.mal
monetdb5/optimizer/Tests/garbage1.mal
monetdb5/optimizer/Tests/groupderive.mal
monetdb5/optimizer/Tests/inline00.mal
monetdb5/optimizer/Tests/inline01.mal
monetdb5/optimizer/Tests/inline02.mal
monetdb5/optimizer/Tests/inline03.mal
monetdb5/optimizer/Tests/inline04.mal
monetdb5/optimizer/Tests/inline05.mal
monetdb5/optimizer/Tests/inline06.mal
monetdb5/optimizer/Tests/inline07.mal
monetdb5/optimizer/Tests/inline08.mal
monetdb5/optimizer/Tests/inline09.mal
monetdb5/optimizer/Tests/inline10.mal
monetdb5/optimizer/Tests/inline11.mal
monetdb5/optimizer/Tests/inlineCst.mal
monetdb5/optimizer/Tests/inlineIfthen.mal
monetdb5/optimizer/Tests/inliners.mal
monetdb5/optimizer/Tests/joinpath.mal
monetdb5/optimizer/Tests/leftjoinpath.mal
monetdb5/optimizer/Tests/mapreduce00.mal
monetdb5/optimizer/Tests/mat00.mal
monetdb5/optimizer/Tests/mat01.mal
monetdb5/optimizer/Tests/mat02.mal
monetdb5/optimizer/Tests/mat03.mal
monetdb5/optimizer/Tests/mat04.mal
monetdb5/optimizer/Tests/mitosis00.mal
monetdb5/optimizer/Tests/octopus00.mal
monetdb5/optimizer/Tests/octopus01.mal
monetdb5/optimizer/Tests/partitions00.mal
monetdb5/optimizer/Tests/partitions01.mal
monetdb5/optimizer/Tests/partitions02.mal
monetdb5/optimizer/Tests/partitions03.mal
monetdb5/optimizer/Tests/partitions04.mal
monetdb5/optimizer/Tests/partitions05.mal
monetdb5/optimizer/Tests/partitions06.mal
monetdb5/optimizer/Tests/partitions07.mal
monetdb5/optimizer/Tests/qep00.mal
monetdb5/optimizer/Tests/qep01.mal
monetdb5/optimizer/Tests/qep02.mal
monetdb5/optimizer/Tests/rangePush00.mal
monetdb5/optimizer/Tests/rangePush01.mal
monetdb5/optimizer/Tests/remap.mal
monetdb5/optimizer/Tests/reorder00.mal
monetdb5/optimizer/Tests/reorder01.mal
monetdb5/optimizer/Tests/replicator00.mal
monetdb5/optimizer/Tests/roberto1.mal
monetdb5/optimizer/Tests/stat.mal
monetdb5/optimizer/Tests/tst4000.mal
monetdb5/optimizer/Tests/tst4003.mal
monetdb5/optimizer/Tests/tst4010.mal
monetdb5/optimizer/Tests/tst4015.mal
monetdb5/optimizer/Tests/tst4030.mal
monetdb5/optimizer/Tests/tst4300.mal
monetdb5/optimizer/Tests/tst4610.mal
monetdb5/optimizer/Tests/tst4611.mal
monetdb5/optimizer/Tests/tst4620.mal
monetdb5/optimizer/Tests/tst4630.mal
monetdb5/optimizer/Tests/tst4631.mal
monetdb5/optimizer/Tests/tst4700.mal
monetdb5/optimizer/Tests/tst4730.mal
monetdb5/optimizer/Tests/tst4800.mal
monetdb5/optimizer/Tests/tst4810.mal
monetdb5/optimizer/Tests/tst4820.mal
monetdb5/optimizer/Tests/tst4900.mal
monetdb5/optimizer/Tests/volcano00.mal
Branch: headless
Log Message:
A first round of patching
None of the tests is suppost to work. It is a patch
geared at the first phase of correct parsing and
type resolution again.
diffs (truncated from 3907 to 300 lines):
diff --git a/monetdb5/optimizer/Tests/AEexample.mal
b/monetdb5/optimizer/Tests/AEexample.mal
--- a/monetdb5/optimizer/Tests/AEexample.mal
+++ b/monetdb5/optimizer/Tests/AEexample.mal
@@ -1,7 +1,7 @@
function qry():void;
a:= array.grid(1,2,4,1);
- b:= batcalc.+(a,1);
- c:= batcalc.*(b,4);
+ b:= colcalc.+(a,1);
+ c:= colcalc.*(b,4);
end qry;
optimizer.accumulators("user","qry");
diff --git a/monetdb5/optimizer/Tests/CMexample.mal
b/monetdb5/optimizer/Tests/CMexample.mal
--- a/monetdb5/optimizer/Tests/CMexample.mal
+++ b/monetdb5/optimizer/Tests/CMexample.mal
@@ -1,9 +1,8 @@
# Cost model example
- r{rows=100} := bat.new(:oid,:int);
- s{rows=1000}:= bat.new(:oid,:int);
+ r{rows=100} := column.new(:int);
+ s{rows=1000}:= column.new(:int);
rs:= algebra.select(s,1,1);
- rr:= bat.reverse(r);
- j:= algebra.join(rs,rr);
+ j:= algebra.join(rs,r);
optimizer.costModel();
mdb.List();
diff --git a/monetdb5/optimizer/Tests/CRexample.mal
b/monetdb5/optimizer/Tests/CRexample.mal
--- a/monetdb5/optimizer/Tests/CRexample.mal
+++ b/monetdb5/optimizer/Tests/CRexample.mal
@@ -1,4 +1,4 @@
-b := bat.new(:void,:int);
+b := column.new(:int);
s1:= algebra.select(b,1,80);
s2:= algebra.select(s1,5,95);
s3:= algebra.select(s2,50,nil:int);
diff --git a/monetdb5/optimizer/Tests/CXerror1.mal
b/monetdb5/optimizer/Tests/CXerror1.mal
--- a/monetdb5/optimizer/Tests/CXerror1.mal
+++ b/monetdb5/optimizer/Tests/CXerror1.mal
@@ -1,9 +1,9 @@
#provided by roberto
function user.f1();
# create bat
- xxx := bat.new(:void, :dbl);
- bat.setName(xxx,"xxx");
- bat.setPersistent(xxx,true);
+ xxx := column.new(:dbl);
+ column.setName(xxx,"xxx");
+ column.setPersistent(xxx,true);
transaction.commit();
# check existance
@@ -19,7 +19,7 @@
# remove it
b := bbp.bind("xxx"); ## here, it becomes b := a;
- bat.setPersistent(b,false); ## but a might be not defined
+ column.setPersistent(b,false); ## but a might be not defined
transaction.commit();
end f1;
optimizer.commonTerms("user", "f1");
diff --git a/monetdb5/optimizer/Tests/CXexample.mal
b/monetdb5/optimizer/Tests/CXexample.mal
--- a/monetdb5/optimizer/Tests/CXexample.mal
+++ b/monetdb5/optimizer/Tests/CXexample.mal
@@ -2,8 +2,8 @@
# common subexpression evaluation
optimizer.commonTerms();
optimizer.aliases();
-b:= bat.new(:int,:int);
-c:= bat.new(:int,:int);
+b:= column.new(:int);
+c:= column.new(:int);
d:= algebra.select(b,0,100);
e:= algebra.select(b,0,100);
k1:= 24;
diff --git a/monetdb5/optimizer/Tests/DCexample.mal
b/monetdb5/optimizer/Tests/DCexample.mal
--- a/monetdb5/optimizer/Tests/DCexample.mal
+++ b/monetdb5/optimizer/Tests/DCexample.mal
@@ -1,10 +1,9 @@
- V7 := bat.new(:oid,:oid);
- V10 := bat.new(:oid,:int);
- V16 := algebra.markH(V7);
- V17 := algebra.join(V16,V7);
- V19 := bat.new(:oid,:oid);
- V22 := bat.new(:oid,:int);
- V23 := algebra.join(V16,V22);
+ V7 := column.new(:oid);
+ V10 := column.new(:int);
+ (V17,W17) := algebra.join(V16,V10);
+ V19 := column.new(:oid);
+ V22 := column.new(:int);
+ (V23,W23) := algebra.join(V16,V22);
io.print("done");
optimizer.deadcode();
diff --git a/monetdb5/optimizer/Tests/DCexample2.mal
b/monetdb5/optimizer/Tests/DCexample2.mal
--- a/monetdb5/optimizer/Tests/DCexample2.mal
+++ b/monetdb5/optimizer/Tests/DCexample2.mal
@@ -1,9 +1,9 @@
#Suggested by Nayden.
-b:= bat.new(:int,:int);
-bat.insert(b,4,2);
-bat.insert(b,9,5);
-bat.insert(b,6,3);
+b:= column.new(:int);
+column.append(b,2);
+column.append(b,5);
+column.append(b,3);
b:= algebra.sort(b);
#should throw out the last statement
optimizer.deadcode();
diff --git a/monetdb5/optimizer/Tests/ESexample.mal
b/monetdb5/optimizer/Tests/ESexample.mal
--- a/monetdb5/optimizer/Tests/ESexample.mal
+++ b/monetdb5/optimizer/Tests/ESexample.mal
@@ -1,12 +1,10 @@
function tst();
- V1 := bat.new(:oid,:int);
- V7 := bat.new(:oid,:int);
- V10{rows=0} := bat.new(:int,:oid);
- V11 := bat.reverse(V10);
- V12 := algebra.kdifference(V7,V11);
- V16 := algebra.markT(V12);
- V17 := algebra.join(V16,V7);
- bat.append(V1,V17);
+ V1 := column.new(:int);
+ V7 := column.new(:int);
+ V10{rows=0} := column.new(:int);
+ V12 := algebra.kdifference(V7,V10);
+ (V17,W17) := algebra.join(V12,V7);
+ column.append(V1,V17);
end tst;
optimizer.costModel("user","tst");
optimizer.emptySet("user","tst");
diff --git a/monetdb5/optimizer/Tests/FTexample.mal
b/monetdb5/optimizer/Tests/FTexample.mal
--- a/monetdb5/optimizer/Tests/FTexample.mal
+++ b/monetdb5/optimizer/Tests/FTexample.mal
@@ -1,7 +1,7 @@
#Code factorization
function test(s:str):wrd;
- b:= bat.new(:int,:str);
- bat.insert(b,1,"hello");
+ b:= column.new(:str);
+ column.append(b,"hello");
z:= algebra.select(b,s,s);
i:= aggr.count(z);
return test:=i;
diff --git a/monetdb5/optimizer/Tests/GCexample.mal
b/monetdb5/optimizer/Tests/GCexample.mal
--- a/monetdb5/optimizer/Tests/GCexample.mal
+++ b/monetdb5/optimizer/Tests/GCexample.mal
@@ -1,9 +1,9 @@
- t1 := bat.new(:oid,:int);
+ t1 := column.new(:int);
t2 := array.grid(132000,8,1,0);
t3 := array.grid(1,100,10560,0);
t4 := array.grid(1,100,10560,0,8);
- t5 := batcalc.+(t2,t4);
- t6 := batcalc.oid(t5);
+ t5 := colcalc.+(t2,t4);
+ t6 := colcalc.oid(t5);
t7 := algebra.join(t6,t1);
optimizer.garbageCollector();
mdb.List();
diff --git a/monetdb5/optimizer/Tests/GCexample01.mal
b/monetdb5/optimizer/Tests/GCexample01.mal
--- a/monetdb5/optimizer/Tests/GCexample01.mal
+++ b/monetdb5/optimizer/Tests/GCexample01.mal
@@ -1,17 +1,17 @@
#checking proper handling of scopes for the garbage collector
function qry();
-b:= bat.new(:int,:int);
-c:= bat.new(:int,:int);
-d:= bat.new(:int,:int);
-bat.insert(b,1,1);
+b:= column.new(:int);
+c:= column.new(:int);
+d:= column.new(:int);
+column.append(b,1);
-barrier (x,y,z):= bat.newIterator(b);
+barrier (x,y,z):= column.newIterator(b);
io.print(x);
exit (x,y,z);
-barrier (x,y,z):= bat.newIterator(c);
+barrier (x,y,z):= column.newIterator(c);
io.print(x);
- redo (x,y,z):= bat.hasMoreElements(c);
+ redo (x,y,z):= column.hasMoreElements(c);
exit (x,y,z);
# do not close d, it may be reused
diff --git a/monetdb5/optimizer/Tests/JPexample.mal
b/monetdb5/optimizer/Tests/JPexample.mal
--- a/monetdb5/optimizer/Tests/JPexample.mal
+++ b/monetdb5/optimizer/Tests/JPexample.mal
@@ -1,11 +1,11 @@
# test the joinpath expander
- a:= bat.new(:void,:oid);
- b:= bat.new(:oid,:oid);
- c:= bat.new(:oid,:str);
- j1:= algebra.join(a,b);
- j2:= algebra.join(j1,c);
- j3:= algebra.join(b,b);
- j4:= algebra.join(b,j3);
+ a:= column.new(:oid);
+ b:= column.new(:oid);
+ c:= column.new(:str);
+ (j1,j1a):= algebra.join(a,b);
+ (j2,j2a):= algebra.join(j1,c);
+ (j3,j3a):= algebra.join(b,b);
+ (j4,j4a):= algebra.join(b,j3);
optimizer.joinPath();
mdb.List();
diff --git a/monetdb5/optimizer/Tests/Mexample.mal
b/monetdb5/optimizer/Tests/Mexample.mal
--- a/monetdb5/optimizer/Tests/Mexample.mal
+++ b/monetdb5/optimizer/Tests/Mexample.mal
@@ -1,5 +1,5 @@
- b:= bat.new(:int,:int);
- bat.insert(b,1,1);
- c:bat[:int,:int]:=mal.multiplex("calc","+",b,1);
+ b:= column.new(:int);
+ column.append(b,1);
+ c:col[:int]:=mal.multiplex("calc","+",b,1);
optimizer.multiplex();
mdb.List();
diff --git a/monetdb5/optimizer/Tests/PHexample.mal
b/monetdb5/optimizer/Tests/PHexample.mal
--- a/monetdb5/optimizer/Tests/PHexample.mal
+++ b/monetdb5/optimizer/Tests/PHexample.mal
@@ -1,10 +1,10 @@
# testing repeatative reverse optimalisation
-r:bat[:int,:int]:= bat.new(:int,:int);
-o:= calc.oid(0@0);
-z:= algebra.markT(r,o);
-rr:= bat.reverse(z);
-s := bat.reverse(r);
-t := bat.reverse(s);
-io.print(t);
-optimizer.peephole();
-mdb.List();
+#r:col[:int]:= column.new(:int);
+#o:= calc.oid(0@0);
+#z:= algebra.markT(r,o);
+#rr:= bat.reverse(z);
+#s := bat.reverse(r);
+#t := bat.reverse(s);
+#io.print(t);
+#optimizer.peephole();
+#mdb.List();
diff --git a/monetdb5/optimizer/Tests/RMexample.mal
b/monetdb5/optimizer/Tests/RMexample.mal
--- a/monetdb5/optimizer/Tests/RMexample.mal
+++ b/monetdb5/optimizer/Tests/RMexample.mal
@@ -1,5 +1,5 @@
-r{count=100} := bat.new(:oid,:int);
-s{count=1000}:= bat.new(:oid,:int);
+r{count=100} := column.new(:int);
+s{count=1000}:= column.new(:int);
rs:= algebra.select(s,1,1);
rr:= bat.reverse(r);
j:= algebra.join(rs,rr);
diff --git a/monetdb5/optimizer/Tests/STexample.mal
b/monetdb5/optimizer/Tests/STexample.mal
--- a/monetdb5/optimizer/Tests/STexample.mal
+++ b/monetdb5/optimizer/Tests/STexample.mal
@@ -1,8 +1,7 @@
-b:= bat.new(:oid,:int);
-bat.insert(b,1@0,2);
+b:= column.new(:int);
+column.append(b,2);
#many more inserts
c{singleton}:= algebra.select(b,0,4);
-d:= algebra.markH(c);
-io.print(d);
+io.print(c);
optimizer.singleton();
mdb.List();
diff --git a/monetdb5/optimizer/Tests/basket00.mal
b/monetdb5/optimizer/Tests/basket00.mal
--- a/monetdb5/optimizer/Tests/basket00.mal
+++ b/monetdb5/optimizer/Tests/basket00.mal
@@ -3,8 +3,8 @@
module basket;
function unlock(a:any);
end unlock;
-function bind(s:str,t:str,c:str,i:int):bat[:any_1,:any_2];
- return bind:= bat.new(:any_1,:any_2);
+function bind(s:str,t:str,c:str,i:int):col[:any_2];
+ return bind:= column.new(:any_2);
end bind;
module datacell;
@@ -16,7 +16,7 @@
X7 := A0;
barrier go:=datacell.basket(); # the marker of the [
#generate binds for all input columns
- X2:bat[:oid,:int] := basket.bind("sys","r","i",0);
+ X2:col[:int] := basket.bind("sys","r","i",0);
X8 := algebra.thetauselect(X2,X7,">");
X10 := calc.oid(0@0);
X12 := algebra.markT(X8,X10);
@@ -26,12 +26,12 @@
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
