Changeset: a14ab93ef854 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a14ab93ef854
Added Files:
monetdb5/mal/Tests/tst880.stable.err
monetdb5/mal/Tests/tst880.stable.out
Removed Files:
monetdb5/mal/Tests/tst090.mal
monetdb5/mal/Tests/tst260.mal
monetdb5/mal/Tests/tst260.stable.err
monetdb5/mal/Tests/tst260.stable.out
monetdb5/mal/Tests/tst612.mal
monetdb5/mal/Tests/tst612.stable.err
monetdb5/mal/Tests/tst612.stable.out
monetdb5/mal/Tests/tst805.mal
monetdb5/mal/Tests/tst805.stable.err
monetdb5/mal/Tests/tst805.stable.out
monetdb5/mal/Tests/tst950.mal
monetdb5/tests/BugReports/Tests/no.050.mal
monetdb5/tests/BugReports/Tests/no.050.stable.err
monetdb5/tests/BugReports/Tests/no.050.stable.out
monetdb5/tests/BugReports/Tests/no.051.mal
monetdb5/tests/BugReports/Tests/no.051.stable.err
monetdb5/tests/BugReports/Tests/no.051.stable.out
monetdb5/tests/BugReports/Tests/no.098.mal
monetdb5/tests/BugReports/Tests/no.098.stable.err
monetdb5/tests/BugReports/Tests/no.098.stable.out
monetdb5/tests/BugReports/Tests/no.157.mal
monetdb5/tests/BugReports/Tests/no.157.stable.err
monetdb5/tests/BugReports/Tests/no.157.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.1023816.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.1023816.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.1023816.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.605953.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.605953.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.605953.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.905495s
monetdb5/tests/BugsViaSourgeforce/Tests/ID.905495s.bat
monetdb5/tests/BugsViaSourgeforce/Tests/ID.905495s.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.905495s.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.905495s.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.914159.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.914159.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.914159.stable.out
Modified Files:
monetdb5/mal/Tests/All
monetdb5/mal/Tests/blkjoin.mal
monetdb5/mal/Tests/bloom.mal
monetdb5/mal/Tests/dataflow01.mal
monetdb5/mal/Tests/dataflow01.stable.out
monetdb5/mal/Tests/prejoin.mal
monetdb5/mal/Tests/recycle01.mal
monetdb5/mal/Tests/recycle01.stable.out
monetdb5/mal/Tests/recycle02.mal
monetdb5/mal/Tests/recycle02.stable.out
monetdb5/mal/Tests/recycle03.mal
monetdb5/mal/Tests/recycle03.stable.out
monetdb5/mal/Tests/recycle04.mal
monetdb5/mal/Tests/recycle04.stable.out
monetdb5/mal/Tests/recycle10.mal
monetdb5/mal/Tests/recycle10.stable.out
monetdb5/mal/Tests/recycle11.mal
monetdb5/mal/Tests/recycle11.stable.out
monetdb5/mal/Tests/recycle12.mal
monetdb5/mal/Tests/recycle12.stable.out
monetdb5/mal/Tests/saveload.mal
monetdb5/mal/Tests/saveload.stable.out
monetdb5/mal/Tests/tst031.mal
monetdb5/mal/Tests/tst031.stable.out
monetdb5/mal/Tests/tst032.mal
monetdb5/mal/Tests/tst032.stable.out
monetdb5/mal/Tests/tst048.mal
monetdb5/mal/Tests/tst048.stable.out
monetdb5/mal/Tests/tst049.mal
monetdb5/mal/Tests/tst049.stable.out
monetdb5/mal/Tests/tst1020.mal
monetdb5/mal/Tests/tst1021.mal
monetdb5/mal/Tests/tst1200.mal
monetdb5/mal/Tests/tst1200.stable.out
monetdb5/mal/Tests/tst1201.mal
monetdb5/mal/Tests/tst1202.mal
monetdb5/mal/Tests/tst1202.stable.out
monetdb5/mal/Tests/tst1203.mal
monetdb5/mal/Tests/tst1203.stable.out
monetdb5/mal/Tests/tst1205.mal
monetdb5/mal/Tests/tst1205.stable.out
monetdb5/mal/Tests/tst1206.mal
monetdb5/mal/Tests/tst1225.mal
monetdb5/mal/Tests/tst1225.stable.out
monetdb5/mal/Tests/tst1500.mal
monetdb5/mal/Tests/tst1500.stable.out
monetdb5/mal/Tests/tst1501.mal
monetdb5/mal/Tests/tst1501.stable.out
monetdb5/mal/Tests/tst1502.mal
monetdb5/mal/Tests/tst1502.stable.out
monetdb5/mal/Tests/tst1503.mal
monetdb5/mal/Tests/tst1503.stable.out
monetdb5/mal/Tests/tst1504.mal
monetdb5/mal/Tests/tst1504.stable.out
monetdb5/mal/Tests/tst200.mal
monetdb5/mal/Tests/tst237.mal
monetdb5/mal/Tests/tst253.mal
monetdb5/mal/Tests/tst253.stable.out
monetdb5/mal/Tests/tst271.mal
monetdb5/mal/Tests/tst292.mal
monetdb5/mal/Tests/tst292.stable.out
monetdb5/mal/Tests/tst880.mal
monetdb5/mal/Tests/tst890.mal
monetdb5/mal/Tests/tst890.stable.out
monetdb5/mal/Tests/tst901a.mal
monetdb5/mal/Tests/tst901a.stable.out
monetdb5/mal/Tests/tst901b.mal
monetdb5/mal/Tests/tst901b.stable.out
monetdb5/mal/Tests/tst902.mal
monetdb5/mal/Tests/tst902.stable.out
monetdb5/mal/Tests/tst909.mal
monetdb5/mal/Tests/tst911.mal
monetdb5/mal/Tests/tst911.stable.out
monetdb5/mal/Tests/tst912.mal
monetdb5/mal/Tests/tst912.stable.out
monetdb5/modules/atoms/Tests/xml00.mal
monetdb5/modules/atoms/Tests/xml00.stable.out
monetdb5/modules/atoms/Tests/xml01.mal
monetdb5/modules/atoms/Tests/xml01.stable.out
monetdb5/modules/atoms/Tests/xml02.mal
monetdb5/modules/atoms/Tests/xml02.stable.out
monetdb5/modules/atoms/Tests/xml03.mal
monetdb5/modules/atoms/Tests/xml03.stable.out
monetdb5/modules/atoms/Tests/xml04.mal
monetdb5/modules/atoms/Tests/xml04.stable.out
monetdb5/modules/atoms/Tests/xml05.mal
monetdb5/modules/atoms/Tests/xml05.stable.out
monetdb5/modules/atoms/Tests/xml06.mal
monetdb5/modules/atoms/Tests/xml10.mal
monetdb5/modules/atoms/Tests/xml10.stable.out
monetdb5/modules/kernel/Tests/batstr.mal
monetdb5/modules/kernel/Tests/batstr.stable.out
monetdb5/modules/mal/Tests/bigsum.mal
monetdb5/modules/mal/Tests/bigsum.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
monetdb5/modules/mal/Tests/mserver00.mal
monetdb5/modules/mal/Tests/mserver00.stable.out
monetdb5/modules/mal/Tests/remote08.mal
monetdb5/modules/mal/Tests/remote08.stable.out
monetdb5/modules/mal/Tests/remote09.mal
monetdb5/modules/mal/Tests/remote09.stable.out
monetdb5/optimizer/Tests/dataflow5.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/inline10.mal
monetdb5/optimizer/Tests/reorder00.mal
monetdb5/optimizer/Tests/tst4700.mal
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/print_CTgroup.SF-1315791.mal
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/print_CTgroup.SF-1315791.stable.out
monetdb5/tests/BugReports/Tests/All
monetdb5/tests/BugsViaSourgeforce/Tests/All
Branch: default
Log Message:
Approve queries and output
Replaced most uses of bat.insert(b,h,t) with bat.append(b,t);
diffs (truncated from 6747 to 300 lines):
diff --git a/monetdb5/mal/Tests/All b/monetdb5/mal/Tests/All
--- a/monetdb5/mal/Tests/All
+++ b/monetdb5/mal/Tests/All
@@ -130,7 +130,6 @@ tst253
tst255
tst2550
tst256
-# tst260 -- algebra.topN removed
tst2570
# tst265 -- windowsum and slidingsum have been removed
# opens /tmp/MonetEvents, i.e. not on Windows:
@@ -163,7 +162,6 @@ tst500
tst501
tst560
tst611
-#tst612 transaction primitives dropped
tst620
tst660
tst661
@@ -178,7 +176,6 @@ tst770
tst780
tst802
tst804
-#tst805 invalid, no BAT columns
tst810
tst819
tst820
@@ -188,7 +185,7 @@ tst850
tst866
tst867
tst870
-#tst880 requested feature
+tst880
tst890
tst900
tst901
diff --git a/monetdb5/mal/Tests/blkjoin.mal b/monetdb5/mal/Tests/blkjoin.mal
--- a/monetdb5/mal/Tests/blkjoin.mal
+++ b/monetdb5/mal/Tests/blkjoin.mal
@@ -17,15 +17,13 @@ rbase:= microbenchmark.random(0:oid, N,
##lbase:= bat.new(:oid,:int);
##barrier (go,i):= language.newRange(0:int);
## k:= mmath.rand();
-## o:= calc.oid(i);
-## bat.insert(lbase,o,k);
+## bat.append(lbase,k);
## redo (go,i):= language.nextElement(1:int,M);
##exit (go,i);
##rbase:= bat.new(:oid,:int);
##barrier (go,i):= language.newRange(0:int);
## k:= mmath.rand();
-## o:= calc.oid(i);
-## bat.insert(rbase,o,k);
+## bat.append(rbase,k);
## redo (go,i):= language.nextElement(1:int,N);
##exit (go,i);
t1:= alarm.usec();
diff --git a/monetdb5/mal/Tests/bloom.mal b/monetdb5/mal/Tests/bloom.mal
--- a/monetdb5/mal/Tests/bloom.mal
+++ b/monetdb5/mal/Tests/bloom.mal
@@ -10,15 +10,13 @@ t0:= alarm.usec();
lbase:= bat.new(:oid,:int);
barrier (go,i):= language.newRange(0:int);
k:= mmath.rand();
- o:= calc.oid(i);
- bat.insert(lbase,o,k);
+ bat.append(lbase,k);
redo (go,i):= language.nextElement(1:int,M);
exit (go,i);
rbase:= bat.new(:oid,:int);
barrier (go,i):= language.newRange(0:int);
k:= mmath.rand();
- o:= calc.oid(i);
- bat.insert(rbase,o,k);
+ bat.append(rbase,k);
redo (go,i):= language.nextElement(1:int,N);
exit (go,i);
# share a sample
diff --git a/monetdb5/mal/Tests/dataflow01.mal
b/monetdb5/mal/Tests/dataflow01.mal
--- a/monetdb5/mal/Tests/dataflow01.mal
+++ b/monetdb5/mal/Tests/dataflow01.mal
@@ -14,7 +14,7 @@ mdb.setDebug(dbgmsk_set);
barrier i:= 0:lng;
k:= k+1;
l:= calc.lng(k);
- bat.insert(b,nil:oid,l);
+ bat.append(b,l);
redo i:= iterator.next(1:lng,1000000:lng);
exit i;
diff --git a/monetdb5/mal/Tests/dataflow01.stable.out
b/monetdb5/mal/Tests/dataflow01.stable.out
--- a/monetdb5/mal/Tests/dataflow01.stable.out
+++ b/monetdb5/mal/Tests/dataflow01.stable.out
@@ -24,7 +24,7 @@ function user.load():bat[:oid,:lng];
barrier i := 0:lng;
k := calc.+(k,1);
l := calc.lng(k);
- bat.insert(b,nil:oid,l);
+ bat.append(b,l);
redo i := iterator.next(1:lng,1000000:lng);
exit i;
mdb.setDebug(dbgmsk_restore);
diff --git a/monetdb5/mal/Tests/prejoin.mal b/monetdb5/mal/Tests/prejoin.mal
--- a/monetdb5/mal/Tests/prejoin.mal
+++ b/monetdb5/mal/Tests/prejoin.mal
@@ -4,8 +4,7 @@ t0:= alarm.usec();
base:= bat.new(:oid,:int);
barrier (go,i):= language.newRange(0:int);
k:= mmath.rand();
- o:= calc.oid(i);
- bat.insert(base,o,k);
+ bat.append(base,k);
# redo (go,i):= language.nextElement(1:int,10:int);
# redo (go,i):= language.nextElement(1:int,1000:int);
redo (go,i):= language.nextElement(1:int,10000000:int);
diff --git a/monetdb5/mal/Tests/recycle01.mal b/monetdb5/mal/Tests/recycle01.mal
--- a/monetdb5/mal/Tests/recycle01.mal
+++ b/monetdb5/mal/Tests/recycle01.mal
@@ -17,18 +17,18 @@ end tid;
function sql.bind(mvc:int, s:str,t:str,c:str,i:int):bat[:oid,:int];
b:= bat.new(:oid,:int);
- bat.insert(b,0@0,0);
- bat.insert(b,1@0,1);
- bat.insert(b,2@0,2);
- bat.insert(b,3@0,3);
- bat.insert(b,4@0,4);
- bat.insert(b,5@0,5);
- bat.insert(b,6@0,6);
- bat.insert(b,7@0,7);
- bat.insert(b,8@0,8);
- bat.insert(b,9@0,9);
- bat.insert(b,10@0,10);
- bat.insert(b,11@0,11);
+ bat.append(b,0);
+ bat.append(b,1);
+ bat.append(b,2);
+ bat.append(b,3);
+ bat.append(b,4);
+ bat.append(b,5);
+ bat.append(b,6);
+ bat.append(b,7);
+ bat.append(b,8);
+ bat.append(b,9);
+ bat.append(b,10);
+ bat.append(b,11);
return bind:=b;
end bind;
diff --git a/monetdb5/mal/Tests/recycle01.stable.out
b/monetdb5/mal/Tests/recycle01.stable.out
--- a/monetdb5/mal/Tests/recycle01.stable.out
+++ b/monetdb5/mal/Tests/recycle01.stable.out
@@ -30,18 +30,18 @@ exit i;
end sql.tid;
function sql.bind(mvc:int,s:str,t:str,c:str,i:int):bat[:oid,:int];
b := bat.new(:oid,:int);
- bat.insert(b,0@0,0);
- bat.insert(b,1@0,1);
- bat.insert(b,2@0,2);
- bat.insert(b,3@0,3);
- bat.insert(b,4@0,4);
- bat.insert(b,5@0,5);
- bat.insert(b,6@0,6);
- bat.insert(b,7@0,7);
- bat.insert(b,8@0,8);
- bat.insert(b,9@0,9);
- bat.insert(b,10@0,10);
- bat.insert(b,11@0,11);
+ bat.append(b,0);
+ bat.append(b,1);
+ bat.append(b,2);
+ bat.append(b,3);
+ bat.append(b,4);
+ bat.append(b,5);
+ bat.append(b,6);
+ bat.append(b,7);
+ bat.append(b,8);
+ bat.append(b,9);
+ bat.append(b,10);
+ bat.append(b,11);
return bind := b;
end sql.bind;
function sql.qry(low:int,hgh:int):void;
diff --git a/monetdb5/mal/Tests/recycle02.mal b/monetdb5/mal/Tests/recycle02.mal
--- a/monetdb5/mal/Tests/recycle02.mal
+++ b/monetdb5/mal/Tests/recycle02.mal
@@ -17,18 +17,18 @@ end tid;
function sql.bind(mvc:int, s:str,t:str,c:str,i:int):bat[:oid,:int];
b:= bat.new(:oid,:int);
- bat.insert(b,0@0,0);
- bat.insert(b,1@0,1);
- bat.insert(b,2@0,2);
- bat.insert(b,3@0,3);
- bat.insert(b,4@0,4);
- bat.insert(b,5@0,5);
- bat.insert(b,6@0,6);
- bat.insert(b,7@0,7);
- bat.insert(b,8@0,8);
- bat.insert(b,9@0,9);
- bat.insert(b,10@0,10);
- bat.insert(b,11@0,11);
+ bat.append(b,0);
+ bat.append(b,1);
+ bat.append(b,2);
+ bat.append(b,3);
+ bat.append(b,4);
+ bat.append(b,5);
+ bat.append(b,6);
+ bat.append(b,7);
+ bat.append(b,8);
+ bat.append(b,9);
+ bat.append(b,10);
+ bat.append(b,11);
return bind:=b;
end bind;
diff --git a/monetdb5/mal/Tests/recycle02.stable.out
b/monetdb5/mal/Tests/recycle02.stable.out
--- a/monetdb5/mal/Tests/recycle02.stable.out
+++ b/monetdb5/mal/Tests/recycle02.stable.out
@@ -30,18 +30,18 @@ exit i;
end sql.tid;
function sql.bind(mvc:int,s:str,t:str,c:str,i:int):bat[:oid,:int];
b := bat.new(:oid,:int);
- bat.insert(b,0@0,0);
- bat.insert(b,1@0,1);
- bat.insert(b,2@0,2);
- bat.insert(b,3@0,3);
- bat.insert(b,4@0,4);
- bat.insert(b,5@0,5);
- bat.insert(b,6@0,6);
- bat.insert(b,7@0,7);
- bat.insert(b,8@0,8);
- bat.insert(b,9@0,9);
- bat.insert(b,10@0,10);
- bat.insert(b,11@0,11);
+ bat.append(b,0);
+ bat.append(b,1);
+ bat.append(b,2);
+ bat.append(b,3);
+ bat.append(b,4);
+ bat.append(b,5);
+ bat.append(b,6);
+ bat.append(b,7);
+ bat.append(b,8);
+ bat.append(b,9);
+ bat.append(b,10);
+ bat.append(b,11);
return bind := b;
end sql.bind;
function sql.qry(low:int,hgh:int):void;
diff --git a/monetdb5/mal/Tests/recycle03.mal b/monetdb5/mal/Tests/recycle03.mal
--- a/monetdb5/mal/Tests/recycle03.mal
+++ b/monetdb5/mal/Tests/recycle03.mal
@@ -16,18 +16,18 @@ end tid;
function sql.bind(m:int,s:str,t:str,c:str,i:int):bat[:oid,:int];
b:= bat.new(:oid,:int);
- bat.insert(b,0@0,0);
- bat.insert(b,1@0,1);
- bat.insert(b,2@0,2);
- bat.insert(b,3@0,3);
- bat.insert(b,4@0,4);
- bat.insert(b,5@0,5);
- bat.insert(b,6@0,6);
- bat.insert(b,7@0,7);
- bat.insert(b,8@0,8);
- bat.insert(b,9@0,9);
- bat.insert(b,10@0,10);
- bat.insert(b,11@0,11);
+ bat.append(b,0);
+ bat.append(b,1);
+ bat.append(b,2);
+ bat.append(b,3);
+ bat.append(b,4);
+ bat.append(b,5);
+ bat.append(b,6);
+ bat.append(b,7);
+ bat.append(b,8);
+ bat.append(b,9);
+ bat.append(b,10);
+ bat.append(b,11);
return bind:=b;
end bind;
diff --git a/monetdb5/mal/Tests/recycle03.stable.out
b/monetdb5/mal/Tests/recycle03.stable.out
--- a/monetdb5/mal/Tests/recycle03.stable.out
+++ b/monetdb5/mal/Tests/recycle03.stable.out
@@ -30,18 +30,18 @@ exit i;
end sql.tid;
function sql.bind(m:int,s:str,t:str,c:str,i:int):bat[:oid,:int];
b := bat.new(:oid,:int);
- bat.insert(b,0@0,0);
- bat.insert(b,1@0,1);
- bat.insert(b,2@0,2);
- bat.insert(b,3@0,3);
- bat.insert(b,4@0,4);
- bat.insert(b,5@0,5);
- bat.insert(b,6@0,6);
- bat.insert(b,7@0,7);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
