Changeset: a4930d9d4e72 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a4930d9d4e72
Added Files:
sql/test/BugTracker-2013/Tests/subtract-one-year.Bug-3215.sql
sql/test/BugTracker-2013/Tests/subtract-one-year.Bug-3215.stable.err
sql/test/BugTracker-2013/Tests/subtract-one-year.Bug-3215.stable.out
Modified Files:
NT/rules.msc
buildtools/autogen/autogen/msc.py
clients/mapiclient/tomograph.c
gdk/gdk_aggr.c
gdk/gdk_atomic.h
gdk/gdk_utils.c
monetdb5/extras/jaql/json.c
monetdb5/mal/mal_box.c
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_resource.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/kernel/aggr.mal
monetdb5/modules/kernel/aggr.mal.sh
monetdb5/modules/kernel/algebra.mx
monetdb5/modules/kernel/batmmath.c
monetdb5/optimizer/opt_centipede.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_mitosis.c
sql/common/sql_hash.c
sql/test/BugTracker-2013/Tests/All
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
testing/Mtest.py.in
tools/mserver/mserver5.c
Branch: ssdb
Log Message:
merged from Feb2013
diffs (truncated from 1579 to 300 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -183,11 +183,11 @@ PYTHON = python
YACC = bison
LEX = flex
-ARCHIVER = lib
+ARCHIVER = lib /nologo
GENDLL =
RC = rc
-MT = mt -nologo
+MT = mt /nologo
JAVAC = javac
JAR = jar
ANT = ant.bat
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
@@ -1027,7 +1027,7 @@ def msc_python_generic(fd, var, python,
fd.write('\t$(INSTALL) "$(srcdir)\\README.rst" "README.rst"\n')
msc['INSTALL'][f] = f, '', '', '', ''
fd.write('install_%s:\n' % f)
- fd.write('\t$(%s) %s install --prefix "$(prefix)"\n' % (PYTHON, f))
+ fd.write('\t$(%s) %s install --prefix "$(prefix)" --install-lib
"$(prefix)\\lib\\%s\n' % (PYTHON, f, PYTHON.lower()))
def msc_python2(fd, var, python, msc):
msc_python_generic(fd, var, python, msc, 'PYTHON2')
diff --git a/clients/mapiclient/tomograph.c b/clients/mapiclient/tomograph.c
--- a/clients/mapiclient/tomograph.c
+++ b/clients/mapiclient/tomograph.c
@@ -1883,7 +1883,8 @@ static void *
doProfile(void *d)
{
wthread *wthr = (wthread *) d;
- int i, len;
+ int i;
+ size_t len;
size_t a;
ssize_t n;
char *response, *x;
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -2145,7 +2145,7 @@ BATgroupmedian(BAT *b, BAT *g, BAT *e, B
}
/* ---------------------------------------------------------------------- */
-/* standard deviation (both biases and non-biased) */
+/* standard deviation (both biased and non-biased) */
#define AGGR_STDEV_SINGLE(TYPE)
\
do { \
diff --git a/gdk/gdk_atomic.h b/gdk/gdk_atomic.h
--- a/gdk/gdk_atomic.h
+++ b/gdk/gdk_atomic.h
@@ -54,9 +54,9 @@
#define ATOMIC_GET_sht(var, lck, fcn) var
#define ATOMIC_SET_sht(var, val, lck, fcn) (var = (val))
-#define ATOMIC_INC_sht(var, lck, fcn) _InterlockedIncrement16(&var)
-#define ATOMIC_DEC_sht(var, lck, fcn) _InterlockedDecrement16(&var)
-#define ATOMIC_CAS_sht(var, old, new, lck, fcn)
_InterlockedCompareExchange16(&var, new, old)
+#define ATOMIC_INC_sht(var, lck, fcn) _InterlockedIncrement16(&(var))
+#define ATOMIC_DEC_sht(var, lck, fcn) _InterlockedDecrement16(&(var))
+#define ATOMIC_CAS_sht(var, old, new, lck, fcn)
_InterlockedCompareExchange16(&(var), new, old)
#pragma intrinsic(_InterlockedIncrement16)
#pragma intrinsic(_InterlockedDecrement16)
@@ -64,11 +64,11 @@
#define ATOMIC_GET_int(var, lck, fcn) var
#define ATOMIC_SET_int(var, val, lck, fcn) (var = (val))
-#define ATOMIC_ADD_int(var, val, lck, fcn) _InterlockedExchangeAdd(&var,
(val))
-#define ATOMIC_SUB_int(var, val, lck, fcn) _InterlockedExchangeAdd(&var,
-(val))
-#define ATOMIC_INC_int(var, lck, fcn) _InterlockedIncrement(&var)
-#define ATOMIC_DEC_int(var, lck, fcn) _InterlockedDecrement(&var)
-#define ATOMIC_CAS_int(var, old, new, lck, fcn)
_InterlockedCompareExchange(&var, new, old)
+#define ATOMIC_ADD_int(var, val, lck, fcn) _InterlockedExchangeAdd(&(var),
(val))
+#define ATOMIC_SUB_int(var, val, lck, fcn) _InterlockedExchangeAdd(&(var),
-(val))
+#define ATOMIC_INC_int(var, lck, fcn) _InterlockedIncrement(&(var))
+#define ATOMIC_DEC_int(var, lck, fcn) _InterlockedDecrement(&(var))
+#define ATOMIC_CAS_int(var, old, new, lck, fcn)
_InterlockedCompareExchange(&(var), new, old)
#pragma intrinsic(_InterlockedExchangeAdd)
#pragma intrinsic(_InterlockedIncrement)
@@ -78,11 +78,11 @@
#if SIZEOF_SSIZE_T == SIZEOF_LNG
#define ATOMIC_GET_lng(var, lck, fcn) var
#define ATOMIC_SET_lng(var, val, lck, fcn) (var = (val))
-#define ATOMIC_ADD_lng(var, val, lck, fcn) _InterlockedExchangeAdd64(&var,
val)
-#define ATOMIC_SUB_lng(var, val, lck, fcn) _InterlockedExchangeAdd64(&var,
-(val))
-#define ATOMIC_INC_lng(var, lck, fcn) _InterlockedIncrement64(&var)
-#define ATOMIC_DEC_lng(var, lck, fcn) _InterlockedDecrement64(&var)
-#define ATOMIC_CAS_lng(var, old, new, lck, fcn)
_InterlockedCompareExchange64(&var, new, old)
+#define ATOMIC_ADD_lng(var, val, lck, fcn)
_InterlockedExchangeAdd64(&(var), val)
+#define ATOMIC_SUB_lng(var, val, lck, fcn)
_InterlockedExchangeAdd64(&(var), -(val))
+#define ATOMIC_INC_lng(var, lck, fcn) _InterlockedIncrement64(&(var))
+#define ATOMIC_DEC_lng(var, lck, fcn) _InterlockedDecrement64(&(var))
+#define ATOMIC_CAS_lng(var, old, new, lck, fcn)
_InterlockedCompareExchange64(&(var), new, old)
#pragma intrinsic(_InterlockedExchangeAdd64)
#pragma intrinsic(_InterlockedIncrement64)
@@ -96,26 +96,26 @@
#define ATOMIC_GET_sht(var, lck, fcn) var
#define ATOMIC_SET_sht(var, val, lck, fcn) (var = (val))
-#define ATOMIC_INC_sht(var, lck, fcn) __sync_add_and_fetch(&var, 1)
-#define ATOMIC_DEC_sht(var, lck, fcn) __sync_sub_and_fetch(&var, 1)
-#define ATOMIC_CAS_sht(var, old, new, lck, fcn)
__sync_val_compare_and_swap(&var, old, new)
+#define ATOMIC_INC_sht(var, lck, fcn) __sync_add_and_fetch(&(var), 1)
+#define ATOMIC_DEC_sht(var, lck, fcn) __sync_sub_and_fetch(&(var), 1)
+#define ATOMIC_CAS_sht(var, old, new, lck, fcn)
__sync_val_compare_and_swap(&(var), old, new)
#define ATOMIC_GET_int(var, lck, fcn) var
#define ATOMIC_SET_int(var, val, lck, fcn) (var = (val))
-#define ATOMIC_ADD_int(var, val, lck, fcn) __sync_fetch_and_add(&var,
(val))
-#define ATOMIC_SUB_int(var, val, lck, fcn) __sync_fetch_and_sub(&var,
(val))
-#define ATOMIC_INC_int(var, lck, fcn) __sync_add_and_fetch(&var, 1)
-#define ATOMIC_DEC_int(var, lck, fcn) __sync_sub_and_fetch(&var, 1)
-#define ATOMIC_CAS_int(var, old, new, lck, fcn)
__sync_val_compare_and_swap(&var, old, new)
+#define ATOMIC_ADD_int(var, val, lck, fcn) __sync_fetch_and_add(&(var),
(val))
+#define ATOMIC_SUB_int(var, val, lck, fcn) __sync_fetch_and_sub(&(var),
(val))
+#define ATOMIC_INC_int(var, lck, fcn) __sync_add_and_fetch(&(var), 1)
+#define ATOMIC_DEC_int(var, lck, fcn) __sync_sub_and_fetch(&(var), 1)
+#define ATOMIC_CAS_int(var, old, new, lck, fcn)
__sync_val_compare_and_swap(&(var), old, new)
#if SIZEOF_SSIZE_T == SIZEOF_LNG
#define ATOMIC_GET_lng(var, lck, fcn) var
#define ATOMIC_SET_lng(var, val, lck, fcn) (var = (val))
-#define ATOMIC_ADD_lng(var, val, lck, fcn) __sync_fetch_and_add(&var,
(val))
-#define ATOMIC_SUB_lng(var, val, lck, fcn) __sync_fetch_and_sub(&var,
(val))
-#define ATOMIC_INC_lng(var, lck, fcn) __sync_add_and_fetch(&var, 1)
-#define ATOMIC_DEC_lng(var, lck, fcn) __sync_sub_and_fetch(&var, 1)
-#define ATOMIC_CAS_lng(var, old, new, lck, fcn)
__sync_val_compare_and_swap(&var, old, new)
+#define ATOMIC_ADD_lng(var, val, lck, fcn) __sync_fetch_and_add(&(var),
(val))
+#define ATOMIC_SUB_lng(var, val, lck, fcn) __sync_fetch_and_sub(&(var),
(val))
+#define ATOMIC_INC_lng(var, lck, fcn) __sync_add_and_fetch(&(var), 1)
+#define ATOMIC_DEC_lng(var, lck, fcn) __sync_sub_and_fetch(&(var), 1)
+#define ATOMIC_CAS_lng(var, old, new, lck, fcn)
__sync_val_compare_and_swap(&(var), old, new)
#endif
#define ATOMIC_INIT(lck, fcn) ((void) 0)
@@ -131,7 +131,7 @@ __ATOMIC_GET_sht(volatile sht *var, MT_L
MT_lock_unset(lck, fcn);
return old;
}
-#define ATOMIC_GET_sht(var, lck, fcn) __ATOMIC_GET_sht(&var, &lck, fcn)
+#define ATOMIC_GET_sht(var, lck, fcn) __ATOMIC_GET_sht(&(var), &(lck), fcn)
static inline sht
__ATOMIC_SET_sht(volatile sht *var, sht val, MT_Lock *lck, const char *fcn)
@@ -143,7 +143,7 @@ __ATOMIC_SET_sht(volatile sht *var, sht
MT_lock_unset(lck, fcn);
return new;
}
-#define ATOMIC_SET_sht(var, val, lck, fcn) __ATOMIC_SET_sht(&var, (val),
&lck, fcn)
+#define ATOMIC_SET_sht(var, val, lck, fcn) __ATOMIC_SET_sht(&(var), (val),
&(lck), fcn)
static inline sht
__ATOMIC_INC_sht(volatile sht *var, MT_Lock *lck, const char *fcn)
@@ -154,7 +154,7 @@ __ATOMIC_INC_sht(volatile sht *var, MT_L
MT_lock_unset(lck, fcn);
return new;
}
-#define ATOMIC_INC_sht(var, lck, fcn) __ATOMIC_INC_sht(&var, &lck,
fcn)
+#define ATOMIC_INC_sht(var, lck, fcn) __ATOMIC_INC_sht(&(var),
&(lck), fcn)
static inline sht
__ATOMIC_DEC_sht(volatile sht *var, MT_Lock *lck, const char *fcn)
@@ -165,7 +165,7 @@ __ATOMIC_DEC_sht(volatile sht *var, MT_L
MT_lock_unset(lck, fcn);
return new;
}
-#define ATOMIC_DEC_sht(var, lck, fcn) __ATOMIC_DEC_sht(&var, &lck,
fcn)
+#define ATOMIC_DEC_sht(var, lck, fcn) __ATOMIC_DEC_sht(&(var),
&(lck), fcn)
static inline sht
__ATOMIC_CAS_sht(volatile sht *var, sht old, sht new, MT_Lock *lck, const char
*fcn)
@@ -178,7 +178,7 @@ __ATOMIC_CAS_sht(volatile sht *var, sht
MT_lock_unset(lck, fcn);
return orig;
}
-#define ATOMIC_CAS_sht(var, old, new, lck, fcn) __ATOMIC_CAS_sht(&var,
(old), (new), &lck, fcn)
+#define ATOMIC_CAS_sht(var, old, new, lck, fcn)
__ATOMIC_CAS_sht(&(var), (old), (new), &(lck), fcn)
static inline int
@@ -190,7 +190,7 @@ __ATOMIC_GET_int(volatile int *var, MT_L
MT_lock_unset(lck, fcn);
return old;
}
-#define ATOMIC_GET_int(var, lck, fcn) __ATOMIC_GET_int(&var, &lck, fcn)
+#define ATOMIC_GET_int(var, lck, fcn) __ATOMIC_GET_int(&(var), &(lck), fcn)
static inline int
__ATOMIC_SET_int(volatile int *var, int val, MT_Lock *lck, const char *fcn)
@@ -202,7 +202,7 @@ __ATOMIC_SET_int(volatile int *var, int
MT_lock_unset(lck, fcn);
return new;
}
-#define ATOMIC_SET_int(var, val, lck, fcn) __ATOMIC_SET_int(&var, (val),
&lck, fcn)
+#define ATOMIC_SET_int(var, val, lck, fcn) __ATOMIC_SET_int(&(var), (val),
&(lck), fcn)
static inline int
__ATOMIC_ADD_int(volatile int *var, int val, MT_Lock *lck, const char *fcn)
@@ -214,7 +214,7 @@ __ATOMIC_ADD_int(volatile int *var, int
MT_lock_unset(lck, fcn);
return old;
}
-#define ATOMIC_ADD_int(var, val, lck, fcn) __ATOMIC_ADD_int(&var, (val),
&lck, fcn)
+#define ATOMIC_ADD_int(var, val, lck, fcn) __ATOMIC_ADD_int(&(var), (val),
&(lck), fcn)
static inline int
__ATOMIC_SUB_int(volatile int *var, int val, MT_Lock *lck, const char *fcn)
@@ -226,7 +226,7 @@ __ATOMIC_SUB_int(volatile int *var, int
MT_lock_unset(lck, fcn);
return old;
}
-#define ATOMIC_SUB_int(var, val, lck, fcn) __ATOMIC_SUB_int(&var, (val),
&lck, fcn)
+#define ATOMIC_SUB_int(var, val, lck, fcn) __ATOMIC_SUB_int(&(var), (val),
&(lck), fcn)
static inline int
__ATOMIC_INC_int(volatile int *var, MT_Lock *lck, const char *fcn)
@@ -237,7 +237,7 @@ __ATOMIC_INC_int(volatile int *var, MT_L
MT_lock_unset(lck, fcn);
return new;
}
-#define ATOMIC_INC_int(var, lck, fcn) __ATOMIC_INC_int(&var, &lck,
fcn)
+#define ATOMIC_INC_int(var, lck, fcn) __ATOMIC_INC_int(&(var),
&(lck), fcn)
static inline int
__ATOMIC_DEC_int(volatile int *var, MT_Lock *lck, const char *fcn)
@@ -248,7 +248,7 @@ __ATOMIC_DEC_int(volatile int *var, MT_L
MT_lock_unset(lck, fcn);
return new;
}
-#define ATOMIC_DEC_int(var, lck, fcn) __ATOMIC_DEC_int(&var, &lck,
fcn)
+#define ATOMIC_DEC_int(var, lck, fcn) __ATOMIC_DEC_int(&(var),
&(lck), fcn)
static inline int
__ATOMIC_CAS_int(volatile int *var, int old, int new, MT_Lock *lck, const char
*fcn)
@@ -261,7 +261,7 @@ __ATOMIC_CAS_int(volatile int *var, int
MT_lock_unset(lck, fcn);
return orig;
}
-#define ATOMIC_CAS_int(var, old, new, lck, fcn) __ATOMIC_CAS_int(&var,
(old), (new), &lck, fcn)
+#define ATOMIC_CAS_int(var, old, new, lck, fcn)
__ATOMIC_CAS_int(&(var), (old), (new), &(lck), fcn)
#if SIZEOF_SSIZE_T == SIZEOF_LNG
@@ -274,7 +274,7 @@ __ATOMIC_GET_lng(volatile lng *var, MT_L
MT_lock_unset(lck, fcn);
return old;
}
-#define ATOMIC_GET_lng(var, lck, fcn) __ATOMIC_GET_lng(&var, &lck, fcn)
+#define ATOMIC_GET_lng(var, lck, fcn) __ATOMIC_GET_lng(&(var), &(lck), fcn)
static inline lng
__ATOMIC_SET_lng(volatile lng *var, lng val, MT_Lock *lck, const char *fcn)
@@ -286,7 +286,7 @@ __ATOMIC_SET_lng(volatile lng *var, lng
MT_lock_unset(lck, fcn);
return new;
}
-#define ATOMIC_SET_lng(var, val, lck, fcn) __ATOMIC_SET_lng(&var, (val),
&lck, fcn)
+#define ATOMIC_SET_lng(var, val, lck, fcn) __ATOMIC_SET_lng(&(var), (val),
&(lck), fcn)
static inline lng
__ATOMIC_ADD_lng(volatile lng *var, lng val, MT_Lock *lck, const char *fcn)
@@ -298,7 +298,7 @@ __ATOMIC_ADD_lng(volatile lng *var, lng
MT_lock_unset(lck, fcn);
return old;
}
-#define ATOMIC_ADD_lng(var, val, lck, fcn) __ATOMIC_ADD_lng(&var, (val),
&lck, fcn)
+#define ATOMIC_ADD_lng(var, val, lck, fcn) __ATOMIC_ADD_lng(&(var), (val),
&(lck), fcn)
static inline lng
__ATOMIC_SUB_lng(volatile lng *var, lng val, MT_Lock *lck, const char *fcn)
@@ -310,7 +310,7 @@ __ATOMIC_SUB_lng(volatile lng *var, lng
MT_lock_unset(lck, fcn);
return old;
}
-#define ATOMIC_SUB_lng(var, val, lck, fcn) __ATOMIC_SUB_lng(&var, (val),
&lck, fcn)
+#define ATOMIC_SUB_lng(var, val, lck, fcn) __ATOMIC_SUB_lng(&(var), (val),
&(lck), fcn)
static inline lng
__ATOMIC_INC_lng(volatile lng *var, MT_Lock *lck, const char *fcn)
@@ -321,7 +321,7 @@ __ATOMIC_INC_lng(volatile lng *var, MT_L
MT_lock_unset(lck, fcn);
return new;
}
-#define ATOMIC_INC_lng(var, lck, fcn) __ATOMIC_INC_lng(&var, &lck,
fcn)
+#define ATOMIC_INC_lng(var, lck, fcn) __ATOMIC_INC_lng(&(var),
&(lck), fcn)
static inline lng
__ATOMIC_DEC_lng(volatile lng *var, MT_Lock *lck, const char *fcn)
@@ -332,7 +332,7 @@ __ATOMIC_DEC_lng(volatile lng *var, MT_L
MT_lock_unset(lck, fcn);
return new;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
