Changeset: 60ab566c3ee0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=60ab566c3ee0
Removed Files:
debian/fix-deb.sh
Modified Files:
clients/mapilib/monetdb-mapi.pc.in
debian/monetdb5-sql.install
gdk/gdk_aggr.c
sql/backends/monet5/sql_cat.c
sql/server/rel_psm.c
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/rel_updates.c
sql/server/sql_mvc.c
sql/test/miscellaneous/Tests/declared_tables.sql
sql/test/miscellaneous/Tests/declared_tables.stable.err
sql/test/miscellaneous/Tests/declared_tables.stable.out
sql/test/miscellaneous/Tests/groupby_error.sql
sql/test/miscellaneous/Tests/simple_selects.sql
sql/test/miscellaneous/Tests/simple_selects.stable.err
sql/test/miscellaneous/Tests/simple_selects.stable.out
Branch: default
Log Message:
Merged with Jun2020
diffs (truncated from 1020 to 300 lines):
diff --git a/clients/mapilib/monetdb-mapi.pc.in
b/clients/mapilib/monetdb-mapi.pc.in
--- a/clients/mapilib/monetdb-mapi.pc.in
+++ b/clients/mapilib/monetdb-mapi.pc.in
@@ -4,15 +4,15 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${exec_prefix}
-libdir=${libdir}
-includedir=${includedir}
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
Name: monetdb-mapi
Description: MonetDB MAPI C-client libary
-Version: @MONETDB_VERSION@
+Version: @PACKAGE_VERSION@
Requires: monetdb-stream openssl
-Libs: -L${libdir} -lmapi
+Libs: -L${libdir} -lmapi @SOCKET_LIBS@
Cflags: -I${includedir}/monetdb
diff --git a/debian/fix-deb.sh b/debian/fix-deb.sh
deleted file mode 100755
--- a/debian/fix-deb.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-case $# in
-0)
- # figure out which distribution this is
- if [ -f /etc/lsb-release ]; then
- source /etc/lsb-release
- SUITE=$DISTRIB_CODENAME
- elif [ -f /etc/os-release ]; then
- source /etc/os-release
- if [[ $ID == debian ]]; then
- SUITE="${VERSION#*(}"
- SUITE="${SUITE%)*}"
- else
- case $VERSION in
- *\(*\)*)
- SUITE="${VERSION#*(}"
- SUITE="${SUITE% *)*}"
- ;;
- *)
- SUITE="${VERSION#*, }"
- SUITE="${SUITE% *)*}"
- ;;
- esac
- SUITE=${SUITE,,}
- fi
- else
- echo "don't know what distro this is"
- exit 1
- fi
- ARCH=$(arch)
- ;;
-1)
- # we're passed the name of the distribution
- SUITE=$1
- ARCH=$(arch)
- ;;
-2)
- SUITE=$1
- ARCH=$2
- ;;
-esac
-
-if [[ $ARCH == i?86 ]]; then
- ARCH=i386 # normalize
-fi
-
-case $SUITE in
-jessie)
- # Debian 8 still have php5-cli and doesn't have php*-sockets;
- # newer ones use php-cli and do have php-sockets.
- sed -i 's/php-cli/php5-cli/;s/, *php-sockets//' debian/control
-
- # The Python 3 version is too old for py3integration.
- sed -i '/^Package: monetdb-python3/,/^$/d' debian/control
- sed -i 's/ python3-dev, python3-numpy,//' debian/control
- rm debian/monetdb-python3.install
- sed -i 's/py3integration=yes/py3integration=no/' debian/rules
- ;;
-eoan)
- # Ubuntu 19.10 (Eoan Ermine) doesn't have liblas-c-dev, hence no LiDAR
- sed -i 's/ liblas-c-dev[^,]*,//' debian/control
- sed -i '/^Package: libmonetdb5-server-lidar/,/^$/d' debian/control
- sed -i '/--enable-lidar=yes/s/yes/no/;/--enable-liblas=yes/s/yes/no/'
debian/rules
- ;;
-esac
-
-# debhelper compatibility 9 and later support multiarch by using
-# architecture-specific subdirectories in /usr/lib (and /lib); our
-# code base is set up for amd64 (x86_64), so change to whatever
-# architecture we're compiling for
-case $ARCH in
-x86_64 | amd64)
- ;;
-*)
- sed -i "s/x86_64/$ARCH/g" debian/*.install
- ;;
-esac
diff --git a/debian/monetdb5-sql.install b/debian/monetdb5-sql.install
--- a/debian/monetdb5-sql.install
+++ b/debian/monetdb5-sql.install
@@ -7,7 +7,6 @@ debian/tmp/etc/tmpfiles.d/monetdbd.conf
# usr/lib/x86_64-linux-gnu/monetdb5/sql*.mal EXCEPT: sql*_hge.mal
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/sql.mal
usr/lib/x86_64-linux-gnu/monetdb5
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/sql[!_]*.mal
usr/lib/x86_64-linux-gnu/monetdb5
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/sql_aggr_[!h]*.mal
usr/lib/x86_64-linux-gnu/monetdb5
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/sql_decimal.mal
usr/lib/x86_64-linux-gnu/monetdb5
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/sql_rank.mal
usr/lib/x86_64-linux-gnu/monetdb5
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/sql_[!adhr]*.mal
usr/lib/x86_64-linux-gnu/monetdb5
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -896,11 +896,11 @@ BATgroupsum(BAT *b, BAT *g, BAT *e, BAT
lng t0 = GDKusec();
if ((err = BATgroupaggrinit(b, g, e, s, &min, &max, &ngrp, &ci,
&ncand)) != NULL) {
- GDKerror("BATgroupsum: %s\n", err);
+ GDKerror("%s: %s\n", __func__, err);
return NULL;
}
if (g == NULL) {
- GDKerror("BATgroupsum: b and g must be aligned\n");
+ GDKerror("%s: b and g must be aligned\n", __func__);
return NULL;
}
@@ -930,7 +930,7 @@ BATgroupsum(BAT *b, BAT *g, BAT *e, BAT
nils = dosum(Tloc(b, 0), b->tnonil, b->hseqbase, &ci, ncand,
Tloc(bn, 0), ngrp, b->ttype, tp, gids, min, max,
- skip_nils, abort_on_error, true, "BATgroupsum", &algo);
+ skip_nils, abort_on_error, true, __func__, &algo);
if (nils < BUN_NONE) {
BATsetcount(bn, ngrp);
@@ -968,7 +968,7 @@ BATsum(void *res, int tp, BAT *b, BAT *s
lng t0 = GDKusec();
if ((err = BATgroupaggrinit(b, NULL, NULL, s, &min, &max, &ngrp, &ci,
&ncand)) != NULL) {
- GDKerror("BATsum: %s\n", err);
+ GDKerror("%s: %s\n", __func__, err);
return GDK_FAIL;
}
switch (tp) {
@@ -1058,15 +1058,15 @@ BATsum(void *res, int tp, BAT *b, BAT *s
* (flt *) res = nil_if_empty ? flt_nil : 0;
break;
default:
- GDKerror("BATsum: type combination (sum(%s)->%s) not
supported.\n",
- ATOMname(b->ttype), ATOMname(tp));
+ GDKerror("%s: type combination (sum(%s)->%s) not supported.\n",
+ __func__, ATOMname(b->ttype), ATOMname(tp));
return GDK_FAIL;
}
if (BATcount(b) == 0)
return GDK_SUCCEED;
nils = dosum(Tloc(b, 0), b->tnonil, b->hseqbase, &ci, ncand,
res, true, b->ttype, tp, &min, min, max,
- skip_nils, abort_on_error, nil_if_empty, "BATsum", &algo);
+ skip_nils, abort_on_error, nil_if_empty, __func__, &algo);
TRC_DEBUG(ALGO, "%s(b="ALGOBATFMT",s="ALGOOPTBATFMT"): %s; "
"start " OIDFMT ", count " BUNFMT " (" LLFMT " usec)\n",
__func__,
@@ -1228,7 +1228,7 @@ BATsum(void *res, int tp, BAT *b, BAT *s
if (abort_on_error) \
goto overflow; \
prods[gid] =
TYPE2##_nil; \
- nils++; \
+ nils++; \
} else { \
prods[gid] *= vals[i]; \
} \
@@ -1472,11 +1472,11 @@ BATgroupprod(BAT *b, BAT *g, BAT *e, BAT
const char *err;
if ((err = BATgroupaggrinit(b, g, e, s, &min, &max, &ngrp, &ci,
&ncand)) != NULL) {
- GDKerror("BATgroupprod: %s\n", err);
+ GDKerror("%s: %s\n", __func__, err);
return NULL;
}
if (g == NULL) {
- GDKerror("BATgroupprod: b and g must be aligned\n");
+ GDKerror("%s: b and g must be aligned\n", __func__);
return NULL;
}
@@ -1506,7 +1506,7 @@ BATgroupprod(BAT *b, BAT *g, BAT *e, BAT
nils = doprod(Tloc(b, 0), b->hseqbase, &ci, ncand, Tloc(bn, 0), ngrp,
b->ttype, tp, gids, true, min, max, skip_nils,
- abort_on_error, true, "BATgroupprod");
+ abort_on_error, true, __func__);
if (nils < BUN_NONE) {
BATsetcount(bn, ngrp);
@@ -1534,7 +1534,7 @@ BATprod(void *res, int tp, BAT *b, BAT *
const char *err;
if ((err = BATgroupaggrinit(b, NULL, NULL, s, &min, &max, &ngrp, &ci,
&ncand)) != NULL) {
- GDKerror("BATprod: %s\n", err);
+ GDKerror("%s: %s\n", __func__, err);
return GDK_FAIL;
}
switch (tp) {
@@ -1562,15 +1562,15 @@ BATprod(void *res, int tp, BAT *b, BAT *
* (dbl *) res = nil_if_empty ? dbl_nil : (dbl) 1;
break;
default:
- GDKerror("BATprod: type combination (prod(%s)->%s) not
supported.\n",
- ATOMname(b->ttype), ATOMname(tp));
+ GDKerror("%s: type combination (prod(%s)->%s) not supported.\n",
+ __func__, ATOMname(b->ttype), ATOMname(tp));
return GDK_FAIL;
}
if (BATcount(b) == 0)
return GDK_SUCCEED;
nils = doprod(Tloc(b, 0), b->hseqbase, &ci, ncand, res, true,
b->ttype, tp, &min, false, min, max,
- skip_nils, abort_on_error, nil_if_empty, "BATprod");
+ skip_nils, abort_on_error, nil_if_empty, __func__);
return nils < BUN_NONE ? GDK_SUCCEED : GDK_FAIL;
}
@@ -1670,11 +1670,11 @@ BATgroupavg(BAT **bnp, BAT **cntsp, BAT
* functions) argument */
if ((err = BATgroupaggrinit(b, g, e, s, &min, &max, &ngrp, &ci,
&ncand)) != NULL) {
- GDKerror("BATgroupavg: %s\n", err);
+ GDKerror("%s: %s\n", __func__, err);
return GDK_FAIL;
}
if (g == NULL) {
- GDKerror("BATgroupavg: b and g must be aligned\n");
+ GDKerror("%s: b and g must be aligned\n", __func__);
return GDK_FAIL;
}
@@ -1683,13 +1683,14 @@ BATgroupavg(BAT **bnp, BAT **cntsp, BAT
* with nil in the tail */
bn = BATconstant(ngrp == 0 ? 0 : min, TYPE_dbl, &dbl_nil, ngrp,
TRANSIENT);
if (bn == NULL) {
- GDKerror("BATgroupavg: failed to create BAT\n");
+ GDKerror("%s: failed to create BAT\n", __func__);
return GDK_FAIL;
}
if (cntsp) {
lng zero = 0;
if ((cn = BATconstant(ngrp == 0 ? 0 : min, TYPE_lng,
&zero, ngrp, TRANSIENT)) == NULL) {
- GDKerror("BATgroupavg: failed to create BAT\n");
+ GDKerror("%s: failed to create BAT\n",
+ __func__);
BBPreclaim(bn);
return GDK_FAIL;
}
@@ -1787,7 +1788,7 @@ BATgroupavg(BAT **bnp, BAT **cntsp, BAT
else
GDKfree(cnts);
BBPunfix(bn->batCacheid);
- GDKerror("BATgroupavg: type (%s) not supported.\n",
+ GDKerror("%s: type (%s) not supported.\n", __func__,
ATOMname(b->ttype));
return GDK_FAIL;
}
@@ -1829,7 +1830,7 @@ BATgroupavg(BAT **bnp, BAT **cntsp, BAT
} else if (cnts) {
GDKfree(cnts);
}
- GDKerror("BATgroupavg: cannot allocate enough memory.\n");
+ GDKerror("%s: cannot allocate enough memory.\n", __func__);
return GDK_FAIL;
}
@@ -1958,7 +1959,7 @@ BATcalcavg(BAT *b, BAT *s, dbl *avg, BUN
AVERAGE_FLOATTYPE(dbl);
break;
default:
- GDKerror("BATcalcavg: average of type %s unsupported.\n",
+ GDKerror("%s: average of type %s unsupported.\n", __func__,
ATOMname(b->ttype));
return GDK_FAIL;
}
@@ -2014,11 +2015,11 @@ BATgroupcount(BAT *b, BAT *g, BAT *e, BA
(void) abort_on_error; /* functions) argument */
if ((err = BATgroupaggrinit(b, g, e, s, &min, &max, &ngrp, &ci,
&ncand)) != NULL) {
- GDKerror("BATgroupcount: %s\n", err);
+ GDKerror("%s: %s\n", __func__, err);
return NULL;
}
if (g == NULL) {
- GDKerror("BATgroupcount: b and g must be aligned\n");
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
