Changeset: 22c005c75665 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=22c005c75665 Added Files: monetdb5/modules/mosaic/Tests/mosaic_delta_lng_tmp.malC monetdb5/modules/mosaic/Tests/mosaic_delta_lng_tmp.stable.err monetdb5/modules/mosaic/Tests/mosaic_delta_lng_tmp.stable.out monetdb5/modules/mosaic/Tests/mosaic_frame_oid_tmp.malC monetdb5/modules/mosaic/Tests/mosaic_frame_oid_tmp.stable.err monetdb5/modules/mosaic/Tests/mosaic_frame_oid_tmp.stable.out Modified Files: monetdb5/modules/mosaic/Tests/All monetdb5/modules/mosaic/mosaic_delta.c Branch: mosaic Log Message:
Bug fix: delta compression and add more tests. diffs (truncated from 7553 to 300 lines): diff --git a/monetdb5/modules/mosaic/Tests/All b/monetdb5/modules/mosaic/Tests/All --- a/monetdb5/modules/mosaic/Tests/All +++ b/monetdb5/modules/mosaic/Tests/All @@ -35,3 +35,5 @@ mosaic_frame_joins mosaic_mix_joins mosaic_frame_lng_tmp +mosaic_frame_oid_tmp +mosaic_delta_lng_tmp diff --git a/monetdb5/modules/mosaic/Tests/mosaic_delta_lng_tmp.malC b/monetdb5/modules/mosaic/Tests/mosaic_delta_lng_tmp.malC new file mode 100644 --- /dev/null +++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_lng_tmp.malC @@ -0,0 +1,687 @@ +a:= bat.new(:lng); +bat.append(a,1000:lng); +bat.append(a,1001:lng); +bat.append(a,999:lng); +bat.append(a,1002:lng); +bat.append(a,998:lng); +bat.append(a,1010:lng); +bat.append(a,990:lng); +bat.append(a,995:lng); +bat.append(a,1005:lng); +bat.append(a,1002:lng); +bat.append(a,1000:lng); +bat.append(a,1001:lng); +bat.append(a,999:lng); +bat.append(a,1002:lng); +bat.append(a,998:lng); +bat.append(a,1010:lng); +bat.append(a,990:lng); +bat.append(a,995:lng); +bat.append(a,1005:lng); +bat.append(a,1002:lng); +bat.append(a,1000:lng); +bat.append(a,1001:lng); +bat.append(a,999:lng); +bat.append(a,1002:lng); +bat.append(a,998:lng); +bat.append(a,1010:lng); +bat.append(a,990:lng); +bat.append(a,995:lng); +bat.append(a,1005:lng); +bat.append(a,1002:lng); +mosaic.compress(a,"delta"); +c:= mosaic.decompress(a); +io.print(a, c); + +sa:= algebra.select(a,nil:lng, nil:lng,false,false,false); +sc:= mosaic.select (c,nil:lng, nil:lng,false,false,false); +io.print(sa, sc); + +sa:= algebra.select(a,nil:lng, nil:lng,false,false,true); +sc:= mosaic.select (c,nil:lng, nil:lng,false,false,true); +io.print(sa, sc); + +sa:= algebra.select(a,1000:lng, nil:lng,false,false,false); +sc:= mosaic.select (c,1000:lng, nil:lng,false,false,false); +tsa:= algebra.thetaselect(a,1000:lng, ">"); +tsc:= mosaic.thetaselect (c,1000:lng, ">"); +io.print(sa, sc, tsa, tsc); + +sa:= algebra.select(a,nil:lng, 1000:lng,false,false,false); +sc:= mosaic.select (c,nil:lng, 1000:lng,false,false,false); +tsa:= algebra.thetaselect(a,1000:lng, "<"); +tsc:= mosaic.thetaselect (c,1000:lng, "<"); +io.print(sa, sc, tsa, tsc); + +sa:= algebra.select(a,900:lng, nil:lng,false,false,false); +sc:= mosaic.select (c,900:lng, nil:lng,false,false,false); +tsa:= algebra.thetaselect(a,900:lng, ">"); +tsc:= mosaic.thetaselect (c,900:lng, ">"); +io.print(sa, sc, tsa, tsc); + +sa:= algebra.select(a,nil:lng, 900:lng,false,false,false); +sc:= mosaic.select (c,nil:lng, 900:lng,false,false,false); +tsa:= algebra.thetaselect(a,900:lng, "<"); +tsc:= mosaic.thetaselect (c,900:lng, "<"); +#io.print(sa, sc, tsa, tsc); + +sa:= algebra.select(a,900:lng, nil:lng,true,false,false); +sc:= mosaic.select (c,900:lng, nil:lng,true,false,false); +tsa:= algebra.thetaselect(a,900:lng, ">="); +tsc:= mosaic.thetaselect (c,900:lng, ">="); +io.print(sa, sc, tsa, tsc); + +sa:= algebra.select(a,nil:lng, 900:lng,false,true,false); +sc:= mosaic.select (c,nil:lng, 900:lng,false,true,false); +tsa:= algebra.thetaselect(a,900:lng, "<="); +tsc:= mosaic.thetaselect (c,900:lng, "<="); +io.print(sa, sc, tsa, tsc); + +sa:= algebra.select(a,1000:lng, nil:lng,true,false,false); +sc:= mosaic.select (c,1000:lng, nil:lng,true,false,false); +tsa:= algebra.thetaselect(a,1000:lng, ">="); +tsc:= mosaic.thetaselect (c,1000:lng, ">="); +io.print(sa, sc, tsa, tsc); + +sa:= algebra.select(a,nil:lng, 1000:lng,false,true,false); +sc:= mosaic.select (c,nil:lng, 1000:lng,false,true,false); +tsa:= algebra.thetaselect(a,1000:lng, "<="); +tsc:= mosaic.thetaselect (c,1000:lng, "<="); +io.print(sa, sc, tsa, tsc); + +sa:= algebra.select(a,1000:lng, 1000:lng,true,true,false); +sc:= mosaic.select (c,1000:lng, 1000:lng,true,true,false); +tsa:= algebra.thetaselect(a,1000:lng, "=="); +tsc:= mosaic.thetaselect (c,1000:lng, "=="); +io.print(sa, sc, tsa, tsc); + +sa:= algebra.select(a,1000:lng, 1000:lng,true,true,true); +sc:= mosaic.select (c,1000:lng, 1000:lng,true,true,true); +tsa:= algebra.thetaselect(a,1000:lng, "!="); +tsc:= mosaic.thetaselect (c,1000:lng, "!="); +io.print(sa, sc, tsa, tsc); + + +sa:= algebra.select(a,1003:lng, 1003:lng,true,true,false); +sc:= mosaic.select (c,1003:lng, 1003:lng,true,true,false); +tsa:= algebra.thetaselect(a,1003:lng, "=="); +tsc:= mosaic.thetaselect (c,1003:lng, "=="); +io.print(sa, sc, tsa, tsc); + +sa:= algebra.select(a,1003:lng, 1003:lng,true,true,true); +sc:= mosaic.select (c,1003:lng, 1003:lng,true,true,true); +tsa:= algebra.thetaselect(a,1003:lng, "!="); +tsc:= mosaic.thetaselect (c,1003:lng, "!="); +io.print(sa, sc, tsa, tsc); + +sa:= algebra.select(a,900:lng, 900:lng,true,true,false); +sc:= mosaic.select (c,900:lng, 900:lng,true,true,false); +tsa:= algebra.thetaselect(a,900:lng, "=="); +tsc:= mosaic.thetaselect (c,900:lng, "=="); +io.print(sa, sc, tsa, tsc); + +sa:= algebra.select(a,900:lng, 900:lng,true,true,true); +sc:= mosaic.select (c,900:lng, 900:lng,true,true,true); +tsa:= algebra.thetaselect(a,900:lng, "!="); +tsc:= mosaic.thetaselect (c,900:lng, "!="); +io.print(sa, sc, tsa, tsc); + +sa:= algebra.select(a,1100:lng, 1100:lng,true,true,false); +sc:= mosaic.select (c,1100:lng, 1100:lng,true,true,false); +tsa:= algebra.thetaselect(a,1100:lng, "=="); +tsc:= mosaic.thetaselect (c,1100:lng, "=="); +io.print(sa, sc, tsa, tsc); + +sa:= algebra.select(a,1100:lng, 1100:lng,true,true,true); +sc:= mosaic.select (c,1100:lng, 1100:lng,true,true,true); +tsa:= algebra.thetaselect(a,1100:lng, "!="); +tsc:= mosaic.thetaselect (c,1100:lng, "!="); +io.print(sa, sc, tsa, tsc); + +sa:= algebra.select(a,991:lng, 1005:lng,true,true,false); +sc:= mosaic.select (c,991:lng, 1005:lng,true,true,false); +io.print(sa, sc); + +sa:= algebra.select(a,999:lng, 1005:lng,true,true,false); +sc:= mosaic.select (c,999:lng, 1005:lng,true,true,false); +io.print(sa, sc); + +sa:= algebra.select(a,991:lng, 1008:lng,true,true,false); +sc:= mosaic.select (c,991:lng, 1008:lng,true,true,false); +io.print(sa, sc); + +sa:= algebra.select(a,999:lng, 1008:lng,true,true,false); +sc:= mosaic.select (c,999:lng, 1008:lng,true,true,false); +io.print(sa, sc); + +sa:= algebra.select(a,991:lng, 1005:lng,false,true,false); +sc:= mosaic.select (c,991:lng, 1005:lng,false,true,false); +io.print(sa, sc); + +sa:= algebra.select(a,999:lng, 1005:lng,false,true,false); +sc:= mosaic.select (c,999:lng, 1005:lng,false,true,false); +io.print(sa, sc); + +sa:= algebra.select(a,991:lng, 1008:lng,false,true,false); +sc:= mosaic.select (c,991:lng, 1008:lng,false,true,false); +io.print(sa, sc); + +sa:= algebra.select(a,999:lng, 1008:lng,false,true,false); +sc:= mosaic.select (c,999:lng, 1008:lng,false,true,false); +io.print(sa, sc); + +sa:= algebra.select(a,991:lng, 1005:lng,true,false,false); +sc:= mosaic.select (c,991:lng, 1005:lng,true,false,false); +io.print(sa, sc); + +sa:= algebra.select(a,999:lng, 1005:lng,true,false,false); +sc:= mosaic.select (c,999:lng, 1005:lng,true,false,false); +io.print(sa, sc); + +sa:= algebra.select(a,991:lng, 1008:lng,true,false,false); +sc:= mosaic.select (c,991:lng, 1008:lng,true,false,false); +io.print(sa, sc); + +sa:= algebra.select(a,999:lng, 1008:lng,true,false,false); +sc:= mosaic.select (c,999:lng, 1008:lng,true,false,false); +io.print(sa, sc); + +sa:= algebra.select(a,991:lng, 1005:lng,false,false,false); +sc:= mosaic.select (c,991:lng, 1005:lng,false,false,false); +io.print(sa, sc); + +sa:= algebra.select(a,999:lng, 1005:lng,false,false,false); +sc:= mosaic.select (c,999:lng, 1005:lng,false,false,false); +io.print(sa, sc); + +sa:= algebra.select(a,991:lng, 1008:lng,false,false,false); +sc:= mosaic.select (c,991:lng, 1008:lng,false,false,false); +io.print(sa, sc); + +sa:= algebra.select(a,999:lng, 1008:lng,false,false,false); +sc:= mosaic.select (c,999:lng, 1008:lng,false,false,false); +io.print(sa, sc); + +sa:= algebra.select(a,991:lng, 1005:lng,true,true,true); +sc:= mosaic.select (c,991:lng, 1005:lng,true,true,true); +io.print(sa, sc); + +sa:= algebra.select(a,999:lng, 1005:lng,true,true,true); +sc:= mosaic.select (c,999:lng, 1005:lng,true,true,true); +io.print(sa, sc); + +sa:= algebra.select(a,991:lng, 1008:lng,true,true,true); +sc:= mosaic.select (c,991:lng, 1008:lng,true,true,true); +io.print(sa, sc); + +sa:= algebra.select(a,999:lng, 1008:lng,true,true,true); +sc:= mosaic.select (c,999:lng, 1008:lng,true,true,true); +io.print(sa, sc); + +sa:= algebra.select(a,991:lng, 1005:lng,false,true,true); +sc:= mosaic.select (c,991:lng, 1005:lng,false,true,true); +io.print(sa, sc); + +sa:= algebra.select(a,999:lng, 1005:lng,false,true,true); +sc:= mosaic.select (c,999:lng, 1005:lng,false,true,true); +io.print(sa, sc); + +sa:= algebra.select(a,991:lng, 1008:lng,false,true,true); +sc:= mosaic.select (c,991:lng, 1008:lng,false,true,true); +io.print(sa, sc); + +sa:= algebra.select(a,999:lng, 1008:lng,false,true,true); +sc:= mosaic.select (c,999:lng, 1008:lng,false,true,true); +io.print(sa, sc); + +sa:= algebra.select(a,991:lng, 1005:lng,true,false,true); +sc:= mosaic.select (c,991:lng, 1005:lng,true,false,true); +io.print(sa, sc); + +sa:= algebra.select(a,999:lng, 1005:lng,true,false,true); +sc:= mosaic.select (c,999:lng, 1005:lng,true,false,true); +io.print(sa, sc); + +sa:= algebra.select(a,991:lng, 1008:lng,true,false,true); +sc:= mosaic.select (c,991:lng, 1008:lng,true,false,true); +io.print(sa, sc); + +sa:= algebra.select(a,999:lng, 1008:lng,true,false,true); +sc:= mosaic.select (c,999:lng, 1008:lng,true,false,true); +io.print(sa, sc); + +sa:= algebra.select(a,991:lng, 1005:lng,false,false,true); +sc:= mosaic.select (c,991:lng, 1005:lng,false,false,true); +io.print(sa, sc); + +sa:= algebra.select(a,999:lng, 1005:lng,false,false,true); +sc:= mosaic.select (c,999:lng, 1005:lng,false,false,true); +io.print(sa, sc); + +sa:= algebra.select(a,991:lng, 1008:lng,false,false,true); +sc:= mosaic.select (c,991:lng, 1008:lng,false,false,true); +io.print(sa, sc); + +sa:= algebra.select(a,999:lng, 1008:lng,false,false,true); +sc:= mosaic.select (c,999:lng, 1008:lng,false,false,true); +io.print(sa, sc); + +sa:= algebra.select(a,980:lng, 1005:lng,true,true,false); +sc:= mosaic.select (c,980:lng, 1005:lng,true,true,false); +io.print(sa, sc); + +sa:= algebra.select(a,980:lng, 1005:lng,true,true,false); +sc:= mosaic.select (c,980:lng, 1005:lng,true,true,false); +io.print(sa, sc); + +sa:= algebra.select(a,980:lng, 1008:lng,true,true,false); +sc:= mosaic.select (c,980:lng, 1008:lng,true,true,false); +io.print(sa, sc); + +sa:= algebra.select(a,999:lng, 1008:lng,true,true,false); +sc:= mosaic.select (c,999:lng, 1008:lng,true,true,false); +io.print(sa, sc); + +sa:= algebra.select(a,980:lng, 1005:lng,false,true,false); +sc:= mosaic.select (c,980:lng, 1005:lng,false,true,false); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
