Changeset: 823a43cea75a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=823a43cea75a Modified Files: sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/leaks/Tests/check0.stable.out sql/test/leaks/Tests/check0.stable.out.int128 sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/check5.stable.out.int128 Branch: Jun2016 Log Message:
Approvals. diffs (truncated from 316 to 300 lines): diff --git a/sql/test/Tests/systemfunctions.stable.out b/sql/test/Tests/systemfunctions.stable.out --- a/sql/test/Tests/systemfunctions.stable.out +++ b/sql/test/Tests/systemfunctions.stable.out @@ -687,7 +687,7 @@ Ready. [ "sys", "gethost", 1, "url", "" ] [ "sys", "getport", 0, "clob", "create function getport(theurl url) returns string\n external name url.\"getPort\";" ] [ "sys", "getport", 1, "url", "" ] -[ "sys", "getproj4", 0, "clob", "create function getproj4(srid_in integer) returns string \nbegin\n return select proj4text from spatial_ref_sys where srid=srid_in; \nend;" ] +[ "sys", "getproj4", 0, "clob", "create function getproj4(srid_in integer) returns string\nbegin\n return select proj4text from spatial_ref_sys where srid=srid_in;\nend;" ] [ "sys", "getproj4", 1, "int", "" ] [ "sys", "getprotocol", 0, "clob", "create function getprotocol(theurl url) returns string\n external name url.\"getProtocol\";" ] [ "sys", "getprotocol", 1, "url", "" ] @@ -4274,7 +4274,7 @@ Ready. [ "sys", "st_touches", 0, "boolean", "create function st_touches(geom1 geometry, geom2 geometry) returns boolean external name geom.\"Touches\";" ] [ "sys", "st_touches", 1, "geometry", "" ] [ "sys", "st_touches", 2, "geometry", "" ] -[ "sys", "st_transform", 0, "geometry", "create function st_transform(geom geometry, srid integer) returns geometry\nbegin\n declare srid_src integer;\n declare proj4_src string;\n declare proj4_dest string;\n select st_srid(geom) into srid_src;\n select getproj4(srid_src) into proj4_src;\n select getproj4(srid) into proj4_dest;\n if proj4_src is null then\n return select internaltransform(geom, srid_src, srid, 'null', proj4_dest); \n else\n if proj4_dest is null then\n return select internaltransform(geom, srid_src, srid, proj4_src, 'null'); \n else\n return select internaltransform(geom, srid_src, srid, proj4_src, proj4_dest);\n end if; \n end if;\nend;" ] +[ "sys", "st_transform", 0, "geometry", "create function st_transform(geom geometry, srid integer) returns geometry\nbegin\n declare srid_src integer;\n declare proj4_src string;\n declare proj4_dest string;\n select st_srid(geom) into srid_src;\n select getproj4(srid_src) into proj4_src;\n select getproj4(srid) into proj4_dest;\n if proj4_src is null then\n return select internaltransform(geom, srid_src, srid, 'null', proj4_dest);\n else\n if proj4_dest is null then\n return select internaltransform(geom, srid_src, srid, proj4_src, 'null');\n else\n return select internaltransform(geom, srid_src, srid, proj4_src, proj4_dest);\n end if;\n end if;\nend;" ] [ "sys", "st_transform", 1, "geometry", "" ] [ "sys", "st_transform", 2, "int", "" ] [ "sys", "st_translate", 0, "geometry", "create function st_translate(geom geometry, dx double, dy double) returns geometry external name geom.\"Translate\";" ] diff --git a/sql/test/Tests/systemfunctions.stable.out.int128 b/sql/test/Tests/systemfunctions.stable.out.int128 --- a/sql/test/Tests/systemfunctions.stable.out.int128 +++ b/sql/test/Tests/systemfunctions.stable.out.int128 @@ -729,7 +729,7 @@ Ready. [ "sys", "gethost", 1, "url", "" ] [ "sys", "getport", 0, "clob", "create function getport(theurl url) returns string\n external name url.\"getPort\";" ] [ "sys", "getport", 1, "url", "" ] -[ "sys", "getproj4", 0, "clob", "create function getproj4(srid_in integer) returns string \nbegin\n return select proj4text from spatial_ref_sys where srid=srid_in; \nend;" ] +[ "sys", "getproj4", 0, "clob", "create function getproj4(srid_in integer) returns string\nbegin\n return select proj4text from spatial_ref_sys where srid=srid_in;\nend;" ] [ "sys", "getproj4", 1, "int", "" ] [ "sys", "getprotocol", 0, "clob", "create function getprotocol(theurl url) returns string\n external name url.\"getProtocol\";" ] [ "sys", "getprotocol", 1, "url", "" ] @@ -4810,7 +4810,7 @@ Ready. [ "sys", "st_touches", 0, "boolean", "create function st_touches(geom1 geometry, geom2 geometry) returns boolean external name geom.\"Touches\";" ] [ "sys", "st_touches", 1, "geometry", "" ] [ "sys", "st_touches", 2, "geometry", "" ] -[ "sys", "st_transform", 0, "geometry", "create function st_transform(geom geometry, srid integer) returns geometry\nbegin\n declare srid_src integer;\n declare proj4_src string;\n declare proj4_dest string;\n select st_srid(geom) into srid_src;\n select getproj4(srid_src) into proj4_src;\n select getproj4(srid) into proj4_dest;\n if proj4_src is null then\n return select internaltransform(geom, srid_src, srid, 'null', proj4_dest); \n else\n if proj4_dest is null then\n return select internaltransform(geom, srid_src, srid, proj4_src, 'null'); \n else\n return select internaltransform(geom, srid_src, srid, proj4_src, proj4_dest);\n end if; \n end if;\nend;" ] +[ "sys", "st_transform", 0, "geometry", "create function st_transform(geom geometry, srid integer) returns geometry\nbegin\n declare srid_src integer;\n declare proj4_src string;\n declare proj4_dest string;\n select st_srid(geom) into srid_src;\n select getproj4(srid_src) into proj4_src;\n select getproj4(srid) into proj4_dest;\n if proj4_src is null then\n return select internaltransform(geom, srid_src, srid, 'null', proj4_dest);\n else\n if proj4_dest is null then\n return select internaltransform(geom, srid_src, srid, proj4_src, 'null');\n else\n return select internaltransform(geom, srid_src, srid, proj4_src, proj4_dest);\n end if;\n end if;\nend;" ] [ "sys", "st_transform", 1, "geometry", "" ] [ "sys", "st_transform", 2, "int", "" ] [ "sys", "st_translate", 0, "geometry", "create function st_translate(geom geometry, dx double, dy double) returns geometry external name geom.\"Translate\";" ] diff --git a/sql/test/leaks/Tests/check0.stable.out b/sql/test/leaks/Tests/check0.stable.out --- a/sql/test/leaks/Tests/check0.stable.out +++ b/sql/test/leaks/Tests/check0.stable.out @@ -80,7 +80,7 @@ Ready. % L1, L2 # name % char, wrd # type % 9, 3 # length -[ "transient", 546 ] +[ "transient", 544 ] #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%'; % .L1, .L2 # table_name % L1, L2 # name diff --git a/sql/test/leaks/Tests/check0.stable.out.int128 b/sql/test/leaks/Tests/check0.stable.out.int128 --- a/sql/test/leaks/Tests/check0.stable.out.int128 +++ b/sql/test/leaks/Tests/check0.stable.out.int128 @@ -80,7 +80,7 @@ Ready. % L1, L2 # name % char, wrd # type % 9, 3 # length -[ "transient", 547 ] +[ "transient", 545 ] #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%'; % .L1, .L2 # table_name % L1, L2 # name diff --git a/sql/test/leaks/Tests/check1.stable.out b/sql/test/leaks/Tests/check1.stable.out --- a/sql/test/leaks/Tests/check1.stable.out +++ b/sql/test/leaks/Tests/check1.stable.out @@ -101,16 +101,16 @@ Ready. [ "int", 34 ] [ "int", 34 ] [ "int", 34 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] [ "int", 56 ] [ "int", 56 ] [ "int", 252 ] [ "int", 259 ] [ "int", 259 ] +[ "int", 293 ] +[ "int", 293 ] +[ "int", 293 ] +[ "int", 293 ] +[ "int", 293 ] [ "int", 373 ] [ "int", 373 ] [ "int", 373 ] diff --git a/sql/test/leaks/Tests/check1.stable.out.int128 b/sql/test/leaks/Tests/check1.stable.out.int128 --- a/sql/test/leaks/Tests/check1.stable.out.int128 +++ b/sql/test/leaks/Tests/check1.stable.out.int128 @@ -101,16 +101,16 @@ Ready. [ "int", 36 ] [ "int", 36 ] [ "int", 36 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] [ "int", 56 ] [ "int", 56 ] [ "int", 252 ] [ "int", 260 ] [ "int", 260 ] +[ "int", 301 ] +[ "int", 301 ] +[ "int", 301 ] +[ "int", 301 ] +[ "int", 301 ] [ "int", 373 ] [ "int", 373 ] [ "int", 373 ] diff --git a/sql/test/leaks/Tests/check2.stable.out b/sql/test/leaks/Tests/check2.stable.out --- a/sql/test/leaks/Tests/check2.stable.out +++ b/sql/test/leaks/Tests/check2.stable.out @@ -101,16 +101,16 @@ Ready. [ "int", 34 ] [ "int", 34 ] [ "int", 34 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] [ "int", 56 ] [ "int", 56 ] [ "int", 252 ] [ "int", 259 ] [ "int", 259 ] +[ "int", 293 ] +[ "int", 293 ] +[ "int", 293 ] +[ "int", 293 ] +[ "int", 293 ] [ "int", 373 ] [ "int", 373 ] [ "int", 373 ] diff --git a/sql/test/leaks/Tests/check2.stable.out.int128 b/sql/test/leaks/Tests/check2.stable.out.int128 --- a/sql/test/leaks/Tests/check2.stable.out.int128 +++ b/sql/test/leaks/Tests/check2.stable.out.int128 @@ -101,16 +101,16 @@ Ready. [ "int", 36 ] [ "int", 36 ] [ "int", 36 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] [ "int", 56 ] [ "int", 56 ] [ "int", 252 ] [ "int", 260 ] [ "int", 260 ] +[ "int", 301 ] +[ "int", 301 ] +[ "int", 301 ] +[ "int", 301 ] +[ "int", 301 ] [ "int", 373 ] [ "int", 373 ] [ "int", 373 ] diff --git a/sql/test/leaks/Tests/check3.stable.out b/sql/test/leaks/Tests/check3.stable.out --- a/sql/test/leaks/Tests/check3.stable.out +++ b/sql/test/leaks/Tests/check3.stable.out @@ -101,16 +101,16 @@ Ready. [ "int", 34 ] [ "int", 34 ] [ "int", 34 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] [ "int", 57 ] [ "int", 57 ] [ "int", 255 ] [ "int", 259 ] [ "int", 259 ] +[ "int", 293 ] +[ "int", 293 ] +[ "int", 293 ] +[ "int", 293 ] +[ "int", 293 ] [ "int", 375 ] [ "int", 375 ] [ "int", 375 ] diff --git a/sql/test/leaks/Tests/check3.stable.out.int128 b/sql/test/leaks/Tests/check3.stable.out.int128 --- a/sql/test/leaks/Tests/check3.stable.out.int128 +++ b/sql/test/leaks/Tests/check3.stable.out.int128 @@ -101,16 +101,16 @@ Ready. [ "int", 36 ] [ "int", 36 ] [ "int", 36 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] [ "int", 57 ] [ "int", 57 ] [ "int", 255 ] [ "int", 260 ] [ "int", 260 ] +[ "int", 301 ] +[ "int", 301 ] +[ "int", 301 ] +[ "int", 301 ] +[ "int", 301 ] [ "int", 375 ] [ "int", 375 ] [ "int", 375 ] diff --git a/sql/test/leaks/Tests/check4.stable.out b/sql/test/leaks/Tests/check4.stable.out --- a/sql/test/leaks/Tests/check4.stable.out +++ b/sql/test/leaks/Tests/check4.stable.out @@ -101,16 +101,16 @@ Ready. [ "int", 34 ] [ "int", 34 ] [ "int", 34 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] [ "int", 58 ] [ "int", 58 ] [ "int", 258 ] [ "int", 259 ] [ "int", 259 ] +[ "int", 293 ] +[ "int", 293 ] +[ "int", 293 ] +[ "int", 293 ] +[ "int", 293 ] [ "int", 377 ] [ "int", 377 ] [ "int", 377 ] diff --git a/sql/test/leaks/Tests/check4.stable.out.int128 b/sql/test/leaks/Tests/check4.stable.out.int128 --- a/sql/test/leaks/Tests/check4.stable.out.int128 +++ b/sql/test/leaks/Tests/check4.stable.out.int128 @@ -101,16 +101,16 @@ Ready. [ "int", 36 ] [ "int", 36 ] [ "int", 36 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] [ "int", 58 ] [ "int", 58 ] [ "int", 258 ] [ "int", 260 ] [ "int", 260 ] +[ "int", 301 ] +[ "int", 301 ] +[ "int", 301 ] +[ "int", 301 ] +[ "int", 301 ] [ "int", 377 ] [ "int", 377 ] [ "int", 377 ] diff --git a/sql/test/leaks/Tests/check5.stable.out b/sql/test/leaks/Tests/check5.stable.out --- a/sql/test/leaks/Tests/check5.stable.out +++ b/sql/test/leaks/Tests/check5.stable.out @@ -101,16 +101,16 @@ Ready. [ "int", 34 ] [ "int", 34 ] [ "int", 34 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] -[ "int", 47 ] [ "int", 58 ] [ "int", 58 ] [ "int", 258 ] [ "int", 259 ] [ "int", 259 ] +[ "int", 293 ] +[ "int", 293 ] +[ "int", 293 ] +[ "int", 293 ] +[ "int", 293 ] [ "int", 377 ] [ "int", 377 ] [ "int", 377 ] diff --git a/sql/test/leaks/Tests/check5.stable.out.int128 b/sql/test/leaks/Tests/check5.stable.out.int128 --- a/sql/test/leaks/Tests/check5.stable.out.int128 +++ b/sql/test/leaks/Tests/check5.stable.out.int128 @@ -101,16 +101,16 @@ Ready. [ "int", 36 ] [ "int", 36 ] [ "int", 36 ] -[ "int", 47 ] -[ "int", 47 ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
