Changeset: c61623659d63 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c61623659d63 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 sql/backends/monet5/vaults/lidar/Tests/lidar-directory.stable.err sql/backends/monet5/vaults/lidar/Tests/lidar-single-file.stable.err Branch: data-vaults Log Message:
Approve tests diffs (truncated from 304 to 300 lines): 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 @@ -11183,23 +11183,6 @@ Ready. [ "uuid", "prelude", "command uuid.prelude():void ", "UUIDprelude;", "" ] [ "uuid", "str", "command uuid.str(u:uuid):str ", "UUIDuuid2str;", "Coerce a uuid to its string type" ] [ "uuid", "uuid", "command uuid.uuid(s:str):uuid ", "UUIDstr2uuid;", "Coerce a string to a uuid, validating its format" ] -[ "vault", "analyzetab", "function vault.analyzetab(status:int, tablename:str):int;", "", "" ] -[ "vault", "analyzetable", "pattern vault.analyzetable(readerID:int, status:int, tablename:str):int ", "VLTanalyzeTable;", "Analyze table" ] -[ "vault", "basename", "command vault.basename(fnme:str, split:str):str ", "VLTbasename;", "Split the fnme string just before the split marker." ] -[ "vault", "bind", "pattern vault.bind(status:int, mvc:int, schema:str, table:str, column:str, access:int) (uid:bat[:oid], uval:bat[:any_1]) ", "mvc_VLT_bind_wrap;", "Bind the 'schema.table.column' BAT with access kind:\n\t0 - base table\n\t1 - inserts\n\t2 - updates" ] -[ "vault", "bind", "pattern vault.bind(status:int, mvc:int, schema:str, table:str, column:str, access:int):bat[:any_1] ", "mvc_VLT_bind_wrap;", "Bind the 'schema.table.column' BAT with access kind:\n\t0 - base table\n\t1 - inserts\n\t2 - updates" ] -[ "vault", "bind", "pattern vault.bind(status:int, mvc:int, schema:str, table:str, column:str, access:int, part_nr:int, nr_parts:int) (uid:bat[:oid], uval:bat[:any_1]) ", "mvc_VLT_bind_wrap;", "Bind the 'schema.table.column' BAT with access kind:\n\t0 - base table\n\t1 - inserts\n\t2 - updates" ] -[ "vault", "bind", "pattern vault.bind(status:int, mvc:int, schema:str, table:str, column:str, access:int, part_nr:int, nr_parts:int):bat[:any_1] ", "mvc_VLT_bind_wrap;", "Bind the 'schema.table.column' BAT partition with access kind:\n\t0 - base table\n\t1 - inserts\n\t2 - updates" ] -[ "vault", "checktab", "function vault.checktab(tablename:str) (X_0:int, X_1:int);", "", "" ] -[ "vault", "checktable", "pattern vault.checktable(mvc:int, tablename:str) (readerID:int, status:int) ", "VLTcheckTable;", "Check if table was loaded" ] -[ "vault", "epiloque", "command vault.epiloque():void ", "VLTepilogue;", "Cleanup the vault." ] -[ "vault", "getdirectory", "command vault.getdirectory():str ", "VLTgetLocation;", "Return the location of the root vault directory" ] -[ "vault", "import", "command vault.import(src:str, trg:str):timestamp ", "VLTimport;", "Use FTP to copy a remote file to the cache" ] -[ "vault", "prelude", "command vault.prelude():void ", "VLTprelude;", "" ] -[ "vault", "remove", "command vault.remove(t:str):timestamp ", "VLTremove;", "Drop a file from the local cache" ] -[ "vault", "setdirectory", "command vault.setdirectory(src:str):str ", "VLTsetLocation;", "Change the location of the root vault directory" ] -[ "vault", "tid", "pattern vault.tid(tatus:int, mvc:int, sname:str, tname:str):bat[:oid] ", "VLTTid;", "Return the tables tid column." ] -[ "vault", "tid", "pattern vault.tid(tatus:int, mvc:int, sname:str, tname:str, part_nr:int, nr_parts:int):bat[:oid] ", "VLTTid;", "Return the tables tid column." ] [ "wkb", "#cmp", "command wkb.#cmp():void ", "wkbCOMP;", "" ] [ "wkb", "#del", "command wkb.#del():void ", "wkbDEL;", "" ] [ "wkb", "#fromstr", "command wkb.#fromstr():void ", "wkbFROMSTR;", "" ] 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 @@ -15397,23 +15397,6 @@ Ready. [ "uuid", "prelude", "command uuid.prelude():void ", "UUIDprelude;", "" ] [ "uuid", "str", "command uuid.str(u:uuid):str ", "UUIDuuid2str;", "Coerce a uuid to its string type" ] [ "uuid", "uuid", "command uuid.uuid(s:str):uuid ", "UUIDstr2uuid;", "Coerce a string to a uuid, validating its format" ] -[ "vault", "analyzetab", "function vault.analyzetab(status:int, tablename:str):int;", "", "" ] -[ "vault", "analyzetable", "pattern vault.analyzetable(readerID:int, status:int, tablename:str):int ", "VLTanalyzeTable;", "Analyze table" ] -[ "vault", "basename", "command vault.basename(fnme:str, split:str):str ", "VLTbasename;", "Split the fnme string just before the split marker." ] -[ "vault", "bind", "pattern vault.bind(status:int, mvc:int, schema:str, table:str, column:str, access:int) (uid:bat[:oid], uval:bat[:any_1]) ", "mvc_VLT_bind_wrap;", "Bind the 'schema.table.column' BAT with access kind:\n\t0 - base table\n\t1 - inserts\n\t2 - updates" ] -[ "vault", "bind", "pattern vault.bind(status:int, mvc:int, schema:str, table:str, column:str, access:int):bat[:any_1] ", "mvc_VLT_bind_wrap;", "Bind the 'schema.table.column' BAT with access kind:\n\t0 - base table\n\t1 - inserts\n\t2 - updates" ] -[ "vault", "bind", "pattern vault.bind(status:int, mvc:int, schema:str, table:str, column:str, access:int, part_nr:int, nr_parts:int) (uid:bat[:oid], uval:bat[:any_1]) ", "mvc_VLT_bind_wrap;", "Bind the 'schema.table.column' BAT with access kind:\n\t0 - base table\n\t1 - inserts\n\t2 - updates" ] -[ "vault", "bind", "pattern vault.bind(status:int, mvc:int, schema:str, table:str, column:str, access:int, part_nr:int, nr_parts:int):bat[:any_1] ", "mvc_VLT_bind_wrap;", "Bind the 'schema.table.column' BAT partition with access kind:\n\t0 - base table\n\t1 - inserts\n\t2 - updates" ] -[ "vault", "checktab", "function vault.checktab(tablename:str) (X_0:int, X_1:int);", "", "" ] -[ "vault", "checktable", "pattern vault.checktable(mvc:int, tablename:str) (readerID:int, status:int) ", "VLTcheckTable;", "Check if table was loaded" ] -[ "vault", "epiloque", "command vault.epiloque():void ", "VLTepilogue;", "Cleanup the vault." ] -[ "vault", "getdirectory", "command vault.getdirectory():str ", "VLTgetLocation;", "Return the location of the root vault directory" ] -[ "vault", "import", "command vault.import(src:str, trg:str):timestamp ", "VLTimport;", "Use FTP to copy a remote file to the cache" ] -[ "vault", "prelude", "command vault.prelude():void ", "VLTprelude;", "" ] -[ "vault", "remove", "command vault.remove(t:str):timestamp ", "VLTremove;", "Drop a file from the local cache" ] -[ "vault", "setdirectory", "command vault.setdirectory(src:str):str ", "VLTsetLocation;", "Change the location of the root vault directory" ] -[ "vault", "tid", "pattern vault.tid(tatus:int, mvc:int, sname:str, tname:str):bat[:oid] ", "VLTTid;", "Return the tables tid column." ] -[ "vault", "tid", "pattern vault.tid(tatus:int, mvc:int, sname:str, tname:str, part_nr:int, nr_parts:int):bat[:oid] ", "VLTTid;", "Return the tables tid column." ] [ "wkb", "#cmp", "command wkb.#cmp():void ", "wkbCOMP;", "" ] [ "wkb", "#del", "command wkb.#del():void ", "wkbDEL;", "" ] [ "wkb", "#fromstr", "command wkb.#fromstr():void ", "wkbFROMSTR;", "" ] diff --git a/sql/backends/monet5/vaults/lidar/Tests/lidar-directory.stable.err b/sql/backends/monet5/vaults/lidar/Tests/lidar-directory.stable.err --- a/sql/backends/monet5/vaults/lidar/Tests/lidar-directory.stable.err +++ b/sql/backends/monet5/vaults/lidar/Tests/lidar-directory.stable.err @@ -24,49 +24,49 @@ stderr of test 'lidar-directory` in dire # cmdline opt gdk_debug = 536870922 Params: XYZainrcpedM Initial table name: tbl1 -file: /home/kutsurak/work/monet/sources/monetdb-test-data/lidar/directory_loading/lidar1.las 2 -file: /home/kutsurak/work/monet/sources/monetdb-test-data/lidar/directory_loading/lidar2.las 2 +#file: /home/kutsurak/work/monet/sources/monetdb-test-data/lidar/directory_loading/lidar1.las 2 +#file: /home/kutsurak/work/monet/sources/monetdb-test-data/lidar/directory_loading/lidar2.las 2 tname: tbl1 tablename: tbl1 ---------------------------------------------------------- - Header Summary ---------------------------------------------------------- - File Name: /home/kutsurak/work/monet/sources/monetdb-test-data/lidar/directory_loading/lidar1.las - Version: 1.2 - Source ID: 0 - Reserved: 0 - Project ID/GUID: '00000000-0000-0000-0000-000000000000' - System Identifier: '' - Generating Software: 'TerraScan' - File Creation Day/Year: 0/0 - Header Size 227 - Offset to Point Data 1994 - Number Var. Length Records 4 - Point Data Format 1 - Point Data Record Length 28 - Number of Point Records 106 - Number of Points by Return 90 12 2 2 0 - Scale Factor X Y Z 0.01 0.01 0.01 - Offset X Y Z -0.000000 -0.000000 -0.000000 - Min X Y Z 635616.310000 848977.790000 407.350000 - Max X Y Z 638864.600000 853362.370000 536.840000 - Spatial Reference +proj=lcc +lat_1=43 +lat_2=45.5 +lat_0=41.75 +lon_0=-120.5 +x_0=399999.9999984 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=ft +no_defs +#--------------------------------------------------------- +# Header Summary +#--------------------------------------------------------- +# File Name: /home/kutsurak/work/monet/sources/monetdb-test-data/lidar/directory_loading/lidar1.las +# Version: 1.2 +# Source ID: 0 +# Reserved: 0 +# Project ID/GUID: '00000000-0000-0000-0000-000000000000' +# System Identifier: '' +# Generating Software: 'TerraScan' +# File Creation Day/Year: 0/0 +# Header Size 227 +# Offset to Point Data 1994 +# Number Var. Length Records 4 +# Point Data Format 1 +# Point Data Record Length 28 +# Number of Point Records 106 +# Number of Points by Return 90 12 2 2 0 +# Scale Factor X Y Z 0.01 0.01 0.01 +# Offset X Y Z -0.000000 -0.000000 -0.000000 +# Min X Y Z 635616.310000 848977.790000 407.350000 +# Max X Y Z 638864.600000 853362.370000 536.840000 +# Spatial Reference +proj=lcc +lat_1=43 +lat_2=45.5 +lat_0=41.75 +lon_0=-120.5 +x_0=399999.9999984 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=ft +no_defs ---------------------------------------------------------- - VLR Summary ---------------------------------------------------------- - User: 'liblas' - Description: 'OGR variant of OpenGIS WKT SRS' - ID: 2112 Length: 720 +#--------------------------------------------------------- +# VLR Summary +#--------------------------------------------------------- +# User: 'liblas' - Description: 'OGR variant of OpenGIS WKT SRS' +# ID: 2112 Length: 720 - User: 'LASF_Projection' - Description: 'GeoTIFF GeoKeyDirectoryTag' - ID: 34735 Length: 64 +# User: 'LASF_Projection' - Description: 'GeoTIFF GeoKeyDirectoryTag' +# ID: 34735 Length: 64 - User: 'LASF_Projection' - Description: 'GeoTIFF GeoAsciiParamsTag' - ID: 34737 Length: 47 +# User: 'LASF_Projection' - Description: 'GeoTIFF GeoAsciiParamsTag' +# ID: 34737 Length: 47 - User: 'liblas' - Description: 'OGR variant of OpenGIS WKT SRS' - ID: 2112 Length: 720 +# User: 'liblas' - Description: 'OGR variant of OpenGIS WKT SRS' +# ID: 2112 Length: 720 Scale: 0.010000 0.010000 0.010000 Decimal type scale: 2 2 2 @@ -74,44 +74,44 @@ Decimal type precision: 6 6 3 decimal digits: 2 2 2 total digits: 8 8 5 ---------------------------------------------------------- - Header Summary ---------------------------------------------------------- - File Name: /home/kutsurak/work/monet/sources/monetdb-test-data/lidar/directory_loading/lidar2.las - Version: 1.2 - Source ID: 0 - Reserved: 0 - Project ID/GUID: '00000000-0000-0000-0000-000000000000' - System Identifier: '' - Generating Software: 'TerraScan' - File Creation Day/Year: 0/0 - Header Size 227 - Offset to Point Data 1994 - Number Var. Length Records 4 - Point Data Format 1 - Point Data Record Length 28 - Number of Point Records 106 - Number of Points by Return 90 12 2 2 0 - Scale Factor X Y Z 0.01 0.01 0.01 - Offset X Y Z -0.000000 -0.000000 -0.000000 - Min X Y Z 635616.310000 848977.790000 407.350000 - Max X Y Z 638864.600000 853362.370000 536.840000 - Spatial Reference +proj=lcc +lat_1=43 +lat_2=45.5 +lat_0=41.75 +lon_0=-120.5 +x_0=399999.9999984 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=ft +no_defs +#--------------------------------------------------------- +# Header Summary +#--------------------------------------------------------- +# File Name: /home/kutsurak/work/monet/sources/monetdb-test-data/lidar/directory_loading/lidar2.las +# Version: 1.2 +# Source ID: 0 +# Reserved: 0 +# Project ID/GUID: '00000000-0000-0000-0000-000000000000' +# System Identifier: '' +# Generating Software: 'TerraScan' +# File Creation Day/Year: 0/0 +# Header Size 227 +# Offset to Point Data 1994 +# Number Var. Length Records 4 +# Point Data Format 1 +# Point Data Record Length 28 +# Number of Point Records 106 +# Number of Points by Return 90 12 2 2 0 +# Scale Factor X Y Z 0.01 0.01 0.01 +# Offset X Y Z -0.000000 -0.000000 -0.000000 +# Min X Y Z 635616.310000 848977.790000 407.350000 +# Max X Y Z 638864.600000 853362.370000 536.840000 +# Spatial Reference +proj=lcc +lat_1=43 +lat_2=45.5 +lat_0=41.75 +lon_0=-120.5 +x_0=399999.9999984 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=ft +no_defs ---------------------------------------------------------- - VLR Summary ---------------------------------------------------------- - User: 'liblas' - Description: 'OGR variant of OpenGIS WKT SRS' - ID: 2112 Length: 720 +#--------------------------------------------------------- +# VLR Summary +#--------------------------------------------------------- +# User: 'liblas' - Description: 'OGR variant of OpenGIS WKT SRS' +# ID: 2112 Length: 720 - User: 'LASF_Projection' - Description: 'GeoTIFF GeoKeyDirectoryTag' - ID: 34735 Length: 64 +# User: 'LASF_Projection' - Description: 'GeoTIFF GeoKeyDirectoryTag' +# ID: 34735 Length: 64 - User: 'LASF_Projection' - Description: 'GeoTIFF GeoAsciiParamsTag' - ID: 34737 Length: 47 +# User: 'LASF_Projection' - Description: 'GeoTIFF GeoAsciiParamsTag' +# ID: 34737 Length: 47 - User: 'liblas' - Description: 'OGR variant of OpenGIS WKT SRS' - ID: 2112 Length: 720 +# User: 'liblas' - Description: 'OGR variant of OpenGIS WKT SRS' +# ID: 2112 Length: 720 Scale: 0.010000 0.010000 0.010000 Decimal type scale: 2 2 2 diff --git a/sql/backends/monet5/vaults/lidar/Tests/lidar-single-file.stable.err b/sql/backends/monet5/vaults/lidar/Tests/lidar-single-file.stable.err --- a/sql/backends/monet5/vaults/lidar/Tests/lidar-single-file.stable.err +++ b/sql/backends/monet5/vaults/lidar/Tests/lidar-single-file.stable.err @@ -27,44 +27,44 @@ Initial table name: tbl0 tname: tbl0 tablename: tbl0 ---------------------------------------------------------- - Header Summary ---------------------------------------------------------- - File Name: /home/kutsurak/work/monet/sources/monetdb-test-data/lidar/lidar1.las - Version: 1.2 - Source ID: 0 - Reserved: 0 - Project ID/GUID: '00000000-0000-0000-0000-000000000000' - System Identifier: '' - Generating Software: 'TerraScan' - File Creation Day/Year: 0/0 - Header Size 227 - Offset to Point Data 1994 - Number Var. Length Records 4 - Point Data Format 1 - Point Data Record Length 28 - Number of Point Records 106 - Number of Points by Return 90 12 2 2 0 - Scale Factor X Y Z 0.01 0.01 0.01 - Offset X Y Z -0.000000 -0.000000 -0.000000 - Min X Y Z 635616.310000 848977.790000 407.350000 - Max X Y Z 638864.600000 853362.370000 536.840000 - Spatial Reference +proj=lcc +lat_1=43 +lat_2=45.5 +lat_0=41.75 +lon_0=-120.5 +x_0=399999.9999984 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=ft +no_defs +#--------------------------------------------------------- +# Header Summary +#--------------------------------------------------------- +# File Name: /home/kutsurak/work/monet/sources/monetdb-test-data/lidar/lidar1.las +# Version: 1.2 +# Source ID: 0 +# Reserved: 0 +# Project ID/GUID: '00000000-0000-0000-0000-000000000000' +# System Identifier: '' +# Generating Software: 'TerraScan' +# File Creation Day/Year: 0/0 +# Header Size 227 +# Offset to Point Data 1994 +# Number Var. Length Records 4 +# Point Data Format 1 +# Point Data Record Length 28 +# Number of Point Records 106 +# Number of Points by Return 90 12 2 2 0 +# Scale Factor X Y Z 0.01 0.01 0.01 +# Offset X Y Z -0.000000 -0.000000 -0.000000 +# Min X Y Z 635616.310000 848977.790000 407.350000 +# Max X Y Z 638864.600000 853362.370000 536.840000 +# Spatial Reference +proj=lcc +lat_1=43 +lat_2=45.5 +lat_0=41.75 +lon_0=-120.5 +x_0=399999.9999984 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=ft +no_defs ---------------------------------------------------------- - VLR Summary ---------------------------------------------------------- - User: 'liblas' - Description: 'OGR variant of OpenGIS WKT SRS' - ID: 2112 Length: 720 +#--------------------------------------------------------- +# VLR Summary +#--------------------------------------------------------- +# User: 'liblas' - Description: 'OGR variant of OpenGIS WKT SRS' +# ID: 2112 Length: 720 - User: 'LASF_Projection' - Description: 'GeoTIFF GeoKeyDirectoryTag' - ID: 34735 Length: 64 +# User: 'LASF_Projection' - Description: 'GeoTIFF GeoKeyDirectoryTag' +# ID: 34735 Length: 64 - User: 'LASF_Projection' - Description: 'GeoTIFF GeoAsciiParamsTag' - ID: 34737 Length: 47 +# User: 'LASF_Projection' - Description: 'GeoTIFF GeoAsciiParamsTag' +# ID: 34737 Length: 47 - User: 'liblas' - Description: 'OGR variant of OpenGIS WKT SRS' - ID: 2112 Length: 720 +# User: 'liblas' - Description: 'OGR variant of OpenGIS WKT SRS' _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
