Changeset: d9e9be574174 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d9e9be574174 Added Files: sql/backends/monet5/generator/89_generator_hge.mal sql/backends/monet5/generator/89_generator_hge.sql sql/backends/monet5/generator/generator_hge.mal Modified Files: clients/Tests/MAL-signatures_all.stable.out.int128 clients/Tests/MAL-signatures_fits_geom.stable.out.int128 clients/Tests/MAL-signatures_geom.stable.out.int128 clients/Tests/MAL-signatures_none.stable.out.int128 clients/Tests/SQL-dump_all.stable.out.int128 clients/Tests/SQL-dump_all.stable.out.oid32.int128 clients/Tests/SQL-dump_geom.stable.out.int128 clients/Tests/SQL-dump_geom.stable.out.oid32.int128 clients/Tests/SQL-dump_none.stable.out.int128 sql/backends/monet5/generator/Makefile.ag sql/backends/monet5/generator/generator.c sql/test/Tests/systemfunctions.stable.out.int128 sql/test/Tests/systemfunctions_bam.stable.out.int128 sql/test/Tests/systemfunctions_gsl.stable.out.int128 sql/test/Tests/systemfunctions_nogeom.stable.out.int128 sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check1_bam.stable.out.int128 sql/test/leaks/Tests/check1_gsl.stable.out.int128 sql/test/leaks/Tests/check1_nogeom.stable.out.int128 sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check2_bam.stable.out.int128 sql/test/leaks/Tests/check2_gsl.stable.out.int128 sql/test/leaks/Tests/check2_nogeom.stable.out.int128 sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check3_bam.stable.out.int128 sql/test/leaks/Tests/check3_gsl.stable.out.int128 sql/test/leaks/Tests/check3_nogeom.stable.out.int128 sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check4_bam.stable.out.int128 sql/test/leaks/Tests/check4_gsl.stable.out.int128 sql/test/leaks/Tests/check4_nogeom.stable.out.int128 sql/test/leaks/Tests/check5.stable.out.int128 sql/test/leaks/Tests/check5_bam.stable.out.int128 sql/test/leaks/Tests/check5_gsl.stable.out.int128 sql/test/leaks/Tests/check5_nogeom.stable.out.int128 Branch: default Log Message:
added type int128 (hge/hugeint) to generator; ... hopefully intepreting and following the generator intentions correctly ... diffs (truncated from 3049 to 300 lines): diff --git a/clients/Tests/MAL-signatures_all.stable.out.int128 b/clients/Tests/MAL-signatures_all.stable.out.int128 --- a/clients/Tests/MAL-signatures_all.stable.out.int128 +++ b/clients/Tests/MAL-signatures_all.stable.out.int128 @@ -49655,6 +49655,10 @@ pattern generator.join(b:bat[:oid,:sht], address VLTgenerator_join; pattern generator.join(b:bat[:oid,:bte],gen:bat[:oid,:bte]) (l:bat[:oid,:oid],r:bat[:oid,:oid]) address VLTgenerator_join; +pattern generator.join(b:bat[:oid,:hge],gen:bat[:oid,:hge]) (l:bat[:oid,:oid],r:bat[:oid,:oid]) +address VLTgenerator_join; +comment Overloaded join operation + pattern generator.leftfetchjoin(b:bat[:oid,:oid],cand:bat[:oid,:timestamp]):bat[:oid,:timestamp] address VLTgenerator_leftfetchjoin; comment Overloaded leftfetchjoin operation @@ -49671,6 +49675,10 @@ pattern generator.leftfetchjoin(b:bat[:o address VLTgenerator_leftfetchjoin; pattern generator.leftfetchjoin(b:bat[:oid,:oid],cand:bat[:oid,:bte]):bat[:oid,:bte] address VLTgenerator_leftfetchjoin; +pattern generator.leftfetchjoin(b:bat[:oid,:oid],cand:bat[:oid,:hge]):bat[:oid,:hge] +address VLTgenerator_leftfetchjoin; +comment Overloaded leftfetchjoin operation + pattern generator.parameters(first:dbl,last:dbl):bat[:oid,:dbl] address VLTgenerator_noop; pattern generator.parameters(first:flt,last:flt):bat[:oid,:flt] @@ -49699,6 +49707,12 @@ pattern generator.parameters(first:sht,l address VLTgenerator_noop; pattern generator.parameters(first:bte,last:bte,step:bte):bat[:oid,:bte] address VLTgenerator_noop; +pattern generator.parameters(first:hge,last:hge):bat[:oid,:hge] +address VLTgenerator_noop; +pattern generator.parameters(first:hge,last:hge,step:hge):bat[:oid,:hge] +address VLTgenerator_noop; +comment Retain the table definition, but don't materialize + pattern generator.subselect(b:bat[:oid,:timestamp],cand:bat[:oid,:oid],low:timestamp,high:timestamp,li:bit,hi:bit,anti:bit):bat[:oid,:oid] address VLTgenerator_subselect; comment Overloaded selection routine @@ -49759,6 +49773,20 @@ pattern generator.series(first:sht,last: address VLTgenerator_table; pattern generator.series(first:bte,last:bte):bat[:oid,:bte] address VLTgenerator_table; +pattern generator.subselect(b:bat[:oid,:hge],cand:bat[:oid,:oid],low:hge,high:hge,li:bit,hi:bit,anti:bit):bat[:oid,:oid] +address VLTgenerator_subselect; +comment Overloaded selection routine + +pattern generator.subselect(b:bat[:oid,:hge],low:hge,high:hge,li:bit,hi:bit,anti:bit):bat[:oid,:oid] +address VLTgenerator_subselect; +comment Overloaded selection routine + +pattern generator.series(first:hge,last:hge,step:hge):bat[:oid,:hge] +address VLTgenerator_table; +comment Create and materialize a generator table + +pattern generator.series(first:hge,last:hge):bat[:oid,:hge] +address VLTgenerator_table; pattern generator.thetasubselect(b:bat[:oid,:timestamp],cnd:bat[:oid,:oid],low:timestamp,oper:str):bat[:oid,:oid] address VLTgenerator_thetasubselect; comment Overloaded selection routine @@ -49791,6 +49819,14 @@ pattern generator.thetasubselect(b:bat[: address VLTgenerator_thetasubselect; pattern generator.thetasubselect(b:bat[:oid,:bte],low:bte,oper:str):bat[:oid,:oid] address VLTgenerator_thetasubselect; +pattern generator.thetasubselect(b:bat[:oid,:hge],cnd:bat[:oid,:oid],low:hge,oper:str):bat[:oid,:oid] +address VLTgenerator_thetasubselect; +comment Overloaded selection routine + +pattern generator.thetasubselect(b:bat[:oid,:hge],low:hge,oper:str):bat[:oid,:oid] +address VLTgenerator_thetasubselect; +comment Overloaded selection routine + command geom.Area(g:wkb):dbl address wkbArea; comment Returns the area of the geometry. diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 --- a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 +++ b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 @@ -49575,6 +49575,10 @@ pattern generator.join(b:bat[:oid,:sht], address VLTgenerator_join; pattern generator.join(b:bat[:oid,:bte],gen:bat[:oid,:bte]) (l:bat[:oid,:oid],r:bat[:oid,:oid]) address VLTgenerator_join; +pattern generator.join(b:bat[:oid,:hge],gen:bat[:oid,:hge]) (l:bat[:oid,:oid],r:bat[:oid,:oid]) +address VLTgenerator_join; +comment Overloaded join operation + pattern generator.leftfetchjoin(b:bat[:oid,:oid],cand:bat[:oid,:timestamp]):bat[:oid,:timestamp] address VLTgenerator_leftfetchjoin; comment Overloaded leftfetchjoin operation @@ -49591,6 +49595,10 @@ pattern generator.leftfetchjoin(b:bat[:o address VLTgenerator_leftfetchjoin; pattern generator.leftfetchjoin(b:bat[:oid,:oid],cand:bat[:oid,:bte]):bat[:oid,:bte] address VLTgenerator_leftfetchjoin; +pattern generator.leftfetchjoin(b:bat[:oid,:oid],cand:bat[:oid,:hge]):bat[:oid,:hge] +address VLTgenerator_leftfetchjoin; +comment Overloaded leftfetchjoin operation + pattern generator.parameters(first:dbl,last:dbl):bat[:oid,:dbl] address VLTgenerator_noop; pattern generator.parameters(first:flt,last:flt):bat[:oid,:flt] @@ -49619,6 +49627,12 @@ pattern generator.parameters(first:sht,l address VLTgenerator_noop; pattern generator.parameters(first:bte,last:bte,step:bte):bat[:oid,:bte] address VLTgenerator_noop; +pattern generator.parameters(first:hge,last:hge):bat[:oid,:hge] +address VLTgenerator_noop; +pattern generator.parameters(first:hge,last:hge,step:hge):bat[:oid,:hge] +address VLTgenerator_noop; +comment Retain the table definition, but don't materialize + pattern generator.subselect(b:bat[:oid,:timestamp],cand:bat[:oid,:oid],low:timestamp,high:timestamp,li:bit,hi:bit,anti:bit):bat[:oid,:oid] address VLTgenerator_subselect; comment Overloaded selection routine @@ -49679,6 +49693,20 @@ pattern generator.series(first:sht,last: address VLTgenerator_table; pattern generator.series(first:bte,last:bte):bat[:oid,:bte] address VLTgenerator_table; +pattern generator.subselect(b:bat[:oid,:hge],cand:bat[:oid,:oid],low:hge,high:hge,li:bit,hi:bit,anti:bit):bat[:oid,:oid] +address VLTgenerator_subselect; +comment Overloaded selection routine + +pattern generator.subselect(b:bat[:oid,:hge],low:hge,high:hge,li:bit,hi:bit,anti:bit):bat[:oid,:oid] +address VLTgenerator_subselect; +comment Overloaded selection routine + +pattern generator.series(first:hge,last:hge,step:hge):bat[:oid,:hge] +address VLTgenerator_table; +comment Create and materialize a generator table + +pattern generator.series(first:hge,last:hge):bat[:oid,:hge] +address VLTgenerator_table; pattern generator.thetasubselect(b:bat[:oid,:timestamp],cnd:bat[:oid,:oid],low:timestamp,oper:str):bat[:oid,:oid] address VLTgenerator_thetasubselect; comment Overloaded selection routine @@ -49711,6 +49739,14 @@ pattern generator.thetasubselect(b:bat[: address VLTgenerator_thetasubselect; pattern generator.thetasubselect(b:bat[:oid,:bte],low:bte,oper:str):bat[:oid,:oid] address VLTgenerator_thetasubselect; +pattern generator.thetasubselect(b:bat[:oid,:hge],cnd:bat[:oid,:oid],low:hge,oper:str):bat[:oid,:oid] +address VLTgenerator_thetasubselect; +comment Overloaded selection routine + +pattern generator.thetasubselect(b:bat[:oid,:hge],low:hge,oper:str):bat[:oid,:oid] +address VLTgenerator_thetasubselect; +comment Overloaded selection routine + command geom.Area(g:wkb):dbl address wkbArea; comment Returns the area of the geometry. diff --git a/clients/Tests/MAL-signatures_geom.stable.out.int128 b/clients/Tests/MAL-signatures_geom.stable.out.int128 --- a/clients/Tests/MAL-signatures_geom.stable.out.int128 +++ b/clients/Tests/MAL-signatures_geom.stable.out.int128 @@ -49551,6 +49551,10 @@ pattern generator.join(b:bat[:oid,:sht], address VLTgenerator_join; pattern generator.join(b:bat[:oid,:bte],gen:bat[:oid,:bte]) (l:bat[:oid,:oid],r:bat[:oid,:oid]) address VLTgenerator_join; +pattern generator.join(b:bat[:oid,:hge],gen:bat[:oid,:hge]) (l:bat[:oid,:oid],r:bat[:oid,:oid]) +address VLTgenerator_join; +comment Overloaded join operation + pattern generator.leftfetchjoin(b:bat[:oid,:oid],cand:bat[:oid,:timestamp]):bat[:oid,:timestamp] address VLTgenerator_leftfetchjoin; comment Overloaded leftfetchjoin operation @@ -49567,6 +49571,10 @@ pattern generator.leftfetchjoin(b:bat[:o address VLTgenerator_leftfetchjoin; pattern generator.leftfetchjoin(b:bat[:oid,:oid],cand:bat[:oid,:bte]):bat[:oid,:bte] address VLTgenerator_leftfetchjoin; +pattern generator.leftfetchjoin(b:bat[:oid,:oid],cand:bat[:oid,:hge]):bat[:oid,:hge] +address VLTgenerator_leftfetchjoin; +comment Overloaded leftfetchjoin operation + pattern generator.parameters(first:dbl,last:dbl):bat[:oid,:dbl] address VLTgenerator_noop; pattern generator.parameters(first:flt,last:flt):bat[:oid,:flt] @@ -49595,6 +49603,12 @@ pattern generator.parameters(first:sht,l address VLTgenerator_noop; pattern generator.parameters(first:bte,last:bte,step:bte):bat[:oid,:bte] address VLTgenerator_noop; +pattern generator.parameters(first:hge,last:hge):bat[:oid,:hge] +address VLTgenerator_noop; +pattern generator.parameters(first:hge,last:hge,step:hge):bat[:oid,:hge] +address VLTgenerator_noop; +comment Retain the table definition, but don't materialize + pattern generator.subselect(b:bat[:oid,:timestamp],cand:bat[:oid,:oid],low:timestamp,high:timestamp,li:bit,hi:bit,anti:bit):bat[:oid,:oid] address VLTgenerator_subselect; comment Overloaded selection routine @@ -49655,6 +49669,20 @@ pattern generator.series(first:sht,last: address VLTgenerator_table; pattern generator.series(first:bte,last:bte):bat[:oid,:bte] address VLTgenerator_table; +pattern generator.subselect(b:bat[:oid,:hge],cand:bat[:oid,:oid],low:hge,high:hge,li:bit,hi:bit,anti:bit):bat[:oid,:oid] +address VLTgenerator_subselect; +comment Overloaded selection routine + +pattern generator.subselect(b:bat[:oid,:hge],low:hge,high:hge,li:bit,hi:bit,anti:bit):bat[:oid,:oid] +address VLTgenerator_subselect; +comment Overloaded selection routine + +pattern generator.series(first:hge,last:hge,step:hge):bat[:oid,:hge] +address VLTgenerator_table; +comment Create and materialize a generator table + +pattern generator.series(first:hge,last:hge):bat[:oid,:hge] +address VLTgenerator_table; pattern generator.thetasubselect(b:bat[:oid,:timestamp],cnd:bat[:oid,:oid],low:timestamp,oper:str):bat[:oid,:oid] address VLTgenerator_thetasubselect; comment Overloaded selection routine @@ -49687,6 +49715,14 @@ pattern generator.thetasubselect(b:bat[: address VLTgenerator_thetasubselect; pattern generator.thetasubselect(b:bat[:oid,:bte],low:bte,oper:str):bat[:oid,:oid] address VLTgenerator_thetasubselect; +pattern generator.thetasubselect(b:bat[:oid,:hge],cnd:bat[:oid,:oid],low:hge,oper:str):bat[:oid,:oid] +address VLTgenerator_thetasubselect; +comment Overloaded selection routine + +pattern generator.thetasubselect(b:bat[:oid,:hge],low:hge,oper:str):bat[:oid,:oid] +address VLTgenerator_thetasubselect; +comment Overloaded selection routine + command geom.Area(g:wkb):dbl address wkbArea; comment Returns the area of the geometry. diff --git a/clients/Tests/MAL-signatures_none.stable.out.int128 b/clients/Tests/MAL-signatures_none.stable.out.int128 --- a/clients/Tests/MAL-signatures_none.stable.out.int128 +++ b/clients/Tests/MAL-signatures_none.stable.out.int128 @@ -49521,6 +49521,10 @@ pattern generator.join(b:bat[:oid,:sht], address VLTgenerator_join; pattern generator.join(b:bat[:oid,:bte],gen:bat[:oid,:bte]) (l:bat[:oid,:oid],r:bat[:oid,:oid]) address VLTgenerator_join; +pattern generator.join(b:bat[:oid,:hge],gen:bat[:oid,:hge]) (l:bat[:oid,:oid],r:bat[:oid,:oid]) +address VLTgenerator_join; +comment Overloaded join operation + pattern generator.leftfetchjoin(b:bat[:oid,:oid],cand:bat[:oid,:timestamp]):bat[:oid,:timestamp] address VLTgenerator_leftfetchjoin; comment Overloaded leftfetchjoin operation @@ -49537,6 +49541,10 @@ pattern generator.leftfetchjoin(b:bat[:o address VLTgenerator_leftfetchjoin; pattern generator.leftfetchjoin(b:bat[:oid,:oid],cand:bat[:oid,:bte]):bat[:oid,:bte] address VLTgenerator_leftfetchjoin; +pattern generator.leftfetchjoin(b:bat[:oid,:oid],cand:bat[:oid,:hge]):bat[:oid,:hge] +address VLTgenerator_leftfetchjoin; +comment Overloaded leftfetchjoin operation + pattern generator.parameters(first:dbl,last:dbl):bat[:oid,:dbl] address VLTgenerator_noop; pattern generator.parameters(first:flt,last:flt):bat[:oid,:flt] @@ -49565,6 +49573,12 @@ pattern generator.parameters(first:sht,l address VLTgenerator_noop; pattern generator.parameters(first:bte,last:bte,step:bte):bat[:oid,:bte] address VLTgenerator_noop; +pattern generator.parameters(first:hge,last:hge):bat[:oid,:hge] +address VLTgenerator_noop; +pattern generator.parameters(first:hge,last:hge,step:hge):bat[:oid,:hge] +address VLTgenerator_noop; +comment Retain the table definition, but don't materialize + pattern generator.subselect(b:bat[:oid,:timestamp],cand:bat[:oid,:oid],low:timestamp,high:timestamp,li:bit,hi:bit,anti:bit):bat[:oid,:oid] address VLTgenerator_subselect; comment Overloaded selection routine @@ -49625,6 +49639,20 @@ pattern generator.series(first:sht,last: address VLTgenerator_table; pattern generator.series(first:bte,last:bte):bat[:oid,:bte] address VLTgenerator_table; +pattern generator.subselect(b:bat[:oid,:hge],cand:bat[:oid,:oid],low:hge,high:hge,li:bit,hi:bit,anti:bit):bat[:oid,:oid] +address VLTgenerator_subselect; +comment Overloaded selection routine + +pattern generator.subselect(b:bat[:oid,:hge],low:hge,high:hge,li:bit,hi:bit,anti:bit):bat[:oid,:oid] +address VLTgenerator_subselect; +comment Overloaded selection routine + +pattern generator.series(first:hge,last:hge,step:hge):bat[:oid,:hge] +address VLTgenerator_table; +comment Create and materialize a generator table + +pattern generator.series(first:hge,last:hge):bat[:oid,:hge] +address VLTgenerator_table; pattern generator.thetasubselect(b:bat[:oid,:timestamp],cnd:bat[:oid,:oid],low:timestamp,oper:str):bat[:oid,:oid] address VLTgenerator_thetasubselect; comment Overloaded selection routine @@ -49657,6 +49685,14 @@ pattern generator.thetasubselect(b:bat[: address VLTgenerator_thetasubselect; pattern generator.thetasubselect(b:bat[:oid,:bte],low:bte,oper:str):bat[:oid,:oid] address VLTgenerator_thetasubselect; +pattern generator.thetasubselect(b:bat[:oid,:hge],cnd:bat[:oid,:oid],low:hge,oper:str):bat[:oid,:oid] +address VLTgenerator_thetasubselect; +comment Overloaded selection routine + +pattern generator.thetasubselect(b:bat[:oid,:hge],low:hge,oper:str):bat[:oid,:oid] +address VLTgenerator_thetasubselect; +comment Overloaded selection routine + pattern group.multicolumn(b:bat[:oid,:any]...) (ref:bat[:oid,:oid],grp:bat[:oid,:oid],hist:bat[:oid,:any]) address GROUPmulticolumngroup; comment Derivation of a group index over multiple columns. diff --git a/clients/Tests/SQL-dump_all.stable.out.int128 b/clients/Tests/SQL-dump_all.stable.out.int128 --- a/clients/Tests/SQL-dump_all.stable.out.int128 +++ b/clients/Tests/SQL-dump_all.stable.out.int128 @@ -757,6 +757,31 @@ returns hugeint external name udf.fuse; _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
