Changeset: 83f31d7ce3c6 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=83f31d7ce3c6
Added Files:
        monetdb5/mal/Tests/malids.malC
        monetdb5/mal/Tests/malids.stable.err
        monetdb5/mal/Tests/malids.stable.out
        monetdb5/modules/atoms/Tests/strappend.malC
        monetdb5/modules/atoms/Tests/strappend.stable.err
        monetdb5/modules/atoms/Tests/strappend.stable.out
        monetdb5/modules/kernel/Tests/select.malC
        monetdb5/modules/kernel/Tests/select.stable.err
        monetdb5/modules/kernel/Tests/select.stable.out
        monetdb5/optimizer/Tests/tst4006.malC
        monetdb5/optimizer/Tests/tst4006.stable.err
        monetdb5/optimizer/Tests/tst4006.stable.out
        sql/backends/monet5/Tests/pyloader06.stable.out.Windows
        sql/backends/monet5/Tests/pyloader07.stable.out.Windows
        sql/test/BugTracker-2016/Tests/groupby_on_column_expression.Bug-3832.sql
        
sql/test/BugTracker-2016/Tests/groupby_on_column_expression.Bug-3832.stable.err
        
sql/test/BugTracker-2016/Tests/groupby_on_column_expression.Bug-3832.stable.out
        sql/test/BugTracker-2017/Tests/cast_boolean_to_string.Bug-6110.sql
        
sql/test/BugTracker-2017/Tests/cast_boolean_to_string.Bug-6110.stable.err
        
sql/test/BugTracker-2017/Tests/cast_boolean_to_string.Bug-6110.stable.out
        sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.sql
        sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.err
        sql/test/BugTracker-2017/Tests/create_view_order_by.Bug-3465.stable.out
        sql/test/BugTracker-2017/Tests/modulo.Bug-6225.sql
        sql/test/BugTracker-2017/Tests/modulo.Bug-6225.stable.err
        sql/test/BugTracker-2017/Tests/modulo.Bug-6225.stable.out
        sql/test/BugTracker-2017/Tests/null-quantile.Bug-6218.sql
        sql/test/BugTracker-2017/Tests/null-quantile.Bug-6218.stable.err
        sql/test/BugTracker-2017/Tests/null-quantile.Bug-6218.stable.out
        sql/test/BugTracker-2017/Tests/real-power.Bug-6228.sql
        sql/test/BugTracker-2017/Tests/real-power.Bug-6228.stable.err
        sql/test/BugTracker-2017/Tests/real-power.Bug-6228.stable.out
        sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.sql
        sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.stable.err
        sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6216.stable.out
        sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6217.sql
        sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6217.stable.err
        sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6217.stable.out
        sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.sql
        sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.stable.err
        sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6219.stable.out
Removed Files:
        monetdb5/extras/sphinx/30_sphinx.mal
        monetdb5/extras/sphinx/Makefile.ag
        monetdb5/extras/sphinx/sphinx.c
        monetdb5/extras/sphinx/sphinx.h
        monetdb5/extras/sphinx/sphinx.mal
        monetdb5/mal/Tests/tst273.stable.err
        monetdb5/mal/Tests/tst273.stable.out
        monetdb5/optimizer/Tests/flowgraph.malC
        monetdb5/optimizer/Tests/flowgraph.stable.err
        monetdb5/optimizer/Tests/flowgraph.stable.out
Modified Files:
        .hgtags
        MonetDB.spec
        NT/monetdb_config.h.in
        NT/rules.msc
        clients/Tests/All
        clients/Tests/MAL-signatures.stable.out
        clients/Tests/MAL-signatures.stable.out.int128
        clients/Tests/exports.stable.out
        configure.ag
        debian/changelog
        debian/rules
        gdk/ChangeLog
        gdk/ChangeLog.Dec2016
        gdk/gdk.h
        gdk/gdk_aggr.c
        gdk/gdk_atoms.c
        gdk/gdk_batop.c
        gdk/gdk_bbp.c
        gdk/gdk_imprints.c
        gdk/gdk_interprocess.c
        gdk/gdk_join.c
        gdk/gdk_logger.c
        gdk/gdk_orderidx.c
        gdk/gdk_private.h
        gdk/gdk_project.c
        gdk/gdk_select.c
        gdk/gdk_utils.c
        geom/monetdb5/geom.c
        geom/monetdb5/geomBulk.c
        geom/monetdb5/geom_upgrade.c
        geom/sql/functions/Tests/ST_NumInteriorRings.stable.out
        monetdb5/ChangeLog
        monetdb5/extras/Makefile.ag
        monetdb5/mal/Tests/All
        monetdb5/mal/Tests/performanceTests/performanceLog
        monetdb5/mal/Tests/run
        monetdb5/mal/mal.h
        monetdb5/mal/mal_authorize.c
        monetdb5/mal/mal_builder.c
        monetdb5/mal/mal_builder.h
        monetdb5/mal/mal_client.c
        monetdb5/mal/mal_dataflow.c
        monetdb5/mal/mal_debugger.c
        monetdb5/mal/mal_function.c
        monetdb5/mal/mal_function.h
        monetdb5/mal/mal_import.c
        monetdb5/mal/mal_instruction.c
        monetdb5/mal/mal_instruction.h
        monetdb5/mal/mal_parser.c
        monetdb5/mal/mal_profiler.c
        monetdb5/mal/mal_runtime.c
        monetdb5/mal/mal_session.c
        monetdb5/modules/atoms/Tests/All
        monetdb5/modules/kernel/Tests/All
        monetdb5/modules/kernel/aggr.c
        monetdb5/modules/mal/Tests/orderidx00.malC
        monetdb5/modules/mal/Tests/orderidx01.malC
        monetdb5/modules/mal/Tests/orderidx02.malC
        monetdb5/modules/mal/Tests/orderidx04.malC
        monetdb5/modules/mal/language.mal
        monetdb5/modules/mal/mal_io.c
        monetdb5/modules/mal/manifold.c
        monetdb5/modules/mal/mdb.c
        monetdb5/modules/mal/mdb.h
        monetdb5/modules/mal/mdb.mal
        monetdb5/modules/mal/oltp.mal
        monetdb5/modules/mal/orderidx.c
        monetdb5/optimizer/Tests/All
        monetdb5/optimizer/Tests/GCexample01.stable.out
        monetdb5/optimizer/Tests/dataflow.stable.out
        monetdb5/optimizer/Tests/dataflow4.stable.out
        monetdb5/optimizer/opt_commonTerms.c
        monetdb5/optimizer/opt_dataflow.c
        monetdb5/optimizer/opt_deadcode.c
        monetdb5/optimizer/opt_emptybind.c
        monetdb5/optimizer/opt_garbageCollector.c
        monetdb5/optimizer/opt_macro.c
        monetdb5/optimizer/opt_prelude.c
        monetdb5/optimizer/opt_prelude.h
        monetdb5/optimizer/opt_profiler.c
        monetdb5/optimizer/opt_reorder.c
        monetdb5/optimizer/opt_support.c
        monetdb5/optimizer/opt_support.h
        monetdb5/optimizer/opt_wrapper.c
        monetdb5/optimizer/optimizer.mal
        monetdb5/scheduler/run_adder.c
        monetdb5/tools/Tests/mserver5--help.stable.err
        monetdb5/tools/Tests/mserver5--help.stable.err.Windows
        sql/ChangeLog
        sql/backends/monet5/Tests/All
        sql/backends/monet5/Tests/pyloader06.stable.out
        sql/backends/monet5/Tests/pyloader07.stable.out
        sql/backends/monet5/UDF/pyapi/convert_loops.h
        sql/backends/monet5/UDF/pyapi/emit.c
        sql/backends/monet5/generator/generator.c
        sql/backends/monet5/rel_bin.c
        sql/backends/monet5/sql.c
        sql/backends/monet5/sql_execute.c
        sql/backends/monet5/sql_gencode.c
        sql/backends/monet5/sql_optimizer.c
        sql/backends/monet5/sql_result.c
        sql/backends/monet5/sql_result.h
        sql/backends/monet5/sql_scenario.c
        sql/backends/monet5/sql_statement.c
        sql/backends/monet5/sql_statistics.c
        sql/backends/monet5/sqlcatalog.mal
        sql/backends/monet5/vaults/bam/Tests/sam_export.stable.out
        sql/backends/monet5/vaults/netcdf/netcdf.c
        sql/common/sql_hash.c
        sql/common/sql_list.c
        sql/include/sql_catalog.h
        sql/server/rel_exp.c
        sql/server/rel_optimizer.c
        sql/server/rel_rel.c
        sql/server/rel_schema.c
        sql/server/rel_select.c
        sql/server/sql_parser.y
        sql/storage/bat/bat_storage.c
        sql/storage/bat/bat_utils.c
        sql/storage/bat/res_table.c
        sql/storage/sql_catalog.c
        sql/storage/sql_storage.h
        
sql/test/BugDay_2005-12-19_2.9.3/Tests/NULL_in_CASE.SF-1211335.stable.out
        
sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out
        
sql/test/BugTracker-2009/Tests/TribooleanFailureWithSubquery.SF-2679434.stable.out.int128
        
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
        sql/test/BugTracker-2009/Tests/set_and_arg_null.SF-2812729.stable.out
        sql/test/BugTracker-2009/Tests/utf8_bug.SF-2822855.stable.out
        
sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
        
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
        sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py
        sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.stable.out
        sql/test/BugTracker-2014/Tests/ifthenelse.Bug-3629.stable.out
        sql/test/BugTracker-2014/Tests/querylog.Bug-3607.stable.out
        sql/test/BugTracker-2015/Tests/string_split.Bug-3564.stable.out
        sql/test/BugTracker-2016/Tests/All
        sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
        sql/test/BugTracker-2016/Tests/rename_exps.Bug-3974.stable.out
        sql/test/BugTracker-2017/Tests/All
        sql/test/BugTracker/Tests/case_with_aggr.SF-1876779.stable.out
        sql/test/BugTracker/Tests/case_with_aggr.SF-1876779.stable.out.int128
        sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
        sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
        sql/test/Tests/identifiers.stable.out
        sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.SQL.py
        sql/test/Users/Tests/grantAndRevokeUserLogedIN.Bug-3476.stable.out
        sql/test/VOC/Tests/median.Bug-3096.stable.out
        sql/test/bugs/Tests/aggr_single_value.stable.out
        sql/test/bugs/Tests/aggr_single_value.stable.out.int128
        sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit
        sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/emptydb-upgrade/Tests/check.stable.out.32bit
        sql/test/emptydb-upgrade/Tests/upgrade.stable.out
        sql/test/emptydb/Tests/check.stable.out.32bit
        sql/test/mergetables/Tests/mergequery.stable.out
        sql/test/orderidx/Tests/simpletable.stable.out
        sql/test/orderidx/Tests/smalltable.stable.out
        sql/test/pg_regress/Tests/create_view.sql
        sql/test/pg_regress/Tests/create_view.stable.err
        sql/test/pg_regress/Tests/create_view.stable.out
        sql/test/pg_regress/Tests/date.stable.out
        sql/test/pg_regress/Tests/interval.stable.out
        sql/test/pg_regress/Tests/interval.stable.out.int128
        sql/test/pg_regress/Tests/strings.stable.out
        sql/test/pg_regress/Tests/strings_concat.stable.out
        sql/test/quantiles/Tests/quantiles.stable.out
        sql/test/remote/Tests/partition_elim.stable.out
        sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
        sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade-chain/Tests/dump.SQL.py
        sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
        sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
        sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
        sql/test/testdb-upgrade/Tests/dump.SQL.py
        sql/test/testdb-upgrade/Tests/upgrade.stable.out
        sql/test/testdb/Tests/testdb-dump.SQL.py
        testing/Mfilter.py
        testing/Mtest.py.in
        tools/merovingian/daemon/connections.c
        tools/mserver/mserver5.c
Branch: graph0
Log Message:

Merge branch 'master' into graph/master


diffs (truncated from 15679 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -651,3 +651,6 @@ bf4b58d202645774b75c7f508c84b30e3be78a49
 bf4b58d202645774b75c7f508c84b30e3be78a49 Dec2016_SP1_release
 3968ed7fb6dab04a2530c6c3e1a5ffd6d649298b Dec2016_7
 3968ed7fb6dab04a2530c6c3e1a5ffd6d649298b Dec2016_SP2_release
+615229dc6f3c7dc89bbd9cc5923ad307b4c93cb1 Dec2016_9
+3968ed7fb6dab04a2530c6c3e1a5ffd6d649298b Dec2016_SP2_release
+615229dc6f3c7dc89bbd9cc5923ad307b4c93cb1 Dec2016_SP2_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -159,7 +159,6 @@ BuildRequires: libatomic_ops-devel
 BuildRequires: libcurl-devel
 BuildRequires: xz-devel
 # BuildRequires: libmicrohttpd-devel
-# BuildRequires: libsphinxclient-devel
 BuildRequires: libuuid-devel
 BuildRequires: libxml2-devel
 BuildRequires: openssl-devel
@@ -918,7 +917,6 @@ developer, but if you do want to test, t
        --with-python3=no \
        --with-readline=yes \
        --with-samtools=%{?with_samtools:yes}%{!?with_samtools:no} \
-       --with-sphinxclient=no \
        --with-unixodbc=yes \
        --with-uuid=yes \
        --with-valgrind=no \
@@ -946,6 +944,13 @@ rm -f %{buildroot}%{_bindir}/Maddlog
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Feb 27 2017 Panagiotis Koutsourakis <[email protected]> - 
11.25.9-20170227
+- Rebuilt.
+- BZ#6217: Segfault in rel_optimizer (sqlsmith)
+- BZ#6218: grouped quantiles with all null group causes following groups
+  to return null
+- BZ#6224: mal_parser: cannot refer to types containing an underscore
+
 * Thu Feb 16 2017 Panagiotis Koutsourakis <[email protected]> - 
11.25.7-20170216
 - Rebuilt.
 - BZ#4034: argnames array in rapi.c has fixed length (that was too short)
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -493,9 +493,6 @@
 /* Define to 1 if the system has the type `socklen_t'. */
 #define HAVE_SOCKLEN_T 1
 
-/* Define if you have the sphinxclient library */
-/* #undef HAVE_SPHINXCLIENT */
-
 /* Define if you have the SQLGetPrivateProfileString function */
 #define HAVE_SQLGETPRIVATEPROFILESTRING 1
 
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -396,11 +396,6 @@ create_winconfig_conds_new_py:
 !ELSE
        $(ECHO) HAVE_SAMTOOLS_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
 !ENDIF
-!IFDEF HAVE_SPHINXCLIENT
-       $(ECHO) HAVE_SPHINXCLIENT_FALSE='#' >> 
"$(TOPDIR)\winconfig_conds_new.py"
-!ELSE
-       $(ECHO) HAVE_SPHINXCLIENT_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
-!ENDIF
 !IFDEF HAVE_SQL
        $(ECHO) HAVE_SQL_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
 !ELSE
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -1,3 +1,3 @@
 exports
-HAVE_FITS&HAVE_GEOM&HAVE_LIBPY&HAVE_LIBR&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP&HAVE_SPHINXCLIENT?MAL-signatures
+HAVE_FITS&HAVE_GEOM&HAVE_LIBPY&HAVE_LIBR&HAVE_LIDAR&HAVE_NETCDF&HAVE_SAMTOOLS&HAVE_SHP?MAL-signatures
 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
@@ -7912,8 +7912,6 @@ Ready.
 [ "mcurl",     "putrequest",   "command mcurl.putrequest(s:str):str ", 
"CURLputRequest;",      "Perform a http put request"    ]
 [ "mdb",       "List", "pattern mdb.List(M:str, F:str):void ", 
"MDBlist3Detail;",      "Dump the routine M.F on standard out." ]
 [ "mdb",       "List", "pattern mdb.List():void ",     "MDBlistDetail;",       
"Dump the current routine on standard out."     ]
-[ "mdb",       "dot",  "pattern mdb.dot(M:str, F:str, s:str):void ",   
"MDBshowFlowGraph;",    "Dump the data flow of the function \n\tM.F in a format 
recognizable by the \n\tcommand 'dot' on the file s"    ]
-[ "mdb",       "dot",  "pattern mdb.dot(s:str):void ", "MDBshowFlowGraph;",    
"Dump the data flow of the current routine in a format recognizable by the 
command 'dot' to the file s" ]
 [ "mdb",       "dump", "pattern mdb.dump():void ",     "MDBdump;",     "Dump 
instruction, stacktrace, and stack"       ]
 [ "mdb",       "getContext",   "command mdb.getContext(s:str):str ",   
"MDBgetExceptionContext;",      "Extract the context string from the exception 
message" ]
 [ "mdb",       "getDebug",     "command mdb.getDebug():int ",  "MDBgetDebug;", 
"Get the kernel debugging bit-set.\nSee the MonetDB configuration file for 
details"     ]
@@ -8139,8 +8137,6 @@ Ready.
 [ "optimizer", "dataflow",     "pattern optimizer.dataflow(mod:str, 
fcn:str):str ",    "OPTwrapper;",  "Dataflow bracket code injection"       ]
 [ "optimizer", "deadcode",     "pattern optimizer.deadcode():str ",    
"OPTwrapper;",  ""      ]
 [ "optimizer", "deadcode",     "pattern optimizer.deadcode(mod:str, 
fcn:str):str ",    "OPTwrapper;",  "Dead code optimizer"   ]
-[ "optimizer", "derivePath",   "pattern optimizer.derivePath():str ",  
"OPTwrapper;",  ""      ]
-[ "optimizer", "derivePath",   "pattern optimizer.derivePath(mod:str, 
fcn:str):str ",  "OPTwrapper;",  "Join path constructor" ]
 [ "optimizer", "emptybind",    "pattern optimizer.emptybind():str ",   
"OPTwrapper;",  ""      ]
 [ "optimizer", "emptybind",    "pattern optimizer.emptybind(mod:str, 
fcn:str):str ",   "OPTwrapper;",  "Evaluate empty set expressions."       ]
 [ "optimizer", "evaluate",     "pattern optimizer.evaluate():str ",    
"OPTwrapper;",  ""      ]
@@ -8153,8 +8149,6 @@ Ready.
 [ "optimizer", "inline",       "pattern optimizer.inline(mod:str, fcn:str):str 
",      "OPTwrapper;",  "Expand inline functions"       ]
 [ "optimizer", "jit",  "pattern optimizer.jit():str ", "OPTwrapper;",  ""      
]
 [ "optimizer", "jit",  "pattern optimizer.jit(mod:str, fcn:str):str ", 
"OPTwrapper;",  "Propagate candidate lists in just-in-time optimization"        
]
-[ "optimizer", "joinselect",   "pattern optimizer.joinselect():str ",  
"OPTwrapper;",  ""      ]
-[ "optimizer", "joinselect",   "pattern optimizer.joinselect(mod:str, 
fcn:str):str ",  "OPTwrapper;",  "Replace select with join select"       ]
 [ "optimizer", "json", "pattern optimizer.json():str ",        "OPTwrapper;",  
""      ]
 [ "optimizer", "json", "pattern optimizer.json(mod:str, fcn:str):str ",        
"OPTwrapper;",  "Unroll the mat.pack operation" ]
 [ "optimizer", "macro",        "pattern optimizer.macro(mod:str, fcn:str, 
targetmod:str, targetfcn:str):void ",        "OPTmacro;",    "Inline a target 
function used in a specific function." ]
@@ -8172,12 +8166,6 @@ Ready.
 [ "optimizer", "optimize",     "pattern optimizer.optimize(mod:str, 
fcn:str):void ",   "QOToptimize;", "Optimize a specific operation" ]
 [ "optimizer", "orcam",        "pattern optimizer.orcam(mod:str, fcn:str, 
targetmod:str, targetfcn:str):void ",        "OPTorcam;",    "Inverse macro, 
find pattern and replace with a function call." ]
 [ "optimizer", "orcam",        "pattern optimizer.orcam(targetmod:str, 
targetfcn:str):void ",  "OPTorcam;",    "Inverse macro processor for current 
function"  ]
-[ "optimizer", "origin",       "pattern optimizer.origin():str ",      
"OPTwrapper;",  ""      ]
-[ "optimizer", "origin",       "pattern optimizer.origin(mod:str, fcn:str):str 
",      "OPTwrapper;",  "OID origin tracker"    ]
-[ "optimizer", "partitions",   "pattern optimizer.partitions():str ",  
"OPTwrapper;",  ""      ]
-[ "optimizer", "partitions",   "pattern optimizer.partitions(mod:str, 
fcn:str):str ",  "OPTwrapper;",  "Experiment with partitioned databases" ]
-[ "optimizer", "prejoin",      "pattern optimizer.prejoin():str ",     
"OPTwrapper;",  ""      ]
-[ "optimizer", "prejoin",      "pattern optimizer.prejoin(mod:str, 
fcn:str):str ",     "OPTwrapper;",  "Dead code optimizer"   ]
 [ "optimizer", "prelude",      "pattern optimizer.prelude():void ",    
"optimizer_prelude;",   "Initialize the optimizer"      ]
 [ "optimizer", "profiler",     "pattern optimizer.profiler():str ",    
"OPTwrapper;",  ""      ]
 [ "optimizer", "profiler",     "pattern optimizer.profiler(mod:str, 
fcn:str):str ",    "OPTwrapper;",  "Collect properties for the profiler"   ]
@@ -8187,8 +8175,6 @@ Ready.
 [ "optimizer", "pushselect",   "pattern optimizer.pushselect(mod:str, 
fcn:str):str ",  "OPTwrapper;",  "Push selects down projections" ]
 [ "optimizer", "querylog",     "pattern optimizer.querylog():str ",    
"OPTwrapper;",  ""      ]
 [ "optimizer", "querylog",     "pattern optimizer.querylog(mod:str, 
fcn:str):str ",    "OPTwrapper;",  "Collect SQL query statistics"  ]
-[ "optimizer", "recycler",     "pattern optimizer.recycler():str ",    
"OPTwrapper;",  ""      ]
-[ "optimizer", "recycler",     "pattern optimizer.recycler(mod:str, 
fcn:str):str ",    "OPTwrapper;",  "Recycler marking and code injection"   ]
 [ "optimizer", "reduce",       "pattern optimizer.reduce():str ",      
"OPTwrapper;",  ""      ]
 [ "optimizer", "reduce",       "pattern optimizer.reduce(mod:str, fcn:str):str 
",      "OPTwrapper;",  "Reduce the stack space claims" ]
 [ "optimizer", "remap",        "pattern optimizer.remap():str ",       
"OPTwrapper;",  ""      ]
@@ -8199,8 +8185,6 @@ Ready.
 [ "optimizer", "reorder",      "pattern optimizer.reorder(mod:str, 
fcn:str):str ",     "OPTwrapper;",  "Reorder by dataflow dependencies"      ]
 [ "optimizer", "sql_append",   "pattern optimizer.sql_append():str ",  
"OPTsql_append;",       "Avoid extra BAT copy with sql.append() whenever 
possible."     ]
 [ "optimizer", "sql_append",   "pattern optimizer.sql_append(mod:str, 
fcn:str):str ",  "OPTsql_append;",       "Avoid extra BAT copy with 
sql.append() whenever possible."     ]
-[ "optimizer", "trace",        "pattern optimizer.trace():str ",       
"OPTwrapper;",  ""      ]
-[ "optimizer", "trace",        "pattern optimizer.trace(mod:str, fcn:str):str 
",       "OPTwrapper;",  "Collect trace of a specific operation" ]
 [ "optimizer", "volcano",      "pattern optimizer.volcano():str ",     
"OPTwrapper;",  ""      ]
 [ "optimizer", "volcano",      "pattern optimizer.volcano(mod:str, 
fcn:str):str ",     "OPTwrapper;",  "Simulate volcano style execution"      ]
 [ "pcre",      "imatch",       "command pcre.imatch(s:str, pat:str):bit ",     
"PCREimatch;",  "Caseless Perl Compatible Regular Expression pattern matching 
against a string" ]
@@ -8290,12 +8274,6 @@ Ready.
 [ "shp",       "attach",       "pattern shp.attach(filename:str):void ",       
"SHPattach;",   "Register an ESRI Shapefile in the vault catalog"       ]
 [ "shp",       "import",       "pattern shp.import(fileid:int):void ", 
"SHPimport;",   "Import an ESRI Shapefile with given id into the vault" ]
 [ "shp",       "import",       "pattern shp.import(fileid:int, po:wkb):void ", 
"SHPpartialimport;",    "Partially import an ESRI Shapefile with given id into 
the vault"       ]
-[ "sphinx",    "search",       "function sphinx.search(q:str):bat[:lng];",     
"",     ""      ]
-[ "sphinx",    "searchIndex",  "function sphinx.searchIndex(q:str, 
i:str):bat[:lng];", "",     ""      ]
-[ "sphinx",    "searchIndexLimit",     "command sphinx.searchIndexLimit(q:str, 
i:str, l:int):bat[:lng] ",      "SPHINXsearchIndexLimit;",      "Search the 
query on the specified index, with limit"   ]
-[ "sphinx",    "sphinx_search",        "function 
sphinx.sphinx_search(q:str):bat[:lng];",      "",     ""      ]
-[ "sphinx",    "sphinx_searchIndex",   "function 
sphinx.sphinx_searchIndex(q:str, i:str):bat[:lng];",  "",     ""      ]
-[ "sphinx",    "sphinx_searchIndexLimit",      "function 
sphinx.sphinx_searchIndexLimit(q:str, i:str, l:int):bat[:lng];",      "",     
""      ]
 [ "sql",       "abort",        "pattern sql.abort():void ",    "SQLabort;",    
"Trigger the abort operation for a MAL block"   ]
 [ "sql",       "affectedRows", "pattern sql.affectedRows(mvc:int, nr:lng):int 
",       "mvc_affected_rows_wrap;",      "export the number of affected rows by 
the current query"       ]
 [ "sql",       "all",  "inline function sql.all(b:bat[:any_1], gp:bat[:oid], 
gpe:bat[:oid], no_nil:bit):bat[:any_1];", "",     ""      ]
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
@@ -10273,8 +10273,6 @@ Ready.
 [ "mcurl",     "putrequest",   "command mcurl.putrequest(s:str):str ", 
"CURLputRequest;",      "Perform a http put request"    ]
 [ "mdb",       "List", "pattern mdb.List(M:str, F:str):void ", 
"MDBlist3Detail;",      "Dump the routine M.F on standard out." ]
 [ "mdb",       "List", "pattern mdb.List():void ",     "MDBlistDetail;",       
"Dump the current routine on standard out."     ]
-[ "mdb",       "dot",  "pattern mdb.dot(M:str, F:str, s:str):void ",   
"MDBshowFlowGraph;",    "Dump the data flow of the function \n\tM.F in a format 
recognizable by the \n\tcommand 'dot' on the file s"    ]
-[ "mdb",       "dot",  "pattern mdb.dot(s:str):void ", "MDBshowFlowGraph;",    
"Dump the data flow of the current routine in a format recognizable by the 
command 'dot' to the file s" ]
 [ "mdb",       "dump", "pattern mdb.dump():void ",     "MDBdump;",     "Dump 
instruction, stacktrace, and stack"       ]
 [ "mdb",       "getContext",   "command mdb.getContext(s:str):str ",   
"MDBgetExceptionContext;",      "Extract the context string from the exception 
message" ]
 [ "mdb",       "getDebug",     "command mdb.getDebug():int ",  "MDBgetDebug;", 
"Get the kernel debugging bit-set.\nSee the MonetDB configuration file for 
details"     ]
@@ -10501,8 +10499,6 @@ Ready.
 [ "optimizer", "dataflow",     "pattern optimizer.dataflow(mod:str, 
fcn:str):str ",    "OPTwrapper;",  "Dataflow bracket code injection"       ]
 [ "optimizer", "deadcode",     "pattern optimizer.deadcode():str ",    
"OPTwrapper;",  ""      ]
 [ "optimizer", "deadcode",     "pattern optimizer.deadcode(mod:str, 
fcn:str):str ",    "OPTwrapper;",  "Dead code optimizer"   ]
-[ "optimizer", "derivePath",   "pattern optimizer.derivePath():str ",  
"OPTwrapper;",  ""      ]
-[ "optimizer", "derivePath",   "pattern optimizer.derivePath(mod:str, 
fcn:str):str ",  "OPTwrapper;",  "Join path constructor" ]
 [ "optimizer", "emptybind",    "pattern optimizer.emptybind():str ",   
"OPTwrapper;",  ""      ]
 [ "optimizer", "emptybind",    "pattern optimizer.emptybind(mod:str, 
fcn:str):str ",   "OPTwrapper;",  "Evaluate empty set expressions."       ]
 [ "optimizer", "evaluate",     "pattern optimizer.evaluate():str ",    
"OPTwrapper;",  ""      ]
@@ -10515,8 +10511,6 @@ Ready.
 [ "optimizer", "inline",       "pattern optimizer.inline(mod:str, fcn:str):str 
",      "OPTwrapper;",  "Expand inline functions"       ]
 [ "optimizer", "jit",  "pattern optimizer.jit():str ", "OPTwrapper;",  ""      
]
 [ "optimizer", "jit",  "pattern optimizer.jit(mod:str, fcn:str):str ", 
"OPTwrapper;",  "Propagate candidate lists in just-in-time optimization"        
]
-[ "optimizer", "joinselect",   "pattern optimizer.joinselect():str ",  
"OPTwrapper;",  ""      ]
-[ "optimizer", "joinselect",   "pattern optimizer.joinselect(mod:str, 
fcn:str):str ",  "OPTwrapper;",  "Replace select with join select"       ]
 [ "optimizer", "json", "pattern optimizer.json():str ",        "OPTwrapper;",  
""      ]
 [ "optimizer", "json", "pattern optimizer.json(mod:str, fcn:str):str ",        
"OPTwrapper;",  "Unroll the mat.pack operation" ]
 [ "optimizer", "macro",        "pattern optimizer.macro(mod:str, fcn:str, 
targetmod:str, targetfcn:str):void ",        "OPTmacro;",    "Inline a target 
function used in a specific function." ]
@@ -10534,12 +10528,6 @@ Ready.
 [ "optimizer", "optimize",     "pattern optimizer.optimize(mod:str, 
fcn:str):void ",   "QOToptimize;", "Optimize a specific operation" ]
 [ "optimizer", "orcam",        "pattern optimizer.orcam(mod:str, fcn:str, 
targetmod:str, targetfcn:str):void ",        "OPTorcam;",    "Inverse macro, 
find pattern and replace with a function call." ]
 [ "optimizer", "orcam",        "pattern optimizer.orcam(targetmod:str, 
targetfcn:str):void ",  "OPTorcam;",    "Inverse macro processor for current 
function"  ]
-[ "optimizer", "origin",       "pattern optimizer.origin():str ",      
"OPTwrapper;",  ""      ]
-[ "optimizer", "origin",       "pattern optimizer.origin(mod:str, fcn:str):str 
",      "OPTwrapper;",  "OID origin tracker"    ]
-[ "optimizer", "partitions",   "pattern optimizer.partitions():str ",  
"OPTwrapper;",  ""      ]
-[ "optimizer", "partitions",   "pattern optimizer.partitions(mod:str, 
fcn:str):str ",  "OPTwrapper;",  "Experiment with partitioned databases" ]
-[ "optimizer", "prejoin",      "pattern optimizer.prejoin():str ",     
"OPTwrapper;",  ""      ]
-[ "optimizer", "prejoin",      "pattern optimizer.prejoin(mod:str, 
fcn:str):str ",     "OPTwrapper;",  "Dead code optimizer"   ]
 [ "optimizer", "prelude",      "pattern optimizer.prelude():void ",    
"optimizer_prelude;",   "Initialize the optimizer"      ]
 [ "optimizer", "profiler",     "pattern optimizer.profiler():str ",    
"OPTwrapper;",  ""      ]
 [ "optimizer", "profiler",     "pattern optimizer.profiler(mod:str, 
fcn:str):str ",    "OPTwrapper;",  "Collect properties for the profiler"   ]
@@ -10549,8 +10537,6 @@ Ready.
 [ "optimizer", "pushselect",   "pattern optimizer.pushselect(mod:str, 
fcn:str):str ",  "OPTwrapper;",  "Push selects down projections" ]
 [ "optimizer", "querylog",     "pattern optimizer.querylog():str ",    
"OPTwrapper;",  ""      ]
 [ "optimizer", "querylog",     "pattern optimizer.querylog(mod:str, 
fcn:str):str ",    "OPTwrapper;",  "Collect SQL query statistics"  ]
-[ "optimizer", "recycler",     "pattern optimizer.recycler():str ",    
"OPTwrapper;",  ""      ]
-[ "optimizer", "recycler",     "pattern optimizer.recycler(mod:str, 
fcn:str):str ",    "OPTwrapper;",  "Recycler marking and code injection"   ]
 [ "optimizer", "reduce",       "pattern optimizer.reduce():str ",      
"OPTwrapper;",  ""      ]
 [ "optimizer", "reduce",       "pattern optimizer.reduce(mod:str, fcn:str):str 
",      "OPTwrapper;",  "Reduce the stack space claims" ]
 [ "optimizer", "remap",        "pattern optimizer.remap():str ",       
"OPTwrapper;",  ""      ]
@@ -10561,8 +10547,6 @@ Ready.
 [ "optimizer", "reorder",      "pattern optimizer.reorder(mod:str, 
fcn:str):str ",     "OPTwrapper;",  "Reorder by dataflow dependencies"      ]
 [ "optimizer", "sql_append",   "pattern optimizer.sql_append():str ",  
"OPTsql_append;",       "Avoid extra BAT copy with sql.append() whenever 
possible."     ]
 [ "optimizer", "sql_append",   "pattern optimizer.sql_append(mod:str, 
fcn:str):str ",  "OPTsql_append;",       "Avoid extra BAT copy with 
sql.append() whenever possible."     ]
-[ "optimizer", "trace",        "pattern optimizer.trace():str ",       
"OPTwrapper;",  ""      ]
-[ "optimizer", "trace",        "pattern optimizer.trace(mod:str, fcn:str):str 
",       "OPTwrapper;",  "Collect trace of a specific operation" ]
 [ "optimizer", "volcano",      "pattern optimizer.volcano():str ",     
"OPTwrapper;",  ""      ]
 [ "optimizer", "volcano",      "pattern optimizer.volcano(mod:str, 
fcn:str):str ",     "OPTwrapper;",  "Simulate volcano style execution"      ]
 [ "pcre",      "imatch",       "command pcre.imatch(s:str, pat:str):bit ",     
"PCREimatch;",  "Caseless Perl Compatible Regular Expression pattern matching 
against a string" ]
@@ -10652,12 +10636,6 @@ Ready.
 [ "shp",       "attach",       "pattern shp.attach(filename:str):void ",       
"SHPattach;",   "Register an ESRI Shapefile in the vault catalog"       ]
 [ "shp",       "import",       "pattern shp.import(fileid:int):void ", 
"SHPimport;",   "Import an ESRI Shapefile with given id into the vault" ]
 [ "shp",       "import",       "pattern shp.import(fileid:int, po:wkb):void ", 
"SHPpartialimport;",    "Partially import an ESRI Shapefile with given id into 
the vault"       ]
-[ "sphinx",    "search",       "function sphinx.search(q:str):bat[:lng];",     
"",     ""      ]
-[ "sphinx",    "searchIndex",  "function sphinx.searchIndex(q:str, 
i:str):bat[:lng];", "",     ""      ]
-[ "sphinx",    "searchIndexLimit",     "command sphinx.searchIndexLimit(q:str, 
i:str, l:int):bat[:lng] ",      "SPHINXsearchIndexLimit;",      "Search the 
query on the specified index, with limit"   ]
-[ "sphinx",    "sphinx_search",        "function 
sphinx.sphinx_search(q:str):bat[:lng];",      "",     ""      ]
-[ "sphinx",    "sphinx_searchIndex",   "function 
sphinx.sphinx_searchIndex(q:str, i:str):bat[:lng];",  "",     ""      ]
-[ "sphinx",    "sphinx_searchIndexLimit",      "function 
sphinx.sphinx_searchIndexLimit(q:str, i:str, l:int):bat[:lng];",      "",     
""      ]
 [ "sql",       "abort",        "pattern sql.abort():void ",    "SQLabort;",    
"Trigger the abort operation for a MAL block"   ]
 [ "sql",       "affectedRows", "pattern sql.affectedRows(mvc:int, nr:lng):int 
",       "mvc_affected_rows_wrap;",      "export the number of affected rows by 
the current query"       ]
 [ "sql",       "all",  "inline function sql.all(b:bat[:any_1], gp:bat[:oid], 
gpe:bat[:oid], no_nil:bit):bat[:any_1];", "",     ""      ]
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1376,7 +1376,6 @@ str MDBsetDebug(int *ret, int *flg);
 str MDBsetDebugStr(int *ret, str *nme);
 str MDBsetTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str MDBsetVarTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MDBshowFlowGraph(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str MDBstart(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str MDBstartFactory(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
 str MDBstop(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
@@ -1990,12 +1989,10 @@ str commitRef;
 str compileOptimizer(Client cntxt, str name);
 str compileString(Symbol *fcn, Client c, str s);
 str connectRef;
-str constraintsRef;
 str convertConstant(malType type, ValPtr vr);
 InstrPtr copyInstruction(InstrPtr p);
 MalBlkPtr copyMalBlk(MalBlkPtr mb);
 str copyRef;
-int copyVariable(MalBlkPtr dst, VarPtr v);
 str copy_fromRef;
 str countRef;
 str count_no_nilRef;
@@ -2145,7 +2142,7 @@ str groupdoneRef;
 int hasCommonResults(InstrPtr p, InstrPtr q);
 int hasSameArguments(MalBlkPtr mb, InstrPtr p, InstrPtr q);
 int hasSameSignature(MalBlkPtr mb, InstrPtr p, InstrPtr q, int stop);
-int hasSideEffects(InstrPtr p, int strict);
+int hasSideEffects(MalBlkPtr mb, InstrPtr p, int strict);
 str hashRef;
 int have_hge;
 str hgeRef;
@@ -2164,7 +2161,6 @@ int initQlog(void);
 int initTrace(void);
 int inlineMALblock(MalBlkPtr mb, int pc, MalBlkPtr mc);
 str inplaceRef;
-void insertInstruction(MalBlkPtr mb, InstrPtr p, int pc);
 void insertSymbol(Module scope, Symbol prg);
 str instruction2str(MalBlkPtr mb, MalStkPtr stl, InstrPtr p, int hidden);
 str instructionCall(MalBlkPtr mb, InstrPtr p, str s, str base, size_t len);
@@ -2175,15 +2171,12 @@ str ioRef;
 str io_stderr(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str io_stdin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
 str io_stdout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-int isAllScalar(MalBlkPtr mb, InstrPtr p);
 int isBlocking(InstrPtr p);
 int isDelta(InstrPtr q);
-int isDependent(InstrPtr p, InstrPtr q);
 int isExceptionVariable(str nme);
 int isFragmentGroup(InstrPtr q);
 int isFragmentGroup2(InstrPtr q);
 int isIdentifier(str s);
-int isInvariant(MalBlkPtr mb, int pcf, int pcl, int varid);
 int isLikeOp(InstrPtr q);
 int isLoopBarrier(MalBlkPtr mb, int pc);
 int isMapOp(InstrPtr q);
@@ -2195,7 +2188,6 @@ int isNotUsedIn(InstrPtr p, int start, i
 int isOptimizerEnabled(MalBlkPtr mb, str opt);
 int isOptimizerPipe(str name);
 int isOrderby(InstrPtr q);
-int isProcedure(MalBlkPtr mb, InstrPtr p);
 int isSample(InstrPtr q);
 int isSealedFunction(InstrPtr q);
 int isSelect(InstrPtr q);
@@ -2245,6 +2237,7 @@ MT_Lock mal_delayLock;
 void mal_exit(void);
 void mal_factory_reset(void) __attribute__((__visibility__("hidden")));
 int mal_init(void);
+void mal_instruction_reset(void);
 void mal_linker_reset(void) __attribute__((__visibility__("hidden")));
 void mal_module_reset(void) __attribute__((__visibility__("hidden")));
 void mal_namespace_reset(void) __attribute__((__visibility__("hidden")));
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to