Changeset: d2cade1f1f4e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d2cade1f1f4e Modified Files: monetdb5/modules/mal/Tests/orderidx02.malC monetdb5/modules/mal/Tests/orderidx02.stable.out Branch: default Log Message:
Fix test and test result. diffs (152 lines): diff --git a/monetdb5/modules/mal/Tests/orderidx02.malC b/monetdb5/modules/mal/Tests/orderidx02.malC --- a/monetdb5/modules/mal/Tests/orderidx02.malC +++ b/monetdb5/modules/mal/Tests/orderidx02.malC @@ -17,29 +17,37 @@ bat.setAccess(bv,"r"); vv:= algebra.slice(bv,0,10); s0:= algebra.subselect(vv,nil:bat[:oid],nil:int,nil:int,false,false,false); -io.print(s0,vv); +s0v := algebra.projection(s0,vv); +io.print(s0,s0v); s1:= algebra.subselect(vv,nil:bat[:oid],nil:int,959217167,true,true,false); -io.print(s1,vv); +s1v := algebra.projection(s1,vv); +io.print(s1,s1v); s2:= algebra.subselect(vv,nil:bat[:oid],959217167,959217167,true,true,false); -io.print(s2,vv); +s2v := algebra.projection(s2,vv); +io.print(s2,s2v); s3:= algebra.subselect(vv,nil:bat[:oid],1863672321,nil:int,true,true,false); -io.print(s3,vv); +s3v := algebra.projection(s3,vv); +io.print(s3,s3v); # introduce an oid index, it should produce the same results bat.orderidx(vv,3); ord := bat.getorderidx(vv); io.print(ord,vv); x0:= algebra.subselect(vv,nil:bat[:oid],nil:int,nil:int,false,false,false); -io.print(x0,vv); +x0v := algebra.projection(x0,vv); +io.print(x0,x0v); x1:= algebra.subselect(vv,nil:bat[:oid],nil:int,959217167,true,true,false); -io.print(x1,vv); +x1v := algebra.projection(x1,vv); +io.print(x1,x1v); x2:= algebra.subselect(vv,nil:bat[:oid],959217167,959217167,true,true,false); -io.print(x2,vv); +x2v := algebra.projection(x2,vv); +io.print(x2,x2v); x3:= algebra.subselect(vv,nil:bat[:oid],1863672321,nil:int,true,true,false); -io.print(x3,vv); +x3v := algebra.projection(x3,vv); +io.print(x3,x3v); diff --git a/monetdb5/modules/mal/Tests/orderidx02.stable.out b/monetdb5/modules/mal/Tests/orderidx02.stable.out --- a/monetdb5/modules/mal/Tests/orderidx02.stable.out +++ b/monetdb5/modules/mal/Tests/orderidx02.stable.out @@ -21,41 +21,14 @@ stdout of test 'orderidx02` in directory # Finished reading the write-ahead log 'sql_logs/sql/log.4' # Finished processing logs sql/sql_logs # MonetDB/SQL module loaded -function user.main():void; -# create sorted oid arrangement - bv := bat.new(:oid,:int); - bat.append(bv,959217167); - bat.append(bv,1920220901); - bat.append(bv,1303856962); - bat.append(bv,1667896496); - bat.append(bv,1080090866); - bat.append(bv,527076325); - bat.append(bv,266430612); - bat.append(bv,1674978691); - bat.append(bv,1863672321); - bat.append(bv,58690783); - vv := algebra.slice(bv,0,10); - s0 := algebra.subselect(vv,nil:bat[:oid,:oid],nil:int,nil:int,false,false,false); - io.print(s0,vv); - s1 := algebra.subselect(vv,nil:bat[:oid,:oid],nil:int,959217167,true,true,false); - io.print(s1,vv); - s2 := algebra.subselect(vv,nil:bat[:oid,:oid],959217167,959217167,true,true,false); - io.print(s2,vv); - s3 := algebra.subselect(vv,nil:bat[:oid,:oid],1863672321,nil:int,true,true,false); - io.print(s3,vv); -# introduce an oid index, it should produce the same results - bat.orderidx(vv,3); - ord := bat.getorderidx(vv); - io.print(ord,vv); - x0 := algebra.subselect(vv,nil:bat[:oid,:oid],nil:int,nil:int,false,false,false); - io.print(x0,vv); - x1 := algebra.subselect(vv,nil:bat[:oid,:oid],nil:int,959217167,true,true,false); - io.print(x1,vv); - x2 := algebra.subselect(vv,nil:bat[:oid,:oid],959217167,959217167,true,true,false); - io.print(x2,vv); - x3 := algebra.subselect(vv,nil:bat[:oid,:oid],1863672321,nil:int,true,true,false); - io.print(x3,vv); -end user.main; +# MonetDB/R module loaded + +Ready. + +# 19:30:09 > +# 19:30:09 > "mclient" "-lmal" "-ftest" "-Eutf-8" "--host=/var/tmp/mtest-1981" "--port=33660" +# 19:30:09 > + #--------------------------# # h t t # name # void void int # type @@ -65,9 +38,9 @@ end user.main; # void oid int # type #--------------------------# [ 0@0, 0@0, 959217167 ] -[ 1@0, 5@0, 1920220901 ] -[ 2@0, 6@0, 1303856962 ] -[ 3@0, 9@0, 1667896496 ] +[ 1@0, 5@0, 527076325 ] +[ 2@0, 6@0, 266430612 ] +[ 3@0, 9@0, 58690783 ] #--------------------------# # h t t # name # void void int # type @@ -77,10 +50,8 @@ end user.main; # h t t # name # void oid int # type #--------------------------# -[ 0@0, 1@0, 959217167 ] -[ 1@0, 8@0, 1920220901 ] -#bat.orderidx pieces 3 -#oidx ttype 5 bat 67077 +[ 0@0, 1@0, 1920220901 ] +[ 1@0, 8@0, 1863672321 ] #--------------------------# # h t t # name # void oid int # type @@ -104,9 +75,9 @@ end user.main; # void oid int # type #--------------------------# [ 0@0, 0@0, 959217167 ] -[ 1@0, 5@0, 1920220901 ] -[ 2@0, 6@0, 1303856962 ] -[ 3@0, 9@0, 1667896496 ] +[ 1@0, 5@0, 527076325 ] +[ 2@0, 6@0, 266430612 ] +[ 3@0, 9@0, 58690783 ] #--------------------------# # h t t # name # void void int # type @@ -116,8 +87,8 @@ end user.main; # h t t # name # void oid int # type #--------------------------# -[ 0@0, 1@0, 959217167 ] -[ 1@0, 8@0, 1920220901 ] +[ 0@0, 1@0, 1920220901 ] +[ 1@0, 8@0, 1863672321 ] # 16:08:53 > # 16:08:53 > "Done." _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
