Changeset: 9973aefd7613 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9973aefd7613
Added Files:
monetdb5/extras/pyapi/Tests/pyapi01.stable.err
monetdb5/extras/pyapi/Tests/pyapi01.stable.out
Modified Files:
MonetDB.spec
clients/Tests/exports.stable.out
clients/mapiclient/Tests/mclient--help.stable.err
clients/mapiclient/Tests/mclient--help.stable.err.Windows
clients/mapiclient/eventparser.c
clients/mapiclient/mclient.c
clients/mapiclient/tachograph.c
clients/mapiclient/tomograph.c
clients/mapilib/mapi.c
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_align.c
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_bbp.h
gdk/gdk_cross.c
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_search.c
gdk/gdk_select.c
gdk/gdk_storage.c
gdk/gdk_tm.c
gdk/gdk_utils.c
monetdb5/mal/mal.h
monetdb5/mal/mal_listing.c
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/json.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/joinpath.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/transaction.c
monetdb5/modules/mal/txtsim.c
sql/backends/monet5/bam/bam_loader.c
sql/backends/monet5/sql_result.c
sql/server/rel_optimizer.c
Branch: pyapi
Log Message:
Branch merge.
diffs (truncated from 4169 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -160,8 +160,8 @@ more client packages.
%package devel
Summary: MonetDB development files
Group: Applications/Databases
-Requires: %{name} = %{version}-%{release}
-Requires: %{name}-stream-devel = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{name}-stream-devel%{?_isa} = %{version}-%{release}
Requires: libatomic_ops-devel
%description devel
@@ -201,7 +201,7 @@ various other components.
%package stream-devel
Summary: MonetDB stream library
Group: Applications/Databases
-Requires: %{name}-stream = %{version}-%{release}
+Requires: %{name}-stream%{?_isa} = %{version}-%{release}
Requires: bzip2-devel
Requires: libcurl-devel
Requires: zlib-devel
@@ -249,7 +249,7 @@ MonetDB, you will very likely need this
%package client-tools
Summary: MonetDB - Monet Database Management System Client Programs
Group: Applications/Databases
-Requires: %{name}-client = %{version}-%{release}
+Requires: %{name}-client%{?_isa} = %{version}-%{release}
%description client-tools
MonetDB is a database management system that is developed from a
@@ -269,8 +269,8 @@ tools can be used to monitor the MonetDB
%package client-devel
Summary: MonetDB - Monet Database Management System Client Programs
Group: Applications/Databases
-Requires: %{name}-client = %{version}-%{release}
-Requires: %{name}-stream-devel = %{version}-%{release}
+Requires: %{name}-client%{?_isa} = %{version}-%{release}
+Requires: %{name}-stream-devel%{?_isa} = %{version}-%{release}
Requires: openssl-devel
%description client-devel
@@ -292,7 +292,7 @@ This package contains the files needed t
%package client-odbc
Summary: MonetDB ODBC driver
Group: Applications/Databases
-Requires: %{name}-client = %{version}-%{release}
+Requires: %{name}-client%{?_isa} = %{version}-%{release}
Requires(pre): unixODBC
%description client-odbc
@@ -349,7 +349,6 @@ program.
%package client-perl
Summary: MonetDB perl interface
Group: Applications/Databases
-Requires: %{name}-client = %{version}-%{release}
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires: perl(DBI)
Requires: perl(Digest::SHA)
@@ -428,12 +427,12 @@ This package contains the activerecord a
%package client-tests
Summary: MonetDB Client tests package
Group: Applications/Databases
-Requires: MonetDB5-server = %{version}-%{release}
-Requires: %{name}-client = %{version}-%{release}
-Requires: %{name}-client-odbc = %{version}-%{release}
+Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
+Requires: %{name}-client%{?_isa} = %{version}-%{release}
+Requires: %{name}-client-odbc%{?_isa} = %{version}-%{release}
Requires: %{name}-client-perl = %{version}-%{release}
Requires: %{name}-client-php = %{version}-%{release}
-Requires: %{name}-SQL-server5 = %{version}-%{release}
+Requires: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
Requires: python-monetdb = %{version}-%{release}
%description client-tests
@@ -466,7 +465,7 @@ developer.
%package geom-MonetDB5
Summary: MonetDB5 SQL GIS support module
Group: Applications/Databases
-Requires: MonetDB5-server = %{version}-%{release}
+Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
Obsoletes: %{name}-geom
Obsoletes: %{name}-geom-devel
@@ -490,7 +489,7 @@ extensions for %{name}-SQL-server5.
%package gsl-MonetDB5
Summary: MonetDB5 SQL interface to the gsl library
Group: Applications/Databases
-Requires: MonetDB5-server = %{version}-%{release}
+Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
%description gsl-MonetDB5
MonetDB is a database management system that is developed from a
@@ -512,7 +511,7 @@ numerical analysis (gsl).
%package bam-MonetDB5
Summary: MonetDB5 SQL interface to the bam library
Group: Applications/Databases
-Requires: MonetDB5-server = %{version}-%{release}
+Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
%description bam-MonetDB5
MonetDB is a database management system that is developed from a
@@ -535,7 +534,7 @@ version of Sequence Alignment/Map) data.
%package R
Summary: Integration of MonetDB and R, allowing use of R from within SQL
Group: Applications/Databases
-Requires: MonetDB-SQL-server5 = %{version}-%{release}
+Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release}
%description R
MonetDB is a database management system that is developed from a
@@ -561,7 +560,7 @@ install it.
%package cfitsio
Summary: MonetDB: Add on module that provides support for FITS files
Group: Applications/Databases
-Requires: MonetDB-SQL-server5 = %{version}-%{release}
+Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release}
%description cfitsio
MonetDB is a database management system that is developed from a
@@ -584,7 +583,7 @@ format.
Summary: MonetDB - Monet Database Management System
Group: Applications/Databases
Requires(pre): shadow-utils
-Requires: %{name}-client = %{version}-%{release}
+Requires: %{name}-client%{?_isa} = %{version}-%{release}
Obsoletes: MonetDB5-server-rdf
%description -n MonetDB5-server
@@ -669,7 +668,7 @@ fi
%package -n MonetDB5-server-hugeint
Summary: MonetDB - 128-bit integer support for MonetDB5-server
Group: Application/Databases
-Requires: MonetDB5-server
+Requires: MonetDB5-server%{?_isa}
%description -n MonetDB5-server-hugeint
MonetDB is a database management system that is developed from a
@@ -689,8 +688,8 @@ MonetDB5-server component.
%package -n MonetDB5-server-devel
Summary: MonetDB development files
Group: Applications/Databases
-Requires: MonetDB5-server = %{version}-%{release}
-Requires: %{name}-devel = %{version}-%{release}
+Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
%description -n MonetDB5-server-devel
MonetDB is a database management system that is developed from a
@@ -711,7 +710,7 @@ used from the MAL level.
%package SQL-server5
Summary: MonetDB5 SQL server modules
Group: Applications/Databases
-Requires: MonetDB5-server = %{version}-%{release}
+Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
# RHEL >= 7, and all current Fedora
Requires: %{_bindir}/systemd-tmpfiles
@@ -777,8 +776,8 @@ systemd-tmpfiles --create %{_sysconfdir}
%package SQL-server5-hugeint
Summary: MonetDB5 128 bit integer (hugeint) support for SQL
Group: Applications/Databases
-Requires: MonetDB5-server-hugeint = %{version}-%{release}
-Requires: MonetDB-SQL-server5 = %{version}-%{release}
+Requires: MonetDB5-server-hugeint%{?_isa} = %{version}-%{release}
+Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release}
%description SQL-server5-hugeint
MonetDB is a database management system that is developed from a
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
@@ -212,7 +212,6 @@ void BBPcold(bat b);
int BBPcurstamp(void);
int BBPdecref(bat b, int logical);
BAT *BBPdescriptor(bat b);
-int BBPdir(int cnt, bat *subcommit);
void BBPhot(bat b);
int BBPin;
int BBPincref(bat b, int logical);
@@ -226,9 +225,9 @@ str BBPphysical(bat b, str buf);
BAT *BBPquickdesc(bat b, int delaccess);
int BBPreclaim(BAT *b);
int BBPrename(bat bid, const char *nme);
-int BBPsave(BAT *b);
+gdk_return BBPsave(BAT *b);
void BBPshare(bat b);
-int BBPsync(int cnt, bat *subcommit);
+gdk_return BBPsync(int cnt, bat *subcommit);
void BBPunlock(const char *s);
gdk_return BUNappend(BAT *b, const void *right, bit force);
gdk_return BUNdel(BAT *b, const void *left, const void *right, bit force);
@@ -245,7 +244,7 @@ int GDK_vm_trim;
int GDKatomcnt;
gdk_return GDKcreatedir(const char *nme);
int GDKdebug;
-int GDKerror(_In_z_ _Printf_format_string_ const char *format, ...)
__attribute__((__format__(__printf__, 1, 2)));
+void GDKerror(_In_z_ _Printf_format_string_ const char *format, ...)
__attribute__((__format__(__printf__, 1, 2)));
void GDKexit(int status) __attribute__((__noreturn__));
int GDKexiting(void);
void GDKfatal(_In_z_ _Printf_format_string_ const char *format, ...)
__attribute__((__format__(__printf__, 1, 2))) __attribute__((__noreturn__));
@@ -275,7 +274,7 @@ void GDKsetenv(str name, str value);
ssize_t GDKstrFromStr(unsigned char *dst, const unsigned char *src, ssize_t
len);
str GDKstrdup(const char *s) __attribute__((__warn_unused_result__));
str GDKstrndup(const char *s, size_t n)
__attribute__((__warn_unused_result__));
-int GDKsyserror(_In_z_ _Printf_format_string_ const char *format, ...)
__attribute__((__format__(__printf__, 1, 2)));
+void GDKsyserror(_In_z_ _Printf_format_string_ const char *format, ...)
__attribute__((__format__(__printf__, 1, 2)));
ThreadRec GDKthreads[THREADS];
gdk_return GDKupgradevarheap(COLrec *c, var_t v, int copyall, int mayshare);
lng GDKusec(void);
@@ -289,7 +288,7 @@ BUN HASHprobe(Hash *h, const void *v);
void HEAP_free(Heap *heap, var_t block);
void HEAP_initialize(Heap *heap, size_t nbytes, size_t nprivate, int
alignment);
var_t HEAP_malloc(Heap *heap, size_t nbytes);
-int HEAPextend(Heap *h, size_t size, int mayshare);
+gdk_return HEAPextend(Heap *h, size_t size, int mayshare);
size_t HEAPmemsize(Heap *h);
size_t HEAPvmsize(Heap *h);
lng IMPSimprintsize(BAT *b);
@@ -324,10 +323,10 @@ int THRhighwater(void);
Thread THRnew(str name);
int THRprintf(stream *s, _In_z_ _Printf_format_string_ const char *format,
...) __attribute__((__format__(__printf__, 2, 3)));
void THRsetdata(int, ptr);
-int TMabort(void);
-int TMcommit(void);
-int TMsubcommit(BAT *bl);
-int TMsubcommit_list(bat *subcommit, int cnt);
+gdk_return TMabort(void);
+gdk_return TMcommit(void);
+gdk_return TMsubcommit(BAT *bl);
+gdk_return TMsubcommit_list(bat *subcommit, int cnt);
void VALclear(ValPtr v);
int VALcmp(const ValRecord *p, const ValRecord *q);
ptr VALconvert(int typ, ValPtr t);
diff --git a/clients/mapiclient/Tests/mclient--help.stable.err
b/clients/mapiclient/Tests/mclient--help.stable.err
--- a/clients/mapiclient/Tests/mclient--help.stable.err
+++ b/clients/mapiclient/Tests/mclient--help.stable.err
@@ -21,7 +21,7 @@ Options are:
-E charset | --encoding=charset specify encoding (character set) of the
terminal
-f kind | --format=kind specify output format {csv,tab,raw,sql,xml}
-H | --history load/save cmdline history (default off)
- -i | --interactive[=tm] interpret \ commands on stdin, use time
formatting {ms,s,m}
+ -i | --interactive[=tm] interpret `\' commands on stdin, use time
formatting {ms,s,m}
-l language | --language=lang {sql,mal}
-L logfile | --log=logfile save client/server interaction
-s stmt | --statement=stmt run single statement
diff --git a/clients/mapiclient/Tests/mclient--help.stable.err.Windows
b/clients/mapiclient/Tests/mclient--help.stable.err.Windows
--- a/clients/mapiclient/Tests/mclient--help.stable.err.Windows
+++ b/clients/mapiclient/Tests/mclient--help.stable.err.Windows
@@ -21,7 +21,7 @@ Options are:
-E charset | --encoding=charset specify encoding (character set) of the
terminal
-f kind | --format=kind specify output format {csv,tab,raw,sql,xml}
-H | --history load/save cmdline history (default off)
- -i | --interactive[=tm] interpret \ commands on stdin, use time
formatting {ms,s,m}
+ -i | --interactive[=tm] interpret `\' commands on stdin, use time
formatting {ms,s,m}
-l language | --language=lang {sql,mal}
-L logfile | --log=logfile save client/server interaction
-s stmt | --statement=stmt run single statement
diff --git a/clients/mapiclient/eventparser.c b/clients/mapiclient/eventparser.c
--- a/clients/mapiclient/eventparser.c
+++ b/clients/mapiclient/eventparser.c
@@ -48,6 +48,10 @@ char *
stripQuotes(char *currentquery)
{ char *q, *c, *qry;
q = qry = (char *) malloc(strlen(currentquery) * 2);
+ if( q == NULL){
+ fprintf(stderr,"Could not allocate query buffer
of size "SZFMT"\n", strlen(currentquery) * 2);
+ exit(-1);
+ }
for (c= currentquery; *c; ){
if ( strncmp(c,"\\\\t",3) == 0){
*q++ = '\t';
@@ -98,6 +102,10 @@ parseArguments(char *call, int m)
break;
*c = 0;
malvariables[malvartop++] = strdup(v);
+ if( malvariables[malvartop-1] == NULL){
+ fprintf(stderr,"Could not allocate memory\n");
+ exit(-1);
+ }
*c = '=';
c++;
}
@@ -114,6 +122,10 @@ parseArguments(char *call, int m)
}
*l= 0;
malarguments[malargc] = strdup(c);
+ if( malarguments[malargc] == NULL){
+ fprintf(stderr,"Could not allocate memory\n");
+ exit(-1);
+ }
c= l+1;
// we skip to the type or end of term
while( *c && *c != ':' && *c !=',' && *c !=')' && *c !=
';') c++;
@@ -124,6 +136,10 @@ parseArguments(char *call, int m)
c++;
*c =0;
malarguments[malargc] = strdup(l);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
