MonetDB: Aug2018 - Fixed type checking for group_concat aggregat...
Changeset: 22ed846b388f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=22ed846b388f
Modified Files:
sql/server/rel_select.c
sql/test/group-concat/Tests/groupconcat01.sql
sql/test/group-concat/Tests/groupconcat01.stable.out
sql/test/group-concat/Tests/groupconcat05.sql
sql/test/group-concat/Tests/groupconcat05.stable.out
Branch: Aug2018
Log Message:
Fixed type checking for group_concat aggregation function. As this aggregate is
implemented for strings only, a proper cast should be made for other types.
diffs (207 lines):
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -3632,10 +3632,20 @@ static sql_exp *
if (!a && list_length(exps) > 1) {
sql_subtype *t1 = exp_subtype(exps->h->data);
a = sql_bind_member_aggr(sql->sa, s, aname,
exp_subtype(exps->h->data), list_length(exps));
-
- if (list_length(exps) != 2 || (!EC_NUMBER(t1->type->eclass) ||
!a || subtype_cmp(
+ bool is_group_concat = (!a && strcmp(s->base.name, "sys") == 0
&& strcmp(aname, "group_concat") == 0);
+
+ if (list_length(exps) != 2 || (!EC_NUMBER(t1->type->eclass) ||
!a || is_group_concat || subtype_cmp(
&((sql_arg*)a->aggr->ops->h->data)->type,
&((sql_arg*)a->aggr->ops->h->next->data)->type) != 0) ) {
+ if(!a && is_group_concat) {
+ sql_subtype *tstr = sql_bind_localtype("str");
+ list *sargs = sa_list(sql->sa);
+ if (list_length(exps) >= 1)
+ append(sargs, tstr);
+ if (list_length(exps) == 2)
+ append(sargs, tstr);
+ a = sql_bind_aggr_(sql->sa, s, aname, sargs);
+ }
if (a) {
node *n, *op = a->aggr->ops->h;
list *nexps = sa_list(sql->sa);
@@ -3651,7 +3661,7 @@ static sql_exp *
}
if (a && list_length(nexps)) /* count(col) has
|exps| != |nexps| */
exps = nexps;
- }
+ }
} else {
sql_exp *l = exps->h->data, *ol = l;
sql_exp *r = exps->h->next->data, *or = r;
diff --git a/sql/test/group-concat/Tests/groupconcat01.sql
b/sql/test/group-concat/Tests/groupconcat01.sql
--- a/sql/test/group-concat/Tests/groupconcat01.sql
+++ b/sql/test/group-concat/Tests/groupconcat01.sql
@@ -18,5 +18,6 @@ select a, group_concat(b) from testme gr
insert into testme values (5, ''), (4, 'nothing'), (5, ''), (3, '');
select a, group_concat(b) from testme group by a;
+select a, group_concat(a) from testme group by a;
rollback;
diff --git a/sql/test/group-concat/Tests/groupconcat01.stable.out
b/sql/test/group-concat/Tests/groupconcat01.stable.out
--- a/sql/test/group-concat/Tests/groupconcat01.stable.out
+++ b/sql/test/group-concat/Tests/groupconcat01.stable.out
@@ -128,6 +128,16 @@ Ready.
[ 3, NULL]
[ 4, NULL]
[ 5, "," ]
+#select a, group_concat(a) from testme group by a;
+% sys.testme, sys.L3 # table_name
+% a, L3 # name
+% int, clob # type
+% 1, 13 # length
+[ 1, "1,1,1,1" ]
+[ 2, "2,2,2,2" ]
+[ 3, "3,3,3,3,3,3,3" ]
+[ 4, "4,4,4" ]
+[ 5, "5,5" ]
#rollback;
# 14:11:33 >
diff --git a/sql/test/group-concat/Tests/groupconcat05.sql
b/sql/test/group-concat/Tests/groupconcat05.sql
--- a/sql/test/group-concat/Tests/groupconcat05.sql
+++ b/sql/test/group-concat/Tests/groupconcat05.sql
@@ -22,5 +22,10 @@ select a, group_concat(b, 'XyZ\n') from
select a, group_concat(b, NULL) from testmore group by a;
select group_concat(b, NULL) from testmore;
+select group_concat(a, NULL) from testmore;
+select group_concat(a, a) from testmore;
+select group_concat(a, 8) from testmore;
+select group_concat(a, b) from testmore;
+select group_concat(b, a) from testmore;
rollback;
diff --git a/sql/test/group-concat/Tests/groupconcat05.stable.out
b/sql/test/group-concat/Tests/groupconcat05.stable.out
--- a/sql/test/group-concat/Tests/groupconcat05.stable.out
+++ b/sql/test/group-concat/Tests/groupconcat05.stable.out
@@ -29,13 +29,13 @@ Ready.
#insert into testmore values (1, 'another'), (1, 'testing'), (1, 'todo');
[ 3]
#select a, group_concat(b, '!') from testmore group by a;
-% sys.testmore,sys.L4 # table_name
+% sys.testmore,sys.L3 # table_name
% a, L3 # name
% int, clob # type
% 1, 20 # length
[ 1, "another!testing!todo" ]
#select group_concat(b, '!') from testmore;
-% sys.L4 # table_name
+%
MonetDB: default - Use %s formats for #defined strings.
Changeset: 025c468b8c8b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=025c468b8c8b
Modified Files:
tools/mserver/monet_version.c.in
Branch: default
Log Message:
Use %s formats for #defined strings.
diffs (30 lines):
diff --git a/tools/mserver/monet_version.c.in b/tools/mserver/monet_version.c.in
--- a/tools/mserver/monet_version.c.in
+++ b/tools/mserver/monet_version.c.in
@@ -47,7 +47,7 @@ monet_version(void)
sz_mem_gb = (dbl)(MT_npages() * MT_pagesize()) / (1024.0 * 1024.0 *
1024.0);
cores = MT_check_nr_cores();
- printf("MonetDB 5 server v" VERSION " ");
+ printf("MonetDB 5 server v%s ", VERSION);
/* coverity[pointless_string_compare] */
if (strcmp(MONETDB_RELEASE, "unreleased") != 0)
printf("\"%s\" ", MONETDB_RELEASE);
@@ -63,7 +63,7 @@ monet_version(void)
if (strcmp(MONETDB_RELEASE, "unreleased") == 0)
printf("This is an unreleased version\n");
printf("Copyright (c) 1993 - July 2008 CWI\n"
- "Copyright (c) August 2008 - 2018 MonetDB B.V., all
rights reserved\n");
+ "Copyright (c) August 2008 - 2018 MonetDB B.V., all rights
reserved\n");
printf("Visit https://www.monetdb.org/ for further information\n");
printf("Found %.1fGiB available memory, %d available cpu core%s\n",
sz_mem_gb, cores, cores != 1 ? "s" : "");
@@ -95,7 +95,7 @@ monet_version(void)
/* no run-time version available, so only compile time */
printf(" libxml2: %s\n", LIBXML_DOTTED_VERSION);
#endif
- printf("Compiled by: %s (" HOST ")\n", "@builtby@");
+ printf("Compiled by: %s (%s)\n", "@builtby@", HOST);
printf("Compilation: %s\n", "@compilercall@");
printf("Linking: %s\n", "@linkercall@");
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Only define function if it's needed.
Changeset: 018e3441592c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=018e3441592c
Modified Files:
tools/mserver/monet_version.c.in
Branch: default
Log Message:
Only define function if it's needed.
diffs (19 lines):
diff --git a/tools/mserver/monet_version.c.in b/tools/mserver/monet_version.c.in
--- a/tools/mserver/monet_version.c.in
+++ b/tools/mserver/monet_version.c.in
@@ -26,6 +26,7 @@
#define STRING(a) # a
#define XSTRING(s) STRING(s)
+#if defined(HAVE_LIBPCRE) || defined(HAVE_OPENSSL)
static void
print_libversion(const char *lib, const char *rtvers, const char *cmvers)
{
@@ -34,6 +35,7 @@ print_libversion(const char *lib, const
printf(" (compiled with %s)", cmvers);
printf("\n");
}
+#endif
void
monet_version(void)
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Get compile-time library version numbers from...
Changeset: 868435d901af for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=868435d901af
Modified Files:
configure.ag
tools/mserver/monet_version.c.in
Branch: default
Log Message:
Get compile-time library version numbers from include files.
Also, only print both if they're different.
There was also a thinko in the run-time vs. compile-time version
number of OpenSSL and libxml2: we only printed the compile-time
version in two different ways. For libxml2, we don't actually have
access to the run-time version number.
diffs (102 lines):
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2667,18 +2667,6 @@ AM_CONDITIONAL([HAVE_DEVELOPER], [test "
AC_SUBST([compilercall], ["$CC $CFLAGS $X_CFLAGS"])
AC_SUBST([linkercall], ["$LD $LDFLAGS"])
AC_SUBST([builtby], ["${USER}@`hostname`"])
-pcreversion="not linked to any PCRE library"
-AS_VAR_IF([have_pcre], [yes], [
-pcreversion="compiled with `pkg-config --modversion libpcre
2>/dev/null`"])
-AC_SUBST([pcreversion])
-opensslversion="not linked to any openssl library"
-AS_VAR_IF([have_openssl], [yes], [
-opensslversion="compiled with `openssl version 2>/dev/null`"])
-AC_SUBST([opensslversion])
-libxml2version="not linked to any libxml2 library"
-AS_VAR_IF([have_libxml2], [yes], [
-libxml2version="compiled with `pkg-config --modversion libxml-2.0
2>/dev/null`"])
-AC_SUBST([libxml2version])
# provide different versions of the paths derived above
AS_VAR_IF([prefix], [NONE],
diff --git a/tools/mserver/monet_version.c.in b/tools/mserver/monet_version.c.in
--- a/tools/mserver/monet_version.c.in
+++ b/tools/mserver/monet_version.c.in
@@ -15,12 +15,26 @@
#include
#endif
#ifdef HAVE_OPENSSL
+#include
#include
+#include
#endif
#ifdef HAVE_LIBXML
#include
#endif
+#define STRING(a) # a
+#define XSTRING(s) STRING(s)
+
+static void
+print_libversion(const char *lib, const char *rtvers, const char *cmvers)
+{
+ printf(" %s: %s", lib, rtvers);
+ if (strcmp(rtvers, cmvers) != 0)
+ printf(" (compiled with %s)", cmvers);
+ printf("\n");
+}
+
void
monet_version(void)
{
@@ -56,31 +70,28 @@ monet_version(void)
GDKnr_threads, GDKnr_threads != 1 ? "s" : ""); */
printf("Libraries:\n");
#ifdef HAVE_LIBPCRE
- {
- char pcreversion[] = "@pcreversion@";
- printf(" libpcre: %s", pcre_version());
- if (*pcreversion)
- printf(" (%s)", pcreversion);
- printf("\n");
- }
+ /* PCRE_PRERELEASE may be defined as an empty value. In order
+* to get the proper amount of white space between various
+* parts of the version string on different compilers (none
+* between minor and prerelease, a single one between that
+* combination and the date), we need to resort to some
+* run-time trickery since we can't do it with the
+* preprocessor */
+ print_libversion("libpcre",
+pcre_version(),
+XSTRING(Z PCRE_PRERELEASE)[1] == 0
+? XSTRING(PCRE_MAJOR.PCRE_MINOR PCRE_DATE)
+: XSTRING(PCRE_MAJOR.PCRE_MINOR)
+ XSTRING(PCRE_PRERELEASE PCRE_DATE));
#endif
#ifdef HAVE_OPENSSL
- {
- char opensslversion[] = "@opensslversion@";
- printf(" openssl: %s", OPENSSL_VERSION_TEXT);
- if (*opensslversion)
- printf(" (%s)", opensslversion);
- printf("\n");
- }
+ print_libversion("openssl",
+OpenSSL_version(OPENSSL_VERSION),
+OPENSSL_VERSION_TEXT);
#endif
#ifdef HAVE_LIBXML
- {
- char libxml2version[] = "@libxml2version@";
- printf(" libxml2: %s", LIBXML_DOTTED_VERSION);
- if (*libxml2version)
- printf(" (%s)", libxml2version);
- printf("\n");
- }
+ /* no run-time version available, so only compile time */
+ printf(" libxml2: %s\n", LIBXML_DOTTED_VERSION);
#endif
printf("Compiled by: %s (" HOST ")\n", "@builtby@");
printf("Compilation: %s\n", "@compilercall@");
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge heads.
Changeset: 557099aecb6a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=557099aecb6a
Modified Files:
NT/monetdb_config.h.in
tools/mserver/mserver5.c
Branch: default
Log Message:
Merge heads.
diffs (47 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -80,9 +80,6 @@
/* Define if building universal (internal helper macro) */
/* #undef AC_APPLE_UNIVERSAL_BUILD */
-/* location where binaries are installed */
-/* #undef BINDIR */
-
/* read-only architecture-independent data */
#define DATA_DIR PREFIX "\\share"
@@ -95,6 +92,9 @@
/* architecture-dependent files */
#define EXEC_PREFIX PREFIX
+/* location where binaries are installed */
+#define BINDIR EXEC_PREFIX "\\bin"
+
/* Define to nothing if C supports flexible array members, and to 1 if it does
not. That way, with a declaration like `struct s { int n; double
d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -511,7 +511,19 @@ main(int argc, char **av)
* bin/mserver5 -> ../
* libX/monetdb5/lib/
* probe libX = lib, lib32, lib64, lib/64 */
- char *libdirs[] = { "lib", "lib64", "lib/64", "lib32", NULL };
+ size_t pref;
+ /* "remove" common prefix of configured BIN and LIB
+* directories from LIBDIR */
+ for (pref = 0; LIBDIR[pref] != 0 && BINDIR[pref] ==
LIBDIR[pref]; pref++)
+ ;
+ const char *libdirs[] = {
+ LIBDIR + pref,
+ "lib",
+ "lib64",
+ "lib/64",
+ "lib32",
+ NULL,
+ };
struct stat sb;
if (binpath != NULL) {
char *p = strrchr(binpath, DIR_SEP);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Aug2018 branch, not changing any f...
Changeset: 97f3e6a29c9c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=97f3e6a29c9c Modified Files: MonetDB.spec NT/monetdb_config.h.in NT/rules.msc clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag gdk/libbat.rc monetdb5/tools/libmonetdb5.rc vertoo.data Branch: default Log Message: Merge with Aug2018 branch, not changing any files.. ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Aug2018 - Post release build.
Changeset: 434c836ee7a7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=434c836ee7a7
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: Aug2018
Log Message:
Post release build.
diffs (229 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.31.9
+%global version 11.31.10
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -642,7 +642,7 @@
#define MONETDB5_PASSWDHASH_TOKEN SHA512
/* Release name or "unreleased" */
-#define MONETDB_RELEASE "Aug2018-SP1"
+#define MONETDB_RELEASE "unreleased"
/* Define if you do not want assertions */
/* #undef NDEBUG */
@@ -666,7 +666,7 @@
#define PACKAGE_URL "https://www.monetdb.org/;
/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.31.9"
+#define PACKAGE_VERSION "11.31.10"
/* Path separator */
#define PATH_SEP ';'
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -6,7 +6,7 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
-VERSION=11.31.9
+VERSION=11.31.10
# ^^
# Maintained via vertoo. Please don't modify by hand!
# Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,31,9,1
- PRODUCTVERSION 11,31,9,1
+ FILEVERSION 11,31,10,1
+ PRODUCTVERSION 11,31,10,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", "11.31.9\0"
+ VALUE "FileVersion", "11.31.10\0"
//
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
@@ -28,7 +28,7 @@ BEGIN
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", "11.31.9\0"
+ VALUE "ProductVersion", "11.31.10\0"
//
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,31,9,1
- PRODUCTVERSION 11,31,9,1
+ FILEVERSION 11,31,10,1
+ PRODUCTVERSION 11,31,10,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", "11.31.9\0"
+ VALUE "FileVersion", "11.31.10\0"
//
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
@@ -28,7 +28,7 @@ BEGIN
VALUE "OriginalFilename", "libMonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", "11.31.9\0"
+ VALUE "ProductVersion", "11.31.10\0"
//
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -62,8 +62,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 11,31,9,1
- PRODUCTVERSION 11,31,9,1
+ FILEVERSION 11,31,10,1
+ PRODUCTVERSION 11,31,10,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -80,12 +80,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", "11.31.9"
+VALUE "FileVersion", "11.31.10"
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2018"
MonetDB: default - Merge with Aug2018 branch.
Changeset: 5b74800dbdff for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5b74800dbdff
Modified Files:
.hgtags
MonetDB.spec
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Aug2018
debian/changelog
libversions
Branch: default
Log Message:
Merge with Aug2018 branch.
diffs (112 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -712,3 +712,5 @@ 3aaf6c916bd870cc478d3973241bc24cafbe1655
a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_7
3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_release
a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_release
+a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_9
+a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_SP1_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -108,7 +108,7 @@ Vendor: MonetDB BV
Group: Applications/Databases
License: MPLv2.0
URL: https://www.monetdb.org/
-Source:
https://www.monetdb.org/downloads/sources/Aug2018/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Aug2018-SP1/%{name}-%{version}.tar.bz2
# we need systemd for the _unitdir macro to exist
# we need checkpolicy and selinux-policy-devel for the SELinux policy
@@ -1038,6 +1038,18 @@ done
%postun -p /sbin/ldconfig
%changelog
+* Fri Oct 05 2018 Sjoerd Mullender - 11.31.9-20181005
+- Rebuilt.
+- BZ#6640: timestamp_to_str returning incorrectly adjusted results
+- BZ#6641: race condition in SQL UDF with update
+- BZ#6642: Hanging query
+- BZ#6646: Example SQLcopyinto.java does not work
+
+* Wed Oct 3 2018 Sjoerd Mullender - 11.31.9-20181005
+- buildtools: On Ubuntu 18.10 (Cosmic Cuttlefish), the libmonetdb5-server-bam
package
+ cannot be built because of an incompatibility in the libbam library
+ (it cannot be used in a shared object.
+
* Wed Aug 29 2018 Sjoerd Mullender - 11.31.7-20180829
- Rebuilt.
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,11 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Wed Oct 3 2018 Sjoerd Mullender - 11.31.9-20181005
+- On Ubuntu 18.10 (Cosmic Cuttlefish), the libmonetdb5-server-bam package
+ cannot be built because of an incompatibility in the libbam library
+ (it cannot be used in a shared object.
+
* Tue Aug 28 2018 Sjoerd Mullender - 11.31.5-20180829
- Build the MonetDB-cfitsio RPM and libmonetdb5-server-cfitsio
Debian/Ubuntu package.
diff --git a/buildtools/ChangeLog.Aug2018 b/buildtools/ChangeLog.Aug2018
--- a/buildtools/ChangeLog.Aug2018
+++ b/buildtools/ChangeLog.Aug2018
@@ -1,8 +1,3 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
-* Wed Oct 3 2018 Sjoerd Mullender
-- On Ubuntu 18.10 (Cosmic Cuttlefish), the libmonetdb5-server-bam package
- cannot be built because of an incompatibility in the libbam library
- (it cannot be used in a shared object.
-
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+monetdb (11.31.9) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#6640: timestamp_to_str returning incorrectly adjusted results
+ * BZ#6641: race condition in SQL UDF with update
+ * BZ#6642: Hanging query
+ * BZ#6646: Example SQLcopyinto.java does not work
+
+ -- Sjoerd Mullender Fri, 05 Oct 2018 09:50:02 +0200
+
+monetdb (11.31.9) unstable; urgency=low
+
+ * buildtools: On Ubuntu 18.10 (Cosmic Cuttlefish), the
libmonetdb5-server-bam package
+cannot be built because of an incompatibility in the libbam library
+(it cannot be used in a shared object.
+
+ -- Sjoerd Mullender Wed, 3 Oct 2018 09:50:02 +0200
+
monetdb (11.31.7) unstable; urgency=low
* Rebuilt.
diff --git a/libversions b/libversions
--- a/libversions
+++ b/libversions
@@ -36,13 +36,13 @@
# version of the GDK library (subdirectory gdk; also includes
# common/options and common/utils)
-GDK_VERSION=17:1:0
+GDK_VERSION=17:2:0
# version of the MAPI library (subdirectory clients/mapilib)
MAPI_VERSION=11:0:1
# version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=25:2:0
+MONETDB5_VERSION=25:3:0
# version of the STREAM library (subdirectory common/stream)
-STREAM_VERSION=12:0:1
+STREAM_VERSION=12:1:1
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Aug2018 - Setting tags Aug2018_9 and Aug2018_SP1 for th...
Changeset: 13bb8c7a5875 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=13bb8c7a5875 Modified Files: .hgtags Branch: Aug2018 Log Message: Setting tags Aug2018_9 and Aug2018_SP1 for the release build. diffs (9 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -712,3 +712,5 @@ 3aaf6c916bd870cc478d3973241bc24cafbe1655 a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_7 3aaf6c916bd870cc478d3973241bc24cafbe1655 Aug2018_release a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_release +a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_9 +a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_SP1_release ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Aug2018 - Moved contents of ChangeLog.Aug2018 to MonetD...
Changeset: a2d8e19ac9d6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a2d8e19ac9d6
Modified Files:
MonetDB.spec
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Aug2018
debian/changelog
Branch: Aug2018
Log Message:
Moved contents of ChangeLog.Aug2018 to MonetDB.spec, debian/changelog and
ChangeLog-Archive.
diffs (83 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -103,7 +103,7 @@ Vendor: MonetDB BV
Group: Applications/Databases
License: MPLv2.0
URL: https://www.monetdb.org/
-Source:
https://www.monetdb.org/downloads/sources/Aug2018/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Aug2018-SP1/%{name}-%{version}.tar.bz2
# we need systemd for the _unitdir macro to exist
# we need checkpolicy and selinux-policy-devel for the SELinux policy
@@ -997,6 +997,18 @@ done
%postun -p /sbin/ldconfig
%changelog
+* Fri Oct 05 2018 Sjoerd Mullender - 11.31.9-20181005
+- Rebuilt.
+- BZ#6640: timestamp_to_str returning incorrectly adjusted results
+- BZ#6641: race condition in SQL UDF with update
+- BZ#6642: Hanging query
+- BZ#6646: Example SQLcopyinto.java does not work
+
+* Wed Oct 3 2018 Sjoerd Mullender - 11.31.9-20181005
+- buildtools: On Ubuntu 18.10 (Cosmic Cuttlefish), the libmonetdb5-server-bam
package
+ cannot be built because of an incompatibility in the libbam library
+ (it cannot be used in a shared object.
+
* Wed Aug 29 2018 Sjoerd Mullender - 11.31.7-20180829
- Rebuilt.
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,11 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Wed Oct 3 2018 Sjoerd Mullender - 11.31.9-20181005
+- On Ubuntu 18.10 (Cosmic Cuttlefish), the libmonetdb5-server-bam package
+ cannot be built because of an incompatibility in the libbam library
+ (it cannot be used in a shared object.
+
* Tue Aug 28 2018 Sjoerd Mullender - 11.31.5-20180829
- Build the MonetDB-cfitsio RPM and libmonetdb5-server-cfitsio
Debian/Ubuntu package.
diff --git a/buildtools/ChangeLog.Aug2018 b/buildtools/ChangeLog.Aug2018
--- a/buildtools/ChangeLog.Aug2018
+++ b/buildtools/ChangeLog.Aug2018
@@ -1,8 +1,3 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
-* Wed Oct 3 2018 Sjoerd Mullender
-- On Ubuntu 18.10 (Cosmic Cuttlefish), the libmonetdb5-server-bam package
- cannot be built because of an incompatibility in the libbam library
- (it cannot be used in a shared object.
-
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+monetdb (11.31.9) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#6640: timestamp_to_str returning incorrectly adjusted results
+ * BZ#6641: race condition in SQL UDF with update
+ * BZ#6642: Hanging query
+ * BZ#6646: Example SQLcopyinto.java does not work
+
+ -- Sjoerd Mullender Fri, 05 Oct 2018 09:50:02 +0200
+
+monetdb (11.31.9) unstable; urgency=low
+
+ * buildtools: On Ubuntu 18.10 (Cosmic Cuttlefish), the
libmonetdb5-server-bam package
+cannot be built because of an incompatibility in the libbam library
+(it cannot be used in a shared object.
+
+ -- Sjoerd Mullender Wed, 3 Oct 2018 09:50:02 +0200
+
monetdb (11.31.7) unstable; urgency=low
* Rebuilt.
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Aug2018 - Updated library versions.
Changeset: 743cdda03d13 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=743cdda03d13 Modified Files: libversions Branch: Aug2018 Log Message: Updated library versions. diffs (20 lines): diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -36,13 +36,13 @@ # version of the GDK library (subdirectory gdk; also includes # common/options and common/utils) -GDK_VERSION=17:1:0 +GDK_VERSION=17:2:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=11:0:1 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=25:2:0 +MONETDB5_VERSION=25:3:0 # version of the STREAM library (subdirectory common/stream) -STREAM_VERSION=12:0:1 +STREAM_VERSION=12:1:1 ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Aug2018 branch, not changing any f...
Changeset: d7b6229b26a4 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d7b6229b26a4 Modified Files: MonetDB.spec NT/monetdb_config.h.in NT/rules.msc clients/mapilib/mapi.rc clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag gdk/libbat.rc monetdb5/tools/libmonetdb5.rc vertoo.data Branch: default Log Message: Merge with Aug2018 branch, not changing any files. ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Aug2018 - Pre-release version number update.
Changeset: f7ffa59caddb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f7ffa59caddb
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: Aug2018
Log Message:
Pre-release version number update.
diffs (229 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.31.8
+%global version 11.31.9
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -642,7 +642,7 @@
#define MONETDB5_PASSWDHASH_TOKEN SHA512
/* Release name or "unreleased" */
-#define MONETDB_RELEASE "unreleased"
+#define MONETDB_RELEASE "Aug2018-SP1"
/* Define if you do not want assertions */
/* #undef NDEBUG */
@@ -666,7 +666,7 @@
#define PACKAGE_URL "https://www.monetdb.org/;
/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.31.8"
+#define PACKAGE_VERSION "11.31.9"
/* Path separator */
#define PATH_SEP ';'
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -6,7 +6,7 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
-VERSION=11.31.8
+VERSION=11.31.9
# ^^
# Maintained via vertoo. Please don't modify by hand!
# Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,31,8,1
- PRODUCTVERSION 11,31,8,1
+ FILEVERSION 11,31,9,1
+ PRODUCTVERSION 11,31,9,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", "11.31.8\0"
+ VALUE "FileVersion", "11.31.9\0"
//
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
@@ -28,7 +28,7 @@ BEGIN
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", "11.31.8\0"
+ VALUE "ProductVersion", "11.31.9\0"
//
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -3,8 +3,8 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
1 VERSIONINFO
- FILEVERSION 11,31,8,1
- PRODUCTVERSION 11,31,8,1
+ FILEVERSION 11,31,9,1
+ PRODUCTVERSION 11,31,9,1
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,7 +18,7 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", "11.31.8\0"
+ VALUE "FileVersion", "11.31.9\0"
//
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
@@ -28,7 +28,7 @@ BEGIN
VALUE "OriginalFilename", "libMonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", "11.31.8\0"
+ VALUE "ProductVersion", "11.31.9\0"
//
// Maintained via vertoo. Please don't modify by hand!
// Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -62,8 +62,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 11,31,8,1
- PRODUCTVERSION 11,31,8,1
+ FILEVERSION 11,31,9,1
+ PRODUCTVERSION 11,31,9,1
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -80,12 +80,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", "11.31.8"
+VALUE "FileVersion", "11.31.9"
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2018"
MonetDB: data-vaults - Make sure that all the cases are covered
Changeset: 0e35894198e6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0e35894198e6
Modified Files:
sql/backends/monet5/vaults/lidar/lidar.c
Branch: data-vaults
Log Message:
Make sure that all the cases are covered
diffs (20 lines):
diff --git a/sql/backends/monet5/vaults/lidar/lidar.c
b/sql/backends/monet5/vaults/lidar/lidar.c
--- a/sql/backends/monet5/vaults/lidar/lidar.c
+++ b/sql/backends/monet5/vaults/lidar/lidar.c
@@ -1262,6 +1262,7 @@ readValue(LASPointH p, ParameterValues p
RetVal ret;
LASColorH color;
+ ret.val_bte = 0;
switch(param) {
case PARAM_X_COORD:
ret.val_dbl = LASPoint_GetX(p);
@@ -1314,7 +1315,7 @@ readValue(LASPointH p, ParameterValues p
color = LASPoint_GetColor(p);
ret.val_int = LASColor_GetRed(color);
break;
- case PARAM_VERTEX_INDEX:
+ default:
/* This data is implicit. Set the return value just for the
* compiler
*/
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: data-vaults - Approve after merge
Changeset: a2ef155c147f for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a2ef155c147f Modified Files: sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 Branch: data-vaults Log Message: Approve after merge diffs (108 lines): diff --git a/sql/test/emptydb/Tests/check.stable.out b/sql/test/emptydb/Tests/check.stable.out --- a/sql/test/emptydb/Tests/check.stable.out +++ b/sql/test/emptydb/Tests/check.stable.out @@ -2315,6 +2315,17 @@ drop function pcre_replace(string, strin [ "sys", "fuse", "SYSTEM", "create function fuse(one integer, two integer) returns bigint external name udf.fuse;","udf", "MAL", "Scalar function", false, false, false, "result", "bigint", 64, 0, "out", "one", "int", 32, 0, "in", "two", "int", 32, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL] [ "sys", "fuse", "SYSTEM", "create function fuse(one smallint, two smallint) returns integer external name udf.fuse;", "udf", "MAL", "Scalar function", false, false, false, "result", "int", 32, 0, "out", "one", "smallint", 16, 0, "in", "two", "smallint", 16, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL] [ "sys", "fuse", "SYSTEM", "create function fuse(one tinyint, two tinyint) returns smallint external name udf.fuse;", "udf", "MAL", "Scalar function", false, false, false, "result", "smallint", 16, 0, "out", "one", "tinyint", 8, 0, "in", "two", "tinyint", 8, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] +[ "sys", "gadgetanalyzetab", "SYSTEM", "create procedure gadgetanalyzetab(status int, tname string) external name gadget.analyzetab;", "gadget", "MAL", "Procedure",true, false, false, "status", "int", 32, 0, "in", "tname","clob", 0, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] +[ "sys", "gadgetattach", "SYSTEM", "create procedure gadgetattach(fname string) external name gadget.attach;", "gadget", "MAL", "Procedure",true, false, false, "fname","clob", 0, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL] +[ "sys",
MonetDB: data-vaults - Fix compilation errors
Changeset: 24bf9a4b447a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=24bf9a4b447a
Modified Files:
sql/backends/monet5/vaults/gadget/gadget.c
sql/backends/monet5/vaults/lidar/lidar.c
sql/backends/monet5/vaults/vault.c
Branch: data-vaults
Log Message:
Fix compilation errors
diffs (89 lines):
diff --git a/sql/backends/monet5/vaults/gadget/gadget.c
b/sql/backends/monet5/vaults/gadget/gadget.c
--- a/sql/backends/monet5/vaults/gadget/gadget.c
+++ b/sql/backends/monet5/vaults/gadget/gadget.c
@@ -72,14 +72,14 @@ gadgetInitCatalog(mvc *m)
gadget_fl = mvc_bind_table(m, sch, "gadget_files");
if (gadget_fl == NULL) {
-gadget_fl = mvc_create_table(m, sch, "gadget_files", tt_table, 0,
SQL_PERSIST, 0, 2);
+gadget_fl = mvc_create_table(m, sch, "gadget_files", tt_table, 0,
SQL_PERSIST, 0, 2, 0);
mvc_create_column_(m, gadget_fl, "id", "int", 32);
mvc_create_column_(m, gadget_fl, "name", "varchar", 80);
}
gadget_tbl = mvc_bind_table(m, sch, "gadget_tables");
if (gadget_tbl == NULL) {
-gadget_tbl = mvc_create_table(m, sch, "gadget_tables", tt_table, 0,
SQL_PERSIST, 0, 37);
+gadget_tbl = mvc_create_table(m, sch, "gadget_tables", tt_table, 0,
SQL_PERSIST, 0, 37, 0);
mvc_create_column_(m, gadget_tbl, "id", "int", 32);
mvc_create_column_(m, gadget_tbl, "file_id", "int", 32);
mvc_create_column_(m, gadget_tbl, "name", "varchar", 80);
@@ -121,7 +121,7 @@ gadgetInitCatalog(mvc *m)
gadget_col = mvc_bind_table(m, sch, "gadget_columns");
if (gadget_col == NULL) {
-gadget_col = mvc_create_table(m, sch, "gadget_columns", tt_table, 0,
SQL_PERSIST, 0, 15);
+gadget_col = mvc_create_table(m, sch, "gadget_columns", tt_table, 0,
SQL_PERSIST, 0, 15, 0);
mvc_create_column_(m, gadget_col, "id", "int", 32);
mvc_create_column_(m, gadget_col, "file_id", "int", 32);
mvc_create_column_(m, gadget_col, "table_id", "int", 32);
@@ -474,7 +474,7 @@ str gadgetListDirAll(Client cntxt, MalBl
/*Let's create a table per GadgetFile*/
if (i == 0) {
cnum = 9;//x, y, z. TODO: Add all available columnt
- tbl = mvc_create_table(m, sch, tname_low, tt_table, 0, SQL_PERSIST,
0, cnum);
+ tbl = mvc_create_table(m, sch, tname_low, tt_table, 0, SQL_PERSIST,
0, cnum, 0);
mvc_create_column_(m, tbl, "id", "bigint", 64);
mvc_create_column_(m, tbl, "posx", "real", 32);
mvc_create_column_(m, tbl, "posy", "real", 32);
@@ -836,7 +836,7 @@ str gadgetAttach(Client cntxt, MalBlkPtr
/*Let's create a table per GadgetFile*/
cnum = 9;//x, y, z. TODO: Add all available columnt
- tbl = mvc_create_table(m, sch, tname_low, tt_table, 0, SQL_PERSIST, 0,
cnum);
+ tbl = mvc_create_table(m, sch, tname_low, tt_table, 0, SQL_PERSIST, 0, cnum,
0);
mvc_create_column_(m, tbl, "id", "bigint", 64);
mvc_create_column_(m, tbl, "posx", "real", 32);
mvc_create_column_(m, tbl, "posy", "real", 32);
@@ -1024,7 +1024,7 @@ str gadgetAttachAll(Client cntxt, MalBlk
/*Let's create a table per GadgetFile*/
if (i == 2) {
cnum = 9;//x, y, z. TODO: Add all available columnt
- tbl = mvc_create_table(m, sch, tname_low, tt_table, 0, SQL_PERSIST, 0,
cnum);
+ tbl = mvc_create_table(m, sch, tname_low, tt_table, 0, SQL_PERSIST, 0,
cnum, 0);
mvc_create_column_(m, tbl, "id", "bigint", 64);
mvc_create_column_(m, tbl, "posx", "real", 32);
mvc_create_column_(m, tbl, "posy", "real", 32);
diff --git a/sql/backends/monet5/vaults/lidar/lidar.c
b/sql/backends/monet5/vaults/lidar/lidar.c
--- a/sql/backends/monet5/vaults/lidar/lidar.c
+++ b/sql/backends/monet5/vaults/lidar/lidar.c
@@ -278,7 +278,7 @@ LIDARinitCatalog(mvc *m)
vault_journal = mvc_bind_table(m, sch, "vault_journal");
if (vault_journal == NULL) {
- vault_journal = mvc_create_table(m, sch, "vault_journal",
tt_table, 0, SQL_PERSIST, 0, 4);
+ vault_journal = mvc_create_table(m, sch, "vault_journal",
tt_table, 0, SQL_PERSIST, 0, 4, 0);
mvc_create_column_(m, vault_journal, "table_id", "int", 32);
mvc_create_column_(m, vault_journal, "table_name", "varchar",
255);
mvc_create_column_(m, vault_journal, "vault_reader_id", "int",
32);
@@ -1107,7 +1107,7 @@ LIDARattach(Client cntxt, MalBlkPtr mb,
}
/* create an SQL table to hold the LIDAR table */
- tbl = mvc_create_table(m, sch, tname_low, tt_table, 0, SQL_PERSIST, 0,
input_params.cnum);
+ tbl = mvc_create_table(m, sch, tname_low, tt_table, 0, SQL_PERSIST, 0,
input_params.cnum, 0);
/* TODO Check for failure */
for (prm = 1; prm <= PARAM_INTENSITY; prm <<= 1) {
diff --git a/sql/backends/monet5/vaults/vault.c
b/sql/backends/monet5/vaults/vault.c
--- a/sql/backends/monet5/vaults/vault.c
+++ b/sql/backends/monet5/vaults/vault.c
@@ -599,7 +599,7 @@ VLTTid(Client cntxt, MalBlkPtr
MonetDB: data-vaults - Merge with default
Changeset: c8c17fa7ffd2 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c8c17fa7ffd2 Added Files: clients/R/Tests/deps-install.timeout debian/libmonetdb17.install debian/libmonetdb5-server-cfitsio.install debian/monetdb-python3.install sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh sql/jdbc/tests/Tests/SQLcopyinto.stable.err sql/jdbc/tests/Tests/SQLcopyinto.stable.out sql/server/rel_propagate.c sql/server/rel_propagate.h sql/server/sql_partition.c sql/server/sql_partition.h sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.sql sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.err sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.out sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.sql sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.err sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.out sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.sql sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.stable.err sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.stable.out sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.sql sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.err sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.out sql/test/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.sql sql/test/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.stable.err sql/test/BugTracker-2018/Tests/timestamp-as-boolean.Bug-6642.stable.out sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.sql sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.stable.err sql/test/BugTracker-2018/Tests/timestamp-roundtrip.Bug-6640.stable.out sql/test/merge-partitions/Tests/All sql/test/merge-partitions/Tests/mergepart00.sql sql/test/merge-partitions/Tests/mergepart00.stable.err sql/test/merge-partitions/Tests/mergepart00.stable.out sql/test/merge-partitions/Tests/mergepart01.sql sql/test/merge-partitions/Tests/mergepart01.stable.err sql/test/merge-partitions/Tests/mergepart01.stable.out sql/test/merge-partitions/Tests/mergepart02.sql sql/test/merge-partitions/Tests/mergepart02.stable.err sql/test/merge-partitions/Tests/mergepart02.stable.out sql/test/merge-partitions/Tests/mergepart03.sql sql/test/merge-partitions/Tests/mergepart03.stable.err sql/test/merge-partitions/Tests/mergepart03.stable.out sql/test/merge-partitions/Tests/mergepart04.sql sql/test/merge-partitions/Tests/mergepart04.stable.err sql/test/merge-partitions/Tests/mergepart04.stable.out sql/test/merge-partitions/Tests/mergepart05.sql sql/test/merge-partitions/Tests/mergepart05.stable.err sql/test/merge-partitions/Tests/mergepart05.stable.out sql/test/merge-partitions/Tests/mergepart06.sql sql/test/merge-partitions/Tests/mergepart06.stable.err sql/test/merge-partitions/Tests/mergepart06.stable.out sql/test/merge-partitions/Tests/mergepart07.sql sql/test/merge-partitions/Tests/mergepart07.stable.err sql/test/merge-partitions/Tests/mergepart07.stable.out sql/test/merge-partitions/Tests/mergepart08.sql sql/test/merge-partitions/Tests/mergepart08.stable.err sql/test/merge-partitions/Tests/mergepart08.stable.out sql/test/merge-partitions/Tests/mergepart09.sql sql/test/merge-partitions/Tests/mergepart09.stable.err sql/test/merge-partitions/Tests/mergepart09.stable.out sql/test/merge-partitions/Tests/mergepart10.sql sql/test/merge-partitions/Tests/mergepart10.stable.err sql/test/merge-partitions/Tests/mergepart10.stable.out sql/test/merge-partitions/Tests/mergepart11.sql sql/test/merge-partitions/Tests/mergepart11.stable.err sql/test/merge-partitions/Tests/mergepart11.stable.out sql/test/merge-partitions/Tests/mergepart12.sql sql/test/merge-partitions/Tests/mergepart12.stable.err sql/test/merge-partitions/Tests/mergepart12.stable.out sql/test/merge-partitions/Tests/mergepart13.sql sql/test/merge-partitions/Tests/mergepart13.stable.err sql/test/merge-partitions/Tests/mergepart13.stable.out sql/test/merge-partitions/Tests/mergepart14.sql sql/test/merge-partitions/Tests/mergepart14.stable.err sql/test/merge-partitions/Tests/mergepart14.stable.out sql/test/merge-partitions/Tests/mergepart15.sql
MonetDB: default - Use the configured libdir to set monet_mod_path.
Changeset: 5321aa5d67b0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5321aa5d67b0
Modified Files:
NT/monetdb_config.h.in
tools/mserver/mserver5.c
Branch: default
Log Message:
Use the configured libdir to set monet_mod_path.
We remove the common prefix from the configured libdir and bindir and
append that to the parent directory of where mserver5 was actually
called from.
This should do the job on Debian/Ubuntu when compiled using debhelper
compatibility level 9 and above.
diffs (47 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -80,9 +80,6 @@
/* Define if building universal (internal helper macro) */
/* #undef AC_APPLE_UNIVERSAL_BUILD */
-/* location where binaries are installed */
-/* #undef BINDIR */
-
/* read-only architecture-independent data */
#define DATA_DIR PREFIX "\\share"
@@ -95,6 +92,9 @@
/* architecture-dependent files */
#define EXEC_PREFIX PREFIX
+/* location where binaries are installed */
+#define BINDIR EXEC_PREFIX "\\bin"
+
/* Define to nothing if C supports flexible array members, and to 1 if it does
not. That way, with a declaration like `struct s { int n; double
d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -511,7 +511,19 @@ main(int argc, char **av)
* bin/mserver5 -> ../
* libX/monetdb5/lib/
* probe libX = lib, lib32, lib64, lib/64 */
- char *libdirs[] = { "lib", "lib64", "lib/64", "lib32", NULL };
+ size_t pref;
+ /* "remove" common prefix of configured BIN and LIB
+* directories from LIBDIR */
+ for (pref = 0; LIBDIR[pref] != 0 && BINDIR[pref] ==
LIBDIR[pref]; pref++)
+ ;
+ const char *libdirs[] = {
+ LIBDIR + pref,
+ "lib",
+ "lib64",
+ "lib/64",
+ "lib32",
+ NULL,
+ };
struct stat sb;
if (binpath != NULL) {
char *p = strrchr(binpath, DIR_SEP);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: analytics - Approve non-128bit build output.
Changeset: d4c3037ab922 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d4c3037ab922 Modified Files: clients/Tests/MAL-signatures.stable.out sql/test/Tests/systemfunctions.stable.out Branch: analytics Log Message: Approve non-128bit build output. diffs (truncated from 306 to 300 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -8380,7 +8380,6 @@ Ready. [ "batsql","avg", "pattern batsql.avg(b:bat[:bte], s:bat[:lng], e:bat[:lng]):bat[:dbl] ", "SQLavg;", "return the average of groups" ] [ "batsql","avg", "pattern batsql.avg(b:bat[:dbl], s:bat[:lng], e:bat[:lng]):bat[:dbl] ", "SQLavg;", "return the average of groups" ] [ "batsql","avg", "pattern batsql.avg(b:bat[:flt], s:bat[:lng], e:bat[:lng]):bat[:dbl] ", "SQLavg;", "return the average of groups" ] -[ "batsql","avg", "pattern batsql.avg(b:bat[:hge], s:bat[:lng], e:bat[:lng]):bat[:dbl] ", "SQLavg;", "return the average of groups" ] [ "batsql","avg", "pattern batsql.avg(b:bat[:int], s:bat[:lng], e:bat[:lng]):bat[:dbl] ", "SQLavg;", "return the average of groups" ] [ "batsql","avg", "pattern batsql.avg(b:bat[:lng], s:bat[:lng], e:bat[:lng]):bat[:dbl] ", "SQLavg;", "return the average of groups" ] [ "batsql","avg", "pattern batsql.avg(b:bat[:sht], s:bat[:lng], e:bat[:lng]):bat[:dbl] ", "SQLavg;", "return the average of groups" ] @@ -8420,17 +8419,12 @@ Ready. [ "batsql","ntile","pattern batsql.ntile(b:bat[:any_1], n:bat[:any_2], p:any_3, o:any_4):bat[:any_2] ","SQLntile;","return the groups divided as equally as possible" ] [ "batsql","password", "pattern batsql.password(user:bat[:str]):bat[:str] ", "db_password_wrap;","Return password hash of user" ] [ "batsql","percent_rank", "pattern batsql.percent_rank(b:bat[:any_1], p:any_2, o:any_3):bat[:dbl] ", "SQLpercent_rank;", "return the percentage into the total number of groups for each row"] -[ "batsql","prod", "pattern batsql.prod(b:bat[:bte], s:bat[:lng], e:bat[:lng]):bat[:hge] ","SQLprod;", "return the product of groups" ] [ "batsql","prod", "pattern batsql.prod(b:bat[:bte], s:bat[:lng], e:bat[:lng]):bat[:lng] ","SQLprod;", "return the product of groups" ] [ "batsql","prod", "pattern batsql.prod(b:bat[:dbl], s:bat[:lng], e:bat[:lng]):bat[:dbl] ","SQLprod;", "return the product of groups" ] [ "batsql","prod", "pattern batsql.prod(b:bat[:flt], s:bat[:lng], e:bat[:lng]):bat[:dbl] ","SQLprod;", "return the product of groups" ] [ "batsql","prod", "pattern batsql.prod(b:bat[:flt], s:bat[:lng], e:bat[:lng]):bat[:flt] ","SQLprod;", "return the product of groups" ] -[ "batsql","prod", "pattern batsql.prod(b:bat[:hge], s:bat[:lng], e:bat[:lng]):bat[:hge] ","SQLprod;", "return the product of groups" ] -[ "batsql","prod", "pattern batsql.prod(b:bat[:int], s:bat[:lng], e:bat[:lng]):bat[:hge] ","SQLprod;", "return the product of groups" ] [ "batsql","prod", "pattern batsql.prod(b:bat[:int], s:bat[:lng], e:bat[:lng]):bat[:lng] ","SQLprod;", "return the product of groups" ] -[ "batsql","prod", "pattern batsql.prod(b:bat[:lng], s:bat[:lng], e:bat[:lng]):bat[:hge] ","SQLprod;", "return the product of groups" ] [ "batsql","prod", "pattern batsql.prod(b:bat[:lng], s:bat[:lng], e:bat[:lng]):bat[:lng] ","SQLprod;", "return the product of groups" ] -[ "batsql","prod", "pattern batsql.prod(b:bat[:sht], s:bat[:lng], e:bat[:lng]):bat[:hge] ","SQLprod;", "return the product of groups" ] [ "batsql","prod", "pattern batsql.prod(b:bat[:sht], s:bat[:lng], e:bat[:lng]):bat[:lng] ","SQLprod;", "return the product of groups" ] [ "batsql","rank", "pattern batsql.rank(b:bat[:any_1], p:any_2, o:any_3):bat[:int] ", "SQLrank;", "return the ranked groups" ] [ "batsql","round","command batsql.round(v:bat[:bte], d:int, s:int, r:bte):bat[:bte] ","bte_bat_round_wrap;", "round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot)"] @@ -8440,71 +8434,58 @@ Ready. [ "batsql","round","command batsql.round(v:bat[:lng], d:int, s:int, r:bte):bat[:lng] ","lng_bat_round_wrap;", "round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot)"] [ "batsql","round","command batsql.round(v:bat[:sht], d:int, s:int, r:bte):bat[:sht] ","sht_bat_round_wrap;", "round off the decimal v(d,s) to r digits behind the dot (if r < 0, before the dot)"] [ "batsql","row_number", "pattern batsql.row_number(b:bat[:any_1], p:any_2, o:any_3):bat[:int] ",
MonetDB: analytics - Merge with default
Changeset: ccde0156d9aa for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ccde0156d9aa Modified Files: buildtools/ChangeLog.Aug2018 clients/Tests/MAL-signatures.stable.out debian/compat debian/control debian/fix-deb.sh debian/libmonetdb-client-dev.install debian/libmonetdb-client-odbc.install debian/libmonetdb-client10.install debian/libmonetdb-dev.install debian/libmonetdb-stream-dev.install debian/libmonetdb-stream11.install debian/libmonetdb17.install debian/libmonetdb5-server-bam.install debian/libmonetdb5-server-cfitsio.install debian/libmonetdb5-server-geom.install debian/libmonetdb5-server-lidar.install debian/monetdb-python2.install debian/monetdb-python3.install debian/monetdb-r.install debian/monetdb5-server-dev.install debian/monetdb5-server-hugeint.install debian/monetdb5-server.install debian/monetdb5-sql-hugeint.install debian/monetdb5-sql.install Branch: analytics Log Message: Merge with default diffs (truncated from 426 to 300 lines): diff --git a/buildtools/ChangeLog.Aug2018 b/buildtools/ChangeLog.Aug2018 --- a/buildtools/ChangeLog.Aug2018 +++ b/buildtools/ChangeLog.Aug2018 @@ -1,3 +1,8 @@ # ChangeLog file for buildtools # This file is updated with Maddlog +* Wed Oct 3 2018 Sjoerd Mullender +- On Ubuntu 18.10 (Cosmic Cuttlefish), the libmonetdb5-server-bam package + cannot be built because of an incompatibility in the libbam library + (it cannot be used in a shared object. + diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -5,10 +5,10 @@ stdout of test 'MAL-signatures` in direc # 21:44:50 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=33053" "--set" "mapi_usock=/var/tmp/mtest-13793/.s.monetdb.33053" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/home/sjoerd/Monet-devel/var/MonetDB/mTests_clients" "--set" "mal_listing=2" "--set" "embedded_r=yes" # 21:44:50 > -# MonetDB 5 server v11.20.0 +# MonetDB 5 server v11.32.0 # This is an unreleased version # Serving database 'mTests_clients', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers +# Compiled for x86_64-unknown-linux-gnu/64bit # Found 15.386 GiB available main-memory. # Copyright (c) 1993 - July 2008 CWI. # Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved @@ -5511,26 +5511,50 @@ Ready. [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:bte]):dbl ", "CMDcalcavg;", "average of non-nil values of B with candidates list" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:bte], s:bat[:oid]) (X_0:dbl, X_1:lng) ","CMDcalcavg;", "average and number of non-nil values of B with candidates list"] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:bte], s:bat[:oid]):dbl ", "CMDcalcavg;", "average of non-nil values of B"] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:bte], s:bat[:oid], scale:int) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B with candidates list"] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:bte], s:bat[:oid], scale:int):dbl ","CMDcalcavg;", "average of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:bte], scale:int) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:bte], scale:int):dbl ", "CMDcalcavg;", "average of non-nil values of B with candidates list" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:dbl]) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:dbl]):dbl ", "CMDcalcavg;", "average of non-nil values of B with candidates list" ] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:dbl], s:bat[:oid]) (X_0:dbl, X_1:lng) ","CMDcalcavg;", "average and number of non-nil values of B with candidates list"] [ "batcalc", "avg", "pattern batcalc.avg(b:bat[:dbl], s:bat[:oid]):dbl ", "CMDcalcavg;", "average of non-nil values of B"] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:dbl], s:bat[:oid], scale:int) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B with candidates list"] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:dbl], s:bat[:oid], scale:int):dbl ","CMDcalcavg;", "average of non-nil values of B" ] +[ "batcalc", "avg", "pattern batcalc.avg(b:bat[:dbl], scale:int) (X_0:dbl, X_1:lng) ", "CMDcalcavg;", "average and number of non-nil values of B" ] +[ "batcalc",
MonetDB: analytics - Approve new output
Changeset: 6ae778afafea for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6ae778afafea Modified Files: sql/test/analytics/Tests/analytics06.sql sql/test/analytics/Tests/analytics06.stable.out Branch: analytics Log Message: Approve new output diffs (35 lines): diff --git a/sql/test/analytics/Tests/analytics06.sql b/sql/test/analytics/Tests/analytics06.sql --- a/sql/test/analytics/Tests/analytics06.sql +++ b/sql/test/analytics/Tests/analytics06.sql @@ -9,7 +9,7 @@ with relation as (select row_number() ov select aa, bb, dd, count(aa) over (partition by bb rows between dd preceding and current row), count(aa) over (partition by bb rows between dd preceding and dd following), - count(aa) over (partition by bb rows between dd + 1 preceding and dd preceding) from relation where bb <> 1; + count(aa) over (partition by bb rows between dd + 1 preceding and dd preceding) from relation; rollback; diff --git a/sql/test/analytics/Tests/analytics06.stable.out b/sql/test/analytics/Tests/analytics06.stable.out --- a/sql/test/analytics/Tests/analytics06.stable.out +++ b/sql/test/analytics/Tests/analytics06.stable.out @@ -89,13 +89,13 @@ Ready. % aa, bb, dd, L20,L24,L30 # name % int, int,int,bigint, bigint, bigint # type % 2, 1, 1, 1, 1, 1 # length -[ 15, 0, 1, 1, 2, 0 ] -[ 15, 0, 1, 2, 3, 1 ] -[ 5, 0, 2, 3, 3, 1 ] -[ 15, 3, 1, 1, 2, 0 ] -[ 15, 3, 1, 2, 3, 1 ] +[ 3, 0, 4, 1, 2, 0 ] +[ NULL,0, 3, 1, 2, 0 ] +[ 8, 0, 6, 2, 2, 0 ] +[ 5, 3, 2, 1, 3, 0 ] +[ 6, 3, 5, 2, 3, 0 ] [ 15, 3, 1, 2, 2, 2 ] -[ NULL,4, 3, 0, 0, 0 ] +[ NULL,4, 7, 0, 0, 0 ] #rollback; #drop table testing; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: sample-with-seed - Merge with default.
Changeset: f36659c6df75 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f36659c6df75
Added Files:
clients/R/Tests/deps-install.timeout
sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat
sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh
sql/jdbc/tests/Tests/SQLcopyinto.stable.err
sql/jdbc/tests/Tests/SQLcopyinto.stable.out
Modified Files:
buildtools/ChangeLog.Aug2018
clients/R/Tests/dbapply.R
clients/R/Tests/deps-install.R
clients/R/Tests/deps-test.R
clients/R/Tests/deps-test.timeout
clients/R/Tests/dplyr-flights.R
clients/R/Tests/dplyr-flights.stable.err
clients/R/Tests/install.R
clients/Tests/MAL-signatures.stable.out
clients/mapiclient/tachograph.c
common/utils/mcrypt.c
configure.ag
debian/compat
debian/control
debian/fix-deb.sh
debian/libmonetdb-client-dev.install
debian/libmonetdb-client-odbc.install
debian/libmonetdb-client10.install
debian/libmonetdb-dev.install
debian/libmonetdb-stream-dev.install
debian/libmonetdb-stream11.install
debian/libmonetdb17.install
debian/libmonetdb5-server-bam.install
debian/libmonetdb5-server-cfitsio.install
debian/libmonetdb5-server-geom.install
debian/libmonetdb5-server-lidar.install
debian/monetdb-python2.install
debian/monetdb-python3.install
debian/monetdb-r.install
debian/monetdb5-server-dev.install
debian/monetdb5-server-hugeint.install
debian/monetdb5-server.install
debian/monetdb5-sql-hugeint.install
debian/monetdb5-sql.install
gdk/gdk_utils.c
monetdb5/mal/mal_linker.c
monetdb5/optimizer/opt_candidates.c
monetdb5/optimizer/opt_macro.c
monetdb5/optimizer/opt_profiler.c
monetdb5/optimizer/opt_querylog.c
sql/backends/monet5/UDF/pyapi/type_conversion.c
sql/backends/monet5/UDF/pyapi/type_conversion.h
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/vaults/shp/shp.c
sql/common/sql_types.c
sql/jdbc/tests/Tests/All
sql/server/rel_updates.c
sql/storage/store.c
sql/test/Tests/seq-default.stable.out
sql/test/seq-default.sql
sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128
testing/exportutils.py
Branch: sample-with-seed
Log Message:
Merge with default.
diffs (truncated from 1270 to 300 lines):
diff --git a/buildtools/ChangeLog.Aug2018 b/buildtools/ChangeLog.Aug2018
--- a/buildtools/ChangeLog.Aug2018
+++ b/buildtools/ChangeLog.Aug2018
@@ -1,3 +1,8 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Wed Oct 3 2018 Sjoerd Mullender
+- On Ubuntu 18.10 (Cosmic Cuttlefish), the libmonetdb5-server-bam package
+ cannot be built because of an incompatibility in the libbam library
+ (it cannot be used in a shared object.
+
diff --git a/clients/R/Tests/dbapply.R b/clients/R/Tests/dbapply.R
--- a/clients/R/Tests/dbapply.R
+++ b/clients/R/Tests/dbapply.R
@@ -1,3 +1,5 @@
+cat("#~BeginProfilingOutput~#\n", file=stderr())
+
if (Sys.getenv("TSTTRGDIR") != "") {
.libPaths(c(.libPaths(), paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")))
}
@@ -81,4 +83,6 @@ print(res)
dbRemoveTable(con,tname)
stopifnot(identical(FALSE, dbExistsTable(con,tname)))
+cat("#~EndProfilingOutput~#\n", file=stderr())
+
print("SUCCESS")
diff --git a/clients/R/Tests/deps-install.R b/clients/R/Tests/deps-install.R
--- a/clients/R/Tests/deps-install.R
+++ b/clients/R/Tests/deps-install.R
@@ -1,6 +1,6 @@
# autoinstall DBI and digest, we need those to install MonetDB.R
options(warn = -1)
-packages_required <- c("digest", "DBI")
+packages_required <- c("digest", "DBI", "devtools")
cat("#~BeginProfilingOutput~#\n", file=stderr())
cat("#~BeginProfilingOutput~#\n", file=stdout())
diff --git a/clients/R/Tests/deps-install.timeout
b/clients/R/Tests/deps-install.timeout
new file mode 100644
--- /dev/null
+++ b/clients/R/Tests/deps-install.timeout
@@ -0,0 +1,1 @@
+2
diff --git a/clients/R/Tests/deps-test.R b/clients/R/Tests/deps-test.R
--- a/clients/R/Tests/deps-test.R
+++ b/clients/R/Tests/deps-test.R
@@ -1,4 +1,4 @@
-packages_required <-
c("assertthat","testthat","survey","nycflights13","RSQLite","dbplyr","dplyr","gdata","callr","devtools","DBItest")
+packages_required <-
c("assertthat","testthat","survey","nycflights13","RSQLite","dbplyr","dplyr","gdata","callr","DBItest")
install_or_upgrade_packages <- function(lp) {
np <- lp[!(lp %in% installed.packages()[,"Package"])]
diff --git a/clients/R/Tests/deps-test.timeout
b/clients/R/Tests/deps-test.timeout
--- a/clients/R/Tests/deps-test.timeout
+++ b/clients/R/Tests/deps-test.timeout
@@ -1,1 +1,1 @@
-5
+20
diff --git a/clients/R/Tests/dplyr-flights.R b/clients/R/Tests/dplyr-flights.R
---
