Changeset: 8b80195fbd4f for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8b80195fbd4f Added Files: sql/backends/monet5/vaults/lidar/Tests/lidar-directory.stable.err sql/backends/monet5/vaults/lidar/Tests/lidar-directory.stable.out sql/backends/monet5/vaults/lidar/Tests/lidar-single-file.stable.err sql/backends/monet5/vaults/lidar/Tests/lidar-single-file.stable.out Modified Files: sql/backends/monet5/vaults/lidar/Tests/All sql/backends/monet5/vaults/lidar/Tests/lidar-single-file.sql.in Branch: data-vaults Log Message:
Add directory test and approve output diffs (truncated from 735 to 300 lines): diff --git a/sql/backends/monet5/vaults/lidar/Tests/All b/sql/backends/monet5/vaults/lidar/Tests/All --- a/sql/backends/monet5/vaults/lidar/Tests/All +++ b/sql/backends/monet5/vaults/lidar/Tests/All @@ -1,1 +1,2 @@ HAVE_DATA_PATH?lidar-single-file +HAVE_DATA_PATH?lidar-directory diff --git a/sql/backends/monet5/vaults/lidar/Tests/lidar-directory.stable.err b/sql/backends/monet5/vaults/lidar/Tests/lidar-directory.stable.err new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/vaults/lidar/Tests/lidar-directory.stable.err @@ -0,0 +1,137 @@ +stderr of test 'lidar-directory` in directory 'sql/backends/monet5/vaults/lidar` itself: + + +# 16:54:24 > +# 16:54:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34483" "--set" "mapi_usock=/var/tmp/mtest-10899/.s.monetdb.34483" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/kutsurak/work/monet/sources/MonetDB/build/install/var/MonetDB/mTests_sql_backends_monet5_vaults_lidar" +# 16:54:24 > + +# builtin opt gdk_dbpath = /home/kutsurak/work/monet/sources/MonetDB/build/install/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 34483 +# cmdline opt mapi_usock = /var/tmp/mtest-10899/.s.monetdb.34483 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /home/kutsurak/work/monet/sources/MonetDB/build/install/var/MonetDB/mTests_sql_backends_monet5_vaults_lidar +# 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 +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 + +--------------------------------------------------------- + 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 GeoAsciiParamsTag' + ID: 34737 Length: 47 + + 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 +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 + +--------------------------------------------------------- + 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 GeoAsciiParamsTag' + ID: 34737 Length: 47 + + 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 +Decimal type precision: 6 6 3 +decimal digits: 2 2 2 +total digits: 8 8 5 +count: 2 +id, rid: 0 2 +#Loading 106 rows +----------------LIDARloadTable_ called, creating reader +#File loaded in 1 ms id, rid: 1 3 +#Loading 106 rows +----------------LIDARloadTable_ called, creating reader +#File loaded in 1 ms +# 16:54:25 > +# 16:54:25 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-10899" "--port=34483" +# 16:54:25 > + + +# 16:54:25 > +# 16:54:25 > "Done." +# 16:54:25 > + diff --git a/sql/backends/monet5/vaults/lidar/Tests/lidar-directory.stable.out b/sql/backends/monet5/vaults/lidar/Tests/lidar-directory.stable.out new file mode 100644 --- /dev/null +++ b/sql/backends/monet5/vaults/lidar/Tests/lidar-directory.stable.out @@ -0,0 +1,272 @@ +stdout of test 'lidar-directory` in directory 'sql/backends/monet5/vaults/lidar` itself: + + +# 16:54:24 > +# 16:54:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34483" "--set" "mapi_usock=/var/tmp/mtest-10899/.s.monetdb.34483" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/kutsurak/work/monet/sources/MonetDB/build/install/var/MonetDB/mTests_sql_backends_monet5_vaults_lidar" +# 16:54:24 > + +# MonetDB 5 server v11.28.0 +# This is an unreleased version +# Serving database 'mTests_sql_backends_monet5_vaults_lidar', using 4 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers +# Found 15.519 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2017 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://zarquon.zarniwoop.org:34483/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-10899/.s.monetdb.34483 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. + +# 16:54:25 > +# 16:54:25 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-10899" "--port=34483" +# 16:54:25 > + +#select column_id, type, width, "sample", count, "unique", nils, minval, maxval, sorted, revsorted from sys.statistics; +% sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics # table_name +% column_id, type, width, sample, count, unique, nils, minval, maxval, sorted, revsorted # name +% int, clob, int, bigint, bigint, bigint, bigint, clob, clob, boolean, boolean # type +% 4, 12, 1, 1, 1, 1, 1, 13, 13, 5, 5 # length +[ 8414, "decimal(8,2)", 8, 0, 0, 0, 0, "635616.310000", "638864.600000", false, false ] +[ 8415, "decimal(8,2)", 8, 0, 0, 0, 0, "848977.790000", "853362.370000", false, false ] +[ 8416, "decimal(5,2)", 5, 0, 0, 0, 0, "407.350000", "536.840000", false, false ] +[ 8428, "decimal(8,2)", 8, 0, 0, 0, 0, "635616.310000", "638864.600000", false, false ] +[ 8429, "decimal(8,2)", 8, 0, 0, 0, 0, "848977.790000", "853362.370000", false, false ] +[ 8430, "decimal(5,2)", 5, 0, 0, 0, 0, "407.350000", "536.840000", false, false ] +#select * from vault_journal; +% sys.vault_journal, sys.vault_journal, sys.vault_journal, sys.vault_journal, sys.vault_journal # table_name +% table_id, table_name, vault_reader_id, vault_type, version # name +% int, varchar, int, varchar, varchar # type +% 4, 4, 1, 5, 5 # length +[ 8413, "tbl0", 1, "lidar", "1.8.0" ] +[ 8427, "tbl1", 1, "lidar", "1.8.0" ] +#select * from tbl1; +% sys.tbl1, sys.tbl1, sys.tbl1, sys.tbl1, sys.tbl1, sys.tbl1, sys.tbl1, sys.tbl1, sys.tbl1, sys.tbl1, sys.tbl1, sys.tbl1 # table_name +% x, y, z, n_returns, n_this_return, classification_number, point_source_id, edge_of_flight_line, direction_of_scan_flag, vertex_index, scan_angle, intensity # name +% decimal, decimal, decimal, int, int, smallint, int, int, int, int, smallint, int # type +% 10, 10, 7, 3, 3, 1, 3, 3, 3, 3, 3, 3 # length +[ 636083.30, 849398.65, 407.35, 0, 0, 1, 0, 0, 0, 0, -11, 0 ] +[ 635616.31, 849984.78, 423.95, 1, 1, 2, 1, 1, 1, 1, 13, 1 ] +[ 635918.31, 849737.43, 414.21, 2, 2, 2, 2, 2, 2, 2, 8, 2 ] +[ 636082.68, 849271.42, 427.92, 3, 3, 1, 3, 3, 3, 3, -2, 3 ] +[ 636454.69, 849950.89, 425.23, 4, 4, 2, 4, 4, 4, 4, 9, 4 ] +[ 636679.04, 849644.36, 411.15, 5, 5, 1, 5, 5, 5, 5, 2, 5 ] +[ 636926.61, 849800.43, 425.98, 6, 6, 1, 6, 6, 6, 6, 7, 6 ] +[ 637095.87, 849274.70, 411.25, 7, 7, 2, 7, 7, 7, 7, -7, 7 ] +[ 636992.03, 849974.97, 480.74, 8, 8, 1, 8, 8, 8, 8, 1, 8 ] +[ 636685.14, 849892.32, 432.32, 9, 9, 1, 9, 9, 9, 9, 1, 9 ] +[ 636328.83, 849966.93, 486.06, 10, 10, 1, 10, 10, 10, 10, 0, 10 ] +[ 635969.65, 850223.46, 426.25, 11, 11, 1, 11, 11, 11, 11, -6, 11 ] +[ 635742.81, 850120.87, 425.36, 12, 12, 1, 12, 12, 12, 12, -11, 12 ] +[ 636292.52, 850470.57, 431.10, 13, 13, 1, 13, 13, 13, 13, -5, 13 ] +[ 636717.98, 850439.86, 437.43, 14, 14, 2, 14, 14, 14, 14, -5, 14 ] +[ 637140.55, 850135.56, 478.77, 15, 15, 1, 15, 15, 15, 15, -10, 15 ] +[ 638332.51, 849367.19, 426.31, 16, 16, 1, 16, 16, 16, 16, -15, 16 ] +[ 637986.68, 849230.68, 462.37, 17, 17, 1, 17, 17, 17, 17, -9, 17 ] +[ 637371.00, 850034.61, 429.86, 18, 18, 1, 18, 18, 18, 18, 11, 18 ] +[ 637489.70, 849423.23, 411.02, 19, 19, 2, 19, 19, 19, 19, -2, 19 ] +[ 637743.82, 849702.66, 430.28, 20, 20, 1, 20, 20, 20, 20, 2, 20 ] +[ 637917.29, 849304.00, 536.84, 21, 21, 1, 21, 21, 21, 21, -3, 21 ] +[ 638091.73, 848977.79, 427.59, 22, 22, 1, 22, 22, 22, 22, -5, 22 ] +[ 638511.61, 850026.74, 435.47, 23, 23, 1, 23, 23, 23, 23, 19, 23 ] +[ 638788.45, 849495.24, 417.32, 24, 24, 1, 24, 24, 24, 24, 3, 24 ] +[ 638472.80, 850277.03, 426.84, 25, 25, 2, 25, 25, 25, 25, -8, 25 ] +[ 638290.78, 849373.95, 456.56, 26, 26, 1, 26, 26, 26, 26, 9, 26 ] +[ 637913.88, 849967.42, 427.26, 27, 27, 1, 27, 27, 27, 27, 2, 27 ] +[ 637700.45, 849934.32, 428.25, 28, 28, 2, 28, 28, 28, 28, 3, 28 ] +[ 637566.80, 850019.00, 425.92, 29, 29, 1, 29, 29, 29, 29, 2, 29 ] +[ 637351.83, 849987.93, 424.05, 30, 30, 1, 30, 30, 30, 30, 2, 30 ] +[ 637286.21, 850026.44, 429.79, 31, 31, 1, 31, 31, 31, 31, -12, 31 ] +[ 637925.71, 850414.47, 424.84, 32, 32, 1, 32, 32, 32, 32, 0, 32 ] +[ 638429.49, 849995.64, 444.55, 33, 33, 1, 33, 33, 33, 33, -15, 33 ] +[ 637099.93, 850669.32, 426.25, 34, 34, 1, 34, 34, 34, 34, -13, 34 ] +[ 636029.36, 850522.90, 425.98, 35, 35, 1, 35, 35, 35, 35, -10, 35 ] +[ 635993.60, 851224.11, 418.77, 36, 36, 2, 36, 36, 36, 36, 10, 36 ] +[ 636300.79, 851193.47, 417.52, 37, 37, 2, 37, 37, 37, 37, 8, 37 ] +[ 636318.27, 850528.71, 431.59, 38, 38, 1, 38, 38, 38, 38, -4, 38 ] +[ 636712.43, 850847.18, 435.43, 39, 39, 2, 39, 39, 39, 39, -1, 39 ] +[ 637179.66, 851307.12, 425.23, 40, 40, 2, 40, 40, 40, 40, 16, 40 ] +[ 637181.36, 850671.36, 474.51, 41, 41, 1, 41, 41, 41, 41, 13, 41 ] +[ 636736.19, 851723.69, 475.59, 42, 42, 1, 42, 42, 42, 42, -12, 42 ] +[ 636570.77, 851103.18, 494.49, 43, 43, 1, 43, 43, 43, 43, 2, 43 ] +[ 636417.03, 850806.33, 430.22, 44, 44, 1, 44, 44, 44, 44, 12, 44 ] +[ 636053.25, 851369.65, 419.85, 45, 45, 1, 45, 45, 45, 45, 0, 45 ] +[ 635777.40, 851542.78, 453.12, 46, 46, 1, 46, 46, 46, 46, -2, 46 ] +[ 635748.69, 852257.84, 416.99, 47, 47, 1, 47, 47, 47, 47, 2, 47 ] +[ 635891.27, 852001.35, 416.08, 48, 48, 1, 48, 48, 48, 48, -1, 48 ] +[ 636000.71, 851466.04, 416.27, 49, 49, 2, 49, 49, 49, 49, -7, 49 ] +[ 636428.02, 852527.59, 421.72, 50, 50, 1, 50, 50, 50, 50, 12, 50 ] +[ 636638.32, 852350.03, 417.32, 51, 51, 2, 51, 51, 51, 51, 6, 51 ] +[ 636784.38, 852110.24, 471.33, 52, 52, 1, 52, 52, 52, 52, 0, 52 ] +[ 637118.44, 852409.84, 424.08, 53, 53, 1, 53, 53, 53, 53, 8, 53 ] +[ 637257.08, 852442.45, 425.26, 54, 54, 1, 54, 54, 54, 54, 1, 54 ] +[ 636982.91, 851998.46, 443.18, 55, 55, 2, 55, 55, 55, 55, 14, 55 ] +[ 636648.00, 852437.83, 420.24, 56, 56, 1, 56, 56, 56, 56, 0, 56 ] +[ 636338.48, 852695.28, 470.24, 57, 57, 1, 57, 57, 57, 57, -2, 57 ] +[ 635983.82, 852885.99, 418.73, 58, 58, 1, 58, 58, 58, 58, -7, 58 ] +[ 635748.39, 852813.12, 462.14, 59, 59, 1, 59, 59, 59, 59, -4, 59 ] +[ 636175.71, 852861.48, 422.41, 60, 60, 2, 60, 60, 60, 60, -9, 60 ] +[ 636799.05, 852851.87, 455.68, 61, 61, 1, 61, 61, 61, 61, -11, 61 ] +[ 638570.70, 850527.33, 432.97, 62, 62, 1, 62, 62, 62, 62, -12, 62 ] +[ 637616.57, 850626.05, 452.13, 63, 63, 1, 63, 63, 63, 63, -11, 63 ] +[ 637294.55, 850719.13, 422.38, 64, 64, 1, 64, 64, 64, 64, 1, 64 ] +[ 637664.76, 850643.37, 437.93, 65, 65, 1, 65, 65, 65, 65, -1, 65 ] +[ 638040.45, 851267.22, 420.96, 66, 66, 2, 66, 66, 66, 66, 17, 66 ] +[ 638317.62, 850430.81, 425.03, 67, 67, 1, 67, 67, 67, 67, -5, 67 ] +[ 638739.93, 851223.88, 534.06, 68, 68, 1, 68, 68, 68, 68, 16, 68 ] +[ 638854.23, 851767.45, 512.50, 69, 69, 1, 69, 69, 69, 69, -10, 69 ] +[ 638671.71, 851434.94, 495.34, 70, 70, 1, 70, 70, 70, 70, -5, 70 ] +[ 638414.27, 851304.99, 421.00, 71, 71, 2, 71, 71, 71, 71, -2, 71 ] +[ 638144.49, 851019.91, 421.03, 72, 72, 2, 72, 72, 72, 72, 5, 72 ] +[ 637816.11, 851492.95, 424.80, 73, 73, 1, 73, 73, 73, 73, -5, 73 ] +[ 637720.41, 851026.05, 420.51, 74, 74, 1, 74, 74, 74, 74, 8, 74 ] +[ 637347.57, 851895.96, 417.16, 75, 75, 2, 75, 75, 75, 75, -13, 75 ] +[ 637434.02, 852480.18, 425.72, 76, 76, 1, 76, 76, 76, 76, 12, 76 ] +[ 637688.21, 852550.30, 424.11, 77, 77, 1, 77, 77, 77, 77, 16, 77 ] +[ 637911.38, 852563.22, 424.44, 78, 78, 1, 78, 78, 78, 78, 12, 78 ] +[ 637883.56, 851511.65, 424.44, 79, 79, 1, 79, 79, 79, 79, -7, 79 ] +[ 638040.88, 851284.02, 421.06, 80, 80, 1, 80, 80, 80, 80, -16, 80 ] +[ 638404.36, 851708.33, 424.67, 81, 81, 1, 81, 81, 81, 81, -9, 81 ] +[ 638749.90, 852044.82, 461.94, 82, 82, 1, 82, 82, 82, 82, 2, 82 ] +[ 638742.71, 851360.40, 490.62, 83, 83, 1, 83, 83, 83, 83, -11, 83 ] +[ 638864.60, 852417.16, 419.29, 84, 84, 2, 84, 84, 84, 84, 4, 84 ] +[ 638585.99, 852644.98, 421.49, 85, 85, 1, 85, 85, 85, 85, -1, 85 ] +[ 638392.95, 852045.77, 419.65, 86, 86, 1, 86, 86, 86, 86, 8, 86 ] +[ 637997.77, 851987.76, 424.41, 87, 87, 2, 87, 87, 87, 87, 11, 87 ] +[ 637533.95, 852692.29, 423.13, 88, 88, 1, 88, 88, 88, 88, -3, 88 ] +[ 637327.56, 852610.07, 422.74, 89, 89, 1, 89, 89, 89, 89, 0, 89 ] +[ 637926.90, 852727.95, 424.08, 90, 90, 2, 90, 90, 90, 90, -10, 90 ] +[ 638738.78, 852761.29, 422.18, 91, 91, 2, 91, 91, 91, 91, -7, 91 ] +[ 636842.36, 853116.21, 433.27, 92, 92, 1, 92, 92, 92, 92, -10, 92 ] +[ 636242.78, 853217.59, 416.60, 93, 93, 1, 93, 93, 93, 93, -13, 93 ] +[ 635781.17, 853044.69, 414.01, 94, 94, 1, 94, 94, 94, 94, -4, 94 ] +[ 636421.39, 853317.65, 416.50, 95, 95, 1, 95, 95, 95, 95, 1, 95 ] +[ 636903.64, 853069.85, 454.20, 96, 96, 1, 96, 96, 96, 96, -7, 96 ] +[ 636866.60, 853362.37, 430.84, 97, 97, 1, 97, 97, 97, 97, 9, 97 ] _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
