Changeset: d4a58da3652a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d4a58da3652a Added Files: clients/mapiclient/dotfile.py monetdb5/optimizer/Tests/flowgraph.malC monetdb5/optimizer/Tests/flowgraph.stable.err monetdb5/optimizer/Tests/flowgraph.stable.out sql/jdbc/tests/Tests/Test_PSlargeamount.SQL.bat sql/jdbc/tests/Tests/Test_PSlargeamount.SQL.sh sql/jdbc/tests/Tests/Test_PSlargeamount.stable.err sql/jdbc/tests/Tests/Test_PSlargeamount.stable.out sql/jdbc/tests/Tests/Test_PSlargeresponse.SQL.bat sql/jdbc/tests/Tests/Test_PSlargeresponse.SQL.sh sql/jdbc/tests/Tests/Test_PSlargeresponse.stable.err sql/jdbc/tests/Tests/Test_PSlargeresponse.stable.out sql/jdbc/tests/Tests/Test_Smoreresults.SQL.bat sql/jdbc/tests/Tests/Test_Smoreresults.SQL.sh sql/jdbc/tests/Tests/Test_Smoreresults.stable.err sql/jdbc/tests/Tests/Test_Smoreresults.stable.out sql/test/BugTracker-2016/Tests/crash.Bug-6081.sql sql/test/BugTracker-2016/Tests/crash.Bug-6081.stable.err sql/test/BugTracker-2016/Tests/crash.Bug-6081.stable.out sql/test/BugTracker-2016/Tests/dce.Bug-6114.sql sql/test/BugTracker-2016/Tests/dce.Bug-6114.stable.err sql/test/BugTracker-2016/Tests/dce.Bug-6114.stable.out sql/test/BugTracker-2016/Tests/dce2.Bug-6115.sql sql/test/BugTracker-2016/Tests/dce2.Bug-6115.stable.err sql/test/BugTracker-2016/Tests/dce2.Bug-6115.stable.out sql/test/BugTracker-2016/Tests/semijoin.Bug-6116.sql sql/test/BugTracker-2016/Tests/semijoin.Bug-6116.stable.err sql/test/BugTracker-2016/Tests/semijoin.Bug-6116.stable.out sql/test/BugTracker-2016/Tests/split_project.Bug-6117.sql sql/test/BugTracker-2016/Tests/split_project.Bug-6117.stable.err sql/test/BugTracker-2016/Tests/split_project.Bug-6117.stable.out Removed Files: clients/examples/C/sample2.c clients/examples/C/sample3.c monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows.single monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single sql/benchmarks/ssbm/Tests/01-explain.SQL.py.src sql/benchmarks/ssbm/Tests/01-explain.reqtests sql/benchmarks/ssbm/Tests/01-explain.stable.err sql/benchmarks/ssbm/Tests/01-explain.stable.out sql/benchmarks/ssbm/Tests/01-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/01-plan.SQL.py.src sql/benchmarks/ssbm/Tests/01-plan.reqtests sql/benchmarks/ssbm/Tests/01-plan.stable.err sql/benchmarks/ssbm/Tests/01-plan.stable.out sql/benchmarks/ssbm/Tests/02-explain.SQL.py.src sql/benchmarks/ssbm/Tests/02-explain.reqtests sql/benchmarks/ssbm/Tests/02-explain.stable.err sql/benchmarks/ssbm/Tests/02-explain.stable.out sql/benchmarks/ssbm/Tests/02-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/02-plan.SQL.py.src sql/benchmarks/ssbm/Tests/02-plan.reqtests sql/benchmarks/ssbm/Tests/02-plan.stable.err sql/benchmarks/ssbm/Tests/02-plan.stable.out sql/benchmarks/ssbm/Tests/03-explain.SQL.py.src sql/benchmarks/ssbm/Tests/03-explain.reqtests sql/benchmarks/ssbm/Tests/03-explain.stable.err sql/benchmarks/ssbm/Tests/03-explain.stable.out sql/benchmarks/ssbm/Tests/03-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/03-plan.SQL.py.src sql/benchmarks/ssbm/Tests/03-plan.reqtests sql/benchmarks/ssbm/Tests/03-plan.stable.err sql/benchmarks/ssbm/Tests/03-plan.stable.out sql/benchmarks/ssbm/Tests/04-explain.SQL.py.src sql/benchmarks/ssbm/Tests/04-explain.reqtests sql/benchmarks/ssbm/Tests/04-explain.stable.err sql/benchmarks/ssbm/Tests/04-explain.stable.out sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/04-plan.SQL.py.src sql/benchmarks/ssbm/Tests/04-plan.reqtests sql/benchmarks/ssbm/Tests/04-plan.stable.err sql/benchmarks/ssbm/Tests/04-plan.stable.out sql/benchmarks/ssbm/Tests/05-explain.SQL.py.src sql/benchmarks/ssbm/Tests/05-explain.reqtests sql/benchmarks/ssbm/Tests/05-explain.stable.err sql/benchmarks/ssbm/Tests/05-explain.stable.out sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/05-plan.SQL.py.src sql/benchmarks/ssbm/Tests/05-plan.reqtests sql/benchmarks/ssbm/Tests/05-plan.stable.err sql/benchmarks/ssbm/Tests/05-plan.stable.out sql/benchmarks/ssbm/Tests/06-explain.SQL.py.src sql/benchmarks/ssbm/Tests/06-explain.reqtests sql/benchmarks/ssbm/Tests/06-explain.stable.err sql/benchmarks/ssbm/Tests/06-explain.stable.out sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/06-plan.SQL.py.src sql/benchmarks/ssbm/Tests/06-plan.reqtests sql/benchmarks/ssbm/Tests/06-plan.stable.err sql/benchmarks/ssbm/Tests/06-plan.stable.out sql/benchmarks/ssbm/Tests/07-explain.SQL.py.src sql/benchmarks/ssbm/Tests/07-explain.reqtests sql/benchmarks/ssbm/Tests/07-explain.stable.err sql/benchmarks/ssbm/Tests/07-explain.stable.out sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/07-plan.SQL.py.src sql/benchmarks/ssbm/Tests/07-plan.reqtests sql/benchmarks/ssbm/Tests/07-plan.stable.err sql/benchmarks/ssbm/Tests/07-plan.stable.out sql/benchmarks/ssbm/Tests/08-explain.SQL.py.src sql/benchmarks/ssbm/Tests/08-explain.reqtests sql/benchmarks/ssbm/Tests/08-explain.stable.err sql/benchmarks/ssbm/Tests/08-explain.stable.out sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/08-plan.SQL.py.src sql/benchmarks/ssbm/Tests/08-plan.reqtests sql/benchmarks/ssbm/Tests/08-plan.stable.err sql/benchmarks/ssbm/Tests/08-plan.stable.out sql/benchmarks/ssbm/Tests/09-explain.SQL.py.src sql/benchmarks/ssbm/Tests/09-explain.reqtests sql/benchmarks/ssbm/Tests/09-explain.stable.err sql/benchmarks/ssbm/Tests/09-explain.stable.out sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/09-plan.SQL.py.src sql/benchmarks/ssbm/Tests/09-plan.reqtests sql/benchmarks/ssbm/Tests/09-plan.stable.err sql/benchmarks/ssbm/Tests/09-plan.stable.out sql/benchmarks/ssbm/Tests/10-explain.SQL.py.src sql/benchmarks/ssbm/Tests/10-explain.reqtests sql/benchmarks/ssbm/Tests/10-explain.stable.err sql/benchmarks/ssbm/Tests/10-explain.stable.out sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/10-plan.SQL.py.src sql/benchmarks/ssbm/Tests/10-plan.reqtests sql/benchmarks/ssbm/Tests/10-plan.stable.err sql/benchmarks/ssbm/Tests/10-plan.stable.out sql/benchmarks/ssbm/Tests/11-explain.SQL.py.src sql/benchmarks/ssbm/Tests/11-explain.reqtests sql/benchmarks/ssbm/Tests/11-explain.stable.err sql/benchmarks/ssbm/Tests/11-explain.stable.out sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/11-plan.SQL.py.src sql/benchmarks/ssbm/Tests/11-plan.reqtests sql/benchmarks/ssbm/Tests/11-plan.stable.err sql/benchmarks/ssbm/Tests/11-plan.stable.out sql/benchmarks/ssbm/Tests/12-explain.SQL.py.src sql/benchmarks/ssbm/Tests/12-explain.reqtests sql/benchmarks/ssbm/Tests/12-explain.stable.err sql/benchmarks/ssbm/Tests/12-explain.stable.out sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/12-plan.SQL.py.src sql/benchmarks/ssbm/Tests/12-plan.reqtests sql/benchmarks/ssbm/Tests/12-plan.stable.err sql/benchmarks/ssbm/Tests/12-plan.stable.out sql/benchmarks/ssbm/Tests/13-explain.SQL.py.src sql/benchmarks/ssbm/Tests/13-explain.reqtests sql/benchmarks/ssbm/Tests/13-explain.stable.err sql/benchmarks/ssbm/Tests/13-explain.stable.out sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128 sql/benchmarks/ssbm/Tests/13-plan.SQL.py.src sql/benchmarks/ssbm/Tests/13-plan.reqtests sql/benchmarks/ssbm/Tests/13-plan.stable.err sql/benchmarks/ssbm/Tests/13-plan.stable.out sql/benchmarks/tpch/Tests/01-explain.SQL.py.src sql/benchmarks/tpch/Tests/01-explain.reqtests sql/benchmarks/tpch/Tests/01-explain.stable.err sql/benchmarks/tpch/Tests/01-explain.stable.out sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit sql/benchmarks/tpch/Tests/01-explain.stable.out.int128 sql/benchmarks/tpch/Tests/01-plan.SQL.py.src sql/benchmarks/tpch/Tests/01-plan.reqtests sql/benchmarks/tpch/Tests/01-plan.stable.err sql/benchmarks/tpch/Tests/01-plan.stable.out sql/benchmarks/tpch/Tests/01-plan.stable.out.int128 sql/benchmarks/tpch/Tests/02-explain.SQL.py.src sql/benchmarks/tpch/Tests/02-explain.reqtests sql/benchmarks/tpch/Tests/02-explain.stable.err sql/benchmarks/tpch/Tests/02-explain.stable.out sql/benchmarks/tpch/Tests/02-explain.stable.out.32bit sql/benchmarks/tpch/Tests/02-plan.SQL.py.src sql/benchmarks/tpch/Tests/02-plan.reqtests sql/benchmarks/tpch/Tests/02-plan.stable.err sql/benchmarks/tpch/Tests/02-plan.stable.out sql/benchmarks/tpch/Tests/02-plan.stable.out.32bit sql/benchmarks/tpch/Tests/03-explain.SQL.py.src sql/benchmarks/tpch/Tests/03-explain.reqtests sql/benchmarks/tpch/Tests/03-explain.stable.err sql/benchmarks/tpch/Tests/03-explain.stable.out sql/benchmarks/tpch/Tests/03-explain.stable.out.int128 sql/benchmarks/tpch/Tests/03-plan.SQL.py.src sql/benchmarks/tpch/Tests/03-plan.reqtests sql/benchmarks/tpch/Tests/03-plan.stable.err sql/benchmarks/tpch/Tests/03-plan.stable.out sql/benchmarks/tpch/Tests/03-plan.stable.out.int128 sql/benchmarks/tpch/Tests/04-explain.SQL.py.src sql/benchmarks/tpch/Tests/04-explain.reqtests sql/benchmarks/tpch/Tests/04-explain.stable.err sql/benchmarks/tpch/Tests/04-explain.stable.out sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit sql/benchmarks/tpch/Tests/04-plan.SQL.py.src sql/benchmarks/tpch/Tests/04-plan.reqtests sql/benchmarks/tpch/Tests/04-plan.stable.err sql/benchmarks/tpch/Tests/04-plan.stable.out sql/benchmarks/tpch/Tests/05-explain.SQL.py.src sql/benchmarks/tpch/Tests/05-explain.reqtests sql/benchmarks/tpch/Tests/05-explain.stable.err sql/benchmarks/tpch/Tests/05-explain.stable.out sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit sql/benchmarks/tpch/Tests/05-explain.stable.out.int128 sql/benchmarks/tpch/Tests/05-plan.SQL.py.src sql/benchmarks/tpch/Tests/05-plan.reqtests sql/benchmarks/tpch/Tests/05-plan.stable.err sql/benchmarks/tpch/Tests/05-plan.stable.out sql/benchmarks/tpch/Tests/05-plan.stable.out.int128 sql/benchmarks/tpch/Tests/06-explain.SQL.py.src sql/benchmarks/tpch/Tests/06-explain.reqtests sql/benchmarks/tpch/Tests/06-explain.stable.err sql/benchmarks/tpch/Tests/06-explain.stable.out sql/benchmarks/tpch/Tests/06-explain.stable.out.int128 sql/benchmarks/tpch/Tests/06-plan.SQL.py.src sql/benchmarks/tpch/Tests/06-plan.reqtests sql/benchmarks/tpch/Tests/06-plan.stable.err sql/benchmarks/tpch/Tests/06-plan.stable.out sql/benchmarks/tpch/Tests/06-plan.stable.out.int128 sql/benchmarks/tpch/Tests/07-explain.SQL.py.src sql/benchmarks/tpch/Tests/07-explain.reqtests sql/benchmarks/tpch/Tests/07-explain.stable.err sql/benchmarks/tpch/Tests/07-explain.stable.out sql/benchmarks/tpch/Tests/07-explain.stable.out.int128 sql/benchmarks/tpch/Tests/07-plan.SQL.py.src sql/benchmarks/tpch/Tests/07-plan.reqtests sql/benchmarks/tpch/Tests/07-plan.stable.err sql/benchmarks/tpch/Tests/07-plan.stable.out sql/benchmarks/tpch/Tests/07-plan.stable.out.int128 sql/benchmarks/tpch/Tests/08-explain.SQL.py.src sql/benchmarks/tpch/Tests/08-explain.reqtests sql/benchmarks/tpch/Tests/08-explain.stable.err sql/benchmarks/tpch/Tests/08-explain.stable.out sql/benchmarks/tpch/Tests/08-explain.stable.out.int128 sql/benchmarks/tpch/Tests/08-plan.SQL.py.src sql/benchmarks/tpch/Tests/08-plan.reqtests sql/benchmarks/tpch/Tests/08-plan.stable.err sql/benchmarks/tpch/Tests/08-plan.stable.out sql/benchmarks/tpch/Tests/08-plan.stable.out.int128 sql/benchmarks/tpch/Tests/09-explain.SQL.py.src sql/benchmarks/tpch/Tests/09-explain.reqtests sql/benchmarks/tpch/Tests/09-explain.stable.err sql/benchmarks/tpch/Tests/09-explain.stable.out sql/benchmarks/tpch/Tests/09-explain.stable.out.int128 sql/benchmarks/tpch/Tests/09-plan.SQL.py.src sql/benchmarks/tpch/Tests/09-plan.reqtests sql/benchmarks/tpch/Tests/09-plan.stable.err sql/benchmarks/tpch/Tests/09-plan.stable.out sql/benchmarks/tpch/Tests/09-plan.stable.out.int128 sql/benchmarks/tpch/Tests/10-explain.SQL.py.src sql/benchmarks/tpch/Tests/10-explain.reqtests sql/benchmarks/tpch/Tests/10-explain.stable.err sql/benchmarks/tpch/Tests/10-explain.stable.out sql/benchmarks/tpch/Tests/10-explain.stable.out.int128 sql/benchmarks/tpch/Tests/10-plan.SQL.py.src sql/benchmarks/tpch/Tests/10-plan.reqtests sql/benchmarks/tpch/Tests/10-plan.stable.err sql/benchmarks/tpch/Tests/10-plan.stable.out sql/benchmarks/tpch/Tests/10-plan.stable.out.int128 sql/benchmarks/tpch/Tests/11-explain.SQL.py.src sql/benchmarks/tpch/Tests/11-explain.reqtests sql/benchmarks/tpch/Tests/11-explain.stable.err sql/benchmarks/tpch/Tests/11-explain.stable.out sql/benchmarks/tpch/Tests/11-explain.stable.out.int128 sql/benchmarks/tpch/Tests/11-plan.SQL.py.src sql/benchmarks/tpch/Tests/11-plan.reqtests sql/benchmarks/tpch/Tests/11-plan.stable.err sql/benchmarks/tpch/Tests/11-plan.stable.out sql/benchmarks/tpch/Tests/11-plan.stable.out.int128 sql/benchmarks/tpch/Tests/12-explain.SQL.py.src sql/benchmarks/tpch/Tests/12-explain.reqtests sql/benchmarks/tpch/Tests/12-explain.stable.err sql/benchmarks/tpch/Tests/12-explain.stable.out sql/benchmarks/tpch/Tests/12-explain.stable.out.int128 sql/benchmarks/tpch/Tests/12-plan.SQL.py.src sql/benchmarks/tpch/Tests/12-plan.reqtests sql/benchmarks/tpch/Tests/12-plan.stable.err sql/benchmarks/tpch/Tests/12-plan.stable.out sql/benchmarks/tpch/Tests/13-explain.SQL.py.src sql/benchmarks/tpch/Tests/13-explain.reqtests sql/benchmarks/tpch/Tests/13-explain.stable.err sql/benchmarks/tpch/Tests/13-explain.stable.out sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit sql/benchmarks/tpch/Tests/13-plan.SQL.py.src sql/benchmarks/tpch/Tests/13-plan.reqtests sql/benchmarks/tpch/Tests/13-plan.stable.err sql/benchmarks/tpch/Tests/13-plan.stable.out sql/benchmarks/tpch/Tests/13-plan.stable.out.32bit sql/benchmarks/tpch/Tests/14-explain.SQL.py.src sql/benchmarks/tpch/Tests/14-explain.reqtests sql/benchmarks/tpch/Tests/14-explain.stable.err sql/benchmarks/tpch/Tests/14-explain.stable.out sql/benchmarks/tpch/Tests/14-explain.stable.out.int128 sql/benchmarks/tpch/Tests/14-plan.SQL.py.src sql/benchmarks/tpch/Tests/14-plan.reqtests sql/benchmarks/tpch/Tests/14-plan.stable.err sql/benchmarks/tpch/Tests/14-plan.stable.out sql/benchmarks/tpch/Tests/14-plan.stable.out.int128 sql/benchmarks/tpch/Tests/15-explain.SQL.py.src sql/benchmarks/tpch/Tests/15-explain.reqtests sql/benchmarks/tpch/Tests/15-explain.stable.err sql/benchmarks/tpch/Tests/15-explain.stable.out sql/benchmarks/tpch/Tests/15-explain.stable.out.int128 sql/benchmarks/tpch/Tests/15-plan.SQL.py.src sql/benchmarks/tpch/Tests/15-plan.reqtests sql/benchmarks/tpch/Tests/15-plan.stable.err sql/benchmarks/tpch/Tests/15-plan.stable.out sql/benchmarks/tpch/Tests/15-plan.stable.out.int128 sql/benchmarks/tpch/Tests/16-explain.SQL.py.src sql/benchmarks/tpch/Tests/16-explain.reqtests sql/benchmarks/tpch/Tests/16-explain.stable.err sql/benchmarks/tpch/Tests/16-explain.stable.out sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit sql/benchmarks/tpch/Tests/16-plan.SQL.py.src sql/benchmarks/tpch/Tests/16-plan.reqtests sql/benchmarks/tpch/Tests/16-plan.stable.err sql/benchmarks/tpch/Tests/16-plan.stable.out sql/benchmarks/tpch/Tests/16-plan.stable.out.32bit sql/benchmarks/tpch/Tests/17-explain.SQL.py.src sql/benchmarks/tpch/Tests/17-explain.reqtests sql/benchmarks/tpch/Tests/17-explain.stable.err sql/benchmarks/tpch/Tests/17-explain.stable.out sql/benchmarks/tpch/Tests/17-explain.stable.out.int128 sql/benchmarks/tpch/Tests/17-plan.SQL.py.src sql/benchmarks/tpch/Tests/17-plan.reqtests sql/benchmarks/tpch/Tests/17-plan.stable.err sql/benchmarks/tpch/Tests/17-plan.stable.out sql/benchmarks/tpch/Tests/17-plan.stable.out.int128 sql/benchmarks/tpch/Tests/18-explain.SQL.py.src sql/benchmarks/tpch/Tests/18-explain.reqtests sql/benchmarks/tpch/Tests/18-explain.stable.err sql/benchmarks/tpch/Tests/18-explain.stable.out sql/benchmarks/tpch/Tests/18-explain.stable.out.int128 sql/benchmarks/tpch/Tests/18-plan.SQL.py.src sql/benchmarks/tpch/Tests/18-plan.reqtests sql/benchmarks/tpch/Tests/18-plan.stable.err sql/benchmarks/tpch/Tests/18-plan.stable.out sql/benchmarks/tpch/Tests/18-plan.stable.out.int128 sql/benchmarks/tpch/Tests/19-explain.SQL.py.src sql/benchmarks/tpch/Tests/19-explain.reqtests sql/benchmarks/tpch/Tests/19-explain.stable.err sql/benchmarks/tpch/Tests/19-explain.stable.out sql/benchmarks/tpch/Tests/19-explain.stable.out.int128 sql/benchmarks/tpch/Tests/19-plan.SQL.py.src sql/benchmarks/tpch/Tests/19-plan.reqtests sql/benchmarks/tpch/Tests/19-plan.stable.err sql/benchmarks/tpch/Tests/19-plan.stable.out sql/benchmarks/tpch/Tests/19-plan.stable.out.int128 sql/benchmarks/tpch/Tests/20-explain.SQL.py.src sql/benchmarks/tpch/Tests/20-explain.reqtests sql/benchmarks/tpch/Tests/20-explain.stable.err sql/benchmarks/tpch/Tests/20-explain.stable.out sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit sql/benchmarks/tpch/Tests/20-explain.stable.out.int128 sql/benchmarks/tpch/Tests/20-plan.SQL.py.src sql/benchmarks/tpch/Tests/20-plan.reqtests sql/benchmarks/tpch/Tests/20-plan.stable.err sql/benchmarks/tpch/Tests/20-plan.stable.out sql/benchmarks/tpch/Tests/20-plan.stable.out.int128 sql/benchmarks/tpch/Tests/21-explain.SQL.py.src sql/benchmarks/tpch/Tests/21-explain.reqtests sql/benchmarks/tpch/Tests/21-explain.stable.err sql/benchmarks/tpch/Tests/21-explain.stable.out sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit sql/benchmarks/tpch/Tests/21-plan.SQL.py.src sql/benchmarks/tpch/Tests/21-plan.reqtests sql/benchmarks/tpch/Tests/21-plan.stable.err sql/benchmarks/tpch/Tests/21-plan.stable.out sql/benchmarks/tpch/Tests/22-explain.SQL.py.src sql/benchmarks/tpch/Tests/22-explain.reqtests sql/benchmarks/tpch/Tests/22-explain.stable.err sql/benchmarks/tpch/Tests/22-explain.stable.out sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit sql/benchmarks/tpch/Tests/22-explain.stable.out.int128 sql/benchmarks/tpch/Tests/22-plan.SQL.py.src sql/benchmarks/tpch/Tests/22-plan.reqtests sql/benchmarks/tpch/Tests/22-plan.stable.err sql/benchmarks/tpch/Tests/22-plan.stable.out sql/test/mapi/Tests/sample2.SQL.bat sql/test/mapi/Tests/sample2.SQL.sh sql/test/mapi/Tests/sample2.stable.err sql/test/mapi/Tests/sample2.stable.out sql/test/mapi/Tests/sample3.SQL.bat sql/test/mapi/Tests/sample3.SQL.sh sql/test/mapi/Tests/sample3.stable.err sql/test/mapi/Tests/sample3.stable.out Modified Files: MonetDB.spec clients/ChangeLog clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/SQL-dump.stable.out clients/Tests/SQL-dump.stable.out.int128 clients/Tests/exports.stable.out clients/examples/C/Makefile.ag clients/mapiclient/mclient.c clients/mapiclient/mhelp.c clients/mapilib/mapi.c clients/mapilib/mapi.h debian/monetdb-client-testing.install gdk/gdk_value.c monetdb5/ChangeLog monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows monetdb5/mal/Tests/tst661.stable.out monetdb5/mal/Tests/tst903.stable.out monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_listing.c monetdb5/mal/mal_profiler.c monetdb5/mal/mal_profiler.h monetdb5/mal/mal_runtime.c monetdb5/modules/kernel/bat5.c monetdb5/modules/mal/Tests/call00.stable.out monetdb5/modules/mal/pcre.c monetdb5/modules/mal/profiler.c monetdb5/modules/mal/profiler.h monetdb5/modules/mal/profiler.mal monetdb5/optimizer/Tests/ARexample.stable.out monetdb5/optimizer/Tests/dataflow4.stable.out monetdb5/optimizer/Tests/dataflow5.stable.out monetdb5/optimizer/Tests/inlineFunction.stable.out monetdb5/optimizer/Tests/inlineFunction2.stable.out monetdb5/optimizer/Tests/inlineFunction4.stable.out monetdb5/optimizer/Tests/projectionchain.stable.out monetdb5/optimizer/Tests/reorder00.stable.out monetdb5/optimizer/Tests/tst4004.stable.out monetdb5/optimizer/Tests/tst4030.stable.out monetdb5/optimizer/opt_support.c monetdb5/optimizer/optimizer.mal sql/ChangeLog sql/backends/monet5/UDF/cudf/Tests/udf-fuse.stable.out sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_gencode.h sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_upgrades.c sql/jdbc/tests/Tests/BugDatabaseMetaData_Bug_3356.stable.out sql/jdbc/tests/Tests/Test_JdbcClient.stable.out sql/scripts/46_profiler.sql sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_select.c sql/server/rel_updates.c sql/server/sql_atom.c sql/server/sql_mvc.c sql/server/sql_scan.c sql/test/BugTracker-2009/Tests/POWER_vs_prod.SF-2596114.stable.out sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.sql sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128 sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out sql/test/BugTracker-2012/Tests/aggregate_incorrect_precision_scale.Bug-3182.stable.out.int128 sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out sql/test/BugTracker-2012/Tests/algebra_find.Bug-2728.stable.out sql/test/BugTracker-2012/Tests/any_null.Bug-2594.stable.out sql/test/BugTracker-2012/Tests/boolean_coersion.Bug-3012.stable.out sql/test/BugTracker-2012/Tests/case_evaluated_too_early.Bug-3186.stable.out sql/test/BugTracker-2012/Tests/cast-tinyint-Bug-3137.stable.out sql/test/BugTracker-2012/Tests/cast_varchar_to_double.Bug-3071.stable.out sql/test/BugTracker-2012/Tests/correlated_groupby_in_selection.Bug-3011.stable.out sql/test/BugTracker-2012/Tests/currenttime.Bug-2781.stable.out sql/test/BugTracker-2012/Tests/date_script_test.Bug-2973.stable.out sql/test/BugTracker-2012/Tests/day-of-month-localization.Bug-2962.stable.out sql/test/BugTracker-2012/Tests/fixed_limit_for_prepare.Bug-3208.stable.out sql/test/BugTracker-2012/Tests/float-mod.Bug-3086.stable.out sql/test/BugTracker-2012/Tests/incorrect_cast_from_double_to_int.Bug-2579.stable.out sql/test/BugTracker-2012/Tests/large-number-operation-strange-results.Bug-2929.stable.out.int128 sql/test/BugTracker-2012/Tests/many-columns-truncated.Bug-3161.stable.out sql/test/BugTracker-2012/Tests/not-equal-Bug.3139.stable.out sql/test/BugTracker-2012/Tests/now_results_in_illegal_argument.Bug-2978.stable.out sql/test/BugTracker-2012/Tests/null_except_null.Bug-3040.stable.out sql/test/BugTracker-2012/Tests/order_by_on_column_exp.Bug-3193.stable.out sql/test/BugTracker-2012/Tests/power_priority.Bug-2291.stable.out sql/test/BugTracker-2012/Tests/power_priority.Bug-2291.stable.out.int128 sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out sql/test/BugTracker-2012/Tests/round-type-inference.Bug-2987.stable.out sql/test/BugTracker-2012/Tests/row_number_does_not_work_in_complex_query.Bug-2805.stable.out sql/test/BugTracker-2012/Tests/scalar_subquery_with_alias.Bug-3093.stable.out sql/test/BugTracker-2012/Tests/server-crash.Bug-3046.stable.out sql/test/BugTracker-2012/Tests/set_operation.Bug-3059.stable.out sql/test/BugTracker-2012/Tests/simple_select.Bug-2988.stable.out sql/test/BugTracker-2012/Tests/sticky-precision.Bug-2969.stable.out sql/test/BugTracker-2012/Tests/timestamp-diff.Bug-3190.stable.out sql/test/BugTracker-2012/Tests/tuples_INTERSECT_vs_count_intersect_differs.Bug-2659.stable.out sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.stable.out sql/test/BugTracker-2012/Tests/user_defined_decimal_function.Bug-2992.stable.out sql/test/BugTracker-2012/Tests/with_and_exists.Bug-3099.stable.out sql/test/BugTracker-2012/Tests/with_in_derived_table.Bug-3043.stable.out sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.int128 sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.stable.out sql/test/BugTracker-2015/Tests/useless_casts.Bug-3756.stable.out sql/test/BugTracker-2016/Tests/All sql/test/BugTracker-2016/Tests/CREATE_INDEX_breaks_table_queries.Bug-4053.stable.out sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.stable.out sql/test/BugTracker-2016/Tests/assert-on-project.Bug-6078.stable.out sql/test/BugTracker-2016/Tests/assert-on-push-project-up.Bug-6077.stable.out sql/test/BugTracker-2016/Tests/assert-on-table-producing-function.Bug-6076.stable.out sql/test/BugTracker-2016/Tests/case-with-string-Bug.3932.stable.out sql/test/BugTracker-2016/Tests/cast_and_floor.Bug-6071.stable.out sql/test/BugTracker-2016/Tests/catalog_name_qualifier.Bug-3948.stable.out sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out.int128 sql/test/BugTracker-2016/Tests/column_not_found.Bug-4064.stable.out sql/test/BugTracker-2016/Tests/convert-function-test-hge.Bug-3460.stable.out sql/test/BugTracker-2016/Tests/date_calculation_and_comparison_wrong_results.Bug-3940.stable.out sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out sql/test/BugTracker-2016/Tests/epoch.Bug-3979.stable.out sql/test/BugTracker-2016/Tests/fk-smaller-pk.Bug-3983.stable.out sql/test/BugTracker-2016/Tests/group_distinct_quantile.Bug-3927.stable.out sql/test/BugTracker-2016/Tests/ifthenelse-void.Bug-6075.stable.out sql/test/BugTracker-2016/Tests/isaUUID_function.Bug-3997.stable.out sql/test/BugTracker-2016/Tests/like_in_non_sys_schema.Bug-4062.stable.out sql/test/BugTracker-2016/Tests/min-max-uuid-column-wrong-results.Bug-3953.stable.out sql/test/BugTracker-2016/Tests/name_conflict_in_union.Bug-6065.stable.out sql/test/BugTracker-2016/Tests/nested-mal-with-multiplex.Bug-4035.stable.out sql/test/BugTracker-2016/Tests/null_in_null.Bug-3900.stable.out sql/test/BugTracker-2016/Tests/outer_constant_predicate.Bug-4070.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit sql/test/BugTracker-2016/Tests/storagemodel.stable.out.int128 sql/test/BugTracker-2016/Tests/string-length.Bug-3999.stable.out sql/test/BugTracker-2016/Tests/subcorr-missing.Bug-3978.stable.out sql/test/BugTracker-2016/Tests/union.Bug-6069.stable.out sql/test/BugTracker-2016/Tests/wrong-nonil-property-with-copy-binary-into.Bug-3937.stable.out sql/test/BugTracker/Tests/authorization.SF-1430616.stable.out sql/test/BugTracker/Tests/bug_in_selection.SF-1892413.stable.err sql/test/BugTracker/Tests/explain.SF-1739353.stable.out sql/test/BugTracker/Tests/groupby_orderby_nonselected.SF-1723863.stable.err sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out sql/test/BugTracker/Tests/subquery_orderby.SF-1688915.stable.err sql/test/Tests/systemfunctions.stable.out sql/test/Tests/systemfunctions.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/check.stable.out sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/check.stable.out sql/test/emptydb-upgrade/Tests/check.stable.out.32bit sql/test/emptydb-upgrade/Tests/check.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 sql/test/leaks/Tests/check1.stable.out.int128 sql/test/leaks/Tests/check2.stable.out.int128 sql/test/leaks/Tests/check3.stable.out.int128 sql/test/leaks/Tests/check4.stable.out.int128 sql/test/leaks/Tests/check5.stable.out.int128 sql/test/mapi/Tests/All sql/test/mapi/Tests/sql_int128.stable.out sql/test/mergetables/Tests/mergequery.stable.out sql/test/pg_regress/Tests/comments.stable.err sql/test/pg_regress/Tests/comments.stable.out sql/test/remote/Tests/partition_elim.stable.out sql/test/remote/Tests/ssbm.stable.out sql/test/remote/Tests/ssbm.stable.out.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 testing/Mfilter.py Branch: oltp Log Message:
Merge with default diffs (truncated from 33697 to 300 lines): diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -384,8 +384,6 @@ developer. %{_bindir}/odbcsample1 %{_bindir}/sample0 %{_bindir}/sample1 -%{_bindir}/sample2 -%{_bindir}/sample3 %{_bindir}/sample4 %{_bindir}/smack00 %{_bindir}/smack01 diff --git a/clients/ChangeLog b/clients/ChangeLog --- a/clients/ChangeLog +++ b/clients/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog file for clients # This file is updated with Maddlog +* Wed Nov 16 2016 Sjoerd Mullender <sjo...@acm.org> +- Removed the "array" and "quick" functions from the mapi library. + To be precise, the removed functions are: mapi_execute_array, + mapi_fetch_field_array, mapi_prepare_array, mapi_query_array, + mapi_quick_query, mapi_quick_query_array, and mapi_quick_response. + * Sun Oct 30 2016 Martin Kersten <m...@cwi.nl> - Added a more elaborate \help command for SQL expressions. 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 @@ -8221,9 +8221,11 @@ Ready. [ "profiler", "getSystemTime", "command profiler.getSystemTime():lng ", "CMDgetSystemTime;", "Obtain the user timing information." ] [ "profiler", "getTrace", "command profiler.getTrace(e:str):bat[:any_1] ", "CMDgetTrace;", "Get the trace details of a specific event" ] [ "profiler", "getUserTime", "command profiler.getUserTime():lng ", "CMDgetUserTime;", "Obtain the user timing information." ] +[ "profiler", "getlimit", "command profiler.getlimit():int ", "CMDgetprofilerlimit;", "Avoid floading of events" ] [ "profiler", "noop", "command profiler.noop():void ", "CMDnoopProfiler;", "Fetch any pending performance events" ] [ "profiler", "openstream", "pattern profiler.openstream(mode:int):void ", "CMDopenProfilerStream;", "Start profiling the events, sent to output stream" ] [ "profiler", "setheartbeat", "command profiler.setheartbeat(b:int):void ", "CMDsetHeartbeat;", "Set heart beat performance tracing" ] +[ "profiler", "setlimit", "command profiler.setlimit(i:int):void ", "CMDsetprofilerlimit;", "Change the profiler event limit counter" ] [ "profiler", "start", "pattern profiler.start():void ", "CMDstartProfiler;", "Start offline performance profiling" ] [ "profiler", "starttrace", "command profiler.starttrace():void ", "CMDstartTrace;", "Start collecting trace information" ] [ "profiler", "starttrace", "command profiler.starttrace(path:str):void ", "CMDstartTracePath;", "Start collecting trace information and keep around in 'path' directory" ] 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 @@ -10583,9 +10583,11 @@ Ready. [ "profiler", "getSystemTime", "command profiler.getSystemTime():lng ", "CMDgetSystemTime;", "Obtain the user timing information." ] [ "profiler", "getTrace", "command profiler.getTrace(e:str):bat[:any_1] ", "CMDgetTrace;", "Get the trace details of a specific event" ] [ "profiler", "getUserTime", "command profiler.getUserTime():lng ", "CMDgetUserTime;", "Obtain the user timing information." ] +[ "profiler", "getlimit", "command profiler.getlimit():int ", "CMDgetprofilerlimit;", "Avoid floading of events" ] [ "profiler", "noop", "command profiler.noop():void ", "CMDnoopProfiler;", "Fetch any pending performance events" ] [ "profiler", "openstream", "pattern profiler.openstream(mode:int):void ", "CMDopenProfilerStream;", "Start profiling the events, sent to output stream" ] [ "profiler", "setheartbeat", "command profiler.setheartbeat(b:int):void ", "CMDsetHeartbeat;", "Set heart beat performance tracing" ] +[ "profiler", "setlimit", "command profiler.setlimit(i:int):void ", "CMDsetprofilerlimit;", "Change the profiler event limit counter" ] [ "profiler", "start", "pattern profiler.start():void ", "CMDstartProfiler;", "Start offline performance profiling" ] [ "profiler", "starttrace", "command profiler.starttrace():void ", "CMDstartTrace;", "Start collecting trace information" ] [ "profiler", "starttrace", "command profiler.starttrace(path:str):void ", "CMDstartTracePath;", "Start collecting trace information and keep around in 'path' directory" ] diff --git a/clients/Tests/SQL-dump.stable.out b/clients/Tests/SQL-dump.stable.out --- a/clients/Tests/SQL-dump.stable.out +++ b/clients/Tests/SQL-dump.stable.out @@ -1789,7 +1789,9 @@ drop function pcre_replace(string, strin [ "json", "tojsonarray", "create aggregate json.tojsonarray(x double) returns string external name aggr.jsonaggr;", "aggr", 1, 3, false, false, false ] [ "json", "tojsonarray", "create aggregate json.tojsonarray(x string) returns string external name aggr.jsonaggr;", "aggr", 1, 3, false, false, false ] [ "json", "valuearray", "create function json.valuearray(js json) returns json external name json.valuearray;", "json", 1, 1, false, false, false ] +[ "profiler", "getlimit", "create function profiler.getlimit() returns integer external name profiler.getlimit;", "profiler", 1, 1, false, false, false ] [ "profiler", "setheartbeat", "create procedure profiler.setheartbeat(beat int) external name profiler.setheartbeat;", "profiler", 1, 2, true, false, false ] +[ "profiler", "setlimit", "create procedure profiler.setlimit(lim integer) external name profiler.setlimit;", "profiler", 1, 2, true, false, false ] [ "profiler", "setpoolsize", "create procedure profiler.setpoolsize(poolsize int) external name profiler.setpoolsize;", "profiler", 1, 2, true, false, false ] [ "profiler", "setstream", "create procedure profiler.setstream(host string, port int) external name profiler.setstream;", "profiler", 1, 2, true, false, false ] [ "profiler", "start", "create procedure profiler.start() external name profiler.\"start\";", "profiler", 1, 2, true, false, false ] @@ -3341,7 +3343,9 @@ drop function pcre_replace(string, strin [ "json", "tojsonarray", "x", "clob", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "json", "tojsonarray", "x", "double", 53, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "json", "valuearray", "js", "json", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] +[ "profiler", "getlimit", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "profiler", "setheartbeat", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] +[ "profiler", "setlimit", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "profiler", "setpoolsize", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "profiler", "setstream", "port", "int", 32, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "profiler", "start", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] @@ -5908,6 +5912,7 @@ drop function pcre_replace(string, strin [ "getextension" ] [ "getfile" ] [ "gethost" ] +[ "getlimit" ] [ "getport" ] [ "getproj4" ] [ "getprotocol" ] @@ -6740,6 +6745,7 @@ drop function pcre_replace(string, strin [ "seq_length" ] [ "sessions" ] [ "setheartbeat" ] +[ "setlimit" ] [ "setmasklen" ] [ "setpoolsize" ] [ "setsession" ] diff --git a/clients/Tests/SQL-dump.stable.out.int128 b/clients/Tests/SQL-dump.stable.out.int128 --- a/clients/Tests/SQL-dump.stable.out.int128 +++ b/clients/Tests/SQL-dump.stable.out.int128 @@ -1796,7 +1796,9 @@ drop function pcre_replace(string, strin [ "json", "tojsonarray", "create aggregate json.tojsonarray(x double) returns string external name aggr.jsonaggr;", "aggr", 1, 3, false, false, false ] [ "json", "tojsonarray", "create aggregate json.tojsonarray(x string) returns string external name aggr.jsonaggr;", "aggr", 1, 3, false, false, false ] [ "json", "valuearray", "create function json.valuearray(js json) returns json external name json.valuearray;", "json", 1, 1, false, false, false ] +[ "profiler", "getlimit", "create function profiler.getlimit() returns integer external name profiler.getlimit;", "profiler", 1, 1, false, false, false ] [ "profiler", "setheartbeat", "create procedure profiler.setheartbeat(beat int) external name profiler.setheartbeat;", "profiler", 1, 2, true, false, false ] +[ "profiler", "setlimit", "create procedure profiler.setlimit(lim integer) external name profiler.setlimit;", "profiler", 1, 2, true, false, false ] [ "profiler", "setpoolsize", "create procedure profiler.setpoolsize(poolsize int) external name profiler.setpoolsize;", "profiler", 1, 2, true, false, false ] [ "profiler", "setstream", "create procedure profiler.setstream(host string, port int) external name profiler.setstream;", "profiler", 1, 2, true, false, false ] [ "profiler", "start", "create procedure profiler.start() external name profiler.\"start\";", "profiler", 1, 2, true, false, false ] @@ -3529,7 +3531,9 @@ drop function pcre_replace(string, strin [ "json", "tojsonarray", "x", "clob", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "json", "tojsonarray", "x", "double", 53, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "json", "valuearray", "js", "json", 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] +[ "profiler", "getlimit", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "profiler", "setheartbeat", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] +[ "profiler", "setlimit", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "profiler", "setpoolsize", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "profiler", "setstream", "port", "int", 32, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "profiler", "start", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] @@ -6301,6 +6305,7 @@ drop function pcre_replace(string, strin [ "getextension" ] [ "getfile" ] [ "gethost" ] +[ "getlimit" ] [ "getport" ] [ "getproj4" ] [ "getprotocol" ] @@ -7240,6 +7245,7 @@ drop function pcre_replace(string, strin [ "seq_length" ] [ "sessions" ] [ "setheartbeat" ] +[ "setlimit" ] [ "setmasklen" ] [ "setpoolsize" ] [ "setsession" ] diff --git a/clients/examples/C/Makefile.ag b/clients/examples/C/Makefile.ag --- a/clients/examples/C/Makefile.ag +++ b/clients/examples/C/Makefile.ag @@ -12,7 +12,7 @@ MAPI_LIBS = $(SOCKET_LIBS) BINS = { CONDINST = HAVE_TESTING DIR = bindir - SOURCES = sample0.c sample1.c sample2.c sample3.c sample4.c \ + SOURCES = sample0.c sample1.c sample4.c \ smack00.c smack01.c LIBS = $(MAPI_LIBS) ../../mapilib/libmapi \ $(curl_LIBS) diff --git a/clients/examples/C/sample2.c b/clients/examples/C/sample2.c deleted file mode 100644 --- a/clients/examples/C/sample2.c +++ /dev/null @@ -1,101 +0,0 @@ -/* - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. - */ - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <mapi.h> - -#define die(dbh,hdl) do { \ - if (hdl) \ - mapi_explain_result(hdl,stderr); \ - else if (dbh) \ - mapi_explain(dbh,stderr); \ - else \ - fprintf(stderr,"command failed\n"); \ - exit(-1); \ - } while (0) - -int -main(int argc, char **argv) -{ - /* a parameter binding test */ - char *nme = 0; - int age = 0; - char *parm[] = { "peter", 0 }; - char *parm2[] = { "25", 0 }; - char *parm3[] = { "peter", "25", 0 }; - Mapi dbh= NULL; - MapiHdl hdl = NULL; - - if (argc != 4) { - printf("usage:%s <host> <port> <language>\n", argv[0]); - exit(-1); - } - - dbh = mapi_connect(argv[1], atoi(argv[2]), "monetdb", "monetdb", argv[3], NULL); - if (dbh == NULL || mapi_error(dbh)) - die(dbh, hdl); - - /* mapi_trace(dbh,1); */ - if (strcmp(argv[3], "sql") == 0) { - /* switch of autocommit */ - if (mapi_setAutocommit(dbh, 0) != MOK || mapi_error(dbh)) - die(dbh,NULL); - if ((hdl = mapi_query(dbh, "create table emp(name varchar(20), age int)")) == NULL || mapi_error(dbh)) - die(dbh, hdl); - if (mapi_close_handle(hdl) != MOK) - die(dbh, hdl); - if ((hdl = mapi_query_array(dbh, "insert into emp values('?', ?)", parm3)) == NULL || mapi_error(dbh)) - die(dbh, hdl); - if (mapi_close_handle(hdl) != MOK) - die(dbh, hdl); - if ((hdl = mapi_query(dbh, "select * from emp")) == NULL || mapi_error(dbh)) - die(dbh, hdl); - if (mapi_bind(hdl, 0, &nme)) - die(dbh, hdl); - if (mapi_bind_var(hdl, 1, MAPI_INT, &age)) - die(dbh, hdl); - while (mapi_fetch_row(hdl)) { - printf("%s is %d\n", nme, age); - } - } else if (strcmp(argv[3], "mal") == 0) { - if ((hdl = mapi_query(dbh, "emp := bat.new(:oid,:str);")) == NULL || mapi_error(dbh)) - die(dbh, hdl); - if ((hdl = mapi_query(dbh, "age := bat.new(:oid,:int);")) == NULL || mapi_error(dbh)) - die(dbh, hdl); - if (mapi_close_handle(hdl) != MOK) - die(dbh, hdl); - if ((hdl = mapi_query_array(dbh, "bat.append(emp,\"?\");", parm)) == NULL || mapi_error(dbh)) - die(dbh, hdl); - if ((hdl = mapi_query_array(dbh, "bat.append(age,?);", parm2)) == NULL || mapi_error(dbh)) - die(dbh, hdl); - if (mapi_close_handle(hdl) != MOK) - die(dbh, hdl); - if ((hdl = mapi_query(dbh, "io.print(emp,age);")) == NULL || mapi_error(dbh)) - die(dbh, hdl); - if (mapi_bind(hdl, 1, &nme)) - die(dbh, hdl); - if (mapi_bind_var(hdl, 2, MAPI_INT, &age)) - die(dbh, hdl); - while (mapi_fetch_row(hdl)) { - printf("%s is %d\n", nme, age); - } - } else { - fprintf(stderr, "%s: unknown language, only mal and sql supported\n", argv[0]); - exit(1); - } - - if (mapi_error(dbh)) - die(dbh, hdl); - if (mapi_close_handle(hdl) != MOK) - die(dbh, hdl); - mapi_destroy(dbh); - - return 0; -} diff --git a/clients/examples/C/sample3.c b/clients/examples/C/sample3.c deleted file mode 100644 --- a/clients/examples/C/sample3.c +++ /dev/null @@ -1,109 +0,0 @@ -/* - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V. - */ - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <mapi.h> -#ifdef _MSC_VER -#define LLFMT "%I64d" -#else -#define LLFMT "%lld" -#endif - -#define die(dbh,hdl) do { \ - if (hdl) \ - mapi_explain_result(hdl,stderr); \ - else if (dbh) \ - mapi_explain(dbh,stderr); \ - else \ - fprintf(stderr,"command failed\n"); \ - exit(-1); \ - } while (0) - -int -main(int argc, char **argv) -{ - Mapi dbh; - MapiHdl hdl = NULL; - mapi_int64 rows, i; - char *parm[] = { "peter", 0 }; - char *parm2[] = { "25", 0 }; - int j; - - if (argc != 4) { - printf("usage:%s <host> <port> <language>\n", argv[0]); - exit(-1); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list