Changeset: 2e358e66a862 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2e358e66a862 Added Files: monetdb5/modules/mal/Tests/mosaic_delta.malC monetdb5/modules/mal/Tests/mosaic_delta_joins.malC monetdb5/modules/mal/Tests/mosaic_delta_subselect.malC monetdb5/modules/mal/Tests/mosaic_delta_thetasubselect.malC monetdb5/modules/mal/Tests/mosaic_dictionary.malC monetdb5/modules/mal/Tests/mosaic_dictionary_joins.malC monetdb5/modules/mal/Tests/mosaic_dictionary_subselect.malC monetdb5/modules/mal/Tests/mosaic_dictionary_thetasubselect.malC monetdb5/modules/mal/Tests/mosaic_frame.malC monetdb5/modules/mal/Tests/mosaic_frame_joins.malC monetdb5/modules/mal/Tests/mosaic_frame_subselect.malC monetdb5/modules/mal/Tests/mosaic_frame_thetasubselect.malC monetdb5/modules/mal/Tests/mosaic_linear.malC monetdb5/modules/mal/Tests/mosaic_linear_joins.malC monetdb5/modules/mal/Tests/mosaic_linear_subselect.malC monetdb5/modules/mal/Tests/mosaic_linear_thetasubselect.malC monetdb5/modules/mal/Tests/mosaic_literal.malC monetdb5/modules/mal/Tests/mosaic_literal_double.malC monetdb5/modules/mal/Tests/mosaic_literal_inplace.malC monetdb5/modules/mal/Tests/mosaic_literal_joins.malC monetdb5/modules/mal/Tests/mosaic_literal_subselect.malC monetdb5/modules/mal/Tests/mosaic_literal_thetasubselect.malC monetdb5/modules/mal/Tests/mosaic_mix.malC monetdb5/modules/mal/Tests/mosaic_mix_joins.malC monetdb5/modules/mal/Tests/mosaic_mix_subselect.malC monetdb5/modules/mal/Tests/mosaic_mix_thetasubselect.malC monetdb5/modules/mal/Tests/mosaic_prefix.malC monetdb5/modules/mal/Tests/mosaic_prefix_joins.malC monetdb5/modules/mal/Tests/mosaic_prefix_subselect.malC monetdb5/modules/mal/Tests/mosaic_prefix_thetasubselect.malC monetdb5/modules/mal/Tests/mosaic_runlength.malC monetdb5/modules/mal/Tests/mosaic_runlength_joins.malC monetdb5/modules/mal/Tests/mosaic_runlength_subselect.malC monetdb5/modules/mal/Tests/mosaic_runlength_thetasubselect.malC monetdb5/modules/mal/Tests/mosaic_view_subselect.malC monetdb5/modules/mal/Tests/mosaic_zone.malC monetdb5/modules/mal/Tests/mosaic_zone_joins.malC monetdb5/modules/mal/Tests/mosaic_zone_subselect.malC monetdb5/modules/mal/Tests/mosaic_zone_thetasubselect.malC Removed Files: monetdb5/modules/mal/Tests/mosaic_delta.mal monetdb5/modules/mal/Tests/mosaic_delta_joins.mal monetdb5/modules/mal/Tests/mosaic_delta_subselect.mal monetdb5/modules/mal/Tests/mosaic_delta_thetasubselect.mal monetdb5/modules/mal/Tests/mosaic_dictionary.mal monetdb5/modules/mal/Tests/mosaic_dictionary_joins.mal monetdb5/modules/mal/Tests/mosaic_dictionary_subselect.mal monetdb5/modules/mal/Tests/mosaic_dictionary_thetasubselect.mal monetdb5/modules/mal/Tests/mosaic_frame.mal monetdb5/modules/mal/Tests/mosaic_frame_joins.mal monetdb5/modules/mal/Tests/mosaic_frame_subselect.mal monetdb5/modules/mal/Tests/mosaic_frame_thetasubselect.mal monetdb5/modules/mal/Tests/mosaic_linear.mal monetdb5/modules/mal/Tests/mosaic_linear_joins.mal monetdb5/modules/mal/Tests/mosaic_linear_subselect.mal monetdb5/modules/mal/Tests/mosaic_linear_thetasubselect.mal monetdb5/modules/mal/Tests/mosaic_literal.mal monetdb5/modules/mal/Tests/mosaic_literal_double.mal monetdb5/modules/mal/Tests/mosaic_literal_inplace.mal monetdb5/modules/mal/Tests/mosaic_literal_joins.mal monetdb5/modules/mal/Tests/mosaic_literal_subselect.mal monetdb5/modules/mal/Tests/mosaic_literal_thetasubselect.mal monetdb5/modules/mal/Tests/mosaic_mix.mal monetdb5/modules/mal/Tests/mosaic_mix_joins.mal monetdb5/modules/mal/Tests/mosaic_mix_subselect.mal monetdb5/modules/mal/Tests/mosaic_mix_thetasubselect.mal monetdb5/modules/mal/Tests/mosaic_prefix.mal monetdb5/modules/mal/Tests/mosaic_prefix_joins.mal monetdb5/modules/mal/Tests/mosaic_prefix_subselect.mal monetdb5/modules/mal/Tests/mosaic_prefix_thetasubselect.mal monetdb5/modules/mal/Tests/mosaic_runlength.mal monetdb5/modules/mal/Tests/mosaic_runlength_joins.mal monetdb5/modules/mal/Tests/mosaic_runlength_subselect.mal monetdb5/modules/mal/Tests/mosaic_runlength_thetasubselect.mal monetdb5/modules/mal/Tests/mosaic_view_subselect.mal monetdb5/modules/mal/Tests/mosaic_zone.mal monetdb5/modules/mal/Tests/mosaic_zone_joins.mal monetdb5/modules/mal/Tests/mosaic_zone_subselect.mal monetdb5/modules/mal/Tests/mosaic_zone_thetasubselect.mal Modified Files: clients/Tests/exports.stable.out monetdb5/modules/mal/Tests/mosaic_delta.stable.out monetdb5/modules/mal/Tests/mosaic_delta_joins.stable.out monetdb5/modules/mal/Tests/mosaic_delta_subselect.stable.out monetdb5/modules/mal/Tests/mosaic_delta_thetasubselect.stable.out monetdb5/modules/mal/Tests/mosaic_frame.stable.out monetdb5/modules/mal/Tests/mosaic_frame_joins.stable.out monetdb5/modules/mal/Tests/mosaic_frame_subselect.stable.out monetdb5/modules/mal/Tests/mosaic_frame_thetasubselect.stable.out monetdb5/modules/mal/Tests/mosaic_linear.stable.out monetdb5/modules/mal/Tests/mosaic_linear_joins.stable.out monetdb5/modules/mal/Tests/mosaic_linear_subselect.stable.out monetdb5/modules/mal/Tests/mosaic_linear_thetasubselect.stable.out monetdb5/modules/mal/Tests/mosaic_literal.stable.out monetdb5/modules/mal/Tests/mosaic_literal_double.stable.out monetdb5/modules/mal/Tests/mosaic_literal_joins.stable.out monetdb5/modules/mal/Tests/mosaic_literal_subselect.stable.out monetdb5/modules/mal/Tests/mosaic_literal_thetasubselect.stable.out monetdb5/modules/mal/Tests/mosaic_mix.stable.out monetdb5/modules/mal/Tests/mosaic_mix_joins.stable.out monetdb5/modules/mal/Tests/mosaic_mix_subselect.stable.out monetdb5/modules/mal/Tests/mosaic_mix_thetasubselect.stable.out monetdb5/modules/mal/Tests/mosaic_prefix.stable.out monetdb5/modules/mal/Tests/mosaic_prefix_joins.stable.out monetdb5/modules/mal/Tests/mosaic_prefix_subselect.stable.out monetdb5/modules/mal/Tests/mosaic_prefix_thetasubselect.stable.out monetdb5/modules/mal/Tests/mosaic_runlength.stable.out monetdb5/modules/mal/Tests/mosaic_runlength_joins.stable.out monetdb5/modules/mal/Tests/mosaic_runlength_subselect.stable.out monetdb5/modules/mal/Tests/mosaic_runlength_thetasubselect.stable.out monetdb5/modules/mal/Tests/mosaic_zone.stable.out monetdb5/modules/mal/Tests/mosaic_zone_joins.stable.out monetdb5/modules/mal/Tests/mosaic_zone_subselect.stable.out monetdb5/modules/mal/Tests/mosaic_zone_thetasubselect.stable.out monetdb5/modules/mal/mosaic.h monetdb5/modules/mal/mosaic_dictionary.c monetdb5/modules/mal/mosaic_frame.c monetdb5/modules/mal/mosaic_prefix.c sql/test/BugTracker/Tests/explain.SF-1739353.stable.err sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.err sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out Branch: mosaic Log Message:
Merge with default. Dictionary need still some work again diffs (truncated from 4260 to 300 lines): diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -100,6 +100,7 @@ dbl BATcalcvariance_population(dbl *avgp dbl BATcalcvariance_sample(dbl *avgp, BAT *b); BAT *BATcalcxor(BAT *b1, BAT *b2, BAT *s); BAT *BATcalcxorcst(BAT *b, const ValRecord *v, BAT *s); +int BATcheckmosaic(BAT *b); gdk_return BATclear(BAT *b, int force); void BATcommit(BAT *b); BAT *BATconst(BAT *l, int tt, const void *val, int role); @@ -267,8 +268,8 @@ gdk_return HEAPextend(Heap *h, size_t si size_t HEAPmemsize(Heap *h); size_t HEAPvmsize(Heap *h); lng IMPSimprintsize(BAT *b); -gdk_return MOSheapAlloc(BAT *b, BUN cap); -void MOSheapDestroy(BAT *b); +gdk_return MOSalloc(BAT *b, BUN cap); +void MOSdestroy(BAT *b); int MT_check_nr_cores(void); int MT_create_thread(MT_Id *t, void( *function)(void *), void *arg, enum MT_thr_detach d); void MT_exiting_thread(void); diff --git a/monetdb5/modules/mal/Tests/mosaic_delta.mal b/monetdb5/modules/mal/Tests/mosaic_delta.malC rename from monetdb5/modules/mal/Tests/mosaic_delta.mal rename to monetdb5/modules/mal/Tests/mosaic_delta.malC diff --git a/monetdb5/modules/mal/Tests/mosaic_delta.stable.out b/monetdb5/modules/mal/Tests/mosaic_delta.stable.out --- a/monetdb5/modules/mal/Tests/mosaic_delta.stable.out +++ b/monetdb5/modules/mal/Tests/mosaic_delta.stable.out @@ -17,52 +17,15 @@ stdout of test 'mosaic_delta` in directo # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-21014/.s.monetdb.38017 # MonetDB/GIS module loaded # MonetDB/SQL module loaded -function user.main():void; -# Delta compression - b := bat.new(:oid,:int); - bat.append(b,0); - bat.append(b,1); - bat.append(b,4); - bat.append(b,-1); - bat.append(b,-3); - bat.append(b,1000); - bat.append(b,1001); - bat.append(b,1004); - bat.append(b,999); - 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); - bs := bat.new(:oid,:timestamp); - bat.append(bs,"2014-08-14 12:00:00.000":timestamp); - bat.append(bs,"2014-08-14 12:00:00.000":timestamp); - bat.append(bs,"2014-08-14 12:00:00.000":timestamp); - bat.append(bs,"2014-08-14 12:00:00.000":timestamp); - bat.append(bs,"2014-08-14 12:00:00.000":timestamp); - bat.append(bs,"2014-08-14 12:01:00.000":timestamp); - bat.append(bs,"2014-08-14 12:02:00.000":timestamp); - bs := bat.append(bs,bs); - io.print(bs); - xs := mosaic.compress(bs,"delta"); -#mosaic.dump(x); - zs := mosaic.decompress(xs); - io.print(zs); - d := bat.new(:oid,:date); - bat.append(d,"2014-08-14":date); - bat.append(d,"2014-08-14":date); - bat.append(d,"2014-08-14":date); - bat.append(d,"2014-08-14":date); - bat.append(d,"2014-08-15":date); - d := bat.append(d,d); - io.print(d); - xd := mosaic.compress(d,"delta"); -#mosaic.dump(xd); - zd := mosaic.decompress(xd); - io.print(zd); -end user.main; +# MonetDB/R module loaded + +Ready. + +# 15:01:27 > +# 15:01:27 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-15809" "--port=37660" +# 15:01:27 > + +#io.print(base); #--------------------------# # h t # name # void int # type diff --git a/monetdb5/modules/mal/Tests/mosaic_delta_joins.mal b/monetdb5/modules/mal/Tests/mosaic_delta_joins.malC rename from monetdb5/modules/mal/Tests/mosaic_delta_joins.mal rename to monetdb5/modules/mal/Tests/mosaic_delta_joins.malC diff --git a/monetdb5/modules/mal/Tests/mosaic_delta_joins.stable.out b/monetdb5/modules/mal/Tests/mosaic_delta_joins.stable.out --- a/monetdb5/modules/mal/Tests/mosaic_delta_joins.stable.out +++ b/monetdb5/modules/mal/Tests/mosaic_delta_joins.stable.out @@ -17,49 +17,15 @@ stdout of test 'mosaic_delta_joins` in d # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-26536/.s.monetdb.30180 # MonetDB/GIS module loaded # MonetDB/SQL module loaded -function user.main():void; -# Delta compression - b := bat.new(:oid,:int); - bat.append(b,0); - bat.append(b,1); - bat.append(b,4); - bat.append(b,-1); - bat.append(b,-3); - bat.append(b,1000); - bat.append(b,1001); - bat.append(b,1004); - bat.append(b,999); - bat.append(b,977); - base := algebra.copy(b); - io.print(base); - x := mosaic.compress(b,"delta"); - c := bat.new(:oid,:oid); - bat.append(c,0@0); - bat.append(c,2@0); - bat.append(c,5@0); - io.print(c); -#mosaic.dump(x); - s := algebra.projection(c,base); - io.print(s); - xs := mosaic.projection(c,x); - io.print(xs); - d := bat.new(:oid,:int); - bat.append(d,4); - bat.append(d,-1); - bat.append(d,nil:int); - (jl,jr) := algebra.join(base,d); - io.print(jl,jr); - (ml,mr) := mosaic.join(x,d); - io.print(ml,mr); - (kl,kr) := algebra.join(d,base); - io.print(kl); - io.print(kr); - io.print(kl,kr); - (nl,nr) := mosaic.join(d,x); - io.print(nl); - io.print(nr); - io.print(nl,nr); -end user.main; +# MonetDB/R module loaded + +Ready. + +# 15:01:39 > +# 15:01:39 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-15809" "--port=37660" +# 15:01:39 > + +#io.print(base); #--------------------------# # h t # name # void int # type diff --git a/monetdb5/modules/mal/Tests/mosaic_delta_subselect.mal b/monetdb5/modules/mal/Tests/mosaic_delta_subselect.malC rename from monetdb5/modules/mal/Tests/mosaic_delta_subselect.mal rename to monetdb5/modules/mal/Tests/mosaic_delta_subselect.malC diff --git a/monetdb5/modules/mal/Tests/mosaic_delta_subselect.stable.out b/monetdb5/modules/mal/Tests/mosaic_delta_subselect.stable.out --- a/monetdb5/modules/mal/Tests/mosaic_delta_subselect.stable.out +++ b/monetdb5/modules/mal/Tests/mosaic_delta_subselect.stable.out @@ -17,92 +17,15 @@ stdout of test 'mosaic_delta_subselect` # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-21014/.s.monetdb.38017 # MonetDB/GIS module loaded # MonetDB/SQL module loaded -function user.main():void; -# Delta compression - b := bat.new(:oid,:int); - bat.append(b,0); - bat.append(b,1); - bat.append(b,4); - bat.append(b,-1); - bat.append(b,-3); - bat.append(b,1000); - bat.append(b,1001); - bat.append(b,1004); - bat.append(b,999); - bat.append(b,977); - base := algebra.copy(b); - io.print(base); - x := 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); - io.print(xs); - s := algebra.subselect(base,-1,4,false,true,false); - io.print(s); - xs := mosaic.subselect(x,-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); - io.print(xs); - s := algebra.subselect(base,-1,4,true,true,false); - io.print(s); - xs := mosaic.subselect(x,-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); - 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); - 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); - 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); - io.print(xs); -# using candidatelists - c := bat.new(:oid,:oid); - bat.append(c,1@0); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - 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); - io.print(xs); -end user.main; +# MonetDB/R module loaded + +Ready. + +# 15:01:31 > +# 15:01:31 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-15809" "--port=37660" +# 15:01:31 > + +#io.print(base); #--------------------------# # h t # name # void int # type diff --git a/monetdb5/modules/mal/Tests/mosaic_delta_thetasubselect.mal b/monetdb5/modules/mal/Tests/mosaic_delta_thetasubselect.malC rename from monetdb5/modules/mal/Tests/mosaic_delta_thetasubselect.mal rename to monetdb5/modules/mal/Tests/mosaic_delta_thetasubselect.malC diff --git a/monetdb5/modules/mal/Tests/mosaic_delta_thetasubselect.stable.out b/monetdb5/modules/mal/Tests/mosaic_delta_thetasubselect.stable.out --- a/monetdb5/modules/mal/Tests/mosaic_delta_thetasubselect.stable.out +++ b/monetdb5/modules/mal/Tests/mosaic_delta_thetasubselect.stable.out @@ -17,75 +17,15 @@ stdout of test 'mosaic_delta_thetasubsel # Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-25433/.s.monetdb.37405 # MonetDB/GIS module loaded # MonetDB/SQL module loaded -function user.main():void; -# Delta compression - b := bat.new(:oid,:int); - bat.append(b,0); - bat.append(b,1); - bat.append(b,4); - bat.append(b,-1); - bat.append(b,-3); - bat.append(b,1000); - bat.append(b,1001); - bat.append(b,1004); - bat.append(b,999); - bat.append(b,977); - base := algebra.copy(b); - io.print(base); - x := mosaic.compress(b,"delta"); - s := algebra.thetasubselect(base,4,"<"); - io.print(s); - xs := mosaic.thetasubselect(x,4,"<"); - io.print(xs); - s := algebra.thetasubselect(base,4,"<="); - io.print(s); - xs := mosaic.thetasubselect(x,4,"<="); - io.print(xs); - s := algebra.thetasubselect(base,4,">"); - io.print(s); - xs := mosaic.thetasubselect(x,4,">"); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
