Changeset: ba7f48c83e7d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ba7f48c83e7d
Added Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err.Windows
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
monetdb5/mal/Tests/recycle04.mal
monetdb5/mal/Tests/recycle04.stable.err
monetdb5/mal/Tests/recycle04.stable.out
monetdb5/mal/mal_http_daemon.c
monetdb5/mal/mal_http_daemon.h
monetdb5/modules/atoms/Tests/curl00.mal
monetdb5/modules/atoms/Tests/curl00.stable.err
monetdb5/modules/atoms/Tests/curl00.stable.out
monetdb5/modules/atoms/mcurl.c
monetdb5/modules/atoms/mcurl.mal
sql/backends/monet5/rest/73_jsonstore.mal
sql/backends/monet5/rest/Makefile.ag
sql/backends/monet5/rest/jsonstore.mal
sql/backends/monet5/rest/rest_jsonstore.c
sql/backends/monet5/rest/rest_jsonstore.h
sql/backends/monet5/rest/rest_jsonstore_handle_get.c
sql/backends/monet5/rest/rest_jsonstore_handle_get.h
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows
sql/test/BugTracker-2013/Tests/avg_needs_abort_on_error.Bug-3329.sql
sql/test/BugTracker-2013/Tests/avg_needs_abort_on_error.Bug-3329.stable.err
sql/test/BugTracker-2013/Tests/avg_needs_abort_on_error.Bug-3329.stable.out
sql/test/BugTracker-2013/Tests/incorrect_subquery_delete.Bug-3315.sql
sql/test/BugTracker-2013/Tests/incorrect_subquery_delete.Bug-3315.stable.err
sql/test/BugTracker-2013/Tests/incorrect_subquery_delete.Bug-3315.stable.out
sql/test/BugTracker-2013/Tests/mitosis-floor.Bug-3330.sql
sql/test/BugTracker-2013/Tests/mitosis-floor.Bug-3330.stable.err
sql/test/BugTracker-2013/Tests/mitosis-floor.Bug-3330.stable.out
sql/test/BugTracker-2013/Tests/unique_constraint_on_declared_table.Bug-3319.sql
sql/test/BugTracker-2013/Tests/unique_constraint_on_declared_table.Bug-3319.stable.err
sql/test/BugTracker-2013/Tests/unique_constraint_on_declared_table.Bug-3319.stable.out
sql/test/BugTracker-2013/Tests/update_on_declared_table.Bug-3318.sql
sql/test/BugTracker-2013/Tests/update_on_declared_table.Bug-3318.stable.err
sql/test/BugTracker-2013/Tests/update_on_declared_table.Bug-3318.stable.out
Removed Files:
monetdb5/mal/Tests/recycle06.mal
monetdb5/mal/Tests/recycle06.stable.err
monetdb5/mal/Tests/recycle06.stable.out
monetdb5/mal/Tests/recycle09.mal
monetdb5/modules/kernel/batstr.h
monetdb5/optimizer/Tests/LICENSE
monetdb5/optimizer/Tests/Mexample.mx
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.sql.in
Modified Files:
.hgtags
NT/monetdb_config.h.in
NT/rules.msc
clients/Tests/exports.stable.out
configure.ag
gdk/gdk.h
gdk/gdk_align.c
gdk/gdk_atomic.h
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_calc.c
gdk/gdk_heap.c
gdk/gdk_mapreduce.c
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_search.c
gdk/gdk_select.c
gdk/gdk_storage.c
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_utils.c
geom/BugTracker/Tests/All
monetdb5/extras/jaql/jaqlscenario.c
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/mal/Makefile.ag
monetdb5/mal/Tests/All
monetdb5/mal/Tests/recycle00.stable.out
monetdb5/mal/Tests/recycle01.stable.out
monetdb5/mal/Tests/recycle02.stable.out
monetdb5/mal/Tests/recycle03.stable.out
monetdb5/mal/Tests/recycle05.mal
monetdb5/mal/Tests/recycle05.stable.out
monetdb5/mal/Tests/recycle07.mal
monetdb5/mal/Tests/recycle07.stable.out
monetdb5/mal/Tests/recycle08.mal
monetdb5/mal/Tests/recycle08.stable.out
monetdb5/mal/Tests/recycle10.mal
monetdb5/mal/Tests/recycle10.stable.out
monetdb5/mal/Tests/recycle11.mal
monetdb5/mal/Tests/recycle11.stable.out
monetdb5/mal/Tests/recycle12.mal
monetdb5/mal/Tests/recycle12.stable.out
monetdb5/mal/Tests/tst270.stable.out
monetdb5/mal/Tests/tst275.stable.out
monetdb5/mal/mal.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_import.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_profiler.h
monetdb5/mal/mal_recycle.c
monetdb5/mal/mal_recycle.h
monetdb5/mal/mal_resource.c
monetdb5/mal/mal_resource.h
monetdb5/mal/mal_runtime.c
monetdb5/modules/atoms/Makefile.ag
monetdb5/modules/atoms/Tests/All
monetdb5/modules/atoms/Tests/xml00.mal
monetdb5/modules/atoms/Tests/xml00.stable.out
monetdb5/modules/atoms/Tests/xml01.mal
monetdb5/modules/atoms/Tests/xml01.stable.out
monetdb5/modules/atoms/Tests/xml02.mal
monetdb5/modules/atoms/Tests/xml02.stable.out
monetdb5/modules/atoms/Tests/xml03.mal
monetdb5/modules/atoms/Tests/xml03.stable.out
monetdb5/modules/atoms/Tests/xml04.mal
monetdb5/modules/atoms/Tests/xml04.stable.out
monetdb5/modules/atoms/Tests/xml05.mal
monetdb5/modules/atoms/Tests/xml05.stable.out
monetdb5/modules/atoms/Tests/xml10.mal
monetdb5/modules/atoms/Tests/xml10.stable.out
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/batxml.mal
monetdb5/modules/atoms/xml.c
monetdb5/modules/kernel/Makefile.ag
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/algebra.mal
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/batcolor.c
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/batstr.c
monetdb5/modules/kernel/batstr.mal
monetdb5/modules/mal/Tests/remote03.stable.out
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/batcalc.mal
monetdb5/modules/mal/batcalc.mal.sh
monetdb5/modules/mal/mal_init.mal
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/recycle.c
monetdb5/modules/mal/recycle.h
monetdb5/modules/mal/recycle.mal
monetdb5/optimizer/Tests/inline09.stable.out
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_octopus.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_recycler.c
monetdb5/optimizer/opt_support.c
sql/backends/monet5/Makefile.ag
sql/backends/monet5/Tests/optimizers.stable.err
sql/backends/monet5/Tests/optimizers.stable.out
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.mx
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_user.c
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
sql/benchmarks/tpch/LOCKED/Tests/02.stable.out
sql/benchmarks/tpch/LOCKED/Tests/04.stable.out
sql/benchmarks/tpch/Tests/01-22.stable.out
sql/benchmarks/tpch/Tests/02.stable.out
sql/benchmarks/tpch/Tests/04.stable.out
sql/common/sql_types.c
sql/include/sql_catalog.h
sql/include/sql_relation.h
sql/rel.txt
sql/server/rel_distribute.c
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_psm.c
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/rel_select.h
sql/server/rel_updates.c
sql/server/sql_semantic.h
sql/test/BugDay_2005-10-06_2.9.3/Tests/var_char_cast_truncate.SF-1150907.stable.out
sql/test/BugDay_2005-12-19_2.9.3/Tests/timestamp_fraction.SF-1357342.stable.out
sql/test/BugTracker-2008/Tests/OOM_query.SF-2457195.stable.out
sql/test/BugTracker-2008/Tests/groupby_with_NULL.SF-2155606.stable.out
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
sql/test/BugTracker-2009/Tests/correlated-selection-bug.stable.out
sql/test/BugTracker-2009/Tests/count_bug.SF-2604583.stable.out
sql/test/BugTracker-2009/Tests/double_count_limit_bug.SF-2862146.stable.out
sql/test/BugTracker-2009/Tests/table-leftovers.SF-2779462.sql
sql/test/BugTracker-2010/Tests/join_problem.Bug-2694.stable.out
sql/test/BugTracker-2011/Tests/aggregate-in-subquery.Bug-2739.stable.out
sql/test/BugTracker-2011/Tests/case-overflow.Bug-2239.stable.out
sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2011/Tests/rand-with-seed.Bug-2900.stable.out
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
sql/test/BugTracker-2012/Tests/scalar_subquery_with_alias.Bug-3093.stable.out
sql/test/BugTracker-2012/Tests/simple_select.Bug-2988.stable.out
sql/test/BugTracker-2013/Tests/All
sql/test/BugTracker-2013/Tests/correlated_select.Bug-3250.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Tests/order_by_complex_exp.stable.out
sql/test/Tests/round.stable.out
sql/test/Tests/setoptimizer.stable.out.Windows
sql/test/Tests/string.stable.out
sql/test/VOC/Tests/VOC.stable.out
sql/test/bugs/Tests/case_substring.stable.out
sql/test/bugs/Tests/crash_order_by.stable.err
sql/test/bugs/Tests/create_insert_select_aggr-bug-00001.stable.out
sql/test/bugs/Tests/groupby_having_charlength-bug-sf-943566.stable.out
sql/test/bugs/Tests/polymorphism.stable.out
sql/test/bugs/Tests/selectlist_subquery-sf-1208599.stable.out
sql/test/bugs/Tests/subselect_single_value-bug-sf-962099.stable.out
sql/test/bugs/Tests/zero_or_one_bug.stable.out
sql/test/sql_xml/Tests/xml.stable.out
sql/test/sql_xml/Tests/xmlelement_segfault.SF-2812767.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
testing/Mtest.py.in
tools/merovingian/ChangeLog.Feb2013
tools/merovingian/client/monetdb.c
Branch: rdf
Log Message:
Merge with default branch
diffs (truncated from 18682 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -532,3 +532,4 @@ efddb40b959a8ce6e77bec83cefd49c0a8de343c
64caf95db680ce67235697114693cbcf4cc859eb before_JSON_data_type
334140294fb20e04aa85ab7f06bc3da45b1ae4f3 before_new_JOIN_implementation
508d02b1f9bf8bac7a86664b092000dd3fd20824 before_reviving_RECYCLER
+64caf95db680ce67235697114693cbcf4cc859eb fixed_strict_Windows_compilation
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
@@ -45,6 +45,9 @@
/* Define if building universal (internal helper macro) */
/* #undef AC_APPLE_UNIVERSAL_BUILD */
+/* location where binaries are installed */
+/* #undef BINDIR */
+
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
systems. This function is required for `alloca.c' support on those systems.
*/
@@ -117,6 +120,9 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
/* #undef HAVE_DLFCN_H */
+/* Define to 1 if you have the <execinfo.h> header file. */
+/* #undef HAVE_EXECINFO_H */
+
/* Define to 1 if you have the `fcntl' function. */
/* #undef HAVE_FCNTL */
@@ -156,6 +162,9 @@
/* Define to 1 if you have the `getaddrinfo' function. */
#define HAVE_GETADDRINFO 1
+/* Define to 1 if you have the `getexecname' function. */
+/* #undef HAVE_GETEXECNAME */
+
/* Define to 1 if you have the `getlogin' function. */
/* #undef HAVE_GETLOGIN */
@@ -171,6 +180,9 @@
/* Define to 1 if you have the `getrlimit' function. */
/* #undef HAVE_GETRLIMIT */
+/* Define to 1 if you have the `GetSystemInfo' function. */
+/* #undef HAVE_GETSYSTEMINFO */
+
/* Define to 1 if you have the `gettimeofday' function. */
/* #undef HAVE_GETTIMEOFDAY */
@@ -204,12 +216,21 @@
/* Define to 1 if you have the `isinf' function. */
/* #undef HAVE_ISINF */
+/* Define that you want to build the jsonstore library */
+/* #undef HAVE_JSONSTORE */
+
/* Define to 1 if you have the `kill' function. */
/* #undef HAVE_KILL */
+/* Define to 1 if you have the <kvm.h> header file. */
+/* #undef HAVE_KVM_H */
+
/* Define to 1 if you have the <langinfo.h> header file. */
/* #undef HAVE_LANGINFO_H */
+/* Define if you have the atomic_ops library */
+/* #undef HAVE_LIBATOMIC_OPS */
+
/* Define if you have the bz2 library */
/* #undef HAVE_LIBBZ2 */
@@ -286,6 +307,15 @@
#endif
#endif
+/* Define to 1 if you have the <mach/mach_init.h> header file. */
+/* #undef HAVE_MACH_MACH_INIT_H */
+
+/* Define to 1 if you have the <mach-o/dyld.h> header file. */
+/* #undef HAVE_MACH_O_DYLD_H */
+
+/* Define to 1 if you have the <mach/task.h> header file. */
+/* #undef HAVE_MACH_TASK_H */
+
/* Define to 1 if you have the `madvise' function. */
/* #undef HAVE_MADVISE */
@@ -298,6 +328,9 @@
/* Define to 1 if you have the `MD5' function. */
#define HAVE_MD5 1
+/* Define if you have the LibMicroHTTPD library */
+/* #undef HAVE_MICROHTTPD */
+
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
@@ -313,9 +346,15 @@
/* Define to 1 if you have the <netdb.h> header file. */
/* #undef HAVE_NETDB_H */
+/* Define to 1 if you have the <netinet/in.h> header file. */
+/* #undef HAVE_NETINET_IN_H */
+
/* Define to 1 if you have the `nl_langinfo' function. */
/* #undef HAVE_NL_LANGINFO */
+/* Define to 1 if you have the `_NSGetExecutablePath' function. */
+/* #undef HAVE__NSGETEXECUTABLEPATH */
+
/* Define to 1 if you have the <odbcinst.h> header file. */
#define HAVE_ODBCINST_H 1
@@ -563,6 +602,9 @@
/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1
+/* Define to 1 if you have the <sys/uio.h> header file. */
+/* #undef HAVE_SYS_UIO_H */
+
/* Define to 1 if you have the <sys/un.h> header file. */
/* #undef HAVE_SYS_UN_H */
@@ -572,6 +614,9 @@
/* Define to 1 if you have the <sys/wait.h> header file. */
/* #undef HAVE_SYS_WAIT_H */
+/* Define to 1 if you have the `task_info' function. */
+/* #undef HAVE_TASK_INFO */
+
/* Define to 1 if you have the <termios.h> header file. */
/* #undef HAVE_TERMIOS_H */
@@ -596,12 +641,18 @@
/* Define to 1 if you have the <utime.h> header file. */
/* #undef HAVE_UTIME_H */
+/* Define if you have the LibUriParser library */
+/* #undef HAVE_URIPARSER */
+
/* uuid */
/* #undef HAVE_UUID */
/* Define to 1 if you have the <uuid/uuid.h> header file. */
/* #undef HAVE_UUID_UUID_H */
+/* Define if you have valgrind installed and want to use it */
+/* #undef HAVE_VALGRIND */
+
/* Define to 1 if you have the <winsock2.h> header file. */
#define HAVE_WINSOCK2_H 1
@@ -708,6 +759,9 @@
/* Define to the version of this package. */
#define PACKAGE_VERSION "11.16.0"
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
/* Path separator */
#define PATH_SEP ';'
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -137,6 +137,13 @@ LTLIBICONV = "$(LIBICONV)\lib\iconv$(DEB
ICONV_CFLAGS = -DHAVE_ICONV "-I$(LIBICONV)\include"
!ENDIF
+!IFDEF HAVE_ATOMIC_OPS
+!IFNDEF LIBATOMIC_OPS
+LIBATOMIC_OPS = C:\atomic_ops-7.2
+!ENDIF
+ATOMIC_OPS_CFLAGS = -DHAVE_LIBATOMIC_OPS "-I$(LIBATOMIC_OPS)"
+!endif
+
!IFDEF HAVE_LIBZ
# This is the location of the ZLIB library
!IFNDEF LIBZLIB
@@ -207,7 +214,7 @@ COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -MDd
# add -Zi flag (implies -debug, not -D_DEBUG) to get symbol info in .pdb files
COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -MD -nologo -Ox -Zi
!ENDIF
-CFLAGS = $(COMPILERFLAGS) -I. -I$(TOPDIR) $(LIBC_INCS) $(INCLUDES)
$(WINCONFIG_INCS) $(ICONV_CFLAGS)
+CFLAGS = $(COMPILERFLAGS) -I. -I$(TOPDIR) $(LIBC_INCS) $(INCLUDES)
$(WINCONFIG_INCS) $(ICONV_CFLAGS) $(ATOMIC_OPS_CFLAGS)
# No general LDFLAGS needed
INSTALL = copy
@@ -303,6 +310,11 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_CFITSIO_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
+!IFDEF HAVE_CURL
+ $(ECHO) HAVE_CURL_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ELSE
+ $(ECHO) HAVE_CURL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ENDIF
!IFDEF HAVE_DEVELOPER
$(ECHO) HAVE_DEVELOPER_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
@@ -410,6 +422,11 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_JAQL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
+!IFDEF HAVE_JSONSTORE
+ $(ECHO) HAVE_JSONSTORE_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ELSE
+ $(ECHO) HAVE_JSONSTORE_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ENDIF
!IFDEF HAVE_TESTING
$(ECHO) HAVE_TESTING_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
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
@@ -273,7 +273,7 @@ BAT *GDKkey;
ATOMIC_TYPE volatile GDKlockcnt;
ATOMIC_TYPE volatile GDKlockcontentioncnt;
MT_Lock *volatile GDKlocklist;
-int volatile GDKlocklistlock;
+ATOMIC_FLAG volatile GDKlocklistlock;
ATOMIC_TYPE volatile GDKlocksleepcnt;
void GDKlockstatistics(int);
void *GDKmalloc(size_t size);
@@ -1369,6 +1369,7 @@ str CSTrelease(Client cntxt, MalBlkPtr m
str CSTreleaseAll(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CSTtake(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CSTtoString(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
+str CURLgetRequest(str *retval, str *url);
str CemptySet(int *k, int *bid);
str DICTbind(int *idx, int *val, str *nme);
str DICTcompress(int *idx, str *nme, int *bid);
@@ -2018,27 +2019,19 @@ str QOTshowPlan(Client cntxt, MalBlkPtr
void QOTstatisticsExit(void);
void QOTupdateStatistics(str nme, int prop, lng val);
QueryQueue QRYqueue;
+str RECYCLEappendSQL(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+str RECYCLEcolumn(Client cntxt, str sch, str tbl, str col);
+str RECYCLEdeleteSQL(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
+void RECYCLEdrop(Client cntxt);
+str RECYCLEdropWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
void RECYCLEdump(stream *s);
-void RECYCLEdumpDataTrans(stream *s);
-str RECYCLEdumpQPatWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-void RECYCLEdumpRecyclerPool(stream *s);
str RECYCLEdumpWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-lng RECYCLEentry(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p, int
pc);
-void RECYCLEexit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p, int
pc, lng ticks);
+lng RECYCLEentry(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p,
RuntimeProfile prof);
+void RECYCLEexit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p,
RuntimeProfile prof);
void RECYCLEinit(void);
-void RECYCLEinitRecyclePool(int sz);
-int RECYCLEinterest(InstrPtr p);
-str RECYCLEmonitor(int *d, int *p);
-int RECYCLEnewQryStat(MalBlkPtr mb);
-str RECYCLEreset(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p, int
pc);
-str RECYCLErunningStat(Client cntxt, MalBlkPtr mb);
+str RECYCLEresetBAT(Client cntxt, int bid);
+str RECYCLEresetBATwrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str RECYCLEsetCache(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-void RECYCLEshutdown(Client cntxt);
-str RECYCLEshutdownWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str RECYCLEstart(Client cntxt, MalBlkPtr mb);
-str RECYCLEstartWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str RECYCLEstop(Client cntxt, MalBlkPtr mb);
-str RECYCLEstopWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
str RMTbatload(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str RMTbincopyfrom(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str RMTbincopyto(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
@@ -2169,51 +2162,38 @@ str STRTail(str *res, str *arg1, int *of
str STRUpper(str *res, str *arg1);
str STRWChrAt(int *res, str *arg1, int *at);
str STRascii(int *ret, str *s);
-str STRbatBytes(int *ret, int *l);
-str STRbatConcat(int *ret, int *l, int *r);
-str STRbatConcatcst(int *ret, int *l, str *cst);
-str STRbatLength(int *ret, int *l);
-str STRbatLower(int *ret, int *l);
-str STRbatLtrim(int *ret, int *l);
-str STRbatPrefix(int *ret, int *l, int *r);
-str STRbatPrefixcst(int *ret, int *l, str *cst);
-str STRbatRstrSearch(int *ret, int *l, int *r);
-str STRbatRstrSearchcst(int *ret, int *l, str *cst);
-str STRbatRtrim(int *ret, int *l);
-str STRbatStrip(int *ret, int *l);
-str STRbatSubstitutecst(int *ret, int *l, str *arg2, str *arg3, bit *rep);
-str STRbatSubstitutecst(int *ret, int *l, str *arg2, str *arg3, bit *rep);
-str STRbatSuffix(int *ret, int *l, int *r);
-str STRbatSuffixcst(int *ret, int *l, str *cst);
-str STRbatTail(int *ret, int *l, int *r);
-str STRbatTailcst(int *ret, int *l, int *cst);
-str STRbatUpper(int *ret, int *l);
-str STRbatWChrAt(int *ret, int *l, int *r);
-str STRbatWChrAtcst(int *ret, int *l, int *cst);
-str STRbatlike_uselect(int *ret, int *bid, str *pat, str *esc);
-str STRbatlike_uselect(int *ret, int *bid, str *pat, str *esc);
-str STRbatlike_uselect(int *ret, int *bid, str *pat, str *esc);
-str STRbatlike_uselect2(int *ret, int *bid, str *pat);
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
