Changeset: 664fad1a3a74 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=664fad1a3a74
Added Files:
sql/backends/monet5/vaults/Tests/All
sql/backends/monet5/vaults/bam/75_bam.mal
sql/backends/monet5/vaults/bam/75_bam.sql
sql/backends/monet5/vaults/bam/BAMRecipe.pdf
sql/backends/monet5/vaults/bam/Makefile.ag
sql/backends/monet5/vaults/bam/Tests/All
sql/backends/monet5/vaults/bam/Tests/bam.py
sql/backends/monet5/vaults/bam/Tests/bam_export.SQL.py
sql/backends/monet5/vaults/bam/Tests/bam_lib.reqtests
sql/backends/monet5/vaults/bam/Tests/bam_lib.sql
sql/backends/monet5/vaults/bam/Tests/bam_lib.stable.err
sql/backends/monet5/vaults/bam/Tests/bam_lib.stable.out
sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.mal
sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.stable.err
sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.stable.out
sql/backends/monet5/vaults/bam/Tests/bam_loader_file.SQL.py
sql/backends/monet5/vaults/bam/Tests/bam_loader_file.stable.err
sql/backends/monet5/vaults/bam/Tests/bam_loader_file.stable.out
sql/backends/monet5/vaults/bam/Tests/bam_loader_files.SQL.py
sql/backends/monet5/vaults/bam/Tests/bam_loader_files.stable.err
sql/backends/monet5/vaults/bam/Tests/bam_loader_files.stable.out
sql/backends/monet5/vaults/bam/Tests/bam_loader_repos.SQL.py
sql/backends/monet5/vaults/bam/Tests/bam_loader_repos.stable.err
sql/backends/monet5/vaults/bam/Tests/bam_loader_repos.stable.out
sql/backends/monet5/vaults/bam/Tests/check_files.reqtests
sql/backends/monet5/vaults/bam/Tests/check_files.sql
sql/backends/monet5/vaults/bam/Tests/check_files.stable.err
sql/backends/monet5/vaults/bam/Tests/check_files.stable.out
sql/backends/monet5/vaults/bam/Tests/check_files_exact.sql
sql/backends/monet5/vaults/bam/Tests/check_files_exact.stable.err
sql/backends/monet5/vaults/bam/Tests/check_files_exact.stable.out
sql/backends/monet5/vaults/bam/Tests/coverage_usecase.reqtests
sql/backends/monet5/vaults/bam/Tests/coverage_usecase.sql
sql/backends/monet5/vaults/bam/Tests/drop_last_files.SQL.py
sql/backends/monet5/vaults/bam/Tests/drop_last_files.stable.err
sql/backends/monet5/vaults/bam/Tests/drop_last_files.stable.out
sql/backends/monet5/vaults/bam/Tests/files/file1.bam
sql/backends/monet5/vaults/bam/Tests/files/file2.sam
sql/backends/monet5/vaults/bam/Tests/files/queryname/file1.bam
sql/backends/monet5/vaults/bam/Tests/files/queryname/file2.sam
sql/backends/monet5/vaults/bam/Tests/mergetable.reqtests
sql/backends/monet5/vaults/bam/Tests/mergetable.sql
sql/backends/monet5/vaults/bam/Tests/mergetable.stable.err
sql/backends/monet5/vaults/bam/Tests/mergetable.stable.out
sql/backends/monet5/vaults/bam/Tests/query1.1.reqtests
sql/backends/monet5/vaults/bam/Tests/query1.1.sql
sql/backends/monet5/vaults/bam/Tests/query1.1.stable.err
sql/backends/monet5/vaults/bam/Tests/query1.1.stable.out
sql/backends/monet5/vaults/bam/Tests/query1.2.reqtests
sql/backends/monet5/vaults/bam/Tests/query1.2.sql
sql/backends/monet5/vaults/bam/Tests/query1.2.stable.err
sql/backends/monet5/vaults/bam/Tests/query1.2.stable.out
sql/backends/monet5/vaults/bam/Tests/query1.3.reqtests
sql/backends/monet5/vaults/bam/Tests/query1.3.sql
sql/backends/monet5/vaults/bam/Tests/query1.3.stable.err
sql/backends/monet5/vaults/bam/Tests/query1.3.stable.out
sql/backends/monet5/vaults/bam/Tests/query1.4.reqtests
sql/backends/monet5/vaults/bam/Tests/query1.4.sql
sql/backends/monet5/vaults/bam/Tests/query1.4.stable.err
sql/backends/monet5/vaults/bam/Tests/query1.4.stable.out
sql/backends/monet5/vaults/bam/Tests/query1.5.reqtests
sql/backends/monet5/vaults/bam/Tests/query1.5.sql
sql/backends/monet5/vaults/bam/Tests/query1.5.stable.err
sql/backends/monet5/vaults/bam/Tests/query1.5.stable.out
sql/backends/monet5/vaults/bam/Tests/query1.6.reqtests
sql/backends/monet5/vaults/bam/Tests/query1.6.sql
sql/backends/monet5/vaults/bam/Tests/query2.1.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.1.sql
sql/backends/monet5/vaults/bam/Tests/query2.1.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.1.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.10.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.10.sql
sql/backends/monet5/vaults/bam/Tests/query2.10.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.10.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.11.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.11.sql
sql/backends/monet5/vaults/bam/Tests/query2.11.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.11.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.12.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.12.sql
sql/backends/monet5/vaults/bam/Tests/query2.12.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.12.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.12.stable.out.int128
sql/backends/monet5/vaults/bam/Tests/query2.2.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.2.sql
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out.int128
sql/backends/monet5/vaults/bam/Tests/query2.3.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.3.sql
sql/backends/monet5/vaults/bam/Tests/query2.3.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.3.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.4.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.4.sql
sql/backends/monet5/vaults/bam/Tests/query2.4.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.4.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.5.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.5.sql
sql/backends/monet5/vaults/bam/Tests/query2.5.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.5.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.5.stable.out.int128
sql/backends/monet5/vaults/bam/Tests/query2.6.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.6.sql
sql/backends/monet5/vaults/bam/Tests/query2.6.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.6.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.7.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.7.sql
sql/backends/monet5/vaults/bam/Tests/query2.7.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.7.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.8.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.8.sql
sql/backends/monet5/vaults/bam/Tests/query2.8.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.8.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.9.reqtests
sql/backends/monet5/vaults/bam/Tests/query2.9.sql
sql/backends/monet5/vaults/bam/Tests/query2.9.stable.err
sql/backends/monet5/vaults/bam/Tests/query2.9.stable.out
sql/backends/monet5/vaults/bam/Tests/sam_export.SQL.py
sql/backends/monet5/vaults/bam/Tests/sam_export.reqtests
sql/backends/monet5/vaults/bam/Tests/sam_export.stable.err
sql/backends/monet5/vaults/bam/Tests/sam_export.stable.out
sql/backends/monet5/vaults/bam/Tests/sql/bam_export.sql
sql/backends/monet5/vaults/bam/Tests/sql/bam_loader_file.sql
sql/backends/monet5/vaults/bam/Tests/sql/bam_loader_files.sql
sql/backends/monet5/vaults/bam/Tests/sql/bam_loader_repos.sql
sql/backends/monet5/vaults/bam/Tests/sql/sam_export.sql
sql/backends/monet5/vaults/bam/Tests/verify_load.sql
sql/backends/monet5/vaults/bam/Tests/verify_load.stable.err
sql/backends/monet5/vaults/bam/Tests/verify_load.stable.out
sql/backends/monet5/vaults/bam/bam.mal
sql/backends/monet5/vaults/bam/bam_db_interface.c
sql/backends/monet5/vaults/bam/bam_db_interface.h
sql/backends/monet5/vaults/bam/bam_export.c
sql/backends/monet5/vaults/bam/bam_export.h
sql/backends/monet5/vaults/bam/bam_globals.c
sql/backends/monet5/vaults/bam/bam_globals.h
sql/backends/monet5/vaults/bam/bam_lib.c
sql/backends/monet5/vaults/bam/bam_lib.h
sql/backends/monet5/vaults/bam/bam_loader.c
sql/backends/monet5/vaults/bam/bam_loader.h
sql/backends/monet5/vaults/bam/bam_wrapper.c
sql/backends/monet5/vaults/bam/bam_wrapper.h
sql/backends/monet5/vaults/bam/default_schema.dia
sql/backends/monet5/vaults/bam/default_schema.png
sql/backends/monet5/vaults/bam/metadata.dia
sql/backends/monet5/vaults/bam/metadata.png
sql/backends/monet5/vaults/bam/mykstring.h
sql/backends/monet5/vaults/bam/paired_schema.dia
sql/backends/monet5/vaults/bam/paired_schema.png
sql/backends/monet5/vaults/fits/73_fits.mal
sql/backends/monet5/vaults/fits/73_fits.sql
sql/backends/monet5/vaults/fits/Makefile.ag
sql/backends/monet5/vaults/fits/fits.c
sql/backends/monet5/vaults/fits/fits.h
sql/backends/monet5/vaults/fits/fits.mal
sql/backends/monet5/vaults/miniseed/71_registrar.mal
sql/backends/monet5/vaults/miniseed/71_registrar.slq
sql/backends/monet5/vaults/miniseed/72_miniseed.mal
sql/backends/monet5/vaults/miniseed/72_miniseed.sql
sql/backends/monet5/vaults/miniseed/Makefile.ag
sql/backends/monet5/vaults/miniseed/Tests/All
sql/backends/monet5/vaults/miniseed/Tests/file_list_example.txt
sql/backends/monet5/vaults/miniseed/Tests/mount.mal
sql/backends/monet5/vaults/miniseed/Tests/mount.stable.err
sql/backends/monet5/vaults/miniseed/Tests/mount.stable.out
sql/backends/monet5/vaults/miniseed/Tests/registrar.sql.in
sql/backends/monet5/vaults/miniseed/Tests/registrar.stable.err
sql/backends/monet5/vaults/miniseed/Tests/registrar.stable.out
sql/backends/monet5/vaults/miniseed/miniseed.c
sql/backends/monet5/vaults/miniseed/miniseed.h
sql/backends/monet5/vaults/miniseed/miniseed.mal
sql/backends/monet5/vaults/miniseed/mseed_clear.sql
sql/backends/monet5/vaults/miniseed/mseed_schema.sql
sql/backends/monet5/vaults/miniseed/registrar.c
sql/backends/monet5/vaults/miniseed/registrar.h
sql/backends/monet5/vaults/miniseed/registrar.mal
sql/backends/monet5/vaults/netcdf/74_netcdf.mal
sql/backends/monet5/vaults/netcdf/74_netcdf.sql
sql/backends/monet5/vaults/netcdf/Makefile.ag
sql/backends/monet5/vaults/netcdf/netcdf.c
sql/backends/monet5/vaults/netcdf/netcdf.mal
sql/backends/monet5/vaults/netcdf/netcdf_vault.h
Removed Files:
sql/backends/monet5/bam/85_bam.mal
sql/backends/monet5/bam/85_bam.sql
sql/backends/monet5/bam/BAMRecipe.pdf
sql/backends/monet5/bam/Makefile.ag
sql/backends/monet5/bam/Tests/All
sql/backends/monet5/bam/Tests/bam.py
sql/backends/monet5/bam/Tests/bam_export.SQL.py
sql/backends/monet5/bam/Tests/bam_lib.reqtests
sql/backends/monet5/bam/Tests/bam_lib.sql
sql/backends/monet5/bam/Tests/bam_lib.stable.err
sql/backends/monet5/bam/Tests/bam_lib.stable.out
sql/backends/monet5/bam/Tests/bam_lib_mal.mal
sql/backends/monet5/bam/Tests/bam_lib_mal.stable.err
sql/backends/monet5/bam/Tests/bam_lib_mal.stable.out
sql/backends/monet5/bam/Tests/bam_loader_file.SQL.py
sql/backends/monet5/bam/Tests/bam_loader_file.stable.err
sql/backends/monet5/bam/Tests/bam_loader_file.stable.out
sql/backends/monet5/bam/Tests/bam_loader_files.SQL.py
sql/backends/monet5/bam/Tests/bam_loader_files.stable.err
sql/backends/monet5/bam/Tests/bam_loader_files.stable.out
sql/backends/monet5/bam/Tests/bam_loader_repos.SQL.py
sql/backends/monet5/bam/Tests/bam_loader_repos.stable.err
sql/backends/monet5/bam/Tests/bam_loader_repos.stable.out
sql/backends/monet5/bam/Tests/check_files.reqtests
sql/backends/monet5/bam/Tests/check_files.sql
sql/backends/monet5/bam/Tests/check_files.stable.err
sql/backends/monet5/bam/Tests/check_files.stable.out
sql/backends/monet5/bam/Tests/check_files_exact.sql
sql/backends/monet5/bam/Tests/check_files_exact.stable.err
sql/backends/monet5/bam/Tests/check_files_exact.stable.out
sql/backends/monet5/bam/Tests/coverage_usecase.reqtests
sql/backends/monet5/bam/Tests/coverage_usecase.sql
sql/backends/monet5/bam/Tests/drop_last_files.SQL.py
sql/backends/monet5/bam/Tests/drop_last_files.stable.err
sql/backends/monet5/bam/Tests/drop_last_files.stable.out
sql/backends/monet5/bam/Tests/files/file1.bam
sql/backends/monet5/bam/Tests/files/file2.sam
sql/backends/monet5/bam/Tests/files/queryname/file1.bam
sql/backends/monet5/bam/Tests/files/queryname/file2.sam
sql/backends/monet5/bam/Tests/mergetable.reqtests
sql/backends/monet5/bam/Tests/mergetable.sql
sql/backends/monet5/bam/Tests/mergetable.stable.err
sql/backends/monet5/bam/Tests/mergetable.stable.out
sql/backends/monet5/bam/Tests/query1.1.reqtests
sql/backends/monet5/bam/Tests/query1.1.sql
sql/backends/monet5/bam/Tests/query1.1.stable.err
sql/backends/monet5/bam/Tests/query1.1.stable.out
sql/backends/monet5/bam/Tests/query1.2.reqtests
sql/backends/monet5/bam/Tests/query1.2.sql
sql/backends/monet5/bam/Tests/query1.2.stable.err
sql/backends/monet5/bam/Tests/query1.2.stable.out
sql/backends/monet5/bam/Tests/query1.3.reqtests
sql/backends/monet5/bam/Tests/query1.3.sql
sql/backends/monet5/bam/Tests/query1.3.stable.err
sql/backends/monet5/bam/Tests/query1.3.stable.out
sql/backends/monet5/bam/Tests/query1.4.reqtests
sql/backends/monet5/bam/Tests/query1.4.sql
sql/backends/monet5/bam/Tests/query1.4.stable.err
sql/backends/monet5/bam/Tests/query1.4.stable.out
sql/backends/monet5/bam/Tests/query1.5.reqtests
sql/backends/monet5/bam/Tests/query1.5.sql
sql/backends/monet5/bam/Tests/query1.5.stable.err
sql/backends/monet5/bam/Tests/query1.5.stable.out
sql/backends/monet5/bam/Tests/query1.6.reqtests
sql/backends/monet5/bam/Tests/query1.6.sql
sql/backends/monet5/bam/Tests/query2.1.reqtests
sql/backends/monet5/bam/Tests/query2.1.sql
sql/backends/monet5/bam/Tests/query2.1.stable.err
sql/backends/monet5/bam/Tests/query2.1.stable.out
sql/backends/monet5/bam/Tests/query2.10.reqtests
sql/backends/monet5/bam/Tests/query2.10.sql
sql/backends/monet5/bam/Tests/query2.10.stable.err
sql/backends/monet5/bam/Tests/query2.10.stable.out
sql/backends/monet5/bam/Tests/query2.11.reqtests
sql/backends/monet5/bam/Tests/query2.11.sql
sql/backends/monet5/bam/Tests/query2.11.stable.err
sql/backends/monet5/bam/Tests/query2.11.stable.out
sql/backends/monet5/bam/Tests/query2.12.reqtests
sql/backends/monet5/bam/Tests/query2.12.sql
sql/backends/monet5/bam/Tests/query2.12.stable.err
sql/backends/monet5/bam/Tests/query2.12.stable.out
sql/backends/monet5/bam/Tests/query2.12.stable.out.int128
sql/backends/monet5/bam/Tests/query2.2.reqtests
sql/backends/monet5/bam/Tests/query2.2.sql
sql/backends/monet5/bam/Tests/query2.2.stable.err
sql/backends/monet5/bam/Tests/query2.2.stable.out
sql/backends/monet5/bam/Tests/query2.2.stable.out.int128
sql/backends/monet5/bam/Tests/query2.3.reqtests
sql/backends/monet5/bam/Tests/query2.3.sql
sql/backends/monet5/bam/Tests/query2.3.stable.err
sql/backends/monet5/bam/Tests/query2.3.stable.out
sql/backends/monet5/bam/Tests/query2.4.reqtests
sql/backends/monet5/bam/Tests/query2.4.sql
sql/backends/monet5/bam/Tests/query2.4.stable.err
sql/backends/monet5/bam/Tests/query2.4.stable.out
sql/backends/monet5/bam/Tests/query2.5.reqtests
sql/backends/monet5/bam/Tests/query2.5.sql
sql/backends/monet5/bam/Tests/query2.5.stable.err
sql/backends/monet5/bam/Tests/query2.5.stable.out
sql/backends/monet5/bam/Tests/query2.5.stable.out.int128
sql/backends/monet5/bam/Tests/query2.6.reqtests
sql/backends/monet5/bam/Tests/query2.6.sql
sql/backends/monet5/bam/Tests/query2.6.stable.err
sql/backends/monet5/bam/Tests/query2.6.stable.out
sql/backends/monet5/bam/Tests/query2.7.reqtests
sql/backends/monet5/bam/Tests/query2.7.sql
sql/backends/monet5/bam/Tests/query2.7.stable.err
sql/backends/monet5/bam/Tests/query2.7.stable.out
sql/backends/monet5/bam/Tests/query2.8.reqtests
sql/backends/monet5/bam/Tests/query2.8.sql
sql/backends/monet5/bam/Tests/query2.8.stable.err
sql/backends/monet5/bam/Tests/query2.8.stable.out
sql/backends/monet5/bam/Tests/query2.9.reqtests
sql/backends/monet5/bam/Tests/query2.9.sql
sql/backends/monet5/bam/Tests/query2.9.stable.err
sql/backends/monet5/bam/Tests/query2.9.stable.out
sql/backends/monet5/bam/Tests/sam_export.SQL.py
sql/backends/monet5/bam/Tests/sam_export.reqtests
sql/backends/monet5/bam/Tests/sam_export.stable.err
sql/backends/monet5/bam/Tests/sam_export.stable.out
sql/backends/monet5/bam/Tests/sql/bam_export.sql
sql/backends/monet5/bam/Tests/sql/bam_loader_file.sql
sql/backends/monet5/bam/Tests/sql/bam_loader_files.sql
sql/backends/monet5/bam/Tests/sql/bam_loader_repos.sql
sql/backends/monet5/bam/Tests/sql/sam_export.sql
sql/backends/monet5/bam/Tests/verify_load.sql
sql/backends/monet5/bam/Tests/verify_load.stable.err
sql/backends/monet5/bam/Tests/verify_load.stable.out
sql/backends/monet5/bam/bam.mal
sql/backends/monet5/bam/bam_db_interface.c
sql/backends/monet5/bam/bam_db_interface.h
sql/backends/monet5/bam/bam_export.c
sql/backends/monet5/bam/bam_export.h
sql/backends/monet5/bam/bam_globals.c
sql/backends/monet5/bam/bam_globals.h
sql/backends/monet5/bam/bam_lib.c
sql/backends/monet5/bam/bam_lib.h
sql/backends/monet5/bam/bam_loader.c
sql/backends/monet5/bam/bam_loader.h
sql/backends/monet5/bam/bam_wrapper.c
sql/backends/monet5/bam/bam_wrapper.h
sql/backends/monet5/bam/default_schema.dia
sql/backends/monet5/bam/default_schema.png
sql/backends/monet5/bam/metadata.dia
sql/backends/monet5/bam/metadata.png
sql/backends/monet5/bam/mykstring.h
sql/backends/monet5/bam/paired_schema.dia
sql/backends/monet5/bam/paired_schema.png
sql/backends/monet5/miniseed/79_registrar.mal
sql/backends/monet5/miniseed/79_registrar.sql
sql/backends/monet5/miniseed/81_miniseed.mal
sql/backends/monet5/miniseed/81_miniseed.sql
sql/backends/monet5/miniseed/Makefile.ag
sql/backends/monet5/miniseed/Tests/All
sql/backends/monet5/miniseed/Tests/file_list_example.txt
sql/backends/monet5/miniseed/Tests/mount.mal
sql/backends/monet5/miniseed/Tests/mount.stable.err
sql/backends/monet5/miniseed/Tests/mount.stable.out
sql/backends/monet5/miniseed/Tests/registrar.sql.in
sql/backends/monet5/miniseed/Tests/registrar.stable.err
sql/backends/monet5/miniseed/Tests/registrar.stable.out
sql/backends/monet5/miniseed/miniseed.c
sql/backends/monet5/miniseed/miniseed.h
sql/backends/monet5/miniseed/miniseed.mal
sql/backends/monet5/miniseed/mseed_clear.sql
sql/backends/monet5/miniseed/mseed_schema.sql
sql/backends/monet5/miniseed/registrar.c
sql/backends/monet5/miniseed/registrar.h
sql/backends/monet5/miniseed/registrar.mal
sql/backends/monet5/vaults/72_fits.mal
sql/backends/monet5/vaults/72_fits.sql
sql/backends/monet5/vaults/74_netcdf.mal
sql/backends/monet5/vaults/74_netcdf.sql
sql/backends/monet5/vaults/fits.c
sql/backends/monet5/vaults/fits.h
sql/backends/monet5/vaults/fits.mal
sql/backends/monet5/vaults/netcdf.c
sql/backends/monet5/vaults/netcdf.mal
sql/backends/monet5/vaults/netcdf_vault.h
Modified Files:
sql/backends/monet5/Makefile.ag
sql/backends/monet5/vaults/Makefile.ag
Branch: DataVaults
Log Message:
Put all DV code togrther
Adjust the Makefiles fot the new compilation units
diffs (truncated from 3029 to 300 lines):
diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag
+++ b/sql/backends/monet5/Makefile.ag
@@ -4,7 +4,7 @@
#
# Copyright 2008-2015 MonetDB B.V.
-SUBDIRS = NOT_WIN32?vaults UDF HAVE_SAMTOOLS?bam LSST HAVE_GSL?gsl generator
HAVE_MSEED?miniseed
+SUBDIRS = NOT_WIN32?vaults UDF LSST HAVE_GSL?gsl generator
INCLUDES = ../../include ../../common ../../storage ../../server \
../../../monetdb5/modules/atoms \
diff --git a/sql/backends/monet5/vaults/Makefile.ag
b/sql/backends/monet5/vaults/Makefile.ag
--- a/sql/backends/monet5/vaults/Makefile.ag
+++ b/sql/backends/monet5/vaults/Makefile.ag
@@ -4,22 +4,25 @@
#
# Copyright 2008-2015 MonetDB B.V.
-INCLUDES = ../../../include \
- ../../../common \
- ../../../storage \
- ../../../server .. \
- ../../../../monetdb5/modules/atoms \
- ../../../../monetdb5/modules/kernel \
- ../../../../monetdb5/mal \
- ../../../../monetdb5/modules/mal \
- ../../../../monetdb5/optimizer \
- ../../../../monetdb5/scheduler \
- ../../../../clients/mapilib \
- ../../../../common/options \
- ../../../../common/stream \
- ../../../../common/utils \
- ../../../../gdk \
- $(READLINE_INCS) $(cfitsio_CFLAGS) $(curl_CFLAGS) $(netcdf_CFLAGS)
+SUBDIRS = HAVE_SAMTOOLS?bam HAVE_MSEED?miniseed HAVE_NETCDF?netcdf
HAVE_FITS?fits
+
+INCLUDES = .. \
+ ../../../include \
+ ../../../common \
+ ../../../storage \
+ ../../../server .. \
+ ../../../../monetdb5/modules/atoms \
+ ../../../../monetdb5/modules/kernel \
+ ../../../../monetdb5/mal \
+ ../../../../monetdb5/modules/mal \
+ ../../../../monetdb5/optimizer \
+ ../../../../monetdb5/scheduler \
+ ../../../../clients/mapilib \
+ ../../../../common/options \
+ ../../../../common/stream \
+ ../../../../common/utils \
+ ../../../../gdk \
+ $(READLINE_INCS) $(curl_CFLAGS)
lib__vault = {
MODULE
@@ -47,67 +50,5 @@ headers_autoload = {
SOURCES = 70_vault.mal
}
-lib__fits = {
- MODULE
- COND = HAVE_FITS
- DIR = libdir/monetdb5
- SOURCES = fits.c
- LIBS = ../../../../monetdb5/tools/libmonetdb5 \
- $(cfitsio_LIBS)
-}
-
-headers_fitsmal = {
- COND = HAVE_FITS
- HEADERS = mal
- DIR = libdir/monetdb5
- SOURCES = fits.mal
-}
-
-headers_fitssql = {
- COND = HAVE_FITS
- HEADERS = sql
- DIR = libdir/monetdb5/createdb
- SOURCES = 72_fits.sql
-}
-
-headers_fitsautoload = {
- COND = HAVE_FITS
- HEADERS = mal
- DIR = libdir/monetdb5/autoload
- SOURCES = 72_fits.mal
-}
-
-lib__netcdf = {
- MODULE
- COND = HAVE_NETCDF
- DIR = libdir/monetdb5
- SOURCES = netcdf.c
- LIBS = ../../../../monetdb5/tools/libmonetdb5 \
- $(netcdf_LIBS)
-}
-
-headers_netcdfmal = {
- COND = HAVE_NETCDF
- HEADERS = mal
- DIR = libdir/monetdb5
- SOURCES = netcdf.mal
-}
-
-headers_netcdfsql = {
- COND = HAVE_NETCDF
- HEADERS = sql
- DIR = libdir/monetdb5/createdb
- SOURCES = 74_netcdf.sql
-}
-
-headers_netcdfautoload = {
- COND = HAVE_NETCDF
- HEADERS = mal
- DIR = libdir/monetdb5/autoload
- SOURCES = 74_netcdf.mal
-}
-
EXTRA_DIST_DIR = Tests
-EXTRA_DIST = 70_vault.mal vault.mal vault.sql vault.h \
- 72_fits.mal fits.mal 72_fits.sql fits.h \
- 74_netcdf.mal netcdf.mal 74_netcdf.sql netcdf_vault.h
+EXTRA_DIST = 70_vault.mal vault.mal vault.sql vault.h
diff --git a/sql/backends/monet5/vaults/Tests/All
b/sql/backends/monet5/vaults/Tests/All
new file mode 100644
--- /dev/null
+++ b/sql/backends/monet5/vaults/Tests/All
@@ -0,0 +1,1 @@
+vault00
diff --git a/sql/backends/monet5/bam/85_bam.mal
b/sql/backends/monet5/vaults/bam/75_bam.mal
rename from sql/backends/monet5/bam/85_bam.mal
rename to sql/backends/monet5/vaults/bam/75_bam.mal
diff --git a/sql/backends/monet5/bam/85_bam.sql
b/sql/backends/monet5/vaults/bam/75_bam.sql
rename from sql/backends/monet5/bam/85_bam.sql
rename to sql/backends/monet5/vaults/bam/75_bam.sql
diff --git a/sql/backends/monet5/bam/BAMRecipe.pdf
b/sql/backends/monet5/vaults/bam/BAMRecipe.pdf
rename from sql/backends/monet5/bam/BAMRecipe.pdf
rename to sql/backends/monet5/vaults/bam/BAMRecipe.pdf
diff --git a/sql/backends/monet5/bam/Makefile.ag
b/sql/backends/monet5/vaults/bam/Makefile.ag
rename from sql/backends/monet5/bam/Makefile.ag
rename to sql/backends/monet5/vaults/bam/Makefile.ag
--- a/sql/backends/monet5/bam/Makefile.ag
+++ b/sql/backends/monet5/vaults/bam/Makefile.ag
@@ -5,22 +5,24 @@
# Copyright 2008-2015 MonetDB B.V.
INCLUDES = .. \
- ../../../include \
- ../../../common \
- ../../../storage \
- ../../../server \
- ../../../../monetdb5/modules/atoms \
- ../../../../monetdb5/modules/kernel \
- ../../../../monetdb5/mal \
- ../../../../monetdb5/modules/mal \
- ../../../../monetdb5/optimizer \
- ../../../../clients/mapilib \
- ../../../../common/options \
- ../../../../common/stream \
- ../../../../gdk \
- ../../../../tools/merovingian \
- ../../../../tools/merovingian/daemon \
- $(SAMTOOLS_CFLAGS)
+ ../../ \
+ ../../../../include \
+ ../../../../common \
+ ../../../../storage \
+ ../../../../server \
+ ../../../../../monetdb5/modules/atoms \
+ ../../../../../monetdb5/modules/kernel \
+ ../../../../../monetdb5/mal \
+ ../../../../../monetdb5/modules/mal \
+ ../../../../../monetdb5/optimizer \
+ ../../../../../monetdb5/backends/vaults \
+ ../../../../../clients/mapilib \
+ ../../../../../common/options \
+ ../../../../../common/stream \
+ ../../../../../gdk \
+ ../../../../../tools/merovingian \
+ ../../../../../tools/merovingian/daemon \
+ $(SAMTOOLS_CFLAGS)
lib__bam = {
MODULE
@@ -32,8 +34,8 @@ lib__bam = {
bam_lib.c bam_lib.h \
bam_export.c bam_export.h \
mykstring.h
- LIBS = ../../../../monetdb5/tools/libmonetdb5 \
- ../../../../gdk/libbat \
+ LIBS = ../../../../../monetdb5/tools/libmonetdb5 \
+ ../../../../../gdk/libbat \
$(SAMTOOLS_LIBS)
}
@@ -46,13 +48,13 @@ headers_mal = {
headers_sql = {
HEADERS = sql
DIR = libdir/monetdb5/createdb
- SOURCES = 85_bam.sql
+ SOURCES = 75_bam.sql
}
headers_autoload = {
HEADERS = mal
DIR = libdir/monetdb5/autoload
- SOURCES = 85_bam.mal
+ SOURCES = 75_bam.mal
}
EXTRA_DIST_DIR = Tests
diff --git a/sql/backends/monet5/bam/Tests/All
b/sql/backends/monet5/vaults/bam/Tests/All
rename from sql/backends/monet5/bam/Tests/All
rename to sql/backends/monet5/vaults/bam/Tests/All
diff --git a/sql/backends/monet5/bam/Tests/bam.py
b/sql/backends/monet5/vaults/bam/Tests/bam.py
rename from sql/backends/monet5/bam/Tests/bam.py
rename to sql/backends/monet5/vaults/bam/Tests/bam.py
diff --git a/sql/backends/monet5/bam/Tests/bam_export.SQL.py
b/sql/backends/monet5/vaults/bam/Tests/bam_export.SQL.py
rename from sql/backends/monet5/bam/Tests/bam_export.SQL.py
rename to sql/backends/monet5/vaults/bam/Tests/bam_export.SQL.py
diff --git a/sql/backends/monet5/bam/Tests/bam_lib.reqtests
b/sql/backends/monet5/vaults/bam/Tests/bam_lib.reqtests
rename from sql/backends/monet5/bam/Tests/bam_lib.reqtests
rename to sql/backends/monet5/vaults/bam/Tests/bam_lib.reqtests
diff --git a/sql/backends/monet5/bam/Tests/bam_lib.sql
b/sql/backends/monet5/vaults/bam/Tests/bam_lib.sql
rename from sql/backends/monet5/bam/Tests/bam_lib.sql
rename to sql/backends/monet5/vaults/bam/Tests/bam_lib.sql
diff --git a/sql/backends/monet5/bam/Tests/bam_lib.stable.err
b/sql/backends/monet5/vaults/bam/Tests/bam_lib.stable.err
rename from sql/backends/monet5/bam/Tests/bam_lib.stable.err
rename to sql/backends/monet5/vaults/bam/Tests/bam_lib.stable.err
--- a/sql/backends/monet5/bam/Tests/bam_lib.stable.err
+++ b/sql/backends/monet5/vaults/bam/Tests/bam_lib.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'bam_lib` in directory 'sql/backends/monet5/bam` itself:
+stderr of test 'bam_lib` in directory 'sql/backends/monet5/vaults/bam` itself:
# 14:48:31 >
diff --git a/sql/backends/monet5/bam/Tests/bam_lib.stable.out
b/sql/backends/monet5/vaults/bam/Tests/bam_lib.stable.out
rename from sql/backends/monet5/bam/Tests/bam_lib.stable.out
rename to sql/backends/monet5/vaults/bam/Tests/bam_lib.stable.out
--- a/sql/backends/monet5/bam/Tests/bam_lib.stable.out
+++ b/sql/backends/monet5/vaults/bam/Tests/bam_lib.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'bam_lib` in directory 'sql/backends/monet5/bam` itself:
+stdout of test 'bam_lib` in directory 'sql/backends/monet5/vaults/bam` itself:
# 14:48:31 >
diff --git a/sql/backends/monet5/bam/Tests/bam_lib_mal.mal
b/sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.mal
rename from sql/backends/monet5/bam/Tests/bam_lib_mal.mal
rename to sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.mal
diff --git a/sql/backends/monet5/bam/Tests/bam_lib_mal.stable.err
b/sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.stable.err
rename from sql/backends/monet5/bam/Tests/bam_lib_mal.stable.err
rename to sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.stable.err
--- a/sql/backends/monet5/bam/Tests/bam_lib_mal.stable.err
+++ b/sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'bam_lib_mal` in directory 'sql/backends/monet5/bam` itself:
+stderr of test 'bam_lib_mal` in directory 'sql/backends/monet5/vaults/bam`
itself:
# 16:51:57 >
diff --git a/sql/backends/monet5/bam/Tests/bam_lib_mal.stable.out
b/sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.stable.out
rename from sql/backends/monet5/bam/Tests/bam_lib_mal.stable.out
rename to sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.stable.out
--- a/sql/backends/monet5/bam/Tests/bam_lib_mal.stable.out
+++ b/sql/backends/monet5/vaults/bam/Tests/bam_lib_mal.stable.out
@@ -1,4 +1,4 @@
-stdout of test 'bam_lib_mal` in directory 'sql/backends/monet5/bam` itself:
+stdout of test 'bam_lib_mal` in directory 'sql/backends/monet5/vaults/bam`
itself:
# 16:51:57 >
diff --git a/sql/backends/monet5/bam/Tests/bam_loader_file.SQL.py
b/sql/backends/monet5/vaults/bam/Tests/bam_loader_file.SQL.py
rename from sql/backends/monet5/bam/Tests/bam_loader_file.SQL.py
rename to sql/backends/monet5/vaults/bam/Tests/bam_loader_file.SQL.py
diff --git a/sql/backends/monet5/bam/Tests/bam_loader_file.stable.err
b/sql/backends/monet5/vaults/bam/Tests/bam_loader_file.stable.err
rename from sql/backends/monet5/bam/Tests/bam_loader_file.stable.err
rename to sql/backends/monet5/vaults/bam/Tests/bam_loader_file.stable.err
--- a/sql/backends/monet5/bam/Tests/bam_loader_file.stable.err
+++ b/sql/backends/monet5/vaults/bam/Tests/bam_loader_file.stable.err
@@ -1,4 +1,4 @@
-stderr of test 'bam_loader_file` in directory 'sql/backends/monet5/bam` itself:
+stderr of test 'bam_loader_file` in directory 'sql/backends/monet5/vaults/bam`
itself:
# 10:22:37 >
@@ -91,9 +91,9 @@ stderr of test 'bam_loader_file` in dire
# qual STRING
NOT NULL
# );
# # <bam_loader> Retrieving next file id...
-# # <bam_loader> Initializing BAM wrapper for file
'/home/robin/MonetDB/SOURCE/sql/backends/monet5/bam/Tests/files/file1.bam'...
-# # <bam_loader> Parsing header for file
'/home/robin/MonetDB/SOURCE/sql/backends/monet5/bam/Tests/files/file1.bam'...
-# # <bam_loader> Creating alignment tables for file
'/home/robin/MonetDB/SOURCE/sql/backends/monet5/bam/Tests/files/file1.bam'...
+# # <bam_loader> Initializing BAM wrapper for file
'/home/robin/MonetDB/SOURCE/sql/backends/monet5/vaults/bam/Tests/files/file1.bam'...
+# # <bam_loader> Parsing header for file
'/home/robin/MonetDB/SOURCE/sql/backends/monet5/vaults/bam/Tests/files/file1.bam'...
+# # <bam_loader> Creating alignment tables for file
'/home/robin/MonetDB/SOURCE/sql/backends/monet5/vaults/bam/Tests/files/file1.bam'...
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
