Changeset: e35545e8b6ff for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e35545e8b6ff
Modified Files:
debian/fix-deb.sh
gdk/Makefile.ag
gdk/gdk_ssort.c
Branch: default
Log Message:
Merge with Dec2016 branch.
diffs (105 lines):
diff --git a/debian/fix-deb.sh b/debian/fix-deb.sh
--- a/debian/fix-deb.sh
+++ b/debian/fix-deb.sh
@@ -57,6 +57,9 @@ esac
case $SUITE in
wheezy | precise)
# numpy is too old
+ sed -i -e 's/, python-dev[^,]*//;s/, python-numpy[^,]*//' \
+ -e '/^Package:.*monetdb-python2/,/^$/d' debian/control
sed -i '/pyintegration=yes/s/yes/no/' debian/rules
+ rm debian/monetdb-python2.install
;;
esac
diff --git a/gdk/Makefile.ag b/gdk/Makefile.ag
--- a/gdk/Makefile.ag
+++ b/gdk/Makefile.ag
@@ -12,28 +12,30 @@ lib_gdk = {
VERSION = $(GDK_VERSION)
NAME = bat
SOURCES = \
+ gdk_select.c \
+ gdk_calc.c gdk_calc.h gdk_calc_compare.h gdk_calc_private.h \
+ gdk_ssort.c gdk_ssort_impl.h \
+ gdk_aggr.c \
gdk.h gdk_cand.h gdk_atomic.h gdk_batop.c \
- gdk_select.c \
gdk_search.c gdk_hash.c gdk_hash.h gdk_tm.c \
gdk_orderidx.c \
gdk_align.c gdk_bbp.c gdk_bbp.h \
gdk_heap.c gdk_utils.c gdk_utils.h \
gdk_atoms.c gdk_atoms.h \
- gdk_qsort.c gdk_qsort_impl.h gdk_ssort.c gdk_ssort_impl.h \
+ gdk_qsort.c gdk_qsort_impl.h \
gdk_storage.c gdk_bat.c \
gdk_delta.c gdk_cross.c gdk_system.c gdk_value.c \
gdk_posix.c gdk_logger.c gdk_sample.c \
gdk_private.h gdk_delta.h gdk_logger.h gdk_posix.h \
gdk_system.h gdk_system_private.h gdk_tm.h gdk_storage.h \
- gdk_calc.c gdk_calc.h gdk_calc_compare.h gdk_calc_private.h \
- gdk_aggr.c gdk_group.c \
+ gdk_group.c \
gdk_imprints.c gdk_imprints.h \
gdk_join.c gdk_project.c \
gdk_unique.c \
gdk_interprocess.c gdk_interprocess.h \
gdk_firstn.c \
bat.feps bat1.feps bat2.feps \
- libbat.rc
+ libbat.rc
LIBS = ../common/options/libmoptions \
../common/stream/libstream \
../common/utils/libmutils \
diff --git a/gdk/gdk_ssort.c b/gdk/gdk_ssort.c
--- a/gdk/gdk_ssort.c
+++ b/gdk/gdk_ssort.c
@@ -58,9 +58,9 @@ typedef struct {
/* 'ah' and 'at' are temp storage to help with merges. They
* contain room for alloced[ht] entries. */
- void **ah;
+ void *ah;
ssize_t allocedh;
- void **at;
+ void *at;
ssize_t allocedt;
/* A stack of n pending runs yet to be merged. Run #i starts
@@ -101,7 +101,7 @@ merge_freemem(MergeState *ms)
/* Ensure enough temp memory for 'need' array slots is available.
* Returns 0 on success and -1 if the memory can't be gotten. */
static int
-merge_getmem(MergeState *ms, ssize_t need, void ***ap,
+merge_getmem(MergeState *ms, ssize_t need, void **ap,
ssize_t *allocedp, int s, char *temparray)
{
assert(ms != NULL);
@@ -177,23 +177,23 @@ merge_getmem(MergeState *ms, ssize_t nee
case 0: \
break; \
case sizeof(bte): \
- for(i=0; i<N; i++) \
+ for (i = 0; i < N; i++) \
((bte*)(d))[i] = ((bte*)(s))[i]; \
break; \
case sizeof(sht): \
- for(i=0; i<N; i++) \
+ for (i = 0; i < N; i++) \
((sht*)(d))[i] = ((sht*)(s))[i]; \
break; \
case sizeof(int): \
- for(i=0; i<N; i++) \
+ for (i = 0; i < N; i++) \
((int*)(d))[i] = ((int*)(s))[i]; \
break; \
case sizeof(lng): \
- for(i=0; i<N; i++) \
+ for (i = 0; i < N; i++) \
((lng*)(d))[i] = ((lng*)(s))[i]; \
break; \
case 2 * sizeof(lng): \
- for(i=0; i<(N<2); i++) \
+ for (i = 0; i < N*2; i++) \
((lng*)(d))[i] = ((lng*)(s))[i]; \
break; \
default: \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
