Changeset: 38d729b48779 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=38d729b48779
Modified Files:
MonetDB.spec
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
clients/odbc/driver/ODBCConvert.c
debian/control
debian/fix-deb.sh
debian/monetdb-r.install
debian/monetdb5-sql.install
debian/rules
gdk/gdk_posix.c
gdk/gdk_storage.c
Branch: default
Log Message:
Merge with Jun2016 branch.
diffs (230 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -9,6 +9,7 @@
%define bits 32
%else
%define bits 64
+%define with_int128=1
%endif
# only add .oidXX suffix if oid size differs from bit size
@@ -134,6 +135,7 @@ BuildRequires: liblas >= 1.8.0
%endif
BuildRequires: libatomic_ops-devel
BuildRequires: libcurl-devel
+BuildRequires: xz-devel
# BuildRequires: libmicrohttpd-devel
# BuildRequires: libsphinxclient-devel
BuildRequires: libuuid-devel
@@ -937,31 +939,43 @@ developer, but if you do want to test, t
--enable-console=yes \
--enable-debug=no \
--enable-developer=no \
+ --enable-embedded=no \
+ --enable-embedded-r=no \
--enable-fits=%{?with_fits:yes}%{!?with_fits:no} \
--enable-gdk=yes \
--enable-geom=%{?with_geos:yes}%{!?with_geos:no} \
--enable-gsl=yes \
--enable-instrument=no \
+ --enable-int128=%{?with_int128:yes}%{!?with_int128:no} \
--enable-jdbc=no \
--enable-lidar=%{?with_lidar:yes}%{!?with_lidar:no} \
+ --enable-mapi=yes \
--enable-merocontrol=no \
--enable-microhttpd=no \
--enable-monetdb5=yes \
+ --enable-netcdf=no \
--enable-odbc=yes \
--enable-oid32=%{?oid32:yes}%{!?oid32:no} \
--enable-optimize=yes \
--enable-profile=no \
--enable-rintegration=%{?with_rintegration:yes}%{!?with_rintegration:no} \
+ --enable-shp=no \
--enable-sql=yes \
--enable-strict=no \
--enable-testing=yes \
--with-ant=no \
--with-bz2=yes \
+ --with-curl=yes \
+ --with-gdal=yes \
--with-geos=%{?with_geos:yes}%{!?with_geos:no} \
--with-java=no \
--with-liblas=%{?with_lidar:yes}%{!?with_lidar:no} \
+ --with-libxml2=yes \
+ --with-lzma=yes \
+ --with-openssl=yes \
--with-perl=yes \
--with-perl-libdir=lib/perl5 \
+ --with-proj=no \
--with-pthread=yes \
--with-python2=yes \
--with-python3=%{?rhel:no}%{!?rhel:yes} \
@@ -969,6 +983,7 @@ developer, but if you do want to test, t
--with-samtools=%{?with_samtools:yes}%{!?with_samtools:no} \
--with-sphinxclient=no \
--with-unixodbc=yes \
+ --with-uuid=yes \
--with-valgrind=no \
%{?comp_cc:CC="%{comp_cc}"}
diff --git a/clients/odbc/driver/ODBCConvert.c
b/clients/odbc/driver/ODBCConvert.c
--- a/clients/odbc/driver/ODBCConvert.c
+++ b/clients/odbc/driver/ODBCConvert.c
@@ -1344,7 +1344,8 @@ ODBCFetch(ODBCStmt *stmt,
case SQL_INTEGER:
case SQL_BIGINT:
case SQL_BIT: {
- int f, n;
+ SQLUBIGINT f;
+ int n;
data = (char *) ptr;
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Vcs-Hg: http://dev.monetdb.org/hg/MonetD
# http://www.debian.org/doc/debian-policy/ch-relationships.html
Build-Depends: debhelper (>= 5), autotools-dev, bison, libatomic-ops-dev,
libbam-dev, libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.4.0),
- libgsl0-dev, libpcre3-dev, libreadline-dev,
+ libgsl0-dev, libpcre3-dev, libreadline-dev, liblzma-dev,
libssl-dev, libxml2-dev, perl, pkg-config, python, python3,
unixodbc-dev, uuid-dev, zlib1g-dev, liblas-c-dev (>= 1.8.0), r-base
Standards-Version: 3.8.0
diff --git a/debian/fix-deb.sh b/debian/fix-deb.sh
--- a/debian/fix-deb.sh
+++ b/debian/fix-deb.sh
@@ -17,5 +17,5 @@ if [[ ( $ID == debian && $VERSION_ID -lt
sed -i '/^Package:.*lidar/,/^$/d' debian/control
sed -i '/^Package:.*geom/,/^$/d' debian/control
rm debian/libmonetdb5-server-lidar.install
debian/libmonetdb5-server-geom.install
- sed -i '/geo[ms]=yes/s/yes/no/;/lidar=yes/s/yes/no/;/liblas=yes/s/yes/no/'
debian/rules
+ sed -i
'/geo[ms]=yes/s/yes/no/;/gdal=yes/s/yes/no/;/lidar=yes/s/yes/no/;/liblas=yes/s/yes/no/'
debian/rules
fi
diff --git a/debian/monetdb-r.install b/debian/monetdb-r.install
--- a/debian/monetdb-r.install
+++ b/debian/monetdb-r.install
@@ -1,3 +1,4 @@
debian/tmp/usr/lib/monetdb5/rapi.mal usr/lib/monetdb5
+debian/tmp/usr/lib/monetdb5/rapi.R usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/autoload/??_rapi.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/monetdb5/lib_rapi.so usr/lib/monetdb5
diff --git a/debian/monetdb5-sql.install b/debian/monetdb5-sql.install
--- a/debian/monetdb5-sql.install
+++ b/debian/monetdb5-sql.install
@@ -3,6 +3,7 @@ debian/tmp/usr/bin/monetdb usr/bin
debian/tmp/usr/lib/monetdb5/*.sql usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/autoload/??_sql.mal usr/lib/monetdb5/autoload
debian/tmp/usr/lib/systemd/system/monetdbd.service lib/systemd/system
+debian/tmp/etc/tmpfiles.d/monetdbd.conf etc/tmpfiles.d
# usr/lib/monetdb5/sql*.mal EXCEPT: sql*_hge.mal
debian/tmp/usr/lib/monetdb5/sql.mal usr/lib/monetdb5
debian/tmp/usr/lib/monetdb5/sql_aggr_[!h]*.mal usr/lib/monetdb5
@@ -11,11 +12,12 @@ debian/tmp/usr/lib/monetdb5/sql_[!adh]*.
debian/tmp/usr/lib/monetdb5/lib_sql.so usr/lib/monetdb5
debian/tmp/var/monetdb5/dbfarm/.merovingian_properties var/monetdb5/dbfarm
-# usr/lib/monetdb5/createdb/*.sql EXCEPT: *_bam.sql, *_geom.sql, *_gsl.sql,
*_hge.sql
-debian/tmp/usr/lib/monetdb5/createdb/??_[!abgju]*.sql usr/lib/monetdb5/createdb
+# usr/lib/monetdb5/createdb/*.sql EXCEPT: *_bam.sql, *_geom.sql, *_gsl.sql,
*_hge.sql *_lidar.sql
+debian/tmp/usr/lib/monetdb5/createdb/??_[!abgjlu]*.sql
usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/??_analytics.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/??_json.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/??_generator.sql usr/lib/monetdb5/createdb
+debian/tmp/usr/lib/monetdb5/createdb/??_like.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/??_udf.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/??_uuid.sql usr/lib/monetdb5/createdb
debian/tmp/usr/lib/monetdb5/createdb/??_url.sql usr/lib/monetdb5/createdb
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,8 @@ override_dh_auto_configure:
--enable-console=yes \
--enable-debug=no \
--enable-developer=no \
+ --enable-embedded=no \
+ --enable-embedded-r=no \
--enable-fits=no \
--enable-gdk=yes \
--enable-geom=yes \
@@ -24,24 +26,33 @@ override_dh_auto_configure:
--enable-instrument=no \
--enable-jdbc=no \
--enable-lidar=yes \
+ --enable-mapi=yes \
--enable-merocontrol=no \
--enable-microhttpd=no \
--enable-monetdb5=yes \
+ --enable-netcdf=no \
--enable-odbc=yes \
--enable-oid32=no \
--enable-optimize=yes \
--enable-profile=no \
--enable-rintegration=yes \
+ --enable-shp=no \
--enable-sql=yes \
--enable-strict=no \
--enable-testing=yes \
--with-ant=no \
--with-bz2=yes \
+ --with-curl=yes \
+ --with-gdal=yes \
--with-geos=yes \
--with-java=no \
--with-liblas=yes \
+ --with-libxml2=yes \
+ --with-lzma=yes \
+ --with-openssl=yes \
--with-perl=yes \
--with-perl-libdir=lib/perl5 \
+ --with-proj=no \
--with-pthread=yes \
--with-python2=yes \
--with-python3=yes \
@@ -49,6 +60,7 @@ override_dh_auto_configure:
--with-samtools=yes \
--with-sphinxclient=no \
--with-unixodbc=yes \
+ --with-uuid=yes \
--with-valgrind=no \
X_CFLAGS=-g
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -623,6 +623,13 @@ MT_mremap(const char *path, int mode, vo
#endif
#endif
) {
+ int err = errno;
+ /* extending failed:
+ * free any disk space
+ * allocated in the
+ * process */
+ (void) ftruncate(fd, (off_t)
old_size);
+ errno = err; /* restore for
error message */
GDKsyserror("MT_mremap: growing
file failed\n");
close(fd);
fprintf(stderr,
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -349,8 +349,14 @@ GDKextendf(int fd, size_t size, const ch
* is not supported on the file system, or if neither
* function exists */
rt = ftruncate(fd, (off_t) size);
- if (rt != 0)
+ if (rt != 0) {
+ /* extending failed, try to reduce file size
+ * back to original */
+ int err = errno;
+ (void) ftruncate(fd, stb.st_size);
+ errno = err; /* restore for error message */
GDKsyserror("GDKextendf: could not extend file\n");
+ }
}
IODEBUG fprintf(stderr, "#GDKextend %s " SZFMT " -> " SZFMT " %dms%s\n",
fn, (size_t) stb.st_size, size,
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
