Changeset: b24332ecf609 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b24332ecf609 Modified Files: clients/Tests/All clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 sql/test/Tests/All sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/leaks/Tests/All 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 sql/test/leaks/Tests/drop3.stable.out Branch: default Log Message:
Change test conditionals so that tests are run if HAVE_LIDAR holds. diffs (truncated from 1174 to 300 lines): diff --git a/clients/Tests/All b/clients/Tests/All --- a/clients/Tests/All +++ b/clients/Tests/All @@ -1,4 +1,4 @@ exports -HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBPY&HAVE_LIBR&!HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&HAVE_SPHINXCLIENT?MAL-signatures -!BITS32&HAVE_FITS&HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SHP&HAVE_SAMTOOLS?SQL-dump +HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBPY&HAVE_LIBR&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&HAVE_SPHINXCLIENT?MAL-signatures +!BITS32&HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIDAR&HAVE_NETCDF&HAVE_PCRE&HAVE_SHP&HAVE_SAMTOOLS?SQL-dump MERCURIAL?malcheck diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -7850,6 +7850,10 @@ Ready. [ "language", "register", "pattern language.register(m:str,f:str,code:str,help:str):void ", "CMDregisterFunction;", "Compile the code string to MAL and register it as a function." ] [ "language", "sink", "pattern language.sink(v:any...):void ", "MALgarbagesink;", "Variables to be considered together when triggering garbage collection.\nUsed in the dataflow blocks to avoid early release of values." ] [ "language", "source", "pattern language.source(f:str):void ", "CMDevalFile;", "Merge the instructions stored in the file with the current program." ] +[ "lidar", "attach", "pattern lidar.attach(fname:str):void ", "LIDARattach;", "Open a LIDAR file and return catalog of the table HDUs" ] +[ "lidar", "export", "pattern lidar.export(tablename:str,fname:str,type:str):void ", "LIDARexportTable;", "Exporta LIDAR table to a LAS/LAZ file" ] +[ "lidar", "load", "pattern lidar.load(tablename:str):void ", "LIDARloadTable;", "Load a LIDAR table from an attached file" ] +[ "lidar", "prelude", "command lidar.prelude():void ", "LIDARprelude;", "" ] [ "lsst", "angsep", "command lsst.angsep(ra1:dbl,dec1:dbl,ra2:dbl,dec2:dbl):dbl ", "qserv_angSep;", "Returns the angular separation in degrees between two spherical\ncoordinate pairs (ra1,dec1) and (ra2,dec2)" ] [ "lsst", "ptinsphbox", "command lsst.ptinsphbox(ra:dbl,dec:dbl,ra_min:dbl,dec_min:dbl,ra_max:dbl,dec_max:dbl):int ", "qserv_ptInSphBox;", "Returns 1 if the given spherical longitude/latitude box contains the given position" ] [ "lsst", "ptinsphcircle", "command lsst.ptinsphcircle(ra:dbl,dec:dbl,ra_cen:dbl,dec_cen:dbl,radius:dbl):int ", "qserv_ptInSphCircle;", "Returns 1 if the given spherical longitude/latitude circle contains the given position" ] @@ -8706,30 +8710,8 @@ Ready. [ "zrule", "define", "command zrule.define(m:int,d:int,w:int,h:int,min:int):zrule ", "MTIMEruleDef0;", "Introduce a synomym timezone rule." ] [ "zrule", "define", "command zrule.define(m:int,d:str,w:int,h:int,min:int):zrule ", "MTIMEruleDef1;", "Introduce a synomym timezone rule." ] [ "zrule", "define", "command zrule.define(m:int,d:str,w:int,min:int):zrule ", "MTIMEruleDef2;", "Introduce a synomym timezone rule." ] -pattern optimizer.emptycolumn(mod:str,fcn:str):str -address OPTwrapper; -comment Evaluate empty set expressions. -pattern optimizer.emptycolumn():str -address OPTwrapper; -pattern sql.emptycolumn(mvc:int,schema:str,table:str,column:str,access:int,part_nr:int,nr_parts:int) (uid:bat[:oid],uval:bat[:any_1]) -address mvc_bind_wrap; -pattern sql.emptycolumn(mvc:int,schema:str,table:str,column:str,access:int,part_nr:int,nr_parts:int):bat[:any_1] -address mvc_bind_wrap; -pattern sql.emptycolumn(mvc:int,schema:str,table:str,column:str,access:int) (uid:bat[:oid],uval:bat[:any_1]) -address mvc_bind_wrap; -pattern sql.emptycolumn(mvc:int,schema:str,table:str,column:str,access:int):bat[:any_1] -address mvc_bind_wrap; -pattern sql.emptycolumnidx(mvc:int,schema:str,table:str,index:str,access:int,part_nr:int,nr_parts:int) (uid:bat[:oid],uval:bat[:any_1]) -address mvc_bind_idxbat_wrap; -pattern sql.emptycolumnidx(mvc:int,schema:str,table:str,index:str,access:int,part_nr:int,nr_parts:int):bat[:any_1] -address mvc_bind_idxbat_wrap; -pattern sql.emptycolumnidx(mvc:int,schema:str,table:str,index:str,access:int) (uid:bat[:oid],uval:bat[:any_1]) -address mvc_bind_idxbat_wrap; -pattern sql.emptycolumnidx(mvc:int,schema:str,table:str,index:str,access:int):bat[:any_1] -address mvc_bind_idxbat_wrap; +# 14:47:14 > +# 14:47:14 > "Done." +# 14:47:14 > -# 14:39:23 > -# 14:39:23 > "Done." -# 14:39:23 > - diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -10215,6 +10215,10 @@ Ready. [ "language", "register", "pattern language.register(m:str,f:str,code:str,help:str):void ", "CMDregisterFunction;", "Compile the code string to MAL and register it as a function." ] [ "language", "sink", "pattern language.sink(v:any...):void ", "MALgarbagesink;", "Variables to be considered together when triggering garbage collection.\nUsed in the dataflow blocks to avoid early release of values." ] [ "language", "source", "pattern language.source(f:str):void ", "CMDevalFile;", "Merge the instructions stored in the file with the current program." ] +[ "lidar", "attach", "pattern lidar.attach(fname:str):void ", "LIDARattach;", "Open a LIDAR file and return catalog of the table HDUs" ] +[ "lidar", "export", "pattern lidar.export(tablename:str,fname:str,type:str):void ", "LIDARexportTable;", "Exporta LIDAR table to a LAS/LAZ file" ] +[ "lidar", "load", "pattern lidar.load(tablename:str):void ", "LIDARloadTable;", "Load a LIDAR table from an attached file" ] +[ "lidar", "prelude", "command lidar.prelude():void ", "LIDARprelude;", "" ] [ "lsst", "angsep", "command lsst.angsep(ra1:dbl,dec1:dbl,ra2:dbl,dec2:dbl):dbl ", "qserv_angSep;", "Returns the angular separation in degrees between two spherical\ncoordinate pairs (ra1,dec1) and (ra2,dec2)" ] [ "lsst", "ptinsphbox", "command lsst.ptinsphbox(ra:dbl,dec:dbl,ra_min:dbl,dec_min:dbl,ra_max:dbl,dec_max:dbl):int ", "qserv_ptInSphBox;", "Returns 1 if the given spherical longitude/latitude box contains the given position" ] [ "lsst", "ptinsphcircle", "command lsst.ptinsphcircle(ra:dbl,dec:dbl,ra_cen:dbl,dec_cen:dbl,radius:dbl):int ", "qserv_ptInSphCircle;", "Returns 1 if the given spherical longitude/latitude circle contains the given position" ] diff --git a/clients/Tests/SQL-dump.stable.out b/clients/Tests/SQL-dump.stable.out --- a/clients/Tests/SQL-dump.stable.out +++ b/clients/Tests/SQL-dump.stable.out @@ -200,6 +200,9 @@ Ready. \dSf sys."isauuid" \dSf sys."left_shift" \dSf sys."left_shift_assign" +\dSf sys."lidarattach" +\dSf sys."lidarexport" +\dSf sys."lidarload" \dSf sys."like" \dSf sys."listdir" \dSf sys."listdirpat" @@ -539,6 +542,9 @@ SYSTEM FUNCTION sys.left_shift SYSTEM FUNCTION sys.left_shift_assign SYSTEM FUNCTION sys.length SYSTEM FUNCTION sys.levenshtein +SYSTEM FUNCTION sys.lidarattach +SYSTEM FUNCTION sys.lidarexport +SYSTEM FUNCTION sys.lidarload SYSTEM FUNCTION sys.like SYSTEM FUNCTION sys.listdir SYSTEM FUNCTION sys.listdirpat @@ -939,6 +945,9 @@ create function isaurl(theurl url) retur create function sys.isauuid(s string) returns boolean external name uuid."isaUUID"; create function "left_shift"(i1 inet, i2 inet) returns boolean external name inet."<<"; create function "left_shift_assign"(i1 inet, i2 inet) returns boolean external name inet."<<="; +create procedure lidarattach(fname string) external name lidar.attach; +create procedure lidarexport(tname string, fname string, format string) external name lidar.export; +create procedure lidarload(tname string) external name lidar.load; create filter function "like"(val string, pat string, esc string) external name algebra."like"; create filter function "like"(val string, pat string) external name algebra."like"; @@ -2054,6 +2063,9 @@ drop function pcre_replace(string, strin [ "sys", "levenshtein", "levenshtein", "txtsim", 0, 1, false, false, false ] [ "sys", "levenshtein", "levenshtein", "txtsim", 0, 1, false, false, false ] [ "sys", "levenshtein", "levenshtein", "txtsim", 0, 1, false, false, false ] +[ "sys", "lidarattach", "create procedure lidarattach(fname string) external name lidar.attach;", "lidar", 1, 2, true, false, false ] +[ "sys", "lidarexport", "create procedure lidarexport(tname string, fname string, format string) external name lidar.export;", "lidar", 1, 2, true, false, false ] +[ "sys", "lidarload", "create procedure lidarload(tname string) external name lidar.load;", "lidar", 1, 2, true, false, false ] [ "sys", "like", "create filter function \"like\"(val string, pat string) external name algebra.\"like\";", "algebra", 1, 4, true, false, false ] [ "sys", "like", "create filter function \"like\"(val string, pat string, esc string) external name algebra.\"like\";", "algebra", 1, 4, true, false, false ] [ "sys", "listdir", "create procedure listdir(dirname string) external name fits.listdir;", "fits", 1, 2, true, false, false ] @@ -3598,6 +3610,9 @@ drop function pcre_replace(string, strin [ "sys", "levenshtein", "arg_1", "clob", 0, 0, 1, "arg_2", "clob", 0, 0, 1, "arg_3", "int", 32, 0, 1, "arg_4", "int", 32, 0, 1, "arg_5", "int", 32, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "levenshtein", "arg_1", "varchar", 0, 0, 1, "arg_2", "varchar", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "levenshtein", "arg_1", "varchar", 0, 0, 1, "arg_2", "varchar", 0, 0, 1, "arg_3", "int", 32, 0, 1, "arg_4", "int", 32, 0, 1, "arg_5", "int", 32, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] +[ "sys", "lidarattach", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] +[ "sys", "lidarexport", "fname", "clob", 0, 0, 1, "format", "clob", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] +[ "sys", "lidarload", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "like", "pat", "clob", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "like", "pat", "clob", 0, 0, 1, "esc", "clob", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "listdir", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] @@ -5842,6 +5857,9 @@ drop function pcre_replace(string, strin [ "levenshtein" ] [ "levenshtein" ] [ "levenshtein" ] +[ "lidarattach" ] +[ "lidarexport" ] +[ "lidarload" ] [ "like" ] [ "like" ] [ "listdir" ] diff --git a/clients/Tests/SQL-dump.stable.out.int128 b/clients/Tests/SQL-dump.stable.out.int128 --- a/clients/Tests/SQL-dump.stable.out.int128 +++ b/clients/Tests/SQL-dump.stable.out.int128 @@ -196,6 +196,9 @@ Ready. \dSf sys."isauuid" \dSf sys."left_shift" \dSf sys."left_shift_assign" +\dSf sys."lidarattach" +\dSf sys."lidarexport" +\dSf sys."lidarload" \dSf sys."like" \dSf sys."listdir" \dSf sys."listdirpat" @@ -535,6 +538,9 @@ SYSTEM FUNCTION sys.left_shift SYSTEM FUNCTION sys.left_shift_assign SYSTEM FUNCTION sys.length SYSTEM FUNCTION sys.levenshtein +SYSTEM FUNCTION sys.lidarattach +SYSTEM FUNCTION sys.lidarexport +SYSTEM FUNCTION sys.lidarload SYSTEM FUNCTION sys.like SYSTEM FUNCTION sys.listdir SYSTEM FUNCTION sys.listdirpat @@ -939,6 +945,9 @@ create function isaurl(theurl url) retur create function sys.isauuid(s string) returns boolean external name uuid."isaUUID"; create function "left_shift"(i1 inet, i2 inet) returns boolean external name inet."<<"; create function "left_shift_assign"(i1 inet, i2 inet) returns boolean external name inet."<<="; +create procedure lidarattach(fname string) external name lidar.attach; +create procedure lidarexport(tname string, fname string, format string) external name lidar.export; +create procedure lidarload(tname string) external name lidar.load; create filter function "like"(val string, pat string, esc string) external name algebra."like"; create filter function "like"(val string, pat string) external name algebra."like"; @@ -2078,6 +2087,9 @@ drop function pcre_replace(string, strin [ "sys", "levenshtein", "levenshtein", "txtsim", 0, 1, false, false, false ] [ "sys", "levenshtein", "levenshtein", "txtsim", 0, 1, false, false, false ] [ "sys", "levenshtein", "levenshtein", "txtsim", 0, 1, false, false, false ] +[ "sys", "lidarattach", "create procedure lidarattach(fname string) external name lidar.attach;", "lidar", 1, 2, true, false, false ] +[ "sys", "lidarexport", "create procedure lidarexport(tname string, fname string, format string) external name lidar.export;", "lidar", 1, 2, true, false, false ] +[ "sys", "lidarload", "create procedure lidarload(tname string) external name lidar.load;", "lidar", 1, 2, true, false, false ] [ "sys", "like", "create filter function \"like\"(val string, pat string) external name algebra.\"like\";", "algebra", 1, 4, true, false, false ] [ "sys", "like", "create filter function \"like\"(val string, pat string, esc string) external name algebra.\"like\";", "algebra", 1, 4, true, false, false ] [ "sys", "listdir", "create procedure listdir(dirname string) external name fits.listdir;", "fits", 1, 2, true, false, false ] @@ -3803,6 +3815,9 @@ drop function pcre_replace(string, strin [ "sys", "levenshtein", "arg_1", "clob", 0, 0, 1, "arg_2", "clob", 0, 0, 1, "arg_3", "int", 32, 0, 1, "arg_4", "int", 32, 0, 1, "arg_5", "int", 32, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "levenshtein", "arg_1", "varchar", 0, 0, 1, "arg_2", "varchar", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "levenshtein", "arg_1", "varchar", 0, 0, 1, "arg_2", "varchar", 0, 0, 1, "arg_3", "int", 32, 0, 1, "arg_4", "int", 32, 0, 1, "arg_5", "int", 32, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] +[ "sys", "lidarattach", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] +[ "sys", "lidarexport", "fname", "clob", 0, 0, 1, "format", "clob", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] +[ "sys", "lidarload", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "like", "pat", "clob", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "like", "pat", "clob", 0, 0, 1, "esc", "clob", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "listdir", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] @@ -6237,6 +6252,9 @@ drop function pcre_replace(string, strin [ "levenshtein" ] [ "levenshtein" ] [ "levenshtein" ] +[ "lidarattach" ] +[ "lidarexport" ] +[ "lidarload" ] [ "like" ] [ "like" ] [ "listdir" ] diff --git a/sql/test/Tests/All b/sql/test/Tests/All --- a/sql/test/Tests/All +++ b/sql/test/Tests/All @@ -2,7 +2,7 @@ bincopycollist-prepare bincopycollist -HAVE_FITS&HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?systemfunctions +HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?systemfunctions example example-queries example-drop 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 @@ -885,6 +885,11 @@ Ready. [ "sys", "levenshtein", 3, "int", "" ] [ "sys", "levenshtein", 4, "int", "" ] [ "sys", "levenshtein", 5, "int", "" ] +[ "sys", "lidarattach", 0, "clob", "create procedure lidarattach(fname string) external name lidar.attach;" ] +[ "sys", "lidarexport", 0, "clob", "create procedure lidarexport(tname string, fname string, format string) external name lidar.export;" ] +[ "sys", "lidarexport", 1, "clob", "" ] +[ "sys", "lidarexport", 2, "clob", "" ] +[ "sys", "lidarload", 0, "clob", "create procedure lidarload(tname string) external name lidar.load;" ] [ "sys", "like", 0, "clob", "create filter function \"like\"(val string, pat string, esc string) external name algebra.\"like\";" ] [ "sys", "like", 1, "clob", "" ] [ "sys", "like", 2, "clob", "" ] 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 @@ -935,6 +935,11 @@ Ready. [ "sys", "levenshtein", 3, "int", "" ] [ "sys", "levenshtein", 4, "int", "" ] [ "sys", "levenshtein", 5, "int", "" ] +[ "sys", "lidarattach", 0, "clob", "create procedure lidarattach(fname string) external name lidar.attach;" ] +[ "sys", "lidarexport", 0, "clob", "create procedure lidarexport(tname string, fname string, format string) external name lidar.export;" ] +[ "sys", "lidarexport", 1, "clob", "" ] +[ "sys", "lidarexport", 2, "clob", "" ] +[ "sys", "lidarload", 0, "clob", "create procedure lidarload(tname string) external name lidar.load;" ] [ "sys", "like", 0, "clob", "create filter function \"like\"(val string, pat string, esc string) external name algebra.\"like\";" ] [ "sys", "like", 1, "clob", "" ] [ "sys", "like", 2, "clob", "" ] diff --git a/sql/test/leaks/Tests/All b/sql/test/leaks/Tests/All --- a/sql/test/leaks/Tests/All +++ b/sql/test/leaks/Tests/All @@ -1,12 +1,12 @@ -HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?check0 -HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?check1 -HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?temp1 -HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?check2 -HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?temp2 -HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?check3 -HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?temp3 -HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?drop3 -HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?check4 -HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?check5 -HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?select1 -HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?select2 +HAVE_GEOM&HAVE_GSL&HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?check0 +HAVE_GEOM&HAVE_GSL&HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?check1 +HAVE_GEOM&HAVE_GSL&HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?temp1 +HAVE_GEOM&HAVE_GSL&HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?check2 +HAVE_GEOM&HAVE_GSL&HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?temp2 +HAVE_GEOM&HAVE_GSL&HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?check3 +HAVE_GEOM&HAVE_GSL&HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?temp3 +HAVE_GEOM&HAVE_GSL&HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?drop3 +HAVE_GEOM&HAVE_GSL&HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?check4 +HAVE_GEOM&HAVE_GSL&HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?check5 +HAVE_GEOM&HAVE_GSL&HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?select1 +HAVE_GEOM&HAVE_GSL&HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?select2 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, bigint # type % 9, 3 # length -[ "transient", 553 ] +[ "transient", 551 ] #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, bigint # type % 9, 3 # length -[ "transient", 554 ] +[ "transient", 552 ] #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 @@ -43,10 +43,10 @@ Ready. [ "bit", 5 ] [ "bit", 56 ] [ "bit", 383 ] -[ "bit", 1548 ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list