MonetDB: trails - Fixed SQL grammar for start and resume continu...
Changeset: 7eeaf552e950 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7eeaf552e950
Modified Files:
sql/backends/monet5/sql_cquery.c
sql/server/sql_parser.y
Branch: trails
Log Message:
Fixed SQL grammar for start and resume continuous queries. Fixed the internal
behavior of STOP ALL and PAUSE ALL
diffs (truncated from 488 to 300 lines):
diff --git a/sql/backends/monet5/sql_cquery.c b/sql/backends/monet5/sql_cquery.c
--- a/sql/backends/monet5/sql_cquery.c
+++ b/sql/backends/monet5/sql_cquery.c
@@ -286,20 +286,19 @@ CQlocateMb(MalBlkPtr mb, int* idx, str*
break;
}
assert(i != mb->stop);
- mb2str = instruction2str(mb, NULL, sig, LIST_MAL_CALL);
- if(mb2str == NULL) {
- throw(MAL,call,MAL_MALLOC_FAIL);
+ if((mb2str = instruction2str(mb, NULL, sig, LIST_MAL_CALL)) == NULL) {
+ throw(SQL,call,MAL_MALLOC_FAIL);
}
for (i = 0; i < pnettop; i++){
if (strcmp(pnet[i].stmt, mb2str) == 0) {
- GDKfree(mb2str);
*idx = i;
+ *res = mb2str;
return MAL_SUCCEED;
}
}
+ *idx = i;
*res = mb2str;
- *idx = i;
return MAL_SUCCEED;
}
@@ -317,7 +316,7 @@ CQerror(Client cntxt, MalBlkPtr mb, MalS
idx = CQlocate(sch, fcn);
if( idx == pnettop)
- throw(SQL,"cquery.error","Continuous procedure %s.%s not
accessible",sch,fcn);
+ throw(SQL,"cquery.error","The continuous procedure %s.%s is not
accessible\n",sch,fcn);
pnet[idx].error = GDKstrdup(error);
return MAL_SUCCEED;
@@ -336,7 +335,7 @@ CQshow(Client cntxt, MalBlkPtr mb, MalSt
idx = CQlocate(sch, fcn);
if( idx == pnettop)
- throw(SQL,"cquery.show","continuous procedure %s.%s not
accessible",sch,fcn);
+ throw(SQL,"cquery.show","The continuous procedure %s.%s is not
accessible\n",sch,fcn);
printFunction(cntxt->fdout, pnet[idx].mb, 0, LIST_MAL_NAME |
LIST_MAL_VALUE | LIST_MAL_MAPI);
return MAL_SUCCEED;
@@ -535,7 +534,7 @@ CQprocedure(Client cntxt, MalBlkPtr mb,
return msg;
s = findSymbolInModule(cntxt->nspace, putName(nme));
if (s == NULL)
- throw(SQL, "cqeury.procedure", "Definition of procedure
missing");
+ throw(SQL, "cquery.procedure", "Definition of procedure
missing");
qry = s->def;
chkProgram(cntxt->fdout,cntxt->nspace,qry);
@@ -596,12 +595,12 @@ CQregister(Client cntxt, MalBlkPtr mb, M
(void) pci;
- if(cycles <= 0 && cycles != int_nil){
- msg = createException(SQL,"cquery.register","The cycles value
must be positive");
+ if(cycles < 0 && cycles != int_nil){
+ msg = createException(SQL,"cquery.register","The cycles value
must be non negative\n");
goto finish;
}
- if(heartbeats <= 0){
- msg = createException(SQL,"cquery.register","The heartbeats
value must be positive");
+ if(heartbeats < 0){
+ msg = createException(SQL,"cquery.register","The heartbeats
value must be non negative\n");
goto finish;
}
@@ -700,18 +699,22 @@ static str
CQresumeInternal(Client cntxt, MalBlkPtr mb, int with_alter)
{
mvc* sqlcontext = ((backend *) cntxt->sqlcontext)->mvc;
- str msg = MAL_SUCCEED, mb2str;
+ str msg = MAL_SUCCEED, mb2str = NULL;
int idx, cycles, heartbeats;
+#ifdef DEBUG_CQUERY
+ fprintf(stderr, "#resume scheduler\n");
+#endif
+
if(with_alter) {
cycles = sqlcontext ? sqlcontext->cycles : int_nil;
heartbeats = sqlcontext ? sqlcontext->heartbeats : 1;
- if(cycles <= 0 && cycles != int_nil){
- msg = createException(SQL,"cquery.resume","The cycles
value must be positive");
+ if(cycles < 0 && cycles != int_nil){
+ msg = createException(SQL,"cquery.resume","The cycles
value must be non negative\n");
goto finish;
}
- if(heartbeats <= 0){
- msg = createException(SQL,"cquery.resume","The
heartbeats value must be positive");
+ if(heartbeats < 0){
+ msg = createException(SQL,"cquery.resume","The
heartbeats value must be non negative\n");
goto finish;
}
}
@@ -722,16 +725,14 @@ CQresumeInternal(Client cntxt, MalBlkPtr
goto unlock;
}
if( idx == pnettop) {
- msg = createException(SQL, "cquery.resume", "continuous
procedure %s has not yet started\n", mb2str);
- GDKfree(mb2str);
+ msg = createException(SQL, "cquery.resume", "The continuous
procedure %s has not yet
MonetDB: Jul2017 - Backed out changeset 4af9c8a9bb37: it screws ...
Changeset: f003897c4d35 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f003897c4d35
Modified Files:
tools/merovingian/daemon/Makefile.ag
Branch: Jul2017
Log Message:
Backed out changeset 4af9c8a9bb37: it screws up Debian/Ubuntu builds.
diffs (18 lines):
diff --git a/tools/merovingian/daemon/Makefile.ag
b/tools/merovingian/daemon/Makefile.ag
--- a/tools/merovingian/daemon/Makefile.ag
+++ b/tools/merovingian/daemon/Makefile.ag
@@ -39,8 +39,14 @@ bin_monetdbd = {
multiplex-funnel.c multiplex-funnel.h \
proxy.c proxy.h
LIBS = ../utils/libmeroutil \
+ ../../../common/stream/libstream \
+ ../../../clients/mapilib/libmapi \
+ ../../../common/utils/libmcrypt \
+ ../../../common/utils/libmsabaoth \
+ ../../../common/utils/libmuuid \
../../../common/utils/libmutils \
../../../monetdb5/tools/libmonetdb5 \
+ ../../../gdk/libbat \
$(UUID_LIBS) \
$(openssl_LIBS) \
$(curl_LIBS) \
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: trails - Added defensive lines for allocations plus the...
Changeset: 3e75a249bbe3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3e75a249bbe3
Modified Files:
sql/backends/monet5/sql_cquery.c
sql/backends/monet5/sql_execute.c
Branch: trails
Log Message:
Added defensive lines for allocations plus the continuous procedures are
properly identified according to their parameters at start
diffs (truncated from 546 to 300 lines):
diff --git a/sql/backends/monet5/sql_cquery.c b/sql/backends/monet5/sql_cquery.c
--- a/sql/backends/monet5/sql_cquery.c
+++ b/sql/backends/monet5/sql_cquery.c
@@ -70,6 +70,8 @@ static int pnstatus = CQINIT;
static int cycleDelay = 200; /* be careful, it affects response/throughput
timings */
MT_Lock ttrLock MT_LOCK_INITIALIZER("cqueryLock");
+#define SET_HEARTBEATS(X) X * 1000 /* minimal 1 ms */
+
static void
CQfree(int idx)
{
@@ -87,7 +89,7 @@ CQfree(int idx)
}
/* We need a lock table for all stream tables considered
- * It is better to use a slot in the BATdescriptor
+ * It is better to use a slot in the BATdescriptor
* A sanity routine should be available to check for any forgotten lock frees.
*/
@@ -151,7 +153,7 @@ str
CQlog( Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
BAT *tickbat = 0, *modbat = 0, *fcnbat = 0, *timebat = 0, *errbat = 0;
bat *tickret, *modret, *fcnret, *timeret, *errorret;
-
+
(void) cntxt;
(void) mb;
@@ -200,7 +202,7 @@ CQstatus( Client cntxt, MalBlkPtr mb, Ma
bat *tickret = 0, *modret = 0, *fcnret = 0, *statusret = 0, *errorret =
0, *stmtret = 0;
int idx;
str msg= MAL_SUCCEED;
-
+
(void) cntxt;
(void) mb;
@@ -271,6 +273,36 @@ CQlocate(str modname, str fcnname)
return i;
}
+static str
+CQlocateMb(MalBlkPtr mb, int* idx, str* res, const char* call)
+{
+ int i;
+ InstrPtr sig = getInstrPtr(mb,0);
+ str mb2str;
+
+ for(i = 1; i< mb->stop; i++){
+ sig= getInstrPtr(mb,i);
+ if( getModuleId(sig) == userRef)
+ break;
+ }
+ assert(i != mb->stop);
+ mb2str = instruction2str(mb, NULL, sig, LIST_MAL_CALL);
+ if(mb2str == NULL) {
+ throw(MAL,call,MAL_MALLOC_FAIL);
+ }
+
+ for (i = 0; i < pnettop; i++){
+ if (strcmp(pnet[i].stmt, mb2str) == 0) {
+ GDKfree(mb2str);
+ *idx = i;
+ return MAL_SUCCEED;
+ }
+ }
+ *res = mb2str;
+ *idx = i;
+ return MAL_SUCCEED;
+}
+
/* capture and remember errors: WARNING no locks in this call yet! */
str
CQerror(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
@@ -285,7 +317,7 @@ CQerror(Client cntxt, MalBlkPtr mb, MalS
idx = CQlocate(sch, fcn);
if( idx == pnettop)
- throw(SQL,"cquery.error","Continuous procedure %s.%s not
accessible\n",sch,fcn);
+ throw(SQL,"cquery.error","Continuous procedure %s.%s not
accessible",sch,fcn);
pnet[idx].error = GDKstrdup(error);
return MAL_SUCCEED;
@@ -304,7 +336,7 @@ CQshow(Client cntxt, MalBlkPtr mb, MalSt
idx = CQlocate(sch, fcn);
if( idx == pnettop)
- throw(SQL,"cquery.show","Continuous procedure %s.%s not
accessible\n",sch,fcn);
+ throw(SQL,"cquery.show","continuous procedure %s.%s not
accessible",sch,fcn);
printFunction(cntxt->fdout, pnet[idx].mb, 0, LIST_MAL_NAME |
LIST_MAL_VALUE | LIST_MAL_MAPI);
return MAL_SUCCEED;
@@ -328,7 +360,7 @@ CQanalysis(Client cntxt, MalBlkPtr mb, i
sch = getVarConstant(mb, getArg(p,2)).val.sval;
tbl = getVarConstant(mb, getArg(p,3)).val.sval;
- // find the stream basket definition
+ // find the stream basket definition
bskt = BSKTlocate(sch,tbl);
if( bskt == 0){
msg = BSKTregisterInternal(cntxt,mb,sch,tbl);
@@ -365,7 +397,7 @@ CQanalysis(Client cntxt, MalBlkPtr mb, i
sch = getVarConstant(mb, getArg(p,1)).val.sval;
tbl = getVarConstant(mb, getArg(p,2)).val.sval;
- // find the stream basket definition
+ // find the stream basket definition
bskt = BSKTlocate(sch,tbl);
if( bskt == 0){
msg = BSKTregisterInternal(cntxt,mb,sch,tbl);
@@ -422,7 +454,6 @@ CQprocedureStmt(Client cntxt, MalBlkPtr
return createException(SQL,"cquery.register","SQL procedure missing");
}
-
static str
CQregisterInternal(Client cntxt, str modnme, str fcnnme)
{
@@ -443,7 +474,7 @@ CQregisterInternal(Client cntxt, str mod
mb = s->def;
sig = getInstrPtr(mb,0);
- if (pnettop == MAXCQ)
+ if (pnettop == MAXCQ)
return
MonetDB: Jul2017 - Post release build.
Changeset: ddf27f1960a0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ddf27f1960a0
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: Jul2017
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 @@
%define name MonetDB
-%define version 11.27.3
+%define version 11.27.4
%{!?buildno: %global buildno %(date +%Y%m%d)}
# groups of related archs
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
@@ -756,7 +756,7 @@
#define MONETDB5_PASSWDHASH_TOKEN SHA512
/* Release name or "unreleased" */
-#define MONETDB_RELEASE "Jul2017-SP1"
+#define MONETDB_RELEASE "unreleased"
/* Suffix for C++ files */
#define MX_CXX_SUFFIX "cxx"
@@ -768,7 +768,7 @@
#define PACKAGE "MonetDB"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.27.3"
+#define PACKAGE_VERSION "11.27.4"
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "https://bugs.monetdb.org/;
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 - 2017 MonetDB B.V.
-VERSION=11.27.3
+VERSION=11.27.4
# ^^
# 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,27,3,1
- PRODUCTVERSION 11,27,3,1
+ FILEVERSION 11,27,4,1
+ PRODUCTVERSION 11,27,4,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.27.3\0"
+ VALUE "FileVersion", "11.27.4\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.27.3\0"
+ VALUE "ProductVersion", "11.27.4\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,27,3,1
- PRODUCTVERSION 11,27,3,1
+ FILEVERSION 11,27,4,1
+ PRODUCTVERSION 11,27,4,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.27.3\0"
+ VALUE "FileVersion", "11.27.4\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.27.3\0"
+ VALUE "ProductVersion", "11.27.4\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,27,3,1
- PRODUCTVERSION 11,27,3,1
+ FILEVERSION 11,27,4,1
+ PRODUCTVERSION 11,27,4,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.27.3"
+VALUE "FileVersion", "11.27.4"
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2017"
MonetDB: default - Merge with Jul2017 branch, not changing any f...
Changeset: 5fb4254154c3 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5fb4254154c3 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 Jul2017 branch, not changing any files.. ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jul2017 - Setting tags Jul2017_3 and Jul2017_SP1 for th...
Changeset: 038196fc48b4 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=038196fc48b4 Modified Files: .hgtags Branch: Jul2017 Log Message: Setting tags Jul2017_3 and Jul2017_SP1 for the release build. diffs (9 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -675,3 +675,5 @@ 8b3d3f7c487cb6e34dab1167797a61862cba2124 8b3d3f7c487cb6e34dab1167797a61862cba2124 Dec2016_SP5_release e6552cdd3180bcd35f959954807cab986a6042a5 Jul2017_1 e6552cdd3180bcd35f959954807cab986a6042a5 Jul2017_release +1534ee14ff84fe5629becc6a5b5e2990b694d5a3 Jul2017_3 +1534ee14ff84fe5629becc6a5b5e2990b694d5a3 Jul2017_SP1_release ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jul2017 branch.
Changeset: 245256a6a70d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=245256a6a70d
Modified Files:
.hgtags
MonetDB.spec
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Jul2017
debian/changelog
gdk/ChangeLog-Archive
gdk/ChangeLog.Jul2017
libversions
tools/merovingian/ChangeLog-Archive
tools/merovingian/ChangeLog.Jul2017
Branch: default
Log Message:
Merge with Jul2017 branch.
diffs (249 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -675,3 +675,5 @@ 8b3d3f7c487cb6e34dab1167797a61862cba2124
8b3d3f7c487cb6e34dab1167797a61862cba2124 Dec2016_SP5_release
e6552cdd3180bcd35f959954807cab986a6042a5 Jul2017_1
e6552cdd3180bcd35f959954807cab986a6042a5 Jul2017_release
+1534ee14ff84fe5629becc6a5b5e2990b694d5a3 Jul2017_3
+1534ee14ff84fe5629becc6a5b5e2990b694d5a3 Jul2017_SP1_release
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -132,7 +132,7 @@ Vendor: MonetDB BV <i...@monetdb.org>
Group: Applications/Databases
License: MPLv2.0
URL: https://www.monetdb.org/
-Source:
https://www.monetdb.org/downloads/sources/Jul2017/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Jul2017-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
@@ -1039,6 +1039,43 @@ done
%postun -p /sbin/ldconfig
%changelog
+* Tue Jul 25 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- Rebuilt.
+- BZ#6325: Merge table unusable in other connections
+- BZ#6328: Transactional/multi-connection issues with merge tables
+- BZ#6336: VALUES multiple inserts error
+- BZ#6339: Mserver5 crashes on nested SELECT
+- BZ#6340: sample operator takes effect after the execution of the query,
+ expected before
+- BZ#6341: MERGE TABLE issue: Cannot register
+- BZ#6342: MERGE TABLE issue: hang
+- BZ#6344: Spurious errors and assertions (SQLsmith)
+
+* Mon Jul 24 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- buildtools: The Debian and Ubuntu installers have been fixed: there was a
file
+ missing in the Jul2017 release.
+
+* Fri Jul 14 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- buildtools: Added a new RPM called MonetDB-selinux which provides the SELinux
+ policy required to run MonetDB under systemd, especially on Fedora 26.
+
+* Fri Jul 14 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- merovingian: monetdbd was leaking open file descriptors to the mserver5
process
+ it started. This has been fixed.
+
+* Fri Jul 7 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- buildtools: The Windows installers (*.msi files) are now created using the
WiX
+ Toolset.
+- buildtools: The Windows binaries are now built using Visual Studio 2015.
Because of
+ this, you may need to install the Visual C++ Redistributable for Visual
+ Studio 2015 before being able to run MonetDB.
+
+* Fri Jul 7 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- gdk: Many functions in GDK are now annotated with the GCC attribute
+ __warn_unused_result__ meaning that the compiler will issue a warning
+ if the result of the function (usually an indication of an error)
+ is not used.
+
* Wed Jul 05 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.1-20170705
- Rebuilt.
- BZ#3465: Request: add support for CREATE VIEW with ORDER BY clause
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,21 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Mon Jul 24 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- The Debian and Ubuntu installers have been fixed: there was a file
+ missing in the Jul2017 release.
+
+* Fri Jul 14 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- Added a new RPM called MonetDB-selinux which provides the SELinux
+ policy required to run MonetDB under systemd, especially on Fedora 26.
+
+* Fri Jul 7 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- The Windows installers (*.msi files) are now created using the WiX
+ Toolset.
+- The Windows binaries are now built using Visual Studio 2015. Because of
+ this, you may need to install the Visual C++ Redistributable for Visual
+ Studio 2015 before being able to run MonetDB.
+
* Tue Dec 6 2016 Sjoerd Mullender <sjo...@acm.org> - 11.25.1-20161214
- New packages MonetDB-python2 (Fedora) and monetdb-python2 (Debian/Ubuntu)
have been created for Python 2 integration into MonetDB.
diff --git a/buildtools/ChangeLog.Jul2017 b/buildtools/ChangeLog.Jul2017
--- a/buildtools/ChangeLog.Jul2017
+++ b/buildtools/ChangeLog.Jul2017
@@ -1,18 +1,3 @@
# ChangeLog file for buildtools
# This file is up
MonetDB: Jul2017 - Updated library versions.
Changeset: c0fa44860cf1 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c0fa44860cf1 Modified Files: libversions Branch: Jul2017 Log Message: Updated library versions. diffs (21 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=15:0:0 +GDK_VERSION=15:1:0 # version of the MAPI library (subdirectory clients/mapilib) -MAPI_VERSION=9:0:0 +MAPI_VERSION=9:1:0 # version of the MONETDB5 library (subdirectory monetdb5, not including extras) -MONETDB5_VERSION=23:0:0 +MONETDB5_VERSION=23:1:0 # version of the STREAM library (subdirectory common/stream) -STREAM_VERSION=10:0:2 +STREAM_VERSION=10:1:2 ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jul2017 - Moved contents of ChangeLog.Jul2017 to MonetD...
Changeset: 1534ee14ff84 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1534ee14ff84
Modified Files:
MonetDB.spec
buildtools/ChangeLog-Archive
buildtools/ChangeLog.Jul2017
debian/changelog
gdk/ChangeLog-Archive
gdk/ChangeLog.Jul2017
tools/merovingian/ChangeLog-Archive
tools/merovingian/ChangeLog.Jul2017
Branch: Jul2017
Log Message:
Moved contents of ChangeLog.Jul2017 to MonetDB.spec, debian/changelog and
ChangeLog-Archive.
diffs (219 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -132,7 +132,7 @@ Vendor: MonetDB BV <i...@monetdb.org>
Group: Applications/Databases
License: MPLv2.0
URL: https://www.monetdb.org/
-Source:
https://www.monetdb.org/downloads/sources/Jul2017/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Jul2017-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
@@ -1039,6 +1039,43 @@ done
%postun -p /sbin/ldconfig
%changelog
+* Tue Jul 25 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- Rebuilt.
+- BZ#6325: Merge table unusable in other connections
+- BZ#6328: Transactional/multi-connection issues with merge tables
+- BZ#6336: VALUES multiple inserts error
+- BZ#6339: Mserver5 crashes on nested SELECT
+- BZ#6340: sample operator takes effect after the execution of the query,
+ expected before
+- BZ#6341: MERGE TABLE issue: Cannot register
+- BZ#6342: MERGE TABLE issue: hang
+- BZ#6344: Spurious errors and assertions (SQLsmith)
+
+* Mon Jul 24 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- buildtools: The Debian and Ubuntu installers have been fixed: there was a
file
+ missing in the Jul2017 release.
+
+* Fri Jul 14 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- buildtools: Added a new RPM called MonetDB-selinux which provides the SELinux
+ policy required to run MonetDB under systemd, especially on Fedora 26.
+
+* Fri Jul 14 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- merovingian: monetdbd was leaking open file descriptors to the mserver5
process
+ it started. This has been fixed.
+
+* Fri Jul 7 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- buildtools: The Windows installers (*.msi files) are now created using the
WiX
+ Toolset.
+- buildtools: The Windows binaries are now built using Visual Studio 2015.
Because of
+ this, you may need to install the Visual C++ Redistributable for Visual
+ Studio 2015 before being able to run MonetDB.
+
+* Fri Jul 7 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- gdk: Many functions in GDK are now annotated with the GCC attribute
+ __warn_unused_result__ meaning that the compiler will issue a warning
+ if the result of the function (usually an indication of an error)
+ is not used.
+
* Wed Jul 05 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.1-20170705
- Rebuilt.
- BZ#3465: Request: add support for CREATE VIEW with ORDER BY clause
diff --git a/buildtools/ChangeLog-Archive b/buildtools/ChangeLog-Archive
--- a/buildtools/ChangeLog-Archive
+++ b/buildtools/ChangeLog-Archive
@@ -1,6 +1,21 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Mon Jul 24 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- The Debian and Ubuntu installers have been fixed: there was a file
+ missing in the Jul2017 release.
+
+* Fri Jul 14 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- Added a new RPM called MonetDB-selinux which provides the SELinux
+ policy required to run MonetDB under systemd, especially on Fedora 26.
+
+* Fri Jul 7 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.3-20170725
+- The Windows installers (*.msi files) are now created using the WiX
+ Toolset.
+- The Windows binaries are now built using Visual Studio 2015. Because of
+ this, you may need to install the Visual C++ Redistributable for Visual
+ Studio 2015 before being able to run MonetDB.
+
* Tue Dec 6 2016 Sjoerd Mullender <sjo...@acm.org> - 11.25.1-20161214
- New packages MonetDB-python2 (Fedora) and monetdb-python2 (Debian/Ubuntu)
have been created for Python 2 integration into MonetDB.
diff --git a/buildtools/ChangeLog.Jul2017 b/buildtools/ChangeLog.Jul2017
--- a/buildtools/ChangeLog.Jul2017
+++ b/buildtools/ChangeLog.Jul2017
@@ -1,18 +1,3 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
-* Mon Jul 24 2017 Sjoerd Mullender <sjo...@acm.org>
-- The Debian and Ubuntu installers have been fixed: there was a file
- missing in the Jul2017 release.
-
-* Fri Jul 14 2017 Sjoerd Mullender <sjo...@acm.org>
-- Added a new RPM called MonetDB-selinux which provides the SELinux
- policy required to run MonetDB under systemd, especially on Fedora
MonetDB: Jul2017 - Pre-release version number update.
Changeset: 9ffe09a3c68b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9ffe09a3c68b
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: Jul2017
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 @@
%define name MonetDB
-%define version 11.27.2
+%define version 11.27.3
%{!?buildno: %global buildno %(date +%Y%m%d)}
# groups of related archs
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
@@ -756,7 +756,7 @@
#define MONETDB5_PASSWDHASH_TOKEN SHA512
/* Release name or "unreleased" */
-#define MONETDB_RELEASE "unreleased"
+#define MONETDB_RELEASE "Jul2017-SP1"
/* Suffix for C++ files */
#define MX_CXX_SUFFIX "cxx"
@@ -768,7 +768,7 @@
#define PACKAGE "MonetDB"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.27.2"
+#define PACKAGE_VERSION "11.27.3"
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "https://bugs.monetdb.org/;
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 - 2017 MonetDB B.V.
-VERSION=11.27.2
+VERSION=11.27.3
# ^^
# 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,27,2,1
- PRODUCTVERSION 11,27,2,1
+ FILEVERSION 11,27,3,1
+ PRODUCTVERSION 11,27,3,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.27.2\0"
+ VALUE "FileVersion", "11.27.3\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.27.2\0"
+ VALUE "ProductVersion", "11.27.3\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,27,2,1
- PRODUCTVERSION 11,27,2,1
+ FILEVERSION 11,27,3,1
+ PRODUCTVERSION 11,27,3,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.27.2\0"
+ VALUE "FileVersion", "11.27.3\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.27.2\0"
+ VALUE "ProductVersion", "11.27.3\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,27,2,1
- PRODUCTVERSION 11,27,2,1
+ FILEVERSION 11,27,3,1
+ PRODUCTVERSION 11,27,3,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.27.2"
+VALUE "FileVersion", "11.27.3"
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright © MonetDB B.V.
MonetDB: default - Merge with Jul2017 branch, not changing any f...
Changeset: c8307c8d8053 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c8307c8d8053 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 Jul2017 branch, not changing any files. ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Jul2017 branch.
Changeset: 17bc8fa2be26 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=17bc8fa2be26 Modified Files: sql/test/Tests/systemfunctions.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/check.stable.out sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade/Tests/check.stable.out sql/test/emptydb-upgrade/Tests/check.stable.out.32bit sql/test/emptydb-upgrade/Tests/check.stable.out.int128 sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit testing/malcheck.py Branch: default Log Message: Merge with Jul2017 branch. diffs (truncated from 641 to 300 lines): diff --git a/sql/test/Tests/systemfunctions.stable.out b/sql/test/Tests/systemfunctions.stable.out --- a/sql/test/Tests/systemfunctions.stable.out +++ b/sql/test/Tests/systemfunctions.stable.out @@ -3301,6 +3301,15 @@ Ready. [ "sys", "sql_div", 0, "bigint", "/" ] [ "sys", "sql_div", 1, "bigint", "" ] [ "sys", "sql_div", 2, "int", "" ] +[ "sys", "sql_div", 0, "decimal", "/" ] +[ "sys", "sql_div", 1, "decimal", "" ] +[ "sys", "sql_div", 2, "decimal", "" ] +[ "sys", "sql_div", 0, "decimal", "/" ] +[ "sys", "sql_div", 1, "decimal", "" ] +[ "sys", "sql_div", 2, "decimal", "" ] +[ "sys", "sql_div", 0, "decimal", "/" ] +[ "sys", "sql_div", 1, "decimal", "" ] +[ "sys", "sql_div", 2, "decimal", "" ] [ "sys", "sql_div", 0, "oid", "/" ] [ "sys", "sql_div", 1, "oid", "" ] [ "sys", "sql_div", 2, "oid", "" ] @@ -3432,6 +3441,15 @@ Ready. [ "sys", "sql_mul", 0, "bigint", "*" ] [ "sys", "sql_mul", 1, "bigint", "" ] [ "sys", "sql_mul", 2, "int", "" ] +[ "sys", "sql_mul", 0, "decimal", "*" ] +[ "sys", "sql_mul", 1, "decimal", "" ] +[ "sys", "sql_mul", 2, "decimal", "" ] +[ "sys", "sql_mul", 0, "decimal", "*" ] +[ "sys", "sql_mul", 1, "decimal", "" ] +[ "sys", "sql_mul", 2, "decimal", "" ] +[ "sys", "sql_mul", 0, "decimal", "*" ] +[ "sys", "sql_mul", 1, "decimal", "" ] +[ "sys", "sql_mul", 2, "decimal", "" ] [ "sys", "sql_mul", 0, "oid", "*" ] [ "sys", "sql_mul", 1, "oid", "" ] [ "sys", "sql_mul", 2, "oid", "" ] diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 @@ -3074,8 +3074,14 @@ drop function pcre_replace(string, strin [ "sys", "sql_div", "/","calc", 0, "function", false, false, false, "res_0","bigint", 64, 0, "out", "arg_1","bigint", 64, 0, "in", "arg_2", "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", "sql_div", "/","calc", 0, "function", false, false, false, "res_0","decimal", 2, 0, "out", "arg_1","decimal", 2, 0, "in", "arg_2", "decimal", 2, 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,
MonetDB: trails - Added stop, resume and pause all continuous qu...
Changeset: b6f92f25fc4d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b6f92f25fc4d
Modified Files:
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
sql/backends/monet5/cquery.mal
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_cat.h
sql/backends/monet5/sql_cquery.c
sql/backends/monet5/sql_cquery.h
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sqlcatalog.mal
sql/include/sql_relation.h
sql/server/rel_psm.c
sql/server/rel_schema.c
sql/server/rel_semantic.c
sql/server/sql_mvc.h
sql/server/sql_parser.h
sql/server/sql_parser.y
Branch: trails
Log Message:
Added stop, resume and pause all continuous queries. Resuming a single
continuous query with either setting heartbeats, cycles or not is also possible
diffs (truncated from 513 to 300 lines):
diff --git a/monetdb5/optimizer/opt_prelude.c b/monetdb5/optimizer/opt_prelude.c
--- a/monetdb5/optimizer/opt_prelude.c
+++ b/monetdb5/optimizer/opt_prelude.c
@@ -81,6 +81,7 @@ str subcountRef;
str copyRef;
str copy_fromRef;
str export_tableRef;
+str change_cpRef;
str count_no_nilRef;
str crossRef;
str createRef;
@@ -408,6 +409,7 @@ void optimizerInit(void)
drop_roleRef = putName("drop_role");
drop_userRef = putName("drop_user");
drop_indexRef = putName("drop_index");
+ change_cpRef = putName("change_cp");
drop_functionRef = putName("drop_function");
drop_triggerRef = putName("drop_trigger");
mergecandRef= putName("mergecand");
diff --git a/monetdb5/optimizer/opt_prelude.h b/monetdb5/optimizer/opt_prelude.h
--- a/monetdb5/optimizer/opt_prelude.h
+++ b/monetdb5/optimizer/opt_prelude.h
@@ -110,6 +110,7 @@ mal_export str drop_userRef;
mal_export str drop_roleRef;
mal_export str drop_userRef;
mal_export str drop_indexRef;
+mal_export str change_cpRef;
mal_export str drop_functionRef;
mal_export str drop_triggerRef;
mal_export str subdiffRef;
diff --git a/sql/backends/monet5/cquery.mal b/sql/backends/monet5/cquery.mal
--- a/sql/backends/monet5/cquery.mal
+++ b/sql/backends/monet5/cquery.mal
@@ -34,7 +34,10 @@ the MAL block to determine the input/out
pattern resume(mod:str, fcn:str)
address CQresume
-comment "Activate a specific continuous query";
+comment "Activate a specific continuous query with no changes";
+pattern resumenoalter(mod:str, fcn:str)
+address CQresumeNoAlter
+comment "Activate a specific continuous query with changes to the cycles and
heartbeat values";
pattern resume()
address CQresumeAll
comment "Activate all continuous queries";
diff --git a/sql/backends/monet5/sql_cat.c b/sql/backends/monet5/sql_cat.c
--- a/sql/backends/monet5/sql_cat.c
+++ b/sql/backends/monet5/sql_cat.c
@@ -24,6 +24,7 @@
#include "querylog.h"
#include "mal_builder.h"
#include "mal_debugger.h"
+#include "sql_cquery.h"
#include
#include
@@ -380,6 +381,21 @@ drop_index(Client cntxt, mvc *sql, char
}
static str
+change_cp(Client cntxt, int action)
+{
+ switch(action) {
+ case mod_stop_all_continuous:
+ return CQderegisterAll(cntxt, NULL, 0, 0);
+ case mod_pause_all_continuous:
+ return CQpauseAll(cntxt, NULL, 0, 0);
+ case mod_resume_all_continuous:
+ return CQresumeAll(cntxt, NULL, 0, 0);
+ default:
+ return sql_message("42000!ALL CONTINUOUS: Unknown
option");
+ }
+}
+
+static str
create_seq(mvc *sql, char *sname, char *seqname, sql_sequence *seq)
{
sql_schema *s = NULL;
@@ -1188,6 +1204,17 @@ SQLdrop_index(Client cntxt, MalBlkPtr mb
}
str
+SQLchange_cp(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+{ mvc *sql = NULL;
+ str msg;
+ int action = *getArgReference_int(stk, pci, 1);
+
+ initcontext();
+ msg = change_cp(cntxt, action);
+ return msg;
+}
+
+str
SQLdrop_function(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{ mvc *sql = NULL;
str msg;
diff --git a/sql/backends/monet5/sql_cat.h b/sql/backends/monet5/sql_cat.h
--- a/sql/backends/monet5/sql_cat.h
+++ b/sql/backends/monet5/sql_cat.h
@@ -56,6 +56,7 @@ sql5_export str SQLrename_user(Client cn
sql5_export str SQLcreate_role(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci) ;
sql5_export str SQLdrop_role(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci) ;
sql5_export str SQLdrop_index(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci) ;
+sql5_export str SQLchange_cp(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci) ;
sql5_export str SQLdrop_function(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci) ;
sql5_export str SQLcreate_function(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci) ;
sql5_export str SQLcreate_trigger(Client
MonetDB: Jul2017 - Approvals.
Changeset: b2d1b9115329 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b2d1b9115329 Modified Files: sql/test/Tests/systemfunctions.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-chain/Tests/check.stable.out sql/test/emptydb-upgrade-chain/Tests/check.stable.out.32bit sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128 sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128 sql/test/emptydb-upgrade/Tests/check.stable.out sql/test/emptydb-upgrade/Tests/check.stable.out.32bit sql/test/emptydb-upgrade/Tests/check.stable.out.int128 sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit Branch: Jul2017 Log Message: Approvals. diffs (truncated from 595 to 300 lines): diff --git a/sql/test/Tests/systemfunctions.stable.out b/sql/test/Tests/systemfunctions.stable.out --- a/sql/test/Tests/systemfunctions.stable.out +++ b/sql/test/Tests/systemfunctions.stable.out @@ -3276,6 +3276,15 @@ Ready. [ "sys", "sql_div", 0, "bigint", "/" ] [ "sys", "sql_div", 1, "bigint", "" ] [ "sys", "sql_div", 2, "int", "" ] +[ "sys", "sql_div", 0, "decimal", "/" ] +[ "sys", "sql_div", 1, "decimal", "" ] +[ "sys", "sql_div", 2, "decimal", "" ] +[ "sys", "sql_div", 0, "decimal", "/" ] +[ "sys", "sql_div", 1, "decimal", "" ] +[ "sys", "sql_div", 2, "decimal", "" ] +[ "sys", "sql_div", 0, "decimal", "/" ] +[ "sys", "sql_div", 1, "decimal", "" ] +[ "sys", "sql_div", 2, "decimal", "" ] [ "sys", "sql_div", 0, "oid", "/" ] [ "sys", "sql_div", 1, "oid", "" ] [ "sys", "sql_div", 2, "oid", "" ] @@ -3407,6 +3416,15 @@ Ready. [ "sys", "sql_mul", 0, "bigint", "*" ] [ "sys", "sql_mul", 1, "bigint", "" ] [ "sys", "sql_mul", 2, "int", "" ] +[ "sys", "sql_mul", 0, "decimal", "*" ] +[ "sys", "sql_mul", 1, "decimal", "" ] +[ "sys", "sql_mul", 2, "decimal", "" ] +[ "sys", "sql_mul", 0, "decimal", "*" ] +[ "sys", "sql_mul", 1, "decimal", "" ] +[ "sys", "sql_mul", 2, "decimal", "" ] +[ "sys", "sql_mul", 0, "decimal", "*" ] +[ "sys", "sql_mul", 1, "decimal", "" ] +[ "sys", "sql_mul", 2, "decimal", "" ] [ "sys", "sql_mul", 0, "oid", "*" ] [ "sys", "sql_mul", 1, "oid", "" ] [ "sys", "sql_mul", 2, "oid", "" ] diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 --- a/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 +++ b/sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128 @@ -3023,8 +3023,14 @@ drop function pcre_replace(string, strin [ "sys", "sql_div", "/","calc", 0, "function", false, false, false, "res_0","bigint", 64, 0, "out", "arg_1","bigint", 64, 0, "in", "arg_2", "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", "sql_div", "/","calc", 0, "function", false, false, false, "res_0","decimal", 2, 0, "out", "arg_1","decimal", 2, 0, "in", "arg_2", "decimal", 2, 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 ]
