Changeset: 6b9c768a58b2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6b9c768a58b2 Modified Files: monetdb5/modules/mosaic/Tests/mosaic_delta.malC monetdb5/modules/mosaic/Tests/mosaic_delta_joins.malC monetdb5/modules/mosaic/Tests/mosaic_delta_subselect.malC monetdb5/modules/mosaic/Tests/mosaic_delta_thetasubselect.malC monetdb5/modules/mosaic/Tests/mosaic_dictionary.malC monetdb5/modules/mosaic/Tests/mosaic_dictionary_joins.malC monetdb5/modules/mosaic/Tests/mosaic_dictionary_joins.stable.out monetdb5/modules/mosaic/Tests/mosaic_dictionary_subselect.malC monetdb5/modules/mosaic/Tests/mosaic_dictionary_thetasubselect.malC monetdb5/modules/mosaic/Tests/mosaic_frame.malC monetdb5/modules/mosaic/Tests/mosaic_frame.stable.out monetdb5/modules/mosaic/Tests/mosaic_frame_joins.malC monetdb5/modules/mosaic/Tests/mosaic_frame_joins.stable.out monetdb5/modules/mosaic/Tests/mosaic_frame_subselect.malC monetdb5/modules/mosaic/Tests/mosaic_frame_thetasubselect.malC monetdb5/modules/mosaic/Tests/mosaic_linear.malC monetdb5/modules/mosaic/Tests/mosaic_linear_joins.malC monetdb5/modules/mosaic/Tests/mosaic_linear_subselect.malC monetdb5/modules/mosaic/Tests/mosaic_linear_thetasubselect.malC monetdb5/modules/mosaic/Tests/mosaic_literal.malC monetdb5/modules/mosaic/Tests/mosaic_literal_double.malC monetdb5/modules/mosaic/Tests/mosaic_literal_joins.malC monetdb5/modules/mosaic/Tests/mosaic_literal_subselect.malC monetdb5/modules/mosaic/Tests/mosaic_literal_thetasubselect.malC monetdb5/modules/mosaic/Tests/mosaic_mix.malC monetdb5/modules/mosaic/Tests/mosaic_mix.stable.err monetdb5/modules/mosaic/Tests/mosaic_mix.stable.out monetdb5/modules/mosaic/Tests/mosaic_mix_joins.malC monetdb5/modules/mosaic/Tests/mosaic_mix_subselect.malC monetdb5/modules/mosaic/Tests/mosaic_mix_thetasubselect.malC monetdb5/modules/mosaic/Tests/mosaic_prefix.malC monetdb5/modules/mosaic/Tests/mosaic_prefix_joins.malC monetdb5/modules/mosaic/Tests/mosaic_prefix_subselect.malC monetdb5/modules/mosaic/Tests/mosaic_prefix_thetasubselect.malC monetdb5/modules/mosaic/Tests/mosaic_runlength.malC monetdb5/modules/mosaic/Tests/mosaic_runlength_joins.malC monetdb5/modules/mosaic/Tests/mosaic_runlength_subselect.malC monetdb5/modules/mosaic/Tests/mosaic_runlength_thetasubselect.malC monetdb5/modules/mosaic/Tests/mosaic_view_subselect.malC monetdb5/modules/mosaic/Tests/mosaic_zone.malC monetdb5/modules/mosaic/Tests/mosaic_zone_joins.malC monetdb5/modules/mosaic/Tests/mosaic_zone_subselect.malC monetdb5/modules/mosaic/Tests/mosaic_zone_thetasubselect.malC Branch: mosaic Log Message:
Approve outputs diffs (truncated from 2479 to 300 lines): diff --git a/monetdb5/modules/mosaic/Tests/mosaic_delta.malC b/monetdb5/modules/mosaic/Tests/mosaic_delta.malC --- a/monetdb5/modules/mosaic/Tests/mosaic_delta.malC +++ b/monetdb5/modules/mosaic/Tests/mosaic_delta.malC @@ -13,10 +13,10 @@ bat.append(b,977); base:= algebra.copy(b); io.print(base); -x:= mosaic.compress(b,"delta"); -#mosaic.dump(x); -z:= mosaic.decompress(x); -io.print(z); +mosaic.compress(b,"delta"); +#mosaic.dump(b); +mosaic.decompress(b); +io.print(b); bs:= bat.new(:timestamp); bat.append(bs,"2014-08-14 12:00:00":timestamp); @@ -29,10 +29,10 @@ bat.append(bs,"2014-08-14 12:02:00":time bs:= bat.append(bs,bs); io.print(bs); -xs:= mosaic.compress(bs,"delta"); -#mosaic.dump(x); -zs:= mosaic.decompress(xs); -io.print(zs); +mosaic.compress(bs,"delta"); +#mosaic.dump(bs); +mosaic.decompress(bs); +io.print(bs); d:= bat.new(:date); bat.append(d,"2014-08-14":date); @@ -43,7 +43,7 @@ bat.append(d,"2014-08-15":date); d:= bat.append(d,d); io.print(d); -xd:= mosaic.compress(d,"delta"); +mosaic.compress(d,"delta"); #mosaic.dump(xd); -zd:= mosaic.decompress(xd); -io.print(zd); +mosaic.decompress(d); +io.print(d); diff --git a/monetdb5/modules/mosaic/Tests/mosaic_delta_joins.malC b/monetdb5/modules/mosaic/Tests/mosaic_delta_joins.malC --- a/monetdb5/modules/mosaic/Tests/mosaic_delta_joins.malC +++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_joins.malC @@ -13,7 +13,7 @@ bat.append(b,977); base:=algebra.copy(b); io.print(base); -x:= mosaic.compress(b,"delta"); +mosaic.compress(b,"delta"); c:= bat.new(:oid); bat.append(c,0@0); @@ -21,10 +21,10 @@ bat.append(c,2@0); bat.append(c,5@0); io.print(c); -#mosaic.dump(x); +#mosaic.dump(b); s:= algebra.projection(c,base); io.print(s); -xs:= mosaic.projection(c,x); +xs:= mosaic.projection(c,b); io.print(xs); d:= bat.new(:int); @@ -34,14 +34,14 @@ bat.append(d,nil:int); (jl,jr):= algebra.subjoin(base,d, nil:bat, nil:bat,false,0:lng); io.print(jl,jr); -(ml,mr):= mosaic.subjoin(x,d, nil:bat, nil:bat,false,0:lng); +(ml,mr):= mosaic.subjoin(b,d, nil:bat, nil:bat,false,0:lng); io.print(ml,mr); (kl,kr):= algebra.subjoin(d,base, nil:bat, nil:bat,false,0:lng); io.print(kl); io.print(kr); io.print(kl,kr); -(nl,nr):= mosaic.subjoin(d,x, nil:bat, nil:bat,false,0:lng); +(nl,nr):= mosaic.subjoin(d,b, nil:bat, nil:bat,false,0:lng); io.print(nl); io.print(nr); io.print(nl,nr); diff --git a/monetdb5/modules/mosaic/Tests/mosaic_delta_subselect.malC b/monetdb5/modules/mosaic/Tests/mosaic_delta_subselect.malC --- a/monetdb5/modules/mosaic/Tests/mosaic_delta_subselect.malC +++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_subselect.malC @@ -13,46 +13,46 @@ bat.append(b,977); base:= algebra.copy(b); io.print(base); -x:= mosaic.compress(b,"delta"); +mosaic.compress(b,"delta"); #mosaic.dump(x); s:= algebra.subselect(base,-1,4,false,false,false); io.print(s); -xs:= mosaic.subselect(x,-1,4,false,false,false); +xs:= mosaic.subselect(b,-1,4,false,false,false); io.print(xs); s:= algebra.subselect(base,-1,4,false,true,false); io.print(s); -xs:= mosaic.subselect(x,-1,4,false,true,false); +xs:= mosaic.subselect(b,-1,4,false,true,false); io.print(xs); s:= algebra.subselect(base,-1,4,true,false,false); io.print(s); -xs:= mosaic.subselect(x,-1,4,true,false,false); +xs:= mosaic.subselect(b,-1,4,true,false,false); io.print(xs); s:= algebra.subselect(base,-1,4,true,true,false); io.print(s); -xs:= mosaic.subselect(x,-1,4,true,true,false); +xs:= mosaic.subselect(b,-1,4,true,true,false); io.print(xs); s:= algebra.subselect(base,nil:int,1001,false,false,false); io.print(s); -xs:= mosaic.subselect(x,nil:int,10010,false,false,false); +xs:= mosaic.subselect(b,nil:int,10010,false,false,false); io.print(xs); s:= algebra.subselect(base,999,nil:int,false,false,false); io.print(s); -xs:= mosaic.subselect(x,999,nil:int,false,false,false); +xs:= mosaic.subselect(b,999,nil:int,false,false,false); io.print(xs); s:= algebra.subselect(base,nil:int,nil:int,false,false,false); io.print(s); -xs:= mosaic.subselect(x,nil:int,nil:int,false,false,false); +xs:= mosaic.subselect(b,nil:int,nil:int,false,false,false); io.print(xs); s:= algebra.subselect(base,nil:int,nil:int,false,false,true); io.print(s); -xs:= mosaic.subselect(x,nil:int,nil:int,false,false,true); +xs:= mosaic.subselect(b,nil:int,nil:int,false,false,true); io.print(xs); # using candidatelists @@ -62,41 +62,41 @@ bat.append(c,5@0); s:= algebra.subselect(base,c,-1,4,false,false,false); io.print(s); -xs:= mosaic.subselect(x,c,-1,4,false,false,false); +xs:= mosaic.subselect(b,c,-1,4,false,false,false); io.print(xs); s:= algebra.subselect(base,c,-1,4,false,true,false); io.print(s); -xs:= mosaic.subselect(x,c,-1,4,false,true,false); +xs:= mosaic.subselect(b,c,-1,4,false,true,false); io.print(xs); s:= algebra.subselect(base,c,-1,4,true,false,false); io.print(s); -xs:= mosaic.subselect(x,c,-1,4,true,false,false); +xs:= mosaic.subselect(b,c,-1,4,true,false,false); io.print(xs); s:= algebra.subselect(base,c,-1,4,true,true,false); io.print(s); -xs:= mosaic.subselect(x,c,-1,4,true,true,false); +xs:= mosaic.subselect(b,c,-1,4,true,true,false); io.print(xs); s:= algebra.subselect(base,c,nil:int,1000,false,false,false); io.print(s); -xs:= mosaic.subselect(x,c,nil:int,1000,false,false,false); +xs:= mosaic.subselect(b,c,nil:int,1000,false,false,false); io.print(xs); s:= algebra.subselect(base,c,1000,nil:int,false,false,false); io.print(s); -xs:= mosaic.subselect(x,c,1000,nil:int,false,false,false); +xs:= mosaic.subselect(b,c,1000,nil:int,false,false,false); io.print(xs); s:= algebra.subselect(base,c,nil:int,nil:int,false,false,false); io.print(s); -xs:= mosaic.subselect(x,c,nil:int,nil:int,false,false,false); +xs:= mosaic.subselect(b,c,nil:int,nil:int,false,false,false); io.print(xs); s:= algebra.subselect(base,c,nil:int,nil:int,false,false,true); io.print(s); -xs:= mosaic.subselect(x,c,nil:int,nil:int,false,false,true); +xs:= mosaic.subselect(b,c,nil:int,nil:int,false,false,true); io.print(xs); diff --git a/monetdb5/modules/mosaic/Tests/mosaic_delta_thetasubselect.malC b/monetdb5/modules/mosaic/Tests/mosaic_delta_thetasubselect.malC --- a/monetdb5/modules/mosaic/Tests/mosaic_delta_thetasubselect.malC +++ b/monetdb5/modules/mosaic/Tests/mosaic_delta_thetasubselect.malC @@ -13,36 +13,36 @@ bat.append(b,977); base:= algebra.copy(b); io.print(base); -x:= mosaic.compress(b,"delta"); +mosaic.compress(b,"delta"); s:= algebra.thetasubselect(base,4,"<"); io.print(s); -xs:= mosaic.thetasubselect(x,4,"<"); +xs:= mosaic.thetasubselect(b,4,"<"); io.print(xs); s:= algebra.thetasubselect(base,4,"<="); io.print(s); -xs:= mosaic.thetasubselect(x,4,"<="); +xs:= mosaic.thetasubselect(b,4,"<="); io.print(xs); s:= algebra.thetasubselect(base,4,">"); io.print(s); -xs:= mosaic.thetasubselect(x,4,">"); +xs:= mosaic.thetasubselect(b,4,">"); io.print(xs); s:= algebra.thetasubselect(base,4,">="); io.print(s); -xs:= mosaic.thetasubselect(x,4,">="); +xs:= mosaic.thetasubselect(b,4,">="); io.print(xs); s:= algebra.thetasubselect(base,4,"=="); io.print(s); -xs:= mosaic.thetasubselect(x,4,"=="); +xs:= mosaic.thetasubselect(b,4,"=="); io.print(xs); s:= algebra.thetasubselect(base,4,"!="); io.print(s); -xs:= mosaic.thetasubselect(x,4,"!="); +xs:= mosaic.thetasubselect(b,4,"!="); io.print(xs); c:= bat.new(:oid); @@ -52,31 +52,31 @@ io.print(c); s:= algebra.thetasubselect(base,c,4,"<"); io.print(s); -xs:= mosaic.thetasubselect(x,c,4,"<"); +xs:= mosaic.thetasubselect(b,c,4,"<"); io.print(xs); s:= algebra.thetasubselect(base,c,4,"<="); io.print(s); -xs:= mosaic.thetasubselect(x,c,4,"<="); +xs:= mosaic.thetasubselect(b,c,4,"<="); io.print(xs); s:= algebra.thetasubselect(base,c,4,">"); io.print(s); -xs:= mosaic.thetasubselect(x,c,4,">"); +xs:= mosaic.thetasubselect(b,c,4,">"); io.print(xs); s:= algebra.thetasubselect(base,c,4,">="); io.print(s); -xs:= mosaic.thetasubselect(x,c,4,">="); +xs:= mosaic.thetasubselect(b,c,4,">="); io.print(xs); s:= algebra.thetasubselect(base,c,4,"=="); io.print(s); -xs:= mosaic.thetasubselect(x,c,4,"=="); +xs:= mosaic.thetasubselect(b,c,4,"=="); io.print(xs); s:= algebra.thetasubselect(base,c,4,"!="); io.print(s); -xs:= mosaic.thetasubselect(x,c,4,"!="); +xs:= mosaic.thetasubselect(b,c,4,"!="); io.print(xs); diff --git a/monetdb5/modules/mosaic/Tests/mosaic_dictionary.malC b/monetdb5/modules/mosaic/Tests/mosaic_dictionary.malC --- a/monetdb5/modules/mosaic/Tests/mosaic_dictionary.malC +++ b/monetdb5/modules/mosaic/Tests/mosaic_dictionary.malC @@ -8,10 +8,10 @@ b:= bat.append(b,b); base:= algebra.copy(b); io.print(base); -x:= mosaic.compress(b,"dictionary"); -#mosaic.dump(x); -z:= mosaic.decompress(x); -io.print(z); +mosaic.compress(b,"dictionary"); +#mosaic.dump(b); +mosaic.decompress(b); +io.print(b); d:= bat.new(:date); bat.append(d,"2014-08-14":date); @@ -22,7 +22,7 @@ bat.append(d,"2014-08-15":date); d:= bat.append(d,d); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
