Changeset: 45f2d0f7204f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=45f2d0f7204f Added Files: monetdb5/extras/dvf/91_dvf.mal monetdb5/extras/dvf/92_opt_dvf.mal monetdb5/extras/dvf/Makefile.ag monetdb5/extras/dvf/README.txt monetdb5/extras/dvf/Tests/All monetdb5/extras/dvf/Tests/create_file_list.py monetdb5/extras/dvf/Tests/create_file_list.stable.err monetdb5/extras/dvf/Tests/create_file_list.stable.out monetdb5/extras/dvf/Tests/dvf.py monetdb5/extras/dvf/Tests/dvf.reqtests monetdb5/extras/dvf/Tests/dvf.stable.err monetdb5/extras/dvf/Tests/dvf.stable.out monetdb5/extras/dvf/Tests/example_mseed_files.zip monetdb5/extras/dvf/Tests/fits_schema.sql monetdb5/extras/dvf/Tests/initializer.sql monetdb5/extras/dvf/Tests/mseed_schema.sql monetdb5/extras/dvf/Tests/mseed_schema.stable.err monetdb5/extras/dvf/Tests/mseed_schema.stable.out monetdb5/extras/dvf/Tests/mseed_schema_segments_mode.sql monetdb5/extras/dvf/Tests/opt_dvf.py monetdb5/extras/dvf/Tests/opt_dvf.reqtests monetdb5/extras/dvf/Tests/opt_dvf.stable.err monetdb5/extras/dvf/Tests/opt_dvf.stable.out monetdb5/extras/dvf/Tests/registrar.reqtests monetdb5/extras/dvf/Tests/registrar.sql.in monetdb5/extras/dvf/Tests/registrar.stable.err monetdb5/extras/dvf/Tests/registrar.stable.out monetdb5/extras/dvf/dvf.c monetdb5/extras/dvf/dvf.h monetdb5/extras/dvf/dvf.mal monetdb5/extras/dvf/opt_dvf.c monetdb5/extras/dvf/opt_dvf.h monetdb5/extras/dvf/opt_dvf.mal 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 Modified Files: .hgtags clients/examples/C/sample0.c clients/examples/C/sample1.c clients/examples/C/sample2.c clients/examples/C/sample3.c clients/examples/C/sample4.c clients/examples/C/smack00.c clients/examples/C/smack01.c clients/mapiclient/ReadlineTools.c clients/mapiclient/ReadlineTools.h clients/mapiclient/dotmonetdb.c clients/mapiclient/dotmonetdb.h clients/mapiclient/dump.c clients/mapiclient/mclient.c clients/mapiclient/mnc.c clients/mapiclient/msqldump.c clients/mapiclient/msqldump.h clients/mapiclient/stethoscope.c clients/mapiclient/tomograph.c clients/mapilib/mapi.c clients/mapilib/mapi.h clients/odbc/driver/ODBCConvert.c clients/odbc/driver/ODBCDbc.c clients/odbc/driver/ODBCDbc.h clients/odbc/driver/ODBCDesc.c clients/odbc/driver/ODBCDesc.h clients/odbc/driver/ODBCEnv.c clients/odbc/driver/ODBCEnv.h clients/odbc/driver/ODBCError.c clients/odbc/driver/ODBCError.h clients/odbc/driver/ODBCGlobal.h clients/odbc/driver/ODBCStmt.c clients/odbc/driver/ODBCStmt.h clients/odbc/driver/ODBCUtil.c clients/odbc/driver/ODBCUtil.h clients/odbc/driver/SQLAllocConnect.c clients/odbc/driver/SQLAllocEnv.c clients/odbc/driver/SQLAllocHandle.c clients/odbc/driver/SQLAllocStmt.c clients/odbc/driver/SQLBindCol.c clients/odbc/driver/SQLBindParameter.c clients/odbc/driver/SQLBrowseConnect.c clients/odbc/driver/SQLBulkOperations.c clients/odbc/driver/SQLCancel.c clients/odbc/driver/SQLCloseCursor.c clients/odbc/driver/SQLColAttribute.c clients/odbc/driver/SQLColAttributes.c clients/odbc/driver/SQLColumnPrivileges.c clients/odbc/driver/SQLColumns.c clients/odbc/driver/SQLConnect.c clients/odbc/driver/SQLCopyDesc.c clients/odbc/driver/SQLDataSources.c clients/odbc/driver/SQLDescribeCol.c clients/odbc/driver/SQLDescribeParam.c clients/odbc/driver/SQLDisconnect.c clients/odbc/driver/SQLDriverConnect.c clients/odbc/driver/SQLDrivers.c clients/odbc/driver/SQLEndTran.c clients/odbc/driver/SQLError.c clients/odbc/driver/SQLExecDirect.c clients/odbc/driver/SQLExecute.c clients/odbc/driver/SQLExtendedFetch.c clients/odbc/driver/SQLFetch.c clients/odbc/driver/SQLFetchScroll.c clients/odbc/driver/SQLForeignKeys.c clients/odbc/driver/SQLFreeConnect.c clients/odbc/driver/SQLFreeEnv.c clients/odbc/driver/SQLFreeHandle.c clients/odbc/driver/SQLFreeStmt.c clients/odbc/driver/SQLGetConnectAttr.c clients/odbc/driver/SQLGetConnectOption.c clients/odbc/driver/SQLGetCursorName.c clients/odbc/driver/SQLGetData.c clients/odbc/driver/SQLGetDescField.c clients/odbc/driver/SQLGetDescRec.c clients/odbc/driver/SQLGetDiagField.c clients/odbc/driver/SQLGetDiagRec.c clients/odbc/driver/SQLGetEnvAttr.c clients/odbc/driver/SQLGetFunctions.c clients/odbc/driver/SQLGetInfo.c clients/odbc/driver/SQLGetStmtAttr.c clients/odbc/driver/SQLGetStmtOption.c clients/odbc/driver/SQLGetTypeInfo.c clients/odbc/driver/SQLMoreResults.c clients/odbc/driver/SQLNativeSql.c clients/odbc/driver/SQLNumParams.c clients/odbc/driver/SQLNumResultCols.c clients/odbc/driver/SQLParamData.c clients/odbc/driver/SQLParamOptions.c clients/odbc/driver/SQLPrepare.c clients/odbc/driver/SQLPrimaryKeys.c clients/odbc/driver/SQLProcedureColumns.c clients/odbc/driver/SQLProcedures.c clients/odbc/driver/SQLPutData.c clients/odbc/driver/SQLRowCount.c clients/odbc/driver/SQLSetConnectAttr.c clients/odbc/driver/SQLSetConnectOption.c clients/odbc/driver/SQLSetCursorName.c clients/odbc/driver/SQLSetDescField.c clients/odbc/driver/SQLSetDescRec.c clients/odbc/driver/SQLSetEnvAttr.c clients/odbc/driver/SQLSetParam.c clients/odbc/driver/SQLSetPos.c clients/odbc/driver/SQLSetScrollOptions.c clients/odbc/driver/SQLSetStmtAttr.c clients/odbc/driver/SQLSetStmtOption.c clients/odbc/driver/SQLSpecialColumns.c clients/odbc/driver/SQLStatistics.c clients/odbc/driver/SQLTablePrivileges.c clients/odbc/driver/SQLTables.c clients/odbc/driver/SQLTransact.c clients/odbc/samples/arraytest.c clients/odbc/samples/odbcsample1.c clients/odbc/samples/testgetinfo.c clients/odbc/setup/drvcfg.c clients/odbc/setup/drvcfg.h clients/odbc/winsetup/install.c clients/odbc/winsetup/resource.h clients/odbc/winsetup/setup.c common/options/getopt.c common/options/getopt1.c common/options/monet_getopt.h common/options/monet_options.c common/options/monet_options.h common/stream/stream.c common/stream/stream.h common/stream/stream_socket.h common/utils/mcrypt.c common/utils/mcrypt.h common/utils/mprompt.h common/utils/msabaoth.c common/utils/msabaoth.h common/utils/mutils.c common/utils/mutils.h common/utils/muuid.c common/utils/muuid.h common/utils/prompt.c configure.ag gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_align.c gdk/gdk_atomic.h gdk/gdk_atoms.c gdk/gdk_atoms.h gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_bbp.h gdk/gdk_calc.c gdk/gdk_calc.h gdk/gdk_calc_compare.h gdk/gdk_calc_private.h gdk/gdk_delta.c gdk/gdk_delta.h gdk/gdk_group.c gdk/gdk_heap.c gdk/gdk_imprints.c gdk/gdk_imprints.h gdk/gdk_join.c gdk/gdk_logger.c gdk/gdk_logger.h gdk/gdk_mapreduce.c gdk/gdk_mapreduce.h gdk/gdk_posix.c gdk/gdk_posix.h gdk/gdk_private.h gdk/gdk_qsort.c gdk/gdk_qsort_impl.h gdk/gdk_sample.c gdk/gdk_search.c gdk/gdk_search.h gdk/gdk_select.c gdk/gdk_ssort.c gdk/gdk_ssort_impl.h gdk/gdk_storage.c gdk/gdk_storage.h gdk/gdk_system.c gdk/gdk_system.h gdk/gdk_tm.c gdk/gdk_tm.h gdk/gdk_utils.c gdk/gdk_utils.h gdk/gdk_value.c geom/lib/libgeom.c geom/lib/libgeom.h geom/monetdb5/geom.c java/example/MJDBCTest.java java/example/PreparedExample.java java/example/SQLImport.java java/example/SQLcopyinto.java java/src/nl/cwi/monetdb/client/JMonetDB.java java/src/nl/cwi/monetdb/client/JdbcClient.java java/src/nl/cwi/monetdb/jdbc/MonetBlob.java java/src/nl/cwi/monetdb/jdbc/MonetClob.java java/src/nl/cwi/monetdb/jdbc/MonetConnection.java java/src/nl/cwi/monetdb/jdbc/MonetDataSource.java java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java java/src/nl/cwi/monetdb/jdbc/MonetDriver.java.in java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java java/src/nl/cwi/monetdb/jdbc/MonetSavepoint.java java/src/nl/cwi/monetdb/jdbc/MonetStatement.java java/src/nl/cwi/monetdb/jdbc/MonetWrapper.java java/src/nl/cwi/monetdb/jdbc/types/INET.java java/src/nl/cwi/monetdb/jdbc/types/URL.java java/src/nl/cwi/monetdb/mcl/MCLException.java java/src/nl/cwi/monetdb/mcl/io/BufferedMCLReader.java java/src/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java java/src/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java java/src/nl/cwi/monetdb/mcl/parser/MCLParseException.java java/src/nl/cwi/monetdb/mcl/parser/MCLParser.java java/src/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java java/src/nl/cwi/monetdb/mcl/parser/TupleLineParser.java java/src/nl/cwi/monetdb/merovingian/Control.java java/src/nl/cwi/monetdb/merovingian/MerovingianException.java java/src/nl/cwi/monetdb/merovingian/SabaothDB.java java/src/nl/cwi/monetdb/util/CmdLineOpts.java java/src/nl/cwi/monetdb/util/Exporter.java java/src/nl/cwi/monetdb/util/Extract.java java/src/nl/cwi/monetdb/util/OptionsException.java java/src/nl/cwi/monetdb/util/SQLExporter.java java/src/nl/cwi/monetdb/util/XMLExporter.java java/tests/BugConcurrent_clients_SF_1504657.java java/tests/BugConcurrent_sequences.java java/tests/Test_Cautocommit.java java/tests/Test_Cforkbomb.java java/tests/Test_Clargequery.java java/tests/Test_Cmanycon.java java/tests/Test_Creplysize.java java/tests/Test_Csavepoints.java java/tests/Test_Csendthread.java java/tests/Test_Ctransaction.java java/tests/Test_Dobjects.java java/tests/Test_PSgeneratedkeys.java java/tests/Test_PSlargeamount.java java/tests/Test_PSlargebatchval.java java/tests/Test_PSlargeresponse.java java/tests/Test_PSmanycon.java java/tests/Test_PSmetadata.java java/tests/Test_PSsomeamount.java java/tests/Test_PSsqldata.java java/tests/Test_PStimedate.java java/tests/Test_PStimezone.java java/tests/Test_PStypes.java java/tests/Test_Rbooleans.java java/tests/Test_Rmetadata.java java/tests/Test_Rpositioning.java java/tests/Test_Rsqldata.java java/tests/Test_Rtimedate.java java/tests/Test_Sbatching.java java/tests/Test_Smoreresults.java monetdb5/extras/Makefile.ag monetdb5/extras/mal_optimizer_template/opt_sql_append.c monetdb5/extras/mal_optimizer_template/opt_sql_append.h monetdb5/extras/sphinx/sphinx.c monetdb5/extras/sphinx/sphinx.h monetdb5/mal/Tests/recycle04.mal monetdb5/mal/Tests/recycle04.stable.err monetdb5/mal/mal.c monetdb5/mal/mal.h monetdb5/mal/mal_atom.c monetdb5/mal/mal_atom.h monetdb5/mal/mal_authorize.c monetdb5/mal/mal_authorize.h monetdb5/mal/mal_builder.c monetdb5/mal/mal_builder.h monetdb5/mal/mal_client.c monetdb5/mal/mal_client.h monetdb5/mal/mal_dataflow.c monetdb5/mal/mal_dataflow.h monetdb5/mal/mal_debugger.c monetdb5/mal/mal_debugger.h monetdb5/mal/mal_errors.h monetdb5/mal/mal_exception.c monetdb5/mal/mal_exception.h monetdb5/mal/mal_factory.c monetdb5/mal/mal_factory.h monetdb5/mal/mal_function.c monetdb5/mal/mal_function.h monetdb5/mal/mal_import.c monetdb5/mal/mal_import.h monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_interpreter.h monetdb5/mal/mal_linker.c monetdb5/mal/mal_linker.h monetdb5/mal/mal_listing.c monetdb5/mal/mal_listing.h monetdb5/mal/mal_module.h monetdb5/mal/mal_namespace.c monetdb5/mal/mal_namespace.h monetdb5/mal/mal_parser.c monetdb5/mal/mal_parser.h monetdb5/mal/mal_private.h monetdb5/mal/mal_profiler.c monetdb5/mal/mal_profiler.h monetdb5/mal/mal_properties.c monetdb5/mal/mal_properties.h monetdb5/mal/mal_readline.c monetdb5/mal/mal_readline.h monetdb5/mal/mal_recycle.c monetdb5/mal/mal_recycle.h monetdb5/mal/mal_resolve.c monetdb5/mal/mal_resolve.h monetdb5/mal/mal_resource.c monetdb5/mal/mal_resource.h monetdb5/mal/mal_runtime.h monetdb5/mal/mal_sabaoth.c monetdb5/mal/mal_sabaoth.h monetdb5/mal/mal_scenario.c monetdb5/mal/mal_scenario.h monetdb5/mal/mal_session.c monetdb5/mal/mal_session.h monetdb5/mal/mal_stack.c monetdb5/mal/mal_stack.h monetdb5/mal/mal_type.c monetdb5/mal/mal_type.h monetdb5/mal/mal_utils.c monetdb5/mal/mal_utils.h monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/blob.h monetdb5/modules/atoms/color.c monetdb5/modules/atoms/color.h monetdb5/modules/atoms/identifier.c monetdb5/modules/atoms/inet.c monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/mtime.h monetdb5/modules/atoms/mtime.mal monetdb5/modules/atoms/str.c monetdb5/modules/atoms/str.h monetdb5/modules/atoms/streams.c monetdb5/modules/atoms/streams.h monetdb5/modules/atoms/url.c monetdb5/modules/atoms/url.h monetdb5/modules/atoms/xml.c monetdb5/modules/atoms/xml.h monetdb5/modules/kernel/aggr.c monetdb5/modules/kernel/alarm.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/bat5.h monetdb5/modules/kernel/batcolor.c monetdb5/modules/kernel/batcolor.h monetdb5/modules/kernel/batmmath.c monetdb5/modules/kernel/batmmath.h monetdb5/modules/kernel/batstr.c monetdb5/modules/kernel/group.c monetdb5/modules/kernel/group.h monetdb5/modules/kernel/logger.c monetdb5/modules/kernel/microbenchmark.c monetdb5/modules/kernel/microbenchmark.h monetdb5/modules/kernel/mmath.c monetdb5/modules/kernel/mmath.h monetdb5/modules/kernel/status.c monetdb5/modules/kernel/status.h monetdb5/modules/mal/batExtensions.c monetdb5/modules/mal/batExtensions.h monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/bbp.c monetdb5/modules/mal/bbp.h monetdb5/modules/mal/calc.c monetdb5/modules/mal/clients.c monetdb5/modules/mal/clients.h monetdb5/modules/mal/cluster.c monetdb5/modules/mal/cluster.h monetdb5/modules/mal/factories.c monetdb5/modules/mal/factories.h monetdb5/modules/mal/groupby.c monetdb5/modules/mal/groupby.h monetdb5/modules/mal/inspect.c monetdb5/modules/mal/inspect.h monetdb5/modules/mal/iterator.c monetdb5/modules/mal/iterator.h monetdb5/modules/mal/joinpath.c monetdb5/modules/mal/joinpath.h monetdb5/modules/mal/language.c monetdb5/modules/mal/language.h monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mal_io.h monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/mal_mapi.h monetdb5/modules/mal/manual.c monetdb5/modules/mal/manual.h monetdb5/modules/mal/mat.c monetdb5/modules/mal/mat.h monetdb5/modules/mal/mkey.c monetdb5/modules/mal/mkey.h monetdb5/modules/mal/mkey.mal monetdb5/modules/mal/pcre.c monetdb5/modules/mal/profiler.c monetdb5/modules/mal/profiler.h monetdb5/modules/mal/querylog.c monetdb5/modules/mal/querylog.h monetdb5/modules/mal/recycle.c monetdb5/modules/mal/recycle.h monetdb5/modules/mal/recycle.mal monetdb5/modules/mal/remote.c monetdb5/modules/mal/remote.h monetdb5/modules/mal/sabaoth.c monetdb5/modules/mal/sabaoth.h monetdb5/modules/mal/sample.c monetdb5/modules/mal/sample.h monetdb5/modules/mal/sysmon.c monetdb5/modules/mal/sysmon.h monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tablet.h monetdb5/modules/mal/tokenizer.c monetdb5/modules/mal/tokenizer.h monetdb5/modules/mal/transaction.c monetdb5/modules/mal/txtsim.c monetdb5/modules/mal/txtsim.h monetdb5/modules/mal/zorder.c monetdb5/modules/mal/zorder.h monetdb5/optimizer/opt_accumulators.c monetdb5/optimizer/opt_accumulators.h monetdb5/optimizer/opt_aliases.c monetdb5/optimizer/opt_aliases.h monetdb5/optimizer/opt_coercion.c monetdb5/optimizer/opt_commonTerms.c monetdb5/optimizer/opt_commonTerms.h monetdb5/optimizer/opt_constants.c monetdb5/optimizer/opt_constants.h monetdb5/optimizer/opt_costModel.c monetdb5/optimizer/opt_costModel.h monetdb5/optimizer/opt_dataflow.c monetdb5/optimizer/opt_deadcode.c monetdb5/optimizer/opt_deadcode.h monetdb5/optimizer/opt_evaluate.c monetdb5/optimizer/opt_evaluate.h monetdb5/optimizer/opt_factorize.c monetdb5/optimizer/opt_factorize.h monetdb5/optimizer/opt_garbageCollector.c monetdb5/optimizer/opt_garbageCollector.h monetdb5/optimizer/opt_inline.c monetdb5/optimizer/opt_inline.h monetdb5/optimizer/opt_joinpath.c monetdb5/optimizer/opt_joinpath.h monetdb5/optimizer/opt_macro.c monetdb5/optimizer/opt_macro.h monetdb5/optimizer/opt_matpack.h monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_mergetable.h monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_mitosis.h monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_multiplex.h monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_pipes.h monetdb5/optimizer/opt_prelude.c monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_pushselect.c monetdb5/optimizer/opt_pushselect.h monetdb5/optimizer/opt_qep.c monetdb5/optimizer/opt_qep.h monetdb5/optimizer/opt_querylog.c monetdb5/optimizer/opt_querylog.h monetdb5/optimizer/opt_recycler.c monetdb5/optimizer/opt_recycler.h monetdb5/optimizer/opt_reduce.c monetdb5/optimizer/opt_reduce.h monetdb5/optimizer/opt_remap.c monetdb5/optimizer/opt_remap.h monetdb5/optimizer/opt_remoteQueries.c monetdb5/optimizer/opt_remoteQueries.h monetdb5/optimizer/opt_reorder.c monetdb5/optimizer/opt_reorder.h monetdb5/optimizer/opt_statistics.c monetdb5/optimizer/opt_statistics.h monetdb5/optimizer/opt_support.c monetdb5/optimizer/opt_support.h monetdb5/optimizer/optimizer.c monetdb5/optimizer/optimizer.h monetdb5/optimizer/optimizer.mal monetdb5/scheduler/run_adder.c monetdb5/scheduler/run_adder.h monetdb5/scheduler/run_isolate.c monetdb5/scheduler/run_isolate.h monetdb5/scheduler/run_memo.c monetdb5/scheduler/run_memo.h monetdb5/scheduler/run_pipeline.c monetdb5/scheduler/run_pipeline.h monetdb5/scheduler/srvpool.c monetdb5/scheduler/srvpool.h sql/backends/monet5/LSST/lsst.c sql/backends/monet5/LSST/lsst.h sql/backends/monet5/Makefile.ag sql/backends/monet5/UDF/Makefile.ag sql/backends/monet5/UDF/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/Tests/udf-reverse.stable.out sql/backends/monet5/UDF/udf.c sql/backends/monet5/UDF/udf.h sql/backends/monet5/UDF/udf_impl.h sql/backends/monet5/prog.c sql/backends/monet5/rel_bin.c sql/backends/monet5/rel_bin.h sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_gencode.h sql/backends/monet5/sql_optimizer.c sql/backends/monet5/sql_optimizer.h sql/backends/monet5/sql_readline.c sql/backends/monet5/sql_readline.h sql/backends/monet5/sql_result.c sql/backends/monet5/sql_result.h sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_scenario.h sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statement.h sql/backends/monet5/sql_user.c sql/backends/monet5/sql_user.h sql/backends/monet5/vaults/fits.c sql/backends/monet5/vaults/fits.h sql/backends/monet5/vaults/vault.c sql/backends/monet5/vaults/vault.h sql/benchmarks/alex/earth.c sql/benchmarks/alex/tomo.c sql/benchmarks/as3ap/as3ap.c sql/benchmarks/hist-uva/ground/main.c sql/benchmarks/xmark/unix.c sql/common/sql_backend.c sql/common/sql_backend.h sql/common/sql_changeset.c sql/common/sql_keyword.c sql/common/sql_list.c sql/common/sql_mem.c sql/common/sql_string.c sql/common/sql_string.h sql/common/sql_types.c sql/common/sql_types.h sql/include/sql_catalog.h sql/include/sql_keyword.h sql/include/sql_list.h sql/include/sql_mem.h sql/include/sql_relation.h sql/jdbc/tests/Tests/Test_Dobjects.stable.out sql/scripts/13_date.sql sql/server/Makefile.ag sql/server/rel_distribute.c sql/server/rel_distribute.h sql/server/rel_dump.c sql/server/rel_dump.h sql/server/rel_exp.c sql/server/rel_exp.h sql/server/rel_optimizer.c sql/server/rel_optimizer.h sql/server/rel_planner.c sql/server/rel_planner.h sql/server/rel_prop.c sql/server/rel_prop.h sql/server/rel_psm.c sql/server/rel_psm.h sql/server/rel_schema.c sql/server/rel_schema.h sql/server/rel_select.c sql/server/rel_select.h sql/server/rel_semantic.c sql/server/rel_semantic.h sql/server/rel_sequence.c sql/server/rel_sequence.h sql/server/rel_trans.c sql/server/rel_trans.h sql/server/rel_updates.c sql/server/rel_updates.h sql/server/rel_xml.c sql/server/rel_xml.h sql/server/sql_atom.c sql/server/sql_atom.h sql/server/sql_datetime.c sql/server/sql_datetime.h sql/server/sql_decimal.c sql/server/sql_decimal.h sql/server/sql_env.c sql/server/sql_env.h sql/server/sql_mvc.c sql/server/sql_mvc.h sql/server/sql_parser.h sql/server/sql_parser.y sql/server/sql_privileges.c sql/server/sql_privileges.h sql/server/sql_qc.c sql/server/sql_qc.h sql/server/sql_scan.c sql/server/sql_scan.h sql/server/sql_semantic.c sql/server/sql_semantic.h sql/server/sql_symbol.c sql/server/sql_symbol.h sql/storage/bat/bat_logger.c sql/storage/bat/bat_logger.h sql/storage/bat/bat_storage.c sql/storage/bat/bat_storage.h sql/storage/bat/bat_table.c sql/storage/bat/bat_table.h sql/storage/bat/bat_utils.c sql/storage/bat/bat_utils.h sql/storage/bat/res_table.c sql/storage/bat/res_table.h sql/storage/restrict/restrict_logger.c sql/storage/restrict/restrict_logger.h sql/storage/restrict/restrict_storage.c sql/storage/restrict/restrict_storage.h sql/storage/restrict/restrict_table.c sql/storage/restrict/restrict_table.h sql/storage/sql_catalog.c sql/storage/sql_storage.h sql/storage/store.c sql/storage/store_connections.c sql/storage/store_connections.h sql/storage/store_dependency.c sql/storage/store_dependency.h sql/storage/store_sequence.c sql/storage/store_sequence.h sql/test/Dependencies/Tests/Dependencies.stable.err sql/test/Dependencies/Tests/Dependencies.stable.out sql/test/Tests/keys.stable.out sql/test/Tests/systemfunctions.stable.out sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out sql/test/leaks/Tests/check0.stable.out sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check2.stable.out sql/test/leaks/Tests/check3.stable.out sql/test/leaks/Tests/check4.stable.out sql/test/leaks/Tests/check5.stable.out sql/test/leaks/Tests/drop3.stable.out sql/test/leaks/Tests/select1.stable.out sql/test/leaks/Tests/select2.stable.out sql/test/leaks/Tests/temp1.stable.out sql/test/leaks/Tests/temp2.stable.out sql/test/leaks/Tests/temp3.stable.out testing/Mdiff.c testing/Mtimeout.c testing/difflib.c testing/difflib.h testing/helpers.c testing/helpers.h tools/merovingian/client/monetdb.c tools/merovingian/daemon/argvcmds.c tools/merovingian/daemon/argvcmds.h tools/merovingian/daemon/client.c tools/merovingian/daemon/client.h tools/merovingian/daemon/connections.c tools/merovingian/daemon/connections.h tools/merovingian/daemon/controlrunner.c tools/merovingian/daemon/controlrunner.h tools/merovingian/daemon/discoveryrunner.c tools/merovingian/daemon/discoveryrunner.h tools/merovingian/daemon/forkmserver.c tools/merovingian/daemon/forkmserver.h tools/merovingian/daemon/handlers.c tools/merovingian/daemon/handlers.h tools/merovingian/daemon/merovingian.c tools/merovingian/daemon/merovingian.h tools/merovingian/daemon/multiplex-funnel.c tools/merovingian/daemon/multiplex-funnel.h tools/merovingian/daemon/peering.c tools/merovingian/daemon/peering.h tools/merovingian/daemon/proxy.c tools/merovingian/daemon/proxy.h tools/merovingian/utils/control.c tools/merovingian/utils/control.h tools/merovingian/utils/database.c tools/merovingian/utils/database.h tools/merovingian/utils/glob.c tools/merovingian/utils/glob.h tools/merovingian/utils/properties.c tools/merovingian/utils/properties.h tools/merovingian/utils/utils.c tools/merovingian/utils/utils.h tools/mserver/monet_version.c.in tools/mserver/mserver5.c Branch: DataVaults Log Message:
Merge with DVframework branch diffs (truncated from 10015 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -518,6 +518,7 @@ 23894afae1679eb37e6866a793ba00782c4b0804 355d0e22cf76c461ba4009d11f84d7bd7349b2a4 Feb2013_3 fc0c9b319d2275215c283a7ece1d389e55b43217 Feb2013_SP1_release 0ee398b5025f7bc3c0320d70eb5c0a3707b69c67 mutation_root +56ccff0f4fe1136e970824754bcc7d1472e18a37 DVframework_bam_root 7daa66a6db1c0404dbf7ed935437b59b7bf54d4b Feb2013_5 df2cbb7845660d94dc484bab860b6893344be92a Feb2013_SP2_release cb55e859a50e0d06a50cc9e4f6e377ddea7cc3aa Feb2013_7 diff --git a/configure.ag b/configure.ag --- a/configure.ag +++ b/configure.ag @@ -2407,6 +2407,42 @@ AC_SUBST(SAMTOOLS_CFLAGS, $SAMTOOLS_CFLA AC_SUBST(SAMTOOLS_LIBS, $SAMTOOLS_LIBS) AM_CONDITIONAL(HAVE_SAMTOOLS, test x"$have_samtools" != xno) +# mseed, only used by sql +have_mseed="auto" +AC_ARG_WITH(mseed, + AS_HELP_STRING([--with-mseed=DIR],[mseed library is installed in DIR]), + [have_mseed="$withval"], [have_mseed="auto"]) +if test "x$have_mseed" != xno; then + + case "$have_mseed" in + auto|yes) + ;; + *) + MSEED_CFLAGS="-I$have_mseed/include" + MSEED_LIBS="-L$have_mseed/lib -lmseed" + ;; + esac + + save_CPPFLAGS="$CPPFLAGS" + save_LDFLAGS="$LDFLAGS" + CPPFLAGS="$CPPFLAGS $MSEED_CFLAGS" + LDFLAGS="$LDFLAGS $MSEED_LIBS" + AC_CHECK_HEADER(libmseed.h, + AC_CHECK_LIB(mseed, msr_init, + AC_DEFINE(HAVE_MSEED, 1, [Define if you have the mseed library]), + [ if test "x$have_mseed" != xauto; then AC_MSG_ERROR([-lmseed library not found]); fi; have_mseed=no ], "-lm"), + [ if test "x$have_mseed" != xauto; then AC_MSG_ERROR([libmseed.h header not found]); fi; have_mseed=no ]) + LDFLAGS="$save_LDFLAGS" + CPPFLAGS="$save_CPPFLAGS" + if test "x$have_mseed" = "xyes" -o "x$have_mseed" = "xauto"; then + MSEED_CFLAGS= + MSEED_LIBS="-lmseed" + fi +fi +AC_SUBST(MSEED_CFLAGS, $MSEED_CFLAGS) +AC_SUBST(MSEED_LIBS, $MSEED_LIBS) +AM_CONDITIONAL(HAVE_MSEED, test x"$have_mseed" != xno) + # geos, only used in geom module org_have_geos=auto have_geos=$org_have_geos diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -1850,7 +1850,6 @@ gdk_export BAT *BBPquickdesc(bat b, int /* * @+ GDK Extensibility - * GDK can be extended with new atoms, search accelerators and storage * modes. * * @- Atomic Type Descriptors diff --git a/monetdb5/extras/Makefile.ag b/monetdb5/extras/Makefile.ag --- a/monetdb5/extras/Makefile.ag +++ b/monetdb5/extras/Makefile.ag @@ -4,5 +4,5 @@ # # Copyright 2008-2015 MonetDB B.V. -SUBDIRS = HAVE_SPHINXCLIENT?sphinx mal_optimizer_template HAVE_LIBR?rapi +SUBDIRS = HAVE_SPHINXCLIENT?sphinx mal_optimizer_template HAVE_LIBR?rapi dvf diff --git a/monetdb5/extras/dvf/91_dvf.mal b/monetdb5/extras/dvf/91_dvf.mal new file mode 100644 --- /dev/null +++ b/monetdb5/extras/dvf/91_dvf.mal @@ -0,0 +1,20 @@ +# The contents of this file are subject to the MonetDB Public License +# Version 1.1 (the "License"); you may not use this file except in +# compliance with the License. You may obtain a copy of the License at +# http://www.monetdb.org/Legal/MonetDBLicense +# +# Software distributed under the License is distributed on an "AS IS" +# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +# License for the specific language governing rights and limitations +# under the License. +# +# The Original Code is the MonetDB Database System. +# +# The Initial Developer of the Original Code is CWI. +# Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +# Copyright August 2008-2013 MonetDB B.V. +# All Rights Reserved. + +# This announces the miniseed module to the MAL interpreter +library dvf; +include dvf; diff --git a/monetdb5/extras/dvf/92_opt_dvf.mal b/monetdb5/extras/dvf/92_opt_dvf.mal new file mode 100644 --- /dev/null +++ b/monetdb5/extras/dvf/92_opt_dvf.mal @@ -0,0 +1,21 @@ +# The contents of this file are subject to the MonetDB Public License +# Version 1.1 (the "License"); you may not use this file except in +# compliance with the License. You may obtain a copy of the License at +# http://www.monetdb.org/Legal/MonetDBLicense +# +# Software distributed under the License is distributed on an "AS IS" +# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +# License for the specific language governing rights and limitations +# under the License. +# +# The Original Code is the MonetDB Database System. +# +# The Initial Developer of the Original Code is CWI. +# Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +# Copyright August 2008-2013 MonetDB B.V. +# All Rights Reserved. + +# This loads the opt_dvf optimizer module +library opt_dvf; +include opt_dvf; + diff --git a/monetdb5/extras/dvf/Makefile.ag b/monetdb5/extras/dvf/Makefile.ag new file mode 100644 --- /dev/null +++ b/monetdb5/extras/dvf/Makefile.ag @@ -0,0 +1,71 @@ +# The contents of this file are subject to the MonetDB Public License +# Version 1.1 (the "License"); you may not use this file except in +# compliance with the License. You may obtain a copy of the License at +# http://www.monetdb.org/Legal/MonetDBLicense +# +# Software distributed under the License is distributed on an "AS IS" +# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the +# License for the specific language governing rights and limitations +# under the License. +# +# The Original Code is the MonetDB Database System. +# +# The Initial Developer of the Original Code is CWI. +# Portions created by CWI are Copyright (C) 1997-July 2008 CWI. +# Copyright August 2008-2013 MonetDB B.V. +# All Rights Reserved. + +INCLUDES = \ + ../../optimizer \ + ../../mal \ + ../../../gdk \ + ../../../common/stream \ + ../../../common/options \ + $(MSEED_CFLAGS) + +MTSAFE + +lib_opt_dvf = { + MODULE + DIR = libdir/monetdb5 + SEP = _ + SOURCES = opt_dvf.c opt_dvf.h + LIBS = ../../tools/libmonetdb5 \ + ../../../gdk/libbat \ + ../../../common/stream/libstream \ + $(MSEED_LIBS) \ + $(MALLOC_LIBS) +} + +lib__dvf = { + MODULE + DIR = libdir/monetdb5 + SOURCES = dvf.c dvf.h + LIBS = ../../tools/libmonetdb5 \ + ../../../gdk/libbat \ + ../../../common/stream/libstream \ + $(MSEED_LIBS) \ + $(MALLOC_LIBS) +} + +headers_mal = { + HEADERS = mal + DIR = libdir/monetdb5 + SOURCES = dvf.mal opt_dvf.mal +} + +headers_opt_dvf_autoload = { + HEADERS = mal + DIR = libdir/monetdb5/autoload + SOURCES = 92_opt_dvf.mal +} + +headers_dvf_autoload = { + HEADERS = mal + DIR = libdir/monetdb5/autoload + SOURCES = 91_dvf.mal +} + +EXTRA_DIST = 92_opt_dvf.mal dvf.mal 91_dvf.mal dvf.h + +EXTRA_DIST_DIR = Tests diff --git a/monetdb5/extras/dvf/README.txt b/monetdb5/extras/dvf/README.txt new file mode 100644 --- /dev/null +++ b/monetdb5/extras/dvf/README.txt @@ -0,0 +1,29 @@ +==How to use mSEED data vault== + +- libmseed library is needed. + - Download the library under the title "libmseed -- The MiniâSEED library" from http://www.iris.edu/software/libraries/ + - Create a directory $HOME/mseed and define LIBMSEED_LOCATION as $HOME/mseed + - Unpack the download libmseed package in $LIBMSEED_LOCATION. You should now have the directory $LIBMSEED_LOCATION/libmseed + - Install under LIBMSEED_LOCATION/libmseed of your choice by referring to the file named 'INSTALL'. A simple 'make' on most Unix-like systems should build the library. + - Create two symbolic links $LIBMSEED_LOCATION/lib and $LIBMSEED_LOCATION/include, so that they both point to the directory $LIBMSEED_LOCATION/libmseed + +- MonetDB 'DVframework' branch is needed. + - Refer to 'Building from Mercurial (HG) Sources' section of the wiki page http://www.monetdb.org/wiki/MonetDB:Building_from_sources + - Check out the 'DVframework' branch by running "hg clone -u DVframework http://dev.monetdb.org/hg/MonetDB/"; + - Follow the steps on the wiki page and note that 'configure' should be run with this additional option: '--with-mseed=$LIBMSEED_LOCATION' + +- How to run an example + - Go and Refer to .sql and .py files in the Tests/ directory under monetdb5/extras/dvf/. + - You need a file containing a list of mSEED files with their absolute paths that you would like to have in the repository. Run "Mtest create_file_list" to get a small example of mSEED file repository. Or you might run "find $PWD -name "*.mseed" > file.lst" to get a list of mseed files under current directory. + - Run "export LD_LIBRARY_PATH=$LIBMSEED_LOCATION/libmseed". + - Run "mserver5" to start mserver with the default settings. + - Run "mclient" in another terminal to get a client connection to the database server using 'demo' database. + - In the mclient sql interface, + - run 'mseed_schema_segments_mode.sql' script to create the normalized schema of mSEED in segments mode. + - run "SET SCHEMA mseed;". + - run "CALL sys.register_repo('TESTDIR/example_mseed_file_list.txt', 0, 1);" where TESTDIR is the relative or absolute path of the aforementioned Tests/ directory. This will employ the registrar module to load only metadata of mSEED files if the second argument is 0 or metadata + actual data if it is 1. The last argument specifies the number threads to use. + - run 'initializer.sql' script to modify MonetDB optimizer pipeline in order to include DVframework optimizer in the pipeline. This is need to me done after every restart of mclient, unfortunately. + - run example queries like "SELECT AVG(sample_value) FROM mseed.dataview WHERE network = 'FR';". You may also prefix the queries with 'EXPLAIN ' to see the query plan after the DVframework optimizer runs. + - You may always refer to man pages of commands beginning with 'm' or 'M' for more information about them. +- E-mail to [email protected] for questions, problems, etc. + diff --git a/monetdb5/extras/dvf/Tests/All b/monetdb5/extras/dvf/Tests/All new file mode 100644 --- /dev/null +++ b/monetdb5/extras/dvf/Tests/All @@ -0,0 +1,5 @@ +mseed_schema +create_file_list +registrar +opt_dvf +dvf diff --git a/monetdb5/extras/dvf/Tests/create_file_list.py b/monetdb5/extras/dvf/Tests/create_file_list.py new file mode 100644 --- /dev/null +++ b/monetdb5/extras/dvf/Tests/create_file_list.py @@ -0,0 +1,13 @@ +import os, sys, zipfile + +dest = os.environ['TSTSRCDIR'] +archive = os.path.join(dest, 'example_mseed_files.zip') +if not os.path.exists(archive): + sys.exit(1) + +z = zipfile.ZipFile(archive) +z.extractall(dest) +fl = open(os.path.join(dest, 'example_mseed_file_list.txt'), 'w') +for f in z.namelist(): + fl.write(str(os.path.join(dest, f)) + '\n') +z.close() diff --git a/monetdb5/extras/dvf/Tests/create_file_list.stable.err b/monetdb5/extras/dvf/Tests/create_file_list.stable.err new file mode 100644 --- /dev/null +++ b/monetdb5/extras/dvf/Tests/create_file_list.stable.err @@ -0,0 +1,12 @@ +stderr of test 'create_file_list` in directory 'extras/dvf` itself: + + +# 16:20:50 > +# 16:20:50 > "/usr/bin/python" "create_file_list.py" "create_file_list" +# 16:20:50 > + + +# 16:20:50 > +# 16:20:50 > "Done." +# 16:20:50 > + diff --git a/monetdb5/extras/dvf/Tests/create_file_list.stable.out b/monetdb5/extras/dvf/Tests/create_file_list.stable.out new file mode 100644 --- /dev/null +++ b/monetdb5/extras/dvf/Tests/create_file_list.stable.out @@ -0,0 +1,12 @@ +stdout of test 'create_file_list` in directory 'extras/dvf` itself: + + +# 16:20:50 > +# 16:20:50 > "/usr/bin/python" "create_file_list.py" "create_file_list" +# 16:20:50 > + + +# 16:20:50 > +# 16:20:50 > "Done." +# 16:20:50 > _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
