Changeset: 65ac5bce6ea3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=65ac5bce6ea3
Added Files:
monetdb5/modules/mal/Tests/qgram.stable.err
monetdb5/modules/mal/Tests/qgram.stable.out
Removed Files:
monetdb5/mal/Tests/tst800.mal
monetdb5/mal/Tests/tst800.stable.err
monetdb5/mal/Tests/tst800.stable.out
monetdb5/mal/Tests/tst801.mal
monetdb5/mal/Tests/tst801.stable.err
monetdb5/mal/Tests/tst801.stable.out
monetdb5/mal/Tests/tst803.mal
monetdb5/mal/Tests/tst803.stable.err
monetdb5/mal/Tests/tst803.stable.out
monetdb5/optimizer/Tests/garbage1.mal
monetdb5/optimizer/Tests/garbage1.stable.err
monetdb5/optimizer/Tests/garbage1.stable.out
monetdb5/tests/BugReports/Tests/no.162.mal
monetdb5/tests/BugReports/Tests/no.162.stable.err
monetdb5/tests/BugReports/Tests/no.162.stable.out
monetdb5/tests/BugReports/Tests/no.165.mal
monetdb5/tests/BugReports/Tests/no.165.stable.err
monetdb5/tests/BugReports/Tests/no.165.stable.out
monetdb5/tests/BugReports/Tests/no.171.mal
monetdb5/tests/BugReports/Tests/no.171.stable.err
monetdb5/tests/BugReports/Tests/no.171.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/ID.642344.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.642344.stable.err
monetdb5/tests/BugsViaSourgeforce/Tests/ID.642344.stable.out
monetdb5/tests/gdkTests/Tests/binsearchmultijoin.mal
monetdb5/tests/gdkTests/Tests/binsearchmultijoin.stable.err
monetdb5/tests/gdkTests/Tests/binsearchmultijoin.stable.out
monetdb5/tests/gdkTests/Tests/binsemijoin.mal
monetdb5/tests/gdkTests/Tests/binsemijoin.stable.err
monetdb5/tests/gdkTests/Tests/binsemijoin.stable.out
monetdb5/tests/suite_00/Tests/test_00.mal
monetdb5/tests/suite_00/Tests/test_00.patch
monetdb5/tests/suite_00/Tests/test_00.stable.err
monetdb5/tests/suite_00/Tests/test_00.stable.out
monetdb5/tests/suite_00/Tests/test_01.mal
monetdb5/tests/suite_00/Tests/test_01.patch
monetdb5/tests/suite_00/Tests/test_01.stable.err
monetdb5/tests/suite_00/Tests/test_01.stable.out
monetdb5/tests/suite_00/Tests/test_02.mal
monetdb5/tests/suite_00/Tests/test_02.stable.err
monetdb5/tests/suite_00/Tests/test_02.stable.out
monetdb5/tests/suite_00/Tests/test_03.mal
monetdb5/tests/suite_00/Tests/test_03.stable.err
monetdb5/tests/suite_00/Tests/test_03.stable.out
monetdb5/tests/suite_00/Tests/test_04.mal
monetdb5/tests/suite_00/Tests/test_04.stable.err
monetdb5/tests/suite_00/Tests/test_04.stable.out
monetdb5/tests/suite_00/Tests/test_05.mal
monetdb5/tests/suite_00/Tests/test_05.patch
monetdb5/tests/suite_00/Tests/test_05.stable.err
monetdb5/tests/suite_00/Tests/test_05.stable.out
monetdb5/tests/suite_00/Tests/test_20.mal
monetdb5/tests/suite_00/Tests/test_20.stable.err
monetdb5/tests/suite_00/Tests/test_20.stable.out
monetdb5/tests/suite_00/Tests/test_30.mal
monetdb5/tests/suite_00/Tests/test_30.modules
monetdb5/tests/suite_00/Tests/test_30.patch
monetdb5/tests/suite_00/Tests/test_30.stable.err
monetdb5/tests/suite_00/Tests/test_30.stable.out
monetdb5/tests/suite_00/Tests/test_31.mal
monetdb5/tests/suite_00/Tests/test_31.modules
monetdb5/tests/suite_00/Tests/test_31.stable.err
monetdb5/tests/suite_00/Tests/test_31.stable.out
monetdb5/tests/suite_00/Tests/test_35.mal
monetdb5/tests/suite_00/Tests/test_35.stable.err
monetdb5/tests/suite_00/Tests/test_35.stable.out
monetdb5/tests/suite_00/Tests/test_55.mal
monetdb5/tests/suite_00/Tests/test_55.patch
monetdb5/tests/suite_00/Tests/test_55.stable.err
monetdb5/tests/suite_00/Tests/test_55.stable.out
monetdb5/tests/suite_00/Tests/test_55.stable.out.64bit
monetdb5/tests/suite_00/Tests/test_55.stable.out.Darwin
monetdb5/tests/suite_00/Tests/test_55.stable.out.Linux
monetdb5/tests/suite_00/Tests/test_55.stable.out.Linux.64bit
monetdb5/tests/suite_00/Tests/test_60.mal
monetdb5/tests/suite_00/Tests/test_60.stable.err
monetdb5/tests/suite_00/Tests/test_60.stable.out
monetdb5/tests/suite_00/Tests/test_65.mal
monetdb5/tests/suite_00/Tests/test_65.stable.err
monetdb5/tests/suite_00/Tests/test_65.stable.out
monetdb5/tests/suite_00/Tests/test_70.mal
monetdb5/tests/suite_00/Tests/test_70.stable.err
monetdb5/tests/suite_00/Tests/test_70.stable.out
monetdb5/tests/suite_00/Tests/test_80.mal
monetdb5/tests/suite_00/Tests/test_80.stable.err
monetdb5/tests/suite_00/Tests/test_80.stable.out
monetdb5/tests/suite_00/Tests/test_90.mal
monetdb5/tests/suite_00/Tests/test_90.stable.err
monetdb5/tests/suite_00/Tests/test_90.stable.out
monetdb5/tests/suite_00/Tests/test_95.mal
monetdb5/tests/suite_00/Tests/test_95.stable.err
monetdb5/tests/suite_00/Tests/test_95.stable.out
monetdb5/tests/suite_01/Tests/test_40.mal
monetdb5/tests/suite_01/Tests/test_40.patch
monetdb5/tests/suite_01/Tests/test_40.stable.err
monetdb5/tests/suite_01/Tests/test_40.stable.out
monetdb5/tests/suite_01/Tests/test_80.mal
monetdb5/tests/suite_01/Tests/test_80.patch
monetdb5/tests/suite_01/Tests/test_80.stable.err
monetdb5/tests/suite_01/Tests/test_80.stable.out
Modified Files:
monetdb5/mal/Tests/All
monetdb5/mal/Tests/saveload.mal
monetdb5/mal/Tests/saveload.stable.out
monetdb5/mal/Tests/tst017.mal
monetdb5/mal/Tests/tst017.stable.out
monetdb5/mal/Tests/tst018.mal
monetdb5/mal/Tests/tst018.stable.out
monetdb5/mal/Tests/tst025.mal
monetdb5/mal/Tests/tst025.stable.out
monetdb5/mal/Tests/tst027.mal
monetdb5/mal/Tests/tst027.stable.out
monetdb5/mal/Tests/tst028.mal
monetdb5/mal/Tests/tst028.stable.out
monetdb5/mal/Tests/tst029.mal
monetdb5/mal/Tests/tst029.stable.out
monetdb5/mal/Tests/tst031.mal
monetdb5/mal/Tests/tst031.stable.out
monetdb5/mal/Tests/tst033.mal
monetdb5/mal/Tests/tst033.stable.out
monetdb5/mal/Tests/tst034.mal
monetdb5/mal/Tests/tst034.stable.out
monetdb5/mal/Tests/tst035.mal
monetdb5/mal/Tests/tst035.stable.out
monetdb5/mal/Tests/tst038.mal
monetdb5/mal/Tests/tst038.stable.out
monetdb5/mal/Tests/tst046.mal
monetdb5/mal/Tests/tst046.stable.out
monetdb5/mal/Tests/tst047.mal
monetdb5/mal/Tests/tst047.stable.out
monetdb5/mal/Tests/tst050.mal
monetdb5/mal/Tests/tst050.stable.out
monetdb5/mal/Tests/tst052.mal
monetdb5/mal/Tests/tst052.stable.out
monetdb5/mal/Tests/tst077.mal
monetdb5/mal/Tests/tst077.stable.out
monetdb5/mal/Tests/tst1000.mal
monetdb5/mal/Tests/tst1000.stable.out
monetdb5/mal/Tests/tst1004.mal
monetdb5/mal/Tests/tst1004.stable.out
monetdb5/mal/Tests/tst1005.mal
monetdb5/mal/Tests/tst1005.stable.out
monetdb5/mal/Tests/tst1012.mal
monetdb5/mal/Tests/tst1012.stable.out
monetdb5/mal/Tests/tst1014.mal
monetdb5/mal/Tests/tst1014.stable.out
monetdb5/mal/Tests/tst103.mal
monetdb5/mal/Tests/tst103.stable.out
monetdb5/mal/Tests/tst104.mal
monetdb5/mal/Tests/tst104.stable.out
monetdb5/mal/Tests/tst105.mal
monetdb5/mal/Tests/tst105.stable.out
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/tst1204.mal
monetdb5/mal/Tests/tst1204.stable.out
monetdb5/mal/Tests/tst1504.mal
monetdb5/mal/Tests/tst1504.stable.out
monetdb5/mal/Tests/tst1602.mal
monetdb5/mal/Tests/tst1602.stable.out
monetdb5/mal/Tests/tst1604.mal
monetdb5/mal/Tests/tst1604.stable.out
monetdb5/mal/Tests/tst200.mal
monetdb5/mal/Tests/tst200.stable.out
monetdb5/mal/Tests/tst201.mal
monetdb5/mal/Tests/tst201.stable.out
monetdb5/mal/Tests/tst202.mal
monetdb5/mal/Tests/tst202.stable.out
monetdb5/mal/Tests/tst210.mal
monetdb5/mal/Tests/tst210.stable.out
monetdb5/mal/Tests/tst220.mal
monetdb5/mal/Tests/tst220.stable.out
monetdb5/mal/Tests/tst230.mal
monetdb5/mal/Tests/tst230.stable.out
monetdb5/mal/Tests/tst231.mal
monetdb5/mal/Tests/tst231.stable.out
monetdb5/mal/Tests/tst232.mal
monetdb5/mal/Tests/tst232.stable.out
monetdb5/mal/Tests/tst233.mal
monetdb5/mal/Tests/tst233.stable.out
monetdb5/mal/Tests/tst234.mal
monetdb5/mal/Tests/tst234.stable.out
monetdb5/mal/Tests/tst235.mal
monetdb5/mal/Tests/tst235.stable.out
monetdb5/mal/Tests/tst256.mal
monetdb5/mal/Tests/tst256.stable.out
monetdb5/mal/Tests/tst260.mal
monetdb5/mal/Tests/tst260.stable.out
monetdb5/mal/Tests/tst270.mal
monetdb5/mal/Tests/tst270.stable.out
monetdb5/mal/Tests/tst272.mal
monetdb5/mal/Tests/tst272.stable.out
monetdb5/mal/Tests/tst3000.mal
monetdb5/mal/Tests/tst3000.stable.out
monetdb5/mal/Tests/tst3030.mal
monetdb5/mal/Tests/tst3030.stable.out
monetdb5/mal/Tests/tst307.mal
monetdb5/mal/Tests/tst307.stable.out
monetdb5/mal/Tests/tst400d.mal
monetdb5/mal/Tests/tst400d.stable.out
monetdb5/mal/Tests/tst610.mal
monetdb5/mal/Tests/tst610.stable.out
monetdb5/mal/Tests/tst611.mal
monetdb5/mal/Tests/tst611.stable.out
monetdb5/mal/Tests/tst750.mal
monetdb5/mal/Tests/tst750.stable.out
monetdb5/mal/Tests/tst755.mal
monetdb5/mal/Tests/tst755.stable.out
monetdb5/mal/Tests/tst760.mal
monetdb5/mal/Tests/tst760.stable.out
monetdb5/mal/Tests/tst802.mal
monetdb5/mal/Tests/tst802.stable.out
monetdb5/mal/Tests/tst913.mal
monetdb5/mal/Tests/tst913.stable.out
monetdb5/modules/kernel/Tests/TriBool.malC
monetdb5/modules/mal/Tests/mapi01.mal
monetdb5/modules/mal/Tests/mapi01.stable.out
monetdb5/modules/mal/Tests/mapi07.mal
monetdb5/modules/mal/Tests/mapi07.stable.out
monetdb5/modules/mal/Tests/remote02.mal
monetdb5/modules/mal/Tests/remote02.stable.out
monetdb5/modules/mal/Tests/remote04.mal
monetdb5/modules/mal/Tests/remote04.stable.out
monetdb5/modules/mal/Tests/remote06.mal
monetdb5/modules/mal/Tests/remote06.stable.out
monetdb5/modules/mal/Tests/remoteInit.mal
monetdb5/modules/mal/Tests/remoteInit.stable.out
monetdb5/modules/mal/batExtensions.c
monetdb5/modules/mal/inspect.mal
monetdb5/optimizer/Tests/All
monetdb5/optimizer/Tests/CRexample.mal
monetdb5/optimizer/Tests/CRexample.stable.out
monetdb5/optimizer/Tests/CXerror1.mal
monetdb5/optimizer/Tests/CXerror1.stable.out
monetdb5/optimizer/Tests/CXexample.mal
monetdb5/optimizer/Tests/CXexample.stable.out
monetdb5/optimizer/Tests/DCexample.mal
monetdb5/optimizer/Tests/DCexample.stable.out
monetdb5/optimizer/Tests/DCexample2.mal
monetdb5/optimizer/Tests/DCexample2.stable.out
monetdb5/optimizer/Tests/ESexample.mal
monetdb5/optimizer/Tests/ESexample.stable.out
monetdb5/optimizer/Tests/FTexample.mal
monetdb5/optimizer/Tests/FTexample.stable.out
monetdb5/optimizer/Tests/JPexample.mal
monetdb5/optimizer/Tests/JPexample.stable.out
monetdb5/optimizer/Tests/emptyset01.mal
monetdb5/optimizer/Tests/emptyset01.stable.out
monetdb5/optimizer/Tests/garbage.mal
monetdb5/optimizer/Tests/garbage.stable.out
monetdb5/optimizer/Tests/inlineCst.stable.out
monetdb5/optimizer/Tests/mat00.mal
monetdb5/optimizer/Tests/mat00.stable.out
monetdb5/optimizer/Tests/mat01.mal
monetdb5/optimizer/Tests/mat01.stable.out
monetdb5/optimizer/Tests/qep00.mal
monetdb5/optimizer/Tests/qep00.stable.out
monetdb5/optimizer/Tests/qep01.mal
monetdb5/optimizer/Tests/qep01.stable.out
monetdb5/optimizer/Tests/qep02.mal
monetdb5/optimizer/Tests/qep02.stable.out
monetdb5/optimizer/Tests/rangePush00.mal
monetdb5/optimizer/Tests/rangePush00.stable.out
monetdb5/optimizer/Tests/rangePush01.mal
monetdb5/optimizer/Tests/rangePush01.stable.out
monetdb5/optimizer/Tests/tst4000.mal
monetdb5/optimizer/Tests/tst4000.stable.out
monetdb5/optimizer/Tests/tst4003.mal
monetdb5/optimizer/Tests/tst4003.stable.out
monetdb5/optimizer/Tests/tst4010.mal
monetdb5/optimizer/Tests/tst4010.stable.out
monetdb5/optimizer/Tests/tst4030.mal
monetdb5/optimizer/Tests/tst4030.stable.out
monetdb5/optimizer/Tests/tst4300.mal
monetdb5/optimizer/Tests/tst4300.stable.out
monetdb5/optimizer/Tests/tst4610.mal
monetdb5/optimizer/Tests/tst4610.stable.out
monetdb5/optimizer/Tests/tst4611.mal
monetdb5/optimizer/Tests/tst4611.stable.out
monetdb5/optimizer/Tests/tst4620.mal
monetdb5/optimizer/Tests/tst4620.stable.out
monetdb5/scheduler/Tests/memo01.mal
monetdb5/scheduler/Tests/memo01.stable.out
monetdb5/scheduler/Tests/memo02.mal
monetdb5/scheduler/Tests/memo02.stable.out
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/negative_size.SF-915339.mal
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/negative_size.SF-915339.stable.out
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/MapiClient_hang_on_rename.SF-852148.mal
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/MapiClient_hang_on_rename.SF-852148.stable.out
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/multiplex_nil.SF-1153664.mal
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/multiplex_nil.SF-1153664.stable.out
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/rename_bat_hyphen.SF-1152369.mal
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/rename_bat_hyphen.SF-1152369.stable.out
monetdb5/tests/BugReports/Tests/All
monetdb5/tests/BugReports/Tests/gettype_in_function.mal
monetdb5/tests/BugReports/Tests/gettype_in_function.stable.out
monetdb5/tests/BugReports/Tests/no.031.mal
monetdb5/tests/BugReports/Tests/no.031.stable.out
monetdb5/tests/BugReports/Tests/no.062.mal
monetdb5/tests/BugReports/Tests/no.062.stable.out
monetdb5/tests/BugReports/Tests/no.100.mal
monetdb5/tests/BugReports/Tests/no.100.stable.out
monetdb5/tests/BugReports/Tests/no.119.mal
monetdb5/tests/BugReports/Tests/no.119.stable.out
monetdb5/tests/BugsViaSourgeforce/Tests/All
monetdb5/tests/BugsViaSourgeforce/Tests/ID.605953.mal
monetdb5/tests/BugsViaSourgeforce/Tests/ID.605953.stable.out
monetdb5/tests/gdkTests/Tests/All
monetdb5/tests/gdkTests/Tests/TMsubcommit.mal
monetdb5/tests/gdkTests/Tests/TMsubcommit.stable.out
monetdb5/tests/gdkTests/Tests/append_dense_tail.mal
monetdb5/tests/gdkTests/Tests/append_dense_tail.stable.out
monetdb5/tests/gdkTests/Tests/intersect_diff_nil.mal
monetdb5/tests/gdkTests/Tests/intersect_diff_nil.stable.out
monetdb5/tests/gdkTests/Tests/qsort.mal
monetdb5/tests/gdkTests/Tests/qsort.stable.out
monetdb5/tests/gdkTests/Tests/scanselect.mal
monetdb5/tests/gdkTests/Tests/scanselect.stable.out
monetdb5/tests/gdkTests/Tests/semijoin.mal
monetdb5/tests/gdkTests/Tests/semijoin.stable.out
monetdb5/tests/gdkTests/Tests/str_heap.mal
monetdb5/tests/gdkTests/Tests/str_heap.stable.out
monetdb5/tests/suite_00/Tests/All
monetdb5/tests/suite_00/Tests/test_10.mal
monetdb5/tests/suite_00/Tests/test_10.stable.out
monetdb5/tests/suite_00/Tests/test_15.mal
monetdb5/tests/suite_00/Tests/test_40.mal
monetdb5/tests/suite_00/Tests/test_40.stable.out
monetdb5/tests/suite_00/Tests/test_50.mal
monetdb5/tests/suite_00/Tests/test_50.stable.out
monetdb5/tests/suite_01/Tests/All
monetdb5/tests/suite_01/Tests/test_05.mal
monetdb5/tests/suite_01/Tests/test_05.stable.out
monetdb5/tests/suite_01/Tests/test_15.stable.out
monetdb5/tests/suite_01/Tests/test_70.mal
monetdb5/tests/suite_01/Tests/test_70.stable.out
Branch: default
Log Message:
Conversion of test suite to :oid headed BATs
In preparation of enforcing BATs to be :oid headed (and subsequently dense),
the tests have been converted towards this change. The actual enforcement
is left out, because still about 15 tests require work,e.g. jaql and
mapi-samples.
A little cleanup of test has been performed.
diffs (truncated from 19004 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
@@ -189,10 +189,7 @@ tst755
tst760
tst770
tst780
-tst800
-tst801
tst802
-tst803
tst804
#tst805 invalid, no BAT columns
tst810
diff --git a/monetdb5/mal/Tests/saveload.mal b/monetdb5/mal/Tests/saveload.mal
--- a/monetdb5/mal/Tests/saveload.mal
+++ b/monetdb5/mal/Tests/saveload.mal
@@ -1,8 +1,8 @@
# save/load tests
-a:= bat.new(:int,:int);
-bat.insert(a,0,123);
-bat.insert(a,0,321);
+a:= bat.new(:oid,:int);
+bat.append(a,123);
+bat.append(a,321);
bat.setName(a,"aaa");
io.print(a);
diff --git a/monetdb5/mal/Tests/saveload.stable.out
b/monetdb5/mal/Tests/saveload.stable.out
--- a/monetdb5/mal/Tests/saveload.stable.out
+++ b/monetdb5/mal/Tests/saveload.stable.out
@@ -40,9 +40,9 @@ stdout of test 'saveload` in directory '
#
function user.main():void;
# save/load tests
- a := bat.new(:int,:int);
- bat.insert(a,0,123);
- bat.insert(a,0,321);
+ a := bat.new(:oid,:int);
+ bat.append(a,123);
+ bat.append(a,321);
bat.setName(a,"aaa");
io.print(a);
b := bat.new(:oid,:str);
@@ -64,8 +64,8 @@ end main;
# h t # name
# int int # type
#-----------------#
-[ 0, 123 ]
-[ 0, 321 ]
+[ 0@0, 123 ]
+[ 1@0, 321 ]
#-------------------------#
# h t # name
# void str # type
@@ -76,8 +76,8 @@ end main;
# h t # name
# int int # type
#-----------------#
-[ 0, 123 ]
-[ 0, 321 ]
+[ 0@0, 123 ]
+[ 1@0, 321 ]
#-------------------------#
# h t # name
# void str # type
diff --git a/monetdb5/mal/Tests/tst017.mal b/monetdb5/mal/Tests/tst017.mal
--- a/monetdb5/mal/Tests/tst017.mal
+++ b/monetdb5/mal/Tests/tst017.mal
@@ -1,8 +1,9 @@
# reference setting tables
- b := bat.new(nil:int,nil:int);
- aa_a := bat.insert(b,1,2);
- ba_a := bat.insert(b,2,3);
+ b := bat.new(:oid,nil:int);
+ aa_a := bat.append(b,1);
+ ba_a := bat.append(b,2);
z := bbp.getLRefCount(b);
io.print(z);
- b := algebra.join(b,b);
- io.print(b);
+ br := bat.reverse(b);
+ c := algebra.join(b,br);
+ io.print(c);
diff --git a/monetdb5/mal/Tests/tst017.stable.out
b/monetdb5/mal/Tests/tst017.stable.out
--- a/monetdb5/mal/Tests/tst017.stable.out
+++ b/monetdb5/mal/Tests/tst017.stable.out
@@ -23,21 +23,22 @@ stdout of test 'tst017` in directory 'ma
#
function user.main():void;
# reference setting tables
- b := bat.new(nil:int,nil:int);
- aa_a := bat.insert(b,1,2);
- ba_a := bat.insert(b,2,3);
+ b := bat.new(:oid,nil:int);
+ aa_a := bat.append(b,1);
+ ba_a := bat.append(b,2);
z := bbp.getLRefCount(b);
io.print(z);
- b := algebra.join(b,b);
- io.print(b);
+ br := bat.reverse(b);
+ c := algebra.join(b,br);
+ io.print(c);
end main;
[ 3 ]
#-----------------#
# h tmp_5 # name
# int int # type
#-----------------#
-[ 1, 3 ]
-#
+[ 0@0, 0@0 ]
+[ 1@0, 1@0 ]
# 18:26:32 >
# 18:26:32 > Done.
diff --git a/monetdb5/mal/Tests/tst018.mal b/monetdb5/mal/Tests/tst018.mal
--- a/monetdb5/mal/Tests/tst018.mal
+++ b/monetdb5/mal/Tests/tst018.mal
@@ -4,7 +4,7 @@ i:= 23;
i:= nil;
io.print(i);
-b:= bat.new(:int,:int);
+b:= bat.new(:oid,:int);
b:= nil;
io.print(b);
diff --git a/monetdb5/mal/Tests/tst018.stable.out
b/monetdb5/mal/Tests/tst018.stable.out
--- a/monetdb5/mal/Tests/tst018.stable.out
+++ b/monetdb5/mal/Tests/tst018.stable.out
@@ -31,7 +31,7 @@ function user.main():void;
i := 23;
i := nil;
io.print(i);
- b := bat.new(:int,:int);
+ b := bat.new(:oid,:int);
b := nil;
io.print(b);
s := "hello";
diff --git a/monetdb5/mal/Tests/tst025.mal b/monetdb5/mal/Tests/tst025.mal
--- a/monetdb5/mal/Tests/tst025.mal
+++ b/monetdb5/mal/Tests/tst025.mal
@@ -1,9 +1,9 @@
-# Wrong behavior of self-deletion, it works on M4
-b:= bat.new(:int,:int);
+# Test bulk delete behavior
+b:= bat.new(:oid,:int);
-bat.insert(b, 5140046, 1804289383 );
-bat.insert(b, 5442033, 846930886 );
-bat.insert(b, 5645862, 1681692777 );
+bat.append(b, 5140046);
+bat.append(b, 5442033);
+bat.append(b, 5645862);
io.print(b);
# it left one behind
diff --git a/monetdb5/mal/Tests/tst025.stable.out
b/monetdb5/mal/Tests/tst025.stable.out
--- a/monetdb5/mal/Tests/tst025.stable.out
+++ b/monetdb5/mal/Tests/tst025.stable.out
@@ -27,11 +27,11 @@ stdout of test 'tst025` in directory 'ma
#
#
function user.main():void;
-# Wrong behavior of self-deletion, it works on M4
- b := bat.new(:int,:int);
- bat.insert(b,5140046,1804289383);
- bat.insert(b,5442033,846930886);
- bat.insert(b,5645862,1681692777);
+# Test bulk delete behavior
+ b := bat.new(:oid,:int);
+ bat.append(b,5140046);
+ bat.append(b,5442033);
+ bat.append(b,5645862);
io.print(b);
# it left one behind
bat.delete(b,b);
@@ -41,11 +41,11 @@ function user.main():void;
end main;
#---------------------------------#
# h t # name
-# int int # type
-#---------------------------------#
-[ 5140046, 1804289383 ]
-[ 5442033, 846930886 ]
-[ 5645862, 1681692777 ]
+# void int # type
+#-------------------------#
+[ 0@0, 5140046 ]
+[ 1@0, 5442033 ]
+[ 2@0, 5645862 ]
#-----------------#
# h t # name
# int int # type
diff --git a/monetdb5/mal/Tests/tst027.mal b/monetdb5/mal/Tests/tst027.mal
--- a/monetdb5/mal/Tests/tst027.mal
+++ b/monetdb5/mal/Tests/tst027.mal
@@ -1,7 +1,7 @@
#variable arguments are only allowed in patterns
-function test(s:str, b:bat[:any_1,:any_2]...);
+function test(s:str, b:bat[:oid,:any_1]...);
io.print(s);
end test;
-b:= bat.new(:int,:int);
-c:= bat.new(:int,:int);
+b:= bat.new(:oid,:int);
+c:= bat.new(:oid,:int);
user.test("hello",b,c);
diff --git a/monetdb5/mal/Tests/tst027.stable.out
b/monetdb5/mal/Tests/tst027.stable.out
--- a/monetdb5/mal/Tests/tst027.stable.out
+++ b/monetdb5/mal/Tests/tst027.stable.out
@@ -5,28 +5,27 @@ stdout of test 'tst027` in directory 'ma
# 07:58:40 > Mtimeout -timeout 60 Mserver
"--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set
"monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB"
--set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/log" --set mapi_port=42158 --set
sql_port=55708 --set monet_prompt= --trace
"--config=/ufs/mk/monet5/src/mal/Tests/All.conf" --dbname=mTests_src_mal
tst027.mal </dev/null
# 07:58:40 >
-# Monet Database Server V4.99.19
-# Copyright (c) 1993-2004, CWI. All rights reserved.
-# Compiled for i686-redhat-linux-gnu/32bit; dynamically linked.
-# config:/ufs/mk/monet5/Linux/etc/MonetDB5.conf
-# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm
-# dbname:mTests_src_mal
-# Visit http://monetdb.cwi.nl/ for further information.
-#function test(s:str, b:bat[:any_1,:any_2]...);
-# io.print(s);
-#end test;
-function user.test(s:str,b:bat[:any_1,:any_2]...):void;
+# MonetDB 5 server v11.12.0
+# This is an unreleased version
+# Serving database 'mTests_mal', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.629 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:38596/
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+# MonetDB/DataCell loaded
+function user.test(s:str,b:bat[:oid,:any_1]...):void;
io.print(s);
end test;
-#b:= bat.new(:int,:int);
-#c:= bat.new(:int,:int);
-#user.test("hello",b,c);
-#
-!TypeException:user.main[4]:'user.test' undefined in: _5:any :=
user.test(_6:str, b:bat[:int,:int], c:bat[:int,:int])
+!TypeException:user.main[4]:'user.test' undefined in: _6:any :=
user.test(_7:str, b:bat[:oid,:int], c:bat[:oid,:int])
function user.main():void;
#variable arguments are only allowed in patterns
- b := bat.new(:int,:int);
- c := bat.new(:int,:int);
+ b := bat.new(:oid,:int);
+ c := bat.new(:oid,:int);
user.test("hello",b,c);
end main;
diff --git a/monetdb5/mal/Tests/tst028.mal b/monetdb5/mal/Tests/tst028.mal
--- a/monetdb5/mal/Tests/tst028.mal
+++ b/monetdb5/mal/Tests/tst028.mal
@@ -1,17 +1,13 @@
-function f(a:bat[:int,:any]):void;
+function f(a:bat[:oid,:any]):void;
io.print(a);
end f;
-function h(a:bat[:any,:int]):void;
+function h(a:bat[:oid,:str]):void;
io.print(a);
end h;
-#function g(b:bat[:int,:any]):void;
- #f(b);
-#end g;
function g(b:any):void;
end g;
-z:= bat.new(:int,:str);
+z:= bat.new(:oid,:str);
f(z);
g(z);
-zrev:= bat.reverse(z);
-h(zrev);
+h(z);
diff --git a/monetdb5/mal/Tests/tst028.stable.out
b/monetdb5/mal/Tests/tst028.stable.out
--- a/monetdb5/mal/Tests/tst028.stable.out
+++ b/monetdb5/mal/Tests/tst028.stable.out
@@ -5,21 +5,23 @@ stdout of test 'tst028` in directory 'ma
# 08:29:21 > Mtimeout -timeout 60 mserver5
"--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --set
"monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set
"xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set
mapi_port=37847 --set xrpc_port=44897 --set monet_prompt= --trace
--dbname=mTests_src_mal tst028.mal < /dev/null
# 08:29:21 >
-# MonetDB Server v5.0.0_beta2_1
-# Copyright (c) 1993-2007 CWI, all rights reserved
-# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
-# dbname:mTests_src_mal
-# Visit http://monetdb.cwi.nl/ for further information
-#function f(a:bat[:int,:any]):void;
-# io.print(a);
-#end f;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
