Changeset: dd9cb6e2374a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dd9cb6e2374a
Added Files:
gdk/gdk_bat.c
gdk/gdk_bat.h
gdk/gdk_utils.c
gdk/gdk_utils.h
gdk/gdk_value.c
monetdb5/extras/jaql/jaqltree.h
sql/test/BugTracker-2012/Tests/bart-crash.Bug-3057.sql
sql/test/BugTracker-2012/Tests/bart-crash.Bug-3057.stable.err
sql/test/BugTracker-2012/Tests/bart-crash.Bug-3057.stable.out
sql/test/BugTracker-2012/Tests/delete-with-constant-where.Bug-3065.sql
sql/test/BugTracker-2012/Tests/delete-with-constant-where.Bug-3065.stable.err
sql/test/BugTracker-2012/Tests/delete-with-constant-where.Bug-3065.stable.out
sql/test/BugTracker-2012/Tests/multiple-arithmetic-operations.Bug-3048.sql
sql/test/BugTracker-2012/Tests/multiple-arithmetic-operations.Bug-3048.stable.err
sql/test/BugTracker-2012/Tests/multiple-arithmetic-operations.Bug-3048.stable.out
sql/test/BugTracker-2012/Tests/parent-table-alias.Bug-3047.sql
sql/test/BugTracker-2012/Tests/parent-table-alias.Bug-3047.stable.err
sql/test/BugTracker-2012/Tests/parent-table-alias.Bug-3047.stable.out
sql/test/BugTracker-2012/Tests/set_operation.Bug-3059.sql
sql/test/BugTracker-2012/Tests/set_operation.Bug-3059.stable.err
sql/test/BugTracker-2012/Tests/set_operation.Bug-3059.stable.out
sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.sql.in
sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.txt
sql/test/snodgrass/Tests/cast_select.sql
sql/test/snodgrass/Tests/cast_table.sql
sql/test/snodgrass/Tests/cast_table.stable.err
sql/test/snodgrass/Tests/cast_table.stable.out
sql/test/snodgrass/Tests/date_parsing.sql
sql/test/snodgrass/Tests/date_parsing.stable.err
sql/test/snodgrass/Tests/date_parsing.stable.out
sql/test/snodgrass/Tests/date_select.sql
sql/test/snodgrass/Tests/date_select.stable.err
sql/test/snodgrass/Tests/date_select.stable.out
sql/test/snodgrass/Tests/date_table.sql
sql/test/snodgrass/Tests/date_table.stable.err
sql/test/snodgrass/Tests/date_table.stable.out
sql/test/snodgrass/Tests/extract_select.sql
sql/test/snodgrass/Tests/extract_select.stable.err
sql/test/snodgrass/Tests/extract_select.stable.out
sql/test/snodgrass/Tests/extract_table.sql
sql/test/snodgrass/Tests/extract_table.stable.err
sql/test/snodgrass/Tests/extract_table.stable.out
sql/test/snodgrass/Tests/interval_parsing.sql
sql/test/snodgrass/Tests/interval_parsing.stable.err
sql/test/snodgrass/Tests/interval_parsing.stable.out
sql/test/snodgrass/Tests/interval_select.sql
sql/test/snodgrass/Tests/interval_select.stable.err
sql/test/snodgrass/Tests/interval_select.stable.out
sql/test/snodgrass/Tests/interval_table.sql
Removed Files:
gdk/gdk_bat.mx
gdk/gdk_utils.mx
gdk/gdk_value.mx
monetdb5/extras/jaql/parser/force-jaql-yy-h-gen.c
monetdb5/modules/mal/radix.mx
sql/backends/monet5/dummy.c
sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.SQL.bat
sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.SQL.sh
sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.stable.err
sql/test/BugDay_2005-10-06_2.9.3/Tests/alter_table_describe.SF-1146092.stable.out
sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.sql
sql/test/snodgrass/Tests/cast_select.SQL.bat
sql/test/snodgrass/Tests/cast_select.SQL.sh
sql/test/snodgrass/cast_select.sql
sql/test/snodgrass/cast_table.sql
sql/test/snodgrass/date_parsing.sql
sql/test/snodgrass/date_select.sql
sql/test/snodgrass/date_table.sql
sql/test/snodgrass/extract_select.sql
sql/test/snodgrass/extract_table.sql
sql/test/snodgrass/interval_parsing.sql
sql/test/snodgrass/interval_select.sql
sql/test/snodgrass/interval_table.sql
Modified Files:
NT/Makefile
NT/rules.msc
buildtools/Mx/Def.c
buildtools/autogen/autogen/msc.py
buildtools/conf/rules.mk
clients/Tests/exports.stable.out
clients/mapiclient/mclient.c
clients/mapiclient/stethoscope.c
clients/mapilib/mapi.c
clients/odbc/setup/drvcfg.c
clients/python/monetdb/mapi2.py
common/stream/stream.c
gdk/ChangeLog
gdk/Makefile.ag
gdk/gdk.h
gdk/gdk_align.c
gdk/gdk_atoms.mx
gdk/gdk_batop.mx
gdk/gdk_bbp.mx
gdk/gdk_calc.c
gdk/gdk_delta.c
gdk/gdk_private.h
gdk/gdk_qsort.mx
gdk/gdk_rangejoin.mx
gdk/gdk_relop.mx
gdk/gdk_sample.c
gdk/gdk_scanselect.mx
gdk/gdk_search.mx
gdk/gdk_setop.mx
gdk/gdk_ssort.mx
gdk/gdk_storage.c
gdk/gdk_system.h
geom/monetdb5/geom.mx
java/tests/Test_PStimezone.java
monetdb5/extras/compiler/mal_compiler.c
monetdb5/extras/crackers/crackers_AVL_index.mx
monetdb5/extras/crackers/crackers_index.mx
monetdb5/extras/crackers/crackers_joins.mx
monetdb5/extras/crackers/crackers_joinselect_ops.mx
monetdb5/extras/crackers/crackers_partial_sideways.mx
monetdb5/extras/crackers/crackers_populate.mx
monetdb5/extras/crackers/crackers_select_ops.mx
monetdb5/extras/crackers/crackers_sideways.mx
monetdb5/extras/crackers/crackers_sortmerge.mx
monetdb5/extras/crackers/crackers_updates.mx
monetdb5/extras/jaql/Makefile.ag
monetdb5/extras/jaql/jaql.c
monetdb5/extras/jaql/jaql.h
monetdb5/extras/jaql/jaql.mal
monetdb5/extras/jaql/jaqlgencode.c
monetdb5/extras/jaql/jaqlscenario.c
monetdb5/extras/jaql/json.c
monetdb5/extras/jaql/json.h
monetdb5/extras/jaql/json.mal
monetdb5/extras/jaql/parser/Makefile.ag
monetdb5/extras/jaql/parser/jaql.l
monetdb5/extras/jaql/parser/jaql.y
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.sql
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/extras/rdf/rdf_shredder.mx
monetdb5/extras/sphinx/sphinx.c
monetdb5/mal/Tests/tst270.stable.out
monetdb5/mal/Tests/tst870.stable.out
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_debugger.mx
monetdb5/mal/mal_instruction.mx
monetdb5/mal/mal_interpreter.mx
monetdb5/mal/mal_recycle.c
monetdb5/mal/mal_sabaoth.c
monetdb5/modules/atoms/Tests/xml10.stable.out
monetdb5/modules/atoms/batxml.mx
monetdb5/modules/atoms/mtime.mx
monetdb5/modules/atoms/url.mx
monetdb5/modules/kernel/aggr_be_avg.mx
monetdb5/modules/kernel/aggr_be_count.mx
monetdb5/modules/kernel/aggr_be_minmax.mx
monetdb5/modules/kernel/aggr_be_prod.mx
monetdb5/modules/kernel/aggr_be_sum.mx
monetdb5/modules/kernel/aggr_bge_avg.mx
monetdb5/modules/kernel/aggr_bge_count.mx
monetdb5/modules/kernel/aggr_bge_minmax.mx
monetdb5/modules/kernel/aggr_bge_prod.mx
monetdb5/modules/kernel/aggr_bge_sum.mx
monetdb5/modules/kernel/aggr_ri.mx
monetdb5/modules/kernel/algebra.mx
monetdb5/modules/kernel/algebra2.mx
monetdb5/modules/kernel/bat5.mx
monetdb5/modules/kernel/batcast.mx
monetdb5/modules/kernel/batcolor.mx
monetdb5/modules/kernel/batifthen.mx
monetdb5/modules/kernel/batmmath.mx
monetdb5/modules/kernel/batmtime.mx
monetdb5/modules/kernel/batstr.mx
monetdb5/modules/kernel/group.mx
monetdb5/modules/kernel/kprelude.mx
monetdb5/modules/kernel/microbenchmark.c
monetdb5/modules/mal/Tests/inspect05.mal
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
monetdb5/modules/mal/batExtensions.c
monetdb5/modules/mal/bbp.mx
monetdb5/modules/mal/cluster.mx
monetdb5/modules/mal/mal_io.mx
monetdb5/modules/mal/mat.mx
monetdb5/modules/mal/mkey.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/pma.mx
monetdb5/modules/mal/pqueue.mx
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/sample.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tablet_si.c
monetdb5/modules/mal/txtsim.c
monetdb5/modules/mal/zorder.mx
monetdb5/optimizer/Tests/tst4005.stable.out
monetdb5/optimizer/Tests/tst4631.stable.out
monetdb5/optimizer/Tests/tst4730.stable.out
monetdb5/optimizer/opt_centipede.mx
monetdb5/optimizer/opt_dictionary.mx
monetdb5/optimizer/opt_emptySet.mx
monetdb5/optimizer/opt_joinpath.mx
monetdb5/optimizer/opt_statistics.c
monetdb5/optimizer/opt_support.c
monetdb5/tests/gdkTests/Tests/casts.mal
monetdb5/tests/gdkTests/Tests/casts.stable.out
monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10
monetdb5/tests/gdkTests/Tests/casts.stable.out.SunOS5.10.oid64
monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows
monetdb5/tests/gdkTests/Tests/casts.stable.out.Windows.64bit.oid64
monetdb5/tests/gdkTests/Tests/casts.stable.out.oid64
monetdb5/tests/suite_00/Tests/test_00.stable.out
monetdb5/tests/suite_00/Tests/test_02.stable.out
sql/backends/monet5/LSST/lsst.c
sql/backends/monet5/UDF/udf.c
sql/backends/monet5/sql.mx
sql/backends/monet5/vaults/fits.c
sql/benchmarks/xmark/unix.c
sql/include/sql_mem.h
sql/jdbc/tests/Tests/Test_PStimezone.stable.out
sql/server/sql_parser.y
sql/server/sql_statement.c
sql/storage/store.c
sql/test/BugDay_2005-10-06_2.9.3/Tests/All
sql/test/BugDay_2005-11-09_2.9.3/Tests/integer_overflow.SF-1048671.stable.err
sql/test/BugTracker-2009/Tests/overflow.SF-2853458.stable.err
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
sql/test/BugTracker-2010/Tests/new-readonly-db.Bug-2695.py
sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.py
sql/test/BugTracker-2012/Tests/All
sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.stable.err
sql/test/BugTracker-2012/Tests/url_script_test.Bug-2972.stable.out
sql/test/Tests/setoptimizer.stable.err
sql/test/Tests/setoptimizer.stable.out
sql/test/leaks/Tests/check0.stable.out
sql/test/snodgrass/Tests/All
sql/test/snodgrass/Tests/cast_select.stable.err
sql/test/snodgrass/Tests/cast_select.stable.out
testing/Mtest.py.in
testing/difflib.h
Branch: sciql
Log Message:
Merge with default branch.
diffs (truncated from 80737 to 300 lines):
diff --git a/NT/Makefile b/NT/Makefile
--- a/NT/Makefile
+++ b/NT/Makefile
@@ -55,6 +55,7 @@ unistd.h:
$(ECHO) #define close _close >> unistd.h
$(ECHO) #define getpid _getpid >> unistd.h
$(ECHO) #define umask _umask >> unistd.h
+ $(ECHO) #define isatty _isatty >> unistd.h
$(ECHO) #endif >> unistd.h
$(ECHO) #endif >> unistd.h
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -171,7 +171,8 @@ RUBY_DIR = lib\ruby\gems\1.9.1
# install python, flex and bison on your systems
PYTHON = python
-YACC = bison -b y -y
+YACC = bison
+LEX = flex
ARCHIVER = lib
GENDLL =
diff --git a/buildtools/Mx/Def.c b/buildtools/Mx/Def.c
--- a/buildtools/Mx/Def.c
+++ b/buildtools/Mx/Def.c
@@ -43,11 +43,11 @@ int ndef = 0;
#define topCond() (condStack[condSP-1].defined)
#define topMacro() (condStack[condSP-1].macro)
-#define pushCond(X,N) { condStack[condSP].defined = (X);\
- condStack[condSP++].macro = StrDup(N); }
-#define toggle() {if(topCond())condStack[condSP-1].defined=0;\
- else condStack[condSP-1].defined=1;}
-#define popCond() {if(condSP) condSP--;else Fatal("DefDir","IFDEF error");}
+#define pushCond(X,N) do { condStack[condSP].defined = (X);\
+ condStack[condSP++].macro = StrDup(N); } while (0)
+#define toggle() do {if(topCond())condStack[condSP-1].defined=0;\
+ else condStack[condSP-1].defined=1;} while (0)
+#define popCond() do {if(condSP) condSP--;else Fatal("DefDir","IFDEF error");}
while (0)
int
allTrue(void)
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -349,25 +349,15 @@ def msc_dep(fd, tar, deplist, msc):
of = b + '.' + de
of = msc_translate_file(of, msc)
fd.write('\t$(YACC) $(YFLAGS) $(AM_YFLAGS) "%s"\n' % of)
- fd.write("\t$(DEL) y.tab.c\n")
- fd.write('\t$(MV) y.tab.h "%s.tab.h"\n' % b)
if ext == "tab.c":
fd.write(getsrc)
x, de = split_filename(deplist[0])
of = b + '.' + de
of = msc_translate_file(of, msc)
fd.write('\t$(YACC) $(YFLAGS) $(AM_YFLAGS) "%s"\n' % of)
- fd.write('\t$(FILTER) $(FILTERPREF)" ;" y.tab.c > "%s.tab.c"\n' % b)
- fd.write("\t$(DEL) y.tab.h\n")
if ext == "yy.c":
fd.write(getsrc)
fd.write('\t$(LEX) $(LFLAGS) $(AM_LFLAGS) "%s.l"\n' % b)
- # either lex.<name>.c or lex.yy.c or lex.$(PARSERNAME).c gets generated
- fd.write('\tif exist lex.%s.c $(MV) lex.%s.c "%s.yy.c.tmp"\n' %
(b,b,b))
- fd.write('\tif exist lex.yy.c $(MV) lex.yy.c "%s.yy.c.tmp"\n' % b)
- fd.write('\tif exist lex.$(PARSERNAME).c $(MV) lex.$(PARSERNAME).c
"%s.yy.c.tmp"\n' % b)
- fd.write('\techo #include "$(CONFIG_H)" > "%s.yy.c"\n' % b)
- fd.write('\ttype "%s.yy.c.tmp" >> "%s.yy.c"\n' % (b, b))
if ext in ("obj", "tab.obj", "yy.obj"):
target, name = msc_find_target(tar, msc)
if name[0] == '_':
@@ -375,7 +365,7 @@ def msc_dep(fd, tar, deplist, msc):
if target == "LIB":
d, dext = split_filename(deplist[0])
if dext in ("c", "yy.c", "tab.c"):
- fd.write('\t$(CC) $(CFLAGS) $(%s_CFLAGS) $(GENDLL) -DLIB%s
-Fo"%s" -c "%s"\n' %
+ fd.write('\t$(CC) $(CFLAGS) $(%s_CFLAGS) $(GENDLL)
-D_CRT_SECURE_NO_WARNINGS -DLIB%s -Fo"%s" -c "%s"\n' %
(split_filename(msc_basename(src))[0], name, t, src))
if ext == 'res':
fd.write("\t$(RC) -fo%s %s\n" % (t, src))
diff --git a/buildtools/conf/rules.mk b/buildtools/conf/rules.mk
--- a/buildtools/conf/rules.mk
+++ b/buildtools/conf/rules.mk
@@ -22,17 +22,10 @@ MV=mv
HIDE=1
MX = $(top_builddir)/buildtools/Mx/Mx
-# in the next few rules, make sure that "$(CONFIG_H)" is included
-# first, also with bison-generated files. This is crucial
-# to prevent inconsistent (re-)definitions of macros.
%.tab.c: %.y
touch waiting.$$$$ && until ln waiting.$$$$ waiting 2>/dev/null; do
sleep 1; done && rm waiting.$$$$
$(YACC) $(YFLAGS) $(AM_YFLAGS) $< || { $(RM) waiting ; exit 1 ; }
if [ -f y.tab.c ]; then $(MV) y.tab.c $*.tab.c ; fi
- $(MV) $*.tab.c $*.tab.c.tmp
- echo '#include <'"$(CONFIG_H)"'>' > $*.tab.c
- grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' $*.tab.c.tmp >> $*.tab.c
- $(RM) $*.tab.c.tmp
[ ! -f y.tab.h ] || $(RM) y.tab.h
$(RM) waiting
@@ -46,19 +39,13 @@ MX = $(top_builddir)/buildtools/Mx/Mx
%.yy.c: %.l
touch waiting.$$$$ && until ln waiting.$$$$ waiting 2>/dev/null; do
sleep 1; done && rm waiting.$$$$
$(LEX) $(LFLAGS) $(AM_LFLAGS) $< || { $(RM) waiting ; exit 1 ; }
- if [ -f $(LEX_OUTPUT_ROOT).c ]; then $(MV) $(LEX_OUTPUT_ROOT).c $*.yy.c
; fi
- $(MV) $*.yy.c $*.yy.c.tmp
- echo '#include <'"$(CONFIG_H)"'>' > $*.yy.c
- grep -v '^#include.*[<"]'"$(CONFIG_H)"'[">]' $*.yy.c.tmp >> $*.yy.c
- $(RM) $*.yy.c.tmp
- [ -f $(LEX_OUTPUT_ROOT).h ] && $(RM) $(LEX_OUTPUT_ROOT).h
+ [ -f $*.yy.h ] && $(RM) $*.yy.h
$(RM) waiting
%.yy.h: %.l
touch waiting.$$$$ && until ln waiting.$$$$ waiting 2>/dev/null; do
sleep 1; done && rm waiting.$$$$
$(LEX) $(LFLAGS) $(AM_LFLAGS) $< || { $(RM) waiting ; exit 1 ; }
- if [ -f $(LEX_OUTPUT_ROOT).h ]; then $(MV) $(LEX_OUTPUT_ROOT).h $*.yy.h
; fi
- [ -f $(LEX_OUTPUT_ROOT).c ] && $(RM) $(LEX_OUTPUT_ROOT).c
+ [ -f $*.yy.c ] && $(RM) $*.yy.c
$(RM) waiting
%.def: %.syms
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
@@ -8,7 +8,7 @@ stdout of test 'exports` in directory '.
# gdk
int ALIGNsetH(BAT *b1, BAT *b2);
int ALIGNsynced(BAT *b1, BAT *b2);
-int ATOMcmp(int id, ptr v_1, ptr v_2);
+int ATOMcmp(int id, const void *v_1, const void *v_2);
ptr ATOMdup(int id, ptr val);
bte ATOMelmshift(int sz);
int ATOMformat(int id, ptr val, char **buf);
@@ -23,6 +23,7 @@ BAT *BATalpha(BAT *b);
BAT *BATantijoin(BAT *l, BAT *r);
BAT *BATantiuselect_(BAT *b, ptr tl, ptr th, bit li, bit hi);
BAT *BATappend(BAT *b, BAT *c, bit force);
+void BATassertProps(BAT *b);
atomDesc BATatoms[];
BAT *BATattach(int tt, const char *heapfile);
BAT *BATbandjoin(BAT *l, BAT *r, ptr mnus, ptr plus, bit li, bit hi);
@@ -102,6 +103,8 @@ BAT *BATdel(BAT *b, BAT *c, bit force);
BAT *BATdelHead(BAT *b, BAT *c, bit force);
int BATdelete(BAT *b);
BAT *BATdelta(BAT *b);
+void BATderiveHeadProps(BAT *b, int expensive);
+void BATderiveProps(BAT *b, int expensive);
BAT *BATextend(BAT *b, BUN newcap);
BAT *BATfakeCommit(BAT *b);
BAT *BATfetch(BAT *b, BAT *s);
@@ -144,7 +147,6 @@ BAT *BATouterjoin(BAT *l, BAT *r, BUN es
BAT *BATprev(BAT *b);
int BATprint(BAT *b);
int BATprintf(stream *f, BAT *b);
-BAT *BATpropcheck(BAT *b, int mode);
BAT *BATrangejoin(BAT *l, BAT *rl, BAT *rh, bit li, bit hi);
BAT *BATrangesplit(BAT *b, BUN n, int unary);
BAT *BATreplace(BAT *b, BAT *n, bit force);
@@ -152,7 +154,6 @@ BAT *BATrestrict(BAT *b, ptr hl, ptr hh,
BAT *BATrevert(BAT *b);
BAT *BATroles(BAT *b, const char *hnme, const char *tnme);
BAT *BATsample(BAT *b, BUN n);
-BAT *BATsample_deprecated(BAT *b, BUN n);
BAT *BATsave(BAT *b);
BAT *BATsdiff(BAT *b, BAT *c);
BAT *BATselect(BAT *b, ptr tl, ptr th);
@@ -248,7 +249,7 @@ void GDKqsort(void *h, void *t, void *ba
void GDKqsort_rev(void *h, void *t, void *base, size_t n, int hs, int ts, int
tpe);
void *GDKrealloc(void *pold, size_t size);
void GDKsetenv(str name, str value);
-ssize_t GDKstrFromStr(unsigned char *src, unsigned char *dst, ssize_t len);
+ssize_t GDKstrFromStr(unsigned char *dst, const unsigned char *src, ssize_t
len);
str GDKstrdup(const char *s);
int GDKsyserror(_In_z_ _Printf_format_string_ const char *format, ...)
__attribute__((__format__(__printf__, 1, 2)));
ThreadRec GDKthreads[THREADS];
@@ -294,9 +295,9 @@ int MT_munmap(void *p, size_t len);
int MT_path_absolute(const char *path);
void MT_sleep_ms(unsigned int ms);
oid OIDbase(oid base);
-int OIDfromStr(str src, int *len, oid **dst);
+int OIDfromStr(const char *src, int *len, oid **dst);
oid OIDnew(oid inc);
-int OIDtoStr(str *dst, int *len, oid *src);
+int OIDtoStr(str *dst, int *len, const oid *src);
void PROPdestroy(PROPrec *p);
BUN SORTfnd_bte(BAT *b, ptr v);
BUN SORTfnd_dbl(BAT *b, ptr v);
@@ -380,16 +381,16 @@ BAT *VIEWhead(BAT *b);
BAT *VIEWhead_(BAT *b, int mode);
size_t _MT_npages;
size_t _MT_pagesize;
-int batFromStr(str src, int *len, bat **dst);
-int batToStr(str *dst, int *len, bat *src);
-int bitFromStr(str src, int *len, bit **dst);
-int bitToStr(str *dst, int *len, bit *src);
-int bteFromStr(str src, int *len, bte **dst);
-int bteToStr(str *dst, int *len, bte *src);
+int batFromStr(const char *src, int *len, bat **dst);
+int batToStr(str *dst, int *len, const bat *src);
+int bitFromStr(const char *src, int *len, bit **dst);
+int bitToStr(str *dst, int *len, const bit *src);
+int bteFromStr(const char *src, int *len, bte **dst);
+int bteToStr(str *dst, int *len, const bte *src);
const bte bte_nil;
int closedir(DIR *dir);
-int dblFromStr(str src, int *len, dbl **dst);
-int dblToStr(str *dst, int *len, dbl *src);
+int dblFromStr(const char *src, int *len, dbl **dst);
+int dblToStr(str *dst, int *len, const dbl *src);
const dbl dbl_nil;
char *dirname(char *path);
int dlclose(void *handle);
@@ -398,18 +399,18 @@ void *dlopen(const char *file, int mode)
void *dlsym(void *handle, const char *name);
int escapedStr(char *dst, const char *src, int dstlen);
int escapedStrlen(const char *src);
-int fltFromStr(str src, int *len, flt **dst);
-int fltToStr(str *dst, int *len, flt *src);
+int fltFromStr(const char *src, int *len, flt **dst);
+int fltToStr(str *dst, int *len, const flt *src);
const flt flt_nil;
int ftruncate(int fd, off_t size);
char *get_bin_path(void);
int gettimeofday(struct timeval *tv, int *ignore_zone);
int gprof_pthread_create(pthread_t *__restrict, __const pthread_attr_t
*__restrict, void *( *fcn)(void *), void *__restrict);
-int intFromStr(str src, int *len, int **dst);
-int intToStr(str *dst, int *len, int *src);
+int intFromStr(const char *src, int *len, int **dst);
+int intToStr(str *dst, int *len, const int *src);
const int int_nil;
-int lngFromStr(str src, int *len, lng **dst);
-int lngToStr(str *dst, int *len, lng *src);
+int lngFromStr(const char *src, int *len, lng **dst);
+int lngToStr(str *dst, int *len, const lng *src);
const lng lng_nil;
int log_abort(logger *lg);
int log_bat(logger *lg, BAT *b, char *n);
@@ -472,19 +473,19 @@ void pthread_sema_init(pthread_sema_t *s
void pthread_sema_init(pthread_sema_t *s, int flag, int nresources);
void pthread_sema_up(pthread_sema_t *s);
void pthread_sema_up(pthread_sema_t *s);
-int ptrFromStr(str src, int *len, ptr **dst);
-int ptrToStr(str *dst, int *len, ptr *src);
+int ptrFromStr(const char *src, int *len, ptr **dst);
+int ptrToStr(str *dst, int *len, const ptr *src);
const ptr ptr_nil;
struct dirent *readdir(DIR *dir);
void rewinddir(DIR *dir);
-int shtFromStr(str src, int *len, sht **dst);
-int shtToStr(str *dst, int *len, sht *src);
+int shtFromStr(const char *src, int *len, sht **dst);
+int shtToStr(str *dst, int *len, const sht *src);
const sht sht_nil;
-int strFromStr(str src, int *len, str *dst);
+int strFromStr(const char *src, int *len, str *dst);
BUN strHash(const char *s);
int strLen(const char *s);
int strNil(const char *s);
-int strToStr(str *dst, int *len, str src);
+int strToStr(str *dst, int *len, const char *src);
const char str_nil[2];
int void_inplace(BAT *b, oid id, ptr val, bit force);
BUN void_replace_bat(BAT *b, BAT *u, bit force);
@@ -1086,7 +1087,6 @@ char *BKCsetRole(int *r, int *bid, char
str BKCsetSequenceBase(int *r, int *bid, oid *o);
str BKCsetSequenceBaseNil(int *r, int *bid, oid *o);
str BKCsetSet(int *res, int *bid, bit *param);
-str BKCsetSorted(bit *res, int *bid);
str BKCsetTransient(int *r, int *bid);
str BKCsetWriteMode(int *res, int *bid);
str BKCsetkey(int *res, int *bid, bit *param);
@@ -2898,13 +2898,9 @@ 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 STRbatEqual(int *ret, int *l, int *r);
-str STRbatEqualCst(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 STRbatNotEqual(int *ret, int *l, int *r);
-str STRbatNotEqualCst(int *ret, int *l, str *cst);
str STRbatPrefix(int *ret, int *l, int *r);
str STRbatPrefixcst(int *ret, int *l, str *cst);
str STRbatRstrSearch(int *ret, int *l, int *r);
@@ -3215,6 +3211,7 @@ str constraintsRef;
str convertConstant(malType type, ValPtr vr);
InstrPtr copyInstruction(InstrPtr p);
MalBlkPtr copyMalBlk(MalBlkPtr mb);
+void copyProperties(MalBlkPtr mb, int src, int dst);
str copyRef;
void copyVariable(MalBlkPtr dst, VarPtr v);
str copy_fromRef;
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
