Changeset: 094f1605da77 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=094f1605da77 Modified Files: monetdb5/modules/mosaic/Tests/mosaic_capped_thetaselect.malC monetdb5/modules/mosaic/Tests/mosaic_capped_thetaselect.stable.out monetdb5/modules/mosaic/Tests/mosaic_mix_select.malC monetdb5/modules/mosaic/Tests/mosaic_mix_select.stable.out monetdb5/modules/mosaic/Tests/mosaic_mix_thetaselect.malC monetdb5/modules/mosaic/Tests/mosaic_mix_thetaselect.stable.out monetdb5/modules/mosaic/Tests/mosaic_var_thetaselect.malC monetdb5/modules/mosaic/Tests/mosaic_var_thetaselect.stable.out Branch: mosaic Log Message:
Temporarily remove candidate list related tests. diffs (truncated from 507 to 300 lines): diff --git a/monetdb5/modules/mosaic/Tests/mosaic_capped_thetaselect.malC b/monetdb5/modules/mosaic/Tests/mosaic_capped_thetaselect.malC --- a/monetdb5/modules/mosaic/Tests/mosaic_capped_thetaselect.malC +++ b/monetdb5/modules/mosaic/Tests/mosaic_capped_thetaselect.malC @@ -42,39 +42,3 @@ s:= algebra.thetaselect(base,"2014-08-14 io.print(s); xs:= mosaic.thetaselect(b,"2014-08-14 12:01:00":timestamp,"!="); io.print(xs); - -c:= bat.new(:oid); -bat.append(c,0@0); -bat.append(c,3@0); -io.print(c); - -s:= algebra.thetaselect(base,c,"2014-08-14 12:01:00":timestamp,"<"); -io.print(s); -xs:= mosaic.thetaselect(b,c,"2014-08-14 12:01:00":timestamp,"<"); -io.print(xs); - -s:= algebra.thetaselect(base,c,"2014-08-14 12:01:00":timestamp,"<="); -io.print(s); -xs:= mosaic.thetaselect(b,c,"2014-08-14 12:01:00":timestamp,"<="); -io.print(xs); - -s:= algebra.thetaselect(base,c,"2014-08-14 12:01:00":timestamp,">"); -io.print(s); -xs:= mosaic.thetaselect(b,c,"2014-08-14 12:01:00":timestamp,">"); -io.print(xs); - -s:= algebra.thetaselect(base,c,"2014-08-14 12:01:00":timestamp,">="); -io.print(s); -xs:= mosaic.thetaselect(b,c,"2014-08-14 12:01:00":timestamp,">="); -io.print(xs); - -s:= algebra.thetaselect(base,c,"2014-08-14 12:01:00":timestamp,"=="); -io.print(s); -xs:= mosaic.thetaselect(b,c,"2014-08-14 12:01:00":timestamp,"=="); -io.print(xs); - -s:= algebra.thetaselect(base,c,"2014-08-14 12:01:00":timestamp,"!="); -io.print(s); -xs:= mosaic.thetaselect(b,c,"2014-08-14 12:01:00":timestamp,"!="); -io.print(xs); - diff --git a/monetdb5/modules/mosaic/Tests/mosaic_capped_thetaselect.stable.out b/monetdb5/modules/mosaic/Tests/mosaic_capped_thetaselect.stable.out --- a/monetdb5/modules/mosaic/Tests/mosaic_capped_thetaselect.stable.out +++ b/monetdb5/modules/mosaic/Tests/mosaic_capped_thetaselect.stable.out @@ -159,72 +159,6 @@ stdout of test 'mosaic_capped_thetaselec [ 5@0, 6@0 ] [ 6@0, 8@0 ] [ 7@0, 9@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 0@0 ] -[ 1@0, 3@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 0@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 0@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 0@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 0@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 3@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 3@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 3@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 3@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 0@0 ] -[ 1@0, 3@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 0@0 ] -[ 1@0, 3@0 ] # 07:31:37 > # 07:31:37 > "Done." diff --git a/monetdb5/modules/mosaic/Tests/mosaic_mix_select.malC b/monetdb5/modules/mosaic/Tests/mosaic_mix_select.malC --- a/monetdb5/modules/mosaic/Tests/mosaic_mix_select.malC +++ b/monetdb5/modules/mosaic/Tests/mosaic_mix_select.malC @@ -64,49 +64,3 @@ s:= algebra.select(base,nil:int,nil:int, io.print(s); xs:= mosaic.select(b,nil:int,nil:int,false,false,true); io.print(xs); - -# using candidatelists -c:= bat.new(:oid); -bat.append(c,2@0); -bat.append(c,5@0); - -s:= algebra.select(base,c,0,50,false,false,false); -io.print(s); -xs:= mosaic.select(b,c,0,50,false,false,false); -io.print(xs); - -s:= algebra.select(base,c,0,50,false,true,false); -io.print(s); -xs:= mosaic.select(b,c,0,50,false,true,false); -io.print(xs); - -s:= algebra.select(base,c,0,50,true,false,false); -io.print(s); -xs:= mosaic.select(b,c,0,50,true,false,false); -io.print(xs); - -s:= algebra.select(base,c,0,50,true,true,false); -io.print(s); -xs:= mosaic.select(b,c,0,50,true,true,false); -io.print(xs); - -s:= algebra.select(base,c,nil:int,50,false,false,false); -io.print(s); -xs:= mosaic.select(b,c,nil:int,50,false,false,false); -io.print(xs); - -s:= algebra.select(base,c,50,nil:int,false,false,false); -io.print(s); -xs:= mosaic.select(b,c,50,nil:int,false,false,false); -io.print(xs); - -s:= algebra.select(base,c,nil:int,nil:int,false,false,false); -io.print(s); -xs:= mosaic.select(b,c,nil:int,nil:int,false,false,false); -io.print(xs); - -s:= algebra.select(base,c,nil:int,nil:int,false,false,true); -io.print(s); -xs:= mosaic.select(b,c,nil:int,nil:int,false,false,true); -io.print(xs); - diff --git a/monetdb5/modules/mosaic/Tests/mosaic_mix_select.stable.out b/monetdb5/modules/mosaic/Tests/mosaic_mix_select.stable.out --- a/monetdb5/modules/mosaic/Tests/mosaic_mix_select.stable.out +++ b/monetdb5/modules/mosaic/Tests/mosaic_mix_select.stable.out @@ -279,92 +279,6 @@ stdout of test 'mosaic_mix_select` in di # h t # name # void oid # type #--------------------------# -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 2@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 2@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 2@0 ] -[ 1@0, 5@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 2@0 ] -[ 1@0, 5@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 2@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 2@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 2@0 ] -[ 1@0, 5@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 2@0 ] -[ 1@0, 5@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 2@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 2@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 2@0 ] -[ 1@0, 5@0 ] -#--------------------------# -# h t # name -# void oid # type -#--------------------------# -[ 0@0, 2@0 ] -[ 1@0, 5@0 ] -#--------------------------# -# h t # name -# void void # type -#--------------------------# -#--------------------------# -# h t # name -# void oid # type -#--------------------------# # 07:37:53 > # 07:37:53 > "Done." diff --git a/monetdb5/modules/mosaic/Tests/mosaic_mix_thetaselect.malC b/monetdb5/modules/mosaic/Tests/mosaic_mix_thetaselect.malC --- a/monetdb5/modules/mosaic/Tests/mosaic_mix_thetaselect.malC +++ b/monetdb5/modules/mosaic/Tests/mosaic_mix_thetaselect.malC @@ -54,40 +54,3 @@ s:= algebra.thetaselect(base,50,"!="); io.print(s); xs:= mosaic.thetaselect(b,50,"!="); io.print(xs); - -# using candidatelists -c:= bat.new(:oid); -bat.append(c,2@0); -bat.append(c,5@0); -io.print(c); - -s:= algebra.thetaselect(base,c,50,"<"); -io.print(s); -xs:= mosaic.thetaselect(b,c,50,"<"); -io.print(xs); - -s:= algebra.thetaselect(base,c,50,"<="); -io.print(s); -xs:= mosaic.thetaselect(b,c,50,"<="); -io.print(xs); - -s:= algebra.thetaselect(base,c,50,">"); -io.print(s); -xs:= mosaic.thetaselect(b,c,50,">"); -io.print(xs); - -s:= algebra.thetaselect(base,c,50,">="); -io.print(s); -xs:= mosaic.thetaselect(b,c,50,">="); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
