'MonetDB: geo - merge with default'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       monetdb-checkins
Subject:    MonetDB: geo - merge with default
From:       Kostis Kyzirakos <commits+kostis=cwi.nl () monetdb ! org>
Date:       2016-01-29 15:31:51
Message-ID: hg.1912d62c4663.1454081511.6315528441665844383 () monetdb2 ! cwi-incubator ! nl
[Download RAW message or body]

Changeset: 1912d62c4663 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1912d62c4663
Added Files:
	gdk/gdk_project.c
	java/tests/BugDecimalRound_Bug_3561.java
	monetdb5/modules/mal/projectionpath.c
	monetdb5/modules/mal/projectionpath.h
	monetdb5/optimizer/Tests/projectionchain.malC
	monetdb5/optimizer/Tests/projectionchain.stable.err
	monetdb5/optimizer/Tests/projectionchain.stable.out
	monetdb5/optimizer/opt_projectionpath.c
	monetdb5/optimizer/opt_projectionpath.h
	monetdb5/optimizer/opt_volcano.c
	monetdb5/optimizer/opt_volcano.h
	sql/jdbc/tests/Tests/BugDecimalRound_Bug_3561.SQL.bat
	sql/jdbc/tests/Tests/BugDecimalRound_Bug_3561.SQL.sh
	sql/jdbc/tests/Tests/BugDecimalRound_Bug_3561.stable.err
	sql/jdbc/tests/Tests/BugDecimalRound_Bug_3561.stable.out
	sql/test/BugTracker-2016/Tests/All
	sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.sql
  sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.stable.err
  sql/test/BugTracker-2016/Tests/LEFT-JOIN_with_OR_conditions_triggers_assertion.Bug-3908.stable.out
  sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.sql
  sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.stable.err
  sql/test/BugTracker-2016/Tests/incorrect_column_name_in_OR_condition_of_LEFT-JOIN_crashes_mserver.Bug-3909.stable.out
  sql/test/pg_regress/Tests/oid.stable.err.oid32.int128
	sql/test/rdf/Tests/q8_v_small.reqtests
	sql/test/rdf/Tests/q8_v_small.sql
	sql/test/rdf/Tests/q8_v_small.stable.err
	sql/test/rdf/Tests/q8_v_small.stable.out
	tools/merovingian/daemon/monetdbd.service.in
Removed Files:
	monetdb5/mal/Tests/tst104.malC
	monetdb5/mal/Tests/tst104.stable.err
	monetdb5/mal/Tests/tst104.stable.out
	monetdb5/mal/Tests/tst105.malC
	monetdb5/mal/Tests/tst105.stable.err
	monetdb5/mal/Tests/tst105.stable.out
	monetdb5/mal/Tests/tst105a.malC
	monetdb5/mal/Tests/tst105a.stable.err
	monetdb5/mal/Tests/tst105a.stable.out
	monetdb5/mal/Tests/tst106.malC
	monetdb5/mal/Tests/tst106.stable.err
	monetdb5/mal/Tests/tst106.stable.out
	monetdb5/mal/Tests/tst150.malC
	monetdb5/mal/Tests/tst150.stable.err
	monetdb5/mal/Tests/tst150.stable.out
	monetdb5/modules/mal/joinpath.c
	monetdb5/modules/mal/joinpath.h
	monetdb5/optimizer/Tests/joinchain.malC
	monetdb5/optimizer/Tests/joinchain.stable.err
	monetdb5/optimizer/Tests/joinchain.stable.out
	monetdb5/optimizer/opt_joinpath.c
	monetdb5/optimizer/opt_joinpath.h
Modified Files:
	MonetDB.spec
	buildtools/ChangeLog
	clients/R/Tests/survey.R
	clients/R/Tests/survey.stable.out
	clients/Tests/All
	clients/Tests/MAL-signatures.stable.out
	clients/Tests/MAL-signatures.stable.out.int128
	clients/Tests/exports.stable.err
	clients/Tests/exports.stable.out
	clients/Tests/malcheck.stable.err
	clients/mapilib/mapi.c
	common/stream/stream.c
	configure.ag
	gdk/ChangeLog
	gdk/Makefile.ag
	gdk/gdk.h
	gdk/gdk_align.c
	gdk/gdk_bat.c
	gdk/gdk_batop.c
	gdk/gdk_bbp.c
	gdk/gdk_calc.c
	gdk/gdk_calc_compare.h
	gdk/gdk_firstn.c
	gdk/gdk_group.c
	gdk/gdk_heap.c
	gdk/gdk_imprints.c
	gdk/gdk_join.c
	gdk/gdk_private.h
	gdk/gdk_search.c
	gdk/gdk_search.h
	gdk/gdk_select.c
	gdk/gdk_storage.c
	gdk/gdk_storage.h
	gdk/gdk_system.c
	gdk/gdk_unique.c
	gdk/gdk_utils.c
	gdk/gdk_utils.h
	geom/monetdb5/30_geom.mal
	java/ChangeLog
	java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
	java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
	java/tests/Makefile.ag
	java/tests/build.xml
	monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
	monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
	monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
	monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.single
	monetdb5/extras/rapi/50_rapi.mal
	monetdb5/extras/sphinx/30_sphinx.mal
	monetdb5/mal/Tests/All
	monetdb5/mal/Tests/dataflow01.malC
	monetdb5/mal/Tests/dynamicload.stable.err
	monetdb5/mal/Tests/tst102.malC
	monetdb5/mal/Tests/tst102.stable.err
	monetdb5/mal/Tests/tst115.malC
	monetdb5/mal/Tests/tst115.stable.err
	monetdb5/mal/mal.c
	monetdb5/mal/mal.h
	monetdb5/mal/mal_authorize.c
	monetdb5/mal/mal_client.c
	monetdb5/mal/mal_dataflow.c
	monetdb5/mal/mal_dataflow.h
	monetdb5/mal/mal_factory.c
	monetdb5/mal/mal_linker.c
	monetdb5/mal/mal_module.c
	monetdb5/mal/mal_namespace.c
	monetdb5/mal/mal_parser.c
	monetdb5/mal/mal_private.h
	monetdb5/mal/mal_profiler.c
	monetdb5/mal/mal_profiler.h
	monetdb5/mal/mal_recycle.c
	monetdb5/mal/mal_resource.c
	monetdb5/mal/mal_resource.h
	monetdb5/mal/mal_runtime.c
	monetdb5/mal/mal_runtime.h
	monetdb5/mal/mal_scenario.c
	monetdb5/modules/atoms/str.c
	monetdb5/modules/kernel/00_aggr_hge.mal
	monetdb5/modules/kernel/00_aggr_hge.mal.sh
	monetdb5/modules/kernel/aggr.mal
	monetdb5/modules/kernel/aggr.mal.sh
	monetdb5/modules/kernel/bat5.c
	monetdb5/modules/mal/01_batcalc.mal
	monetdb5/modules/mal/01_batcalc.mal.sh
	monetdb5/modules/mal/01_calc.mal
	monetdb5/modules/mal/Makefile.ag
	monetdb5/modules/mal/Tests/All
	monetdb5/modules/mal/Tests/inspect05.stable.out
	monetdb5/modules/mal/Tests/manifold.malC
	monetdb5/modules/mal/Tests/remote03.malC
	monetdb5/modules/mal/Tests/remote03.stable.err
	monetdb5/modules/mal/Tests/remote03.stable.out
	monetdb5/modules/mal/language.mal
	monetdb5/modules/mal/mal_mapi.c
	monetdb5/modules/mal/profiler.c
	monetdb5/modules/mal/profiler.h
	monetdb5/modules/mal/profiler.mal
	monetdb5/optimizer/Makefile.ag
	monetdb5/optimizer/Tests/All
	monetdb5/optimizer/Tests/JPexample.malC
	monetdb5/optimizer/Tests/JPexample.stable.out
	monetdb5/optimizer/Tests/dataflow.malC
	monetdb5/optimizer/Tests/dataflow.stable.out
	monetdb5/optimizer/Tests/dataflow3.malC
	monetdb5/optimizer/Tests/joinpath.malC
	monetdb5/optimizer/Tests/leftjoinpath.malC
	monetdb5/optimizer/Tests/manifold2.stable.out.single
	monetdb5/optimizer/Tests/tst4005.malC
	monetdb5/optimizer/Tests/tst4630.malC
	monetdb5/optimizer/opt_costModel.c
	monetdb5/optimizer/opt_pipes.c
	monetdb5/optimizer/opt_prelude.c
	monetdb5/optimizer/opt_prelude.h
	monetdb5/optimizer/opt_profiler.c
	monetdb5/optimizer/opt_support.c
	monetdb5/optimizer/opt_support.h
	monetdb5/optimizer/opt_wrapper.c
	monetdb5/optimizer/optimizer.mal
	monetdb5/scheduler/Tests/All
	sql/backends/monet5/40_sql.mal
	sql/backends/monet5/Makefile.ag
	sql/backends/monet5/Tests/optimizers.sql
	sql/backends/monet5/Tests/optimizers.stable.err
	sql/backends/monet5/UDF/80_udf.mal
	sql/backends/monet5/generator/90_generator.mal
	sql/backends/monet5/generator/Tests/joins00.sql
	sql/backends/monet5/generator/Tests/joins01.sql
	sql/backends/monet5/generator/Tests/joins01.stable.out
	sql/backends/monet5/gsl/73_gsl.mal
	sql/backends/monet5/rel_bin.c
	sql/backends/monet5/sql.c
	sql/backends/monet5/sql.mal
	sql/backends/monet5/sql_decimal.mal.sh
	sql/backends/monet5/sql_decimal_hge.mal.sh
	sql/backends/monet5/sql_optimizer.c
	sql/backends/monet5/sql_scenario.c
	sql/backends/monet5/vaults/70_vault.mal
	sql/backends/monet5/vaults/bam/85_bam.mal
	sql/backends/monet5/vaults/bam/85_bam.sql
	sql/backends/monet5/vaults/bam/bam.mal
	sql/backends/monet5/vaults/lidar/75_lidar.mal
	sql/backends/monet5/vaults/lidar/lidar.c
	sql/backends/monet5/vaults/lidar/lidar.h
	sql/backends/monet5/vaults/lidar/lidar.mal
	sql/benchmarks/ssbm/Tests/01-explain.stable.out
	sql/benchmarks/ssbm/Tests/02-explain.stable.out
	sql/benchmarks/ssbm/Tests/03-explain.stable.out
	sql/benchmarks/ssbm/Tests/04-explain.stable.out
	sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
	sql/benchmarks/ssbm/Tests/05-explain.stable.out
	sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
	sql/benchmarks/ssbm/Tests/06-explain.stable.out
	sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
	sql/benchmarks/ssbm/Tests/07-explain.stable.out
	sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
	sql/benchmarks/ssbm/Tests/08-explain.stable.out
	sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
	sql/benchmarks/ssbm/Tests/09-explain.stable.out
	sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
	sql/benchmarks/ssbm/Tests/10-explain.stable.out
	sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
	sql/benchmarks/ssbm/Tests/11-explain.stable.out
	sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128
	sql/benchmarks/ssbm/Tests/12-explain.stable.out
	sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
	sql/benchmarks/ssbm/Tests/13-explain.stable.out
	sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128
	sql/benchmarks/tpch/Tests/01-explain.stable.out
	sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
	sql/benchmarks/tpch/Tests/02-explain.stable.out
	sql/benchmarks/tpch/Tests/03-explain.stable.out
	sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
	sql/benchmarks/tpch/Tests/04-explain.stable.out
	sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit
	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/06-explain.stable.out
	sql/benchmarks/tpch/Tests/07-explain.stable.out
	sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
	sql/benchmarks/tpch/Tests/08-explain.stable.out
	sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
	sql/benchmarks/tpch/Tests/08-plan.stable.out
	sql/benchmarks/tpch/Tests/08-plan.stable.out.int128
	sql/benchmarks/tpch/Tests/09-explain.stable.out
	sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
	sql/benchmarks/tpch/Tests/10-explain.stable.out
	sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
	sql/benchmarks/tpch/Tests/11-explain.stable.out
	sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
	sql/benchmarks/tpch/Tests/12-explain.stable.out
	sql/benchmarks/tpch/Tests/13-explain.stable.out
	sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit
	sql/benchmarks/tpch/Tests/14-explain.stable.out
	sql/benchmarks/tpch/Tests/15-explain.stable.out
	sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
	sql/benchmarks/tpch/Tests/16-explain.stable.out
	sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
	sql/benchmarks/tpch/Tests/17-explain.stable.out
	sql/benchmarks/tpch/Tests/17-explain.stable.out.int128
	sql/benchmarks/tpch/Tests/18-explain.stable.out
	sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
	sql/benchmarks/tpch/Tests/19-explain.stable.out
	sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
	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/21-explain.stable.out
	sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
	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/wisconsin/Tests/All
	sql/jdbc/tests/Tests/All
	sql/jdbc/tests/Tests/Test_Dobjects.stable.out
	sql/jdbc/tests/Tests/Test_PSmetadata.stable.out
	sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
	sql/jdbc/tests/Tests/Test_Rsqldata.stable.out
	sql/server/rel_optimizer.c
	sql/server/rel_psm.c
	sql/server/rel_select.c
	sql/server/sql_mvc.c
	sql/server/sql_parser.y
	sql/storage/bat/bat_storage.c
	sql/storage/bat/bat_utils.c
	sql/storage/bat/bat_utils.h
	sql/storage/sql_storage.h
	sql/storage/store.c
	sql/test/BugTracker-2009/Tests/lost_update.SF-2790020.py
	sql/test/BugTracker-2009/Tests/reorder.SF-2770608.sql
	sql/test/BugTracker-2009/Tests/table-leftovers.SF-2779462.sql
	sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
	sql/test/BugTracker-2011/Tests/bulk_rotate_xor_hash-error.Bug-2734.stable.out
	sql/test/BugTracker-2011/Tests/cast-crash.Bug-2678.stable.out
	sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
	sql/test/BugTracker-2011/Tests/predicate.Bug-2908.stable.out
	sql/test/BugTracker-2011/Tests/sqltables.Bug-2921.stable.out
	sql/test/BugTracker-2012/Tests/querycache.Bug-3212.stable.out
	sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out
	sql/test/BugTracker-2013/Tests/between.Bug-3259.stable.out.single
	sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out.single
	sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
	sql/test/BugTracker/Tests/caching.SF-1651599.stable.out
	sql/test/BugTracker/Tests/insert_not_exists.SF-1380287.stable.out
	sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
	sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
	sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
	sql/test/Skyserver/Tests/Skyserver.stable.out
	sql/test/Tests/All
	sql/test/Tests/median_stdev.sql
	sql/test/Tests/setoptimizer.stable.err
	sql/test/Tests/setoptimizer.stable.out
	sql/test/Tests/setoptimizer.stable.out.Windows
	sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out
	sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_MapiClient.stable.out
	sql/test/leaks/Tests/All
	sql/test/leaks/Tests/check0.stable.out
	sql/test/leaks/Tests/check0.stable.out.int128
	sql/test/leaks/Tests/check1.stable.out
	sql/test/leaks/Tests/check1.stable.out.int128
	sql/test/leaks/Tests/check2.stable.out
	sql/test/leaks/Tests/check2.stable.out.int128
	sql/test/leaks/Tests/check3.stable.out
	sql/test/leaks/Tests/check3.stable.out.int128
	sql/test/leaks/Tests/check4.stable.out
	sql/test/leaks/Tests/check4.stable.out.int128
	sql/test/leaks/Tests/check5.stable.out
	sql/test/leaks/Tests/check5.stable.out.int128
	sql/test/leaks/Tests/drop3.stable.out.int128
	sql/test/leaks/Tests/select1.stable.out
	sql/test/leaks/Tests/select1.stable.out.int128
	sql/test/leaks/Tests/select2.stable.out
	sql/test/leaks/Tests/select2.stable.out.int128
	sql/test/leaks/Tests/temp1.stable.out
	sql/test/leaks/Tests/temp1.stable.out.int128
	sql/test/leaks/Tests/temp2.stable.out.int128
	sql/test/leaks/Tests/temp3.stable.out
	sql/test/leaks/Tests/temp3.stable.out.int128
	sql/test/pg_regress/Tests/int8.sql
	sql/test/pg_regress/Tests/int8.stable.err
	sql/test/pg_regress/Tests/int8.stable.out
	sql/test/pg_regress/Tests/int8.stable.out.int128
	sql/test/pg_regress/Tests/random.sql
	sql/test/pg_regress/Tests/random.stable.out
	sql/test/pg_regress/Tests/strings.stable.out
	sql/test/rdf/Tests/All
	testing/Makefile.ag
	testing/Mfilter.py
	testing/Mtest.py.in
	tools/merovingian/daemon/Makefile.ag
	tools/merovingian/daemon/connections.c
	tools/merovingian/daemon/connections.h
	tools/merovingian/daemon/merovingian.c
	tools/mserver/Makefile.ag
Branch: geo
Log Message:

merge with default


diffs (truncated from 24461 to 300 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -754,6 +754,7 @@ systemd-tmpfiles --create %{_sysconfdir}
 %exclude %{_sysconfdir}/tmpfiles.d/monetdbd.conf
 %endif
 %config(noreplace) %{_localstatedir}/monetdb5/dbfarm/.merovingian_properties
+%{_unitdir}/monetdbd.service
 %{_libdir}/monetdb5/autoload/??_sql.mal
 %{_libdir}/monetdb5/lib_sql.so
 %{_libdir}/monetdb5/*.sql
@@ -891,9 +892,6 @@ developer, but if you do want to test, t
 
 %files testing-python
 %defattr(-,root,root)
-# at least F12 doesn't produce these
-# %exclude %{_bindir}/*.pyc
-# %exclude %{_bindir}/*.pyo
 %{_bindir}/Mapprove.py
 %{_bindir}/Mtest.py
 %dir %{python_sitelib}/MonetDBtesting
diff --git a/buildtools/ChangeLog b/buildtools/ChangeLog
--- a/buildtools/ChangeLog
+++ b/buildtools/ChangeLog
@@ -1,3 +1,7 @@
 # ChangeLog file for buildtools
 # This file is updated with Maddlog
 
+* Sat Jan 23 2016 Sjoerd Mullender <sjoerd@acm.org>
+- Implemented a systemd configuration file for a monetdbd.service
+  on Fedora.
+
diff --git a/clients/R/Tests/survey.R b/clients/R/Tests/survey.R
--- a/clients/R/Tests/survey.R
+++ b/clients/R/Tests/survey.R
@@ -69,3 +69,4 @@ cat("#~EndVariableOutput~#\n")
 
 
 print("SUCCESS")
+dbDisconnect(db)
diff --git a/clients/R/Tests/survey.stable.out b/clients/R/Tests/survey.stable.out
--- a/clients/R/Tests/survey.stable.out
+++ b/clients/R/Tests/survey.stable.out
@@ -172,6 +172,7 @@ 2     223 757 33.847     2
 [1] TRUE
 #~EndVariableOutput~#
 [1] "SUCCESS"
+[1] TRUE
 
 # 14:26:26 >  
 # 14:26:26 >  "Done."
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,4 +1,4 @@
 exports
-HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT?MAL-signatures
                
-!BITS32&!BITS64OID32&HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS?SQL-dump
 +HAVE_FITS&HAVE_GEOM&HAVE_GSL&HAVE_LIBR&!HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SPHINXCLIENT?MAL-signatures
 +!BITS32&!BITS64OID32&HAVE_FITS&HAVE_GEOM&HAVE_GSL&!HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS?SQL-dump
  MERCURIAL?malcheck
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
@@ -1989,8 +1989,8 @@ command algebra.not_like(s:str,pat:str):
 address PCREnotlike2;
 command algebra.not_like(s:str,pat:str,esc:str):bit 
 address PCREnotlike3;
-pattern algebra.projectionPath(l:bat[:any]...):bat[:any] 
-address ALGjoinPath;
+pattern algebra.projectionpath(l:bat[:any]...):bat[:any] 
+address ALGprojectionpath;
 comment Routine to handle join paths.  The type analysis is rather tricky.
 
 command algebra.projection(left:bat[:oid],right:bat[:any_3]):bat[:any_3] 
@@ -2005,10 +2005,6 @@ command algebra.reuse(b:bat[:any_1]):bat
 address ALGreuse;
 comment Reuse a temporary BAT if you can. Otherwise,	allocate enough storage to \
accept result of an 	operation (not involving the heap)  
-pattern algebra.semijoinPath(l:bat[:any]...):bat[:any] 
-address ALGjoinPath;
-comment Routine to handle join paths.  The type analysis is rather tricky.
-
 command algebra.subslice(b:bat[:any_1],x:wrd,y:wrd):bat[:oid] 
 address ALGsubslice_wrd;
 comment Return the oids of the slice with the BUNs at position x till y.
@@ -4083,15 +4079,15 @@ pattern batcalc.!=(b1:bat[:bte],b2:bat[:
 address CMDbatNE;
 comment Return B1 != B2
 
-pattern batcalc.!=(vb:bat[:oid],s:bat[:oid]):bat[:bit] 
-address CMDbatNE;
-comment Return V != B with candidates list
-
-pattern batcalc.!=(vb:bat[:oid]):bat[:bit] 
-address CMDbatNE;
-comment Return V != B
-
-pattern batcalc.!=(b:bat[:oid],vs:bat[:oid]):bat[:bit] 
+pattern batcalc.!=(v:oid,b:bat[:oid],s:bat[:oid]):bat[:bit] 
+address CMDbatNE;
+comment Return V != B with candidates list
+
+pattern batcalc.!=(v:oid,b:bat[:oid]):bat[:bit] 
+address CMDbatNE;
+comment Return V != B
+
+pattern batcalc.!=(b:bat[:oid],v:oid,s:bat[:oid]):bat[:bit] 
 address CMDbatNE;
 comment Return B != V with candidates list
 
@@ -12779,15 +12775,15 @@ pattern batcalc.<=(b1:bat[:bte],b2:bat[:
 address CMDbatLE;
 comment Return B1 <= B2
 
-pattern batcalc.<=(vb:bat[:oid],s:bat[:oid]):bat[:bit] 
-address CMDbatLE;
-comment Return V <= B with candidates list
-
-pattern batcalc.<=(vb:bat[:oid]):bat[:bit] 
-address CMDbatLE;
-comment Return V <= B
-
-pattern batcalc.<=(b:bat[:oid],vs:bat[:oid]):bat[:bit] 
+pattern batcalc.<=(v:oid,b:bat[:oid],s:bat[:oid]):bat[:bit] 
+address CMDbatLE;
+comment Return V <= B with candidates list
+
+pattern batcalc.<=(v:oid,b:bat[:oid]):bat[:bit] 
+address CMDbatLE;
+comment Return V <= B
+
+pattern batcalc.<=(b:bat[:oid],v:oid,s:bat[:oid]):bat[:bit] 
 address CMDbatLE;
 comment Return B <= V with candidates list
 
@@ -14027,15 +14023,15 @@ pattern batcalc.<(b1:bat[:bte],b2:bat[:b
 address CMDbatLT;
 comment Return B1 < B2
 
-pattern batcalc.<(vb:bat[:oid],s:bat[:oid]):bat[:bit] 
-address CMDbatLT;
-comment Return V < B with candidates list
-
-pattern batcalc.<(vb:bat[:oid]):bat[:bit] 
-address CMDbatLT;
-comment Return V < B
-
-pattern batcalc.<(b:bat[:oid],vs:bat[:oid]):bat[:bit] 
+pattern batcalc.<(v:oid,b:bat[:oid],s:bat[:oid]):bat[:bit] 
+address CMDbatLT;
+comment Return V < B with candidates list
+
+pattern batcalc.<(v:oid,b:bat[:oid]):bat[:bit] 
+address CMDbatLT;
+comment Return V < B
+
+pattern batcalc.<(b:bat[:oid],v:oid,s:bat[:oid]):bat[:bit] 
 address CMDbatLT;
 comment Return B < V with candidates list
 
@@ -16035,15 +16031,15 @@ pattern batcalc.==(b1:bat[:bte],b2:bat[:
 address CMDbatEQ;
 comment Return B1 == B2
 
-pattern batcalc.==(vb:bat[:oid],s:bat[:oid]):bat[:bit] 
-address CMDbatEQ;
-comment Return V == B with candidates list
-
-pattern batcalc.==(vb:bat[:oid]):bat[:bit] 
-address CMDbatEQ;
-comment Return V == B
-
-pattern batcalc.==(b:bat[:oid],vs:bat[:oid]):bat[:bit] 
+pattern batcalc.==(v:oid,b:bat[:oid],s:bat[:oid]):bat[:bit] 
+address CMDbatEQ;
+comment Return V == B with candidates list
+
+pattern batcalc.==(v:oid,b:bat[:oid]):bat[:bit] 
+address CMDbatEQ;
+comment Return V == B
+
+pattern batcalc.==(b:bat[:oid],v:oid,s:bat[:oid]):bat[:bit] 
 address CMDbatEQ;
 comment Return B == V with candidates list
 
@@ -17363,15 +17359,15 @@ pattern batcalc.>=(b1:bat[:bte],b2:bat[:
 address CMDbatGE;
 comment Return B1 >= B2
 
-pattern batcalc.>=(vb:bat[:oid],s:bat[:oid]):bat[:bit] 
-address CMDbatGE;
-comment Return V >= B with candidates list
-
-pattern batcalc.>=(vb:bat[:oid]):bat[:bit] 
-address CMDbatGE;
-comment Return V >= B
-
-pattern batcalc.>=(b:bat[:oid],vs:bat[:oid]):bat[:bit] 
+pattern batcalc.>=(v:oid,b:bat[:oid],s:bat[:oid]):bat[:bit] 
+address CMDbatGE;
+comment Return V >= B with candidates list
+
+pattern batcalc.>=(v:oid,b:bat[:oid]):bat[:bit] 
+address CMDbatGE;
+comment Return V >= B
+
+pattern batcalc.>=(b:bat[:oid],v:oid,s:bat[:oid]):bat[:bit] 
 address CMDbatGE;
 comment Return B >= V with candidates list
 
@@ -18611,15 +18607,15 @@ pattern batcalc.>(b1:bat[:bte],b2:bat[:b
 address CMDbatGT;
 comment Return B1 > B2
 
-pattern batcalc.>(vb:bat[:oid],s:bat[:oid]):bat[:bit] 
-address CMDbatGT;
-comment Return V > B with candidates list
-
-pattern batcalc.>(vb:bat[:oid]):bat[:bit] 
-address CMDbatGT;
-comment Return V > B
-
-pattern batcalc.>(b:bat[:oid],vs:bat[:oid]):bat[:bit] 
+pattern batcalc.>(v:oid,b:bat[:oid],s:bat[:oid]):bat[:bit] 
+address CMDbatGT;
+comment Return V > B with candidates list
+
+pattern batcalc.>(v:oid,b:bat[:oid]):bat[:bit] 
+address CMDbatGT;
+comment Return V > B
+
+pattern batcalc.>(b:bat[:oid],v:oid,s:bat[:oid]):bat[:bit] 
 address CMDbatGT;
 comment Return B > V with candidates list
 
@@ -22575,15 +22571,15 @@ pattern batcalc.cmp(b1:bat[:bte],b2:bat[
 address CMDbatCMP;
 comment Return -1/0/1 if B1 </==/> B2
 
-pattern batcalc.cmp(vb:bat[:oid],s:bat[:oid]):bat[:bte] 
-address CMDbatCMP;
-comment Return -1/0/1 if V </==/> B with candidates list
-
-pattern batcalc.cmp(b:bat[:oid],vs:bat[:oid]):bat[:bte] 
-address CMDbatCMP;
-comment Return -1/0/1 if B </==/> V with candidates list
-
-pattern batcalc.cmp(vb:bat[:oid]):bat[:bte] 
+pattern batcalc.cmp(v:oid,b:bat[:oid],s:bat[:oid]):bat[:bte] 
+address CMDbatCMP;
+comment Return -1/0/1 if V </==/> B with candidates list
+
+pattern batcalc.cmp(b:bat[:oid],v:oid,s:bat[:oid]):bat[:bte] 
+address CMDbatCMP;
+comment Return -1/0/1 if B </==/> V with candidates list
+
+pattern batcalc.cmp(v:oid,b:bat[:oid]):bat[:bte] 
 address CMDbatCMP;
 comment Return -1/0/1 if V </==/> B
 
@@ -24439,18 +24435,6 @@ pattern batcalc.ifthenelse(b:bat[:bit],v
 address CMDifthen;
 comment If-then-else operation to assemble a conditional result
 
-pattern batcalc.ifthenelse(v:bit,b1:bat[:any_1],v2:any_1):bat[:any_1] 
-address CMDifthen;
-comment If-then-else operation to assemble a conditional result
-
-pattern batcalc.ifthenelse(v:bit,v1:any_1,b2:bat[:any_1]):bat[:any_1] 
-address CMDifthen;
-comment If-then-else operation to assemble a conditional result
-
-pattern batcalc.ifthenelse(v:bit,b1:bat[:any_1],b2:bat[:any_1]):bat[:any_1] 
-address CMDifthen;
-comment If-then-else operation to assemble a conditional result
-
 pattern batcalc.int_noerror(b:bat[:str],s:bat[:oid]):bat[:int] 
 address CMDconvert_int;
 comment cast from str to int with candidates list
@@ -38775,6 +38759,10 @@ command language.assert(v:sht,term:str):
 address MALassertSht;
 command language.assert(v:bit,term:str):void 
 address MALassertBit;
+pattern language.block(v:int,w:any...):int 
+address deblockdataflow;
+comment Block on availability of all variables w, and then pass on v
+
 pattern language.call(s:bat[:str]):void 
 address CMDcallBAT;
 comment Evaluate a program stored in a BAT.
@@ -39965,12 +39953,6 @@ comment Replace select with join select
 
 pattern optimizer.joinselect():str 
 address OPTwrapper;
-pattern optimizer.joinPath(mod:str,fcn:str):str 
-address OPTwrapper;
-comment Join path constructor
-
-pattern optimizer.joinPath():str 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list


[prev in list] [next in list] [prev in thread] [next in thread] 
