MonetDB: default - Look at bit set properly
Changeset: 56c41dbda55f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=56c41dbda55f
Modified Files:
monetdb5/optimizer/opt_dataflow.c
Branch: default
Log Message:
Look at bit set properly
This solves spurious crashes when variables are used multiple times
without a proper language.pass() finalization action.
diffs (28 lines):
diff --git a/monetdb5/optimizer/opt_dataflow.c
b/monetdb5/optimizer/opt_dataflow.c
--- a/monetdb5/optimizer/opt_dataflow.c
+++ b/monetdb5/optimizer/opt_dataflow.c
@@ -236,7 +236,7 @@ OPTdataflowImplementation(Client cntxt,
// collect BAT variables garbage collected
within the block
if( !simple)
for( k=q->retc; kargc; k++){
- if (getState(states,q,k) ==
VAR2READ && getEndScope(mb,getArg(q,k)) == j &&
isaBatType(getVarType(mb,getArg(q,k))) )
+ if (getState(states,q,k) &
VAR2READ && getEndScope(mb,getArg(q,k)) == j &&
isaBatType(getVarType(mb,getArg(q,k))) )
top =
dflowGarbagesink(cntxt, mb, getArg(q,k), sink, top);
}
}
@@ -293,11 +293,11 @@ OPTdataflowImplementation(Client cntxt,
setState(states, p,1, VARBLOCK);
for ( k = p->retc; k< p->argc; k++)
if( !isVarConstant(mb,getArg(p,k)) ){
- if( getState(states, p, k) == VARREAD)
- setState(states, p, k, VAR2READ);
+ if( getState(states, p, k) & VARREAD)
+ setState(states, p, k, (VARREAD | VAR2READ));
else
- if( getState(states, p, k) == VARWRITE)
- setState(states, p ,k, VARREAD);
+ if( getState(states, p, k) & VARWRITE)
+ setState(states, p ,k, (VARREAD | VARWRITE));
}
#ifdef DEBUG_OPT_DATAFLOW
fprintf(stderr,"# variable states\n");
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jul2017 - handle subqueries in value lists, solves bug ...
Changeset: 2cbddfe7dcb8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2cbddfe7dcb8
Added Files:
sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.sql
sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.stable.err
sql/test/BugTracker-2017/Tests/handle-values-subqueries.Bug-6336.stable.out
Modified Files:
sql/backends/monet5/rel_bin.c
sql/server/rel_dump.c
sql/server/rel_rel.c
sql/server/rel_updates.c
sql/test/BugTracker-2017/Tests/All
Branch: Jul2017
Log Message:
handle subqueries in value lists, solves bug 6336
diffs (214 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -260,7 +260,7 @@ handle_in_exps(backend *be, sql_exp *ce,
}
static stmt *
-value_list(backend *be, list *vals)
+value_list(backend *be, list *vals, stmt *left, stmt *sel)
{
node *n;
stmt *s;
@@ -269,7 +269,7 @@ value_list(backend *be, list *vals)
s = stmt_temp(be, exp_subtype(vals->h->data));
for( n = vals->h; n; n = n->next) {
sql_exp *e = n->data;
- stmt *i = exp_bin(be, e, NULL, NULL, NULL, NULL, NULL, NULL);
+ stmt *i = exp_bin(be, e, left, NULL, NULL, NULL, NULL, sel);
if (list_length(vals) == 1)
return i;
@@ -387,7 +387,7 @@ exp_bin(backend *be, sql_exp *e, stmt *l
} else if (e->r) { /* parameters */
s = stmt_var(be, sa_strdup(sql->sa, e->r),
e->tpe.type?>tpe:NULL, 0, e->flag);
} else if (e->f) { /* values */
- s = value_list(be, e->f);
+ s = value_list(be, e->f, left, sel);
} else {/* arguments */
s = stmt_varnr(be, e->flag, e->tpe.type?>tpe:NULL);
}
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -126,7 +126,8 @@ exp_print(mvc *sql, stream *fout, sql_ex
mnstr_printf(fout, "%s", name);
} else if (e->f) { /* values list */
list *l = e->f;
- exp_print(sql, fout, l->h->data, depth, 0, 0);
+ //exp_print(sql, fout, l->h->data, depth, 0, 0);
+ exps_print(sql, fout, l, depth, 0, 0);
} else { /* numbered arguments */
mnstr_printf(fout, "A%d", e->flag);
}
diff --git a/sql/server/rel_rel.c b/sql/server/rel_rel.c
--- a/sql/server/rel_rel.c
+++ b/sql/server/rel_rel.c
@@ -279,7 +279,7 @@ rel_bind_column2( mvc *sql, sql_rel *rel
if (rel->l)
return rel_bind_column2(sql, rel->l, tname, cname, f);
} else if (is_apply(rel->op)) {
- sql_exp *e = NULL;//exps_bind_column2(rel->exps, tname, cname);
+ sql_exp *e = NULL;
if (!e && rel->l)
e = rel_bind_column2(sql, rel->l, tname, cname, f);
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -492,8 +492,16 @@ insert_into(mvc *sql, dlist *qname, dlis
sql_column *c = m->data;
sql_rel *r = NULL;
sql_exp *ins =
insert_value(sql, c, , n->data.sym);
- if (!ins || r)
+ if (!ins)
return NULL;
+ if (r && inner)
+ inner =
rel_crossproduct(sql->sa, inner, r, op_join);
+ else if (r)
+ inner = r;
+ if (inner && !ins->name) {
+ exp_label(sql->sa, ins,
++sql->label);
+ ins =
exp_column(sql->sa, exp_relname(ins), exp_name(ins), exp_subtype(ins),
ins->card, has_nil(ins), is_intern(ins));
+ }
list_append(vals_list, ins);
}
} else {
@@ -505,7 +513,7 @@ insert_into(mvc *sql, dlist *qname, dlis
if (!ins)
return NULL;
MonetDB: Jul2017 - fixed bug 6339, ie fixed problem in column lo...
Changeset: 6a7ff140ae05 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6a7ff140ae05
Modified Files:
sql/server/rel_rel.c
Branch: Jul2017
Log Message:
fixed bug 6339, ie fixed problem in column lookup in combination with
the apply operator
diffs (23 lines):
diff --git a/sql/server/rel_rel.c b/sql/server/rel_rel.c
--- a/sql/server/rel_rel.c
+++ b/sql/server/rel_rel.c
@@ -274,11 +274,18 @@ rel_bind_column2( mvc *sql, sql_rel *rel
} else if (is_set(rel->op) ||
is_sort(rel) ||
is_semi(rel->op) ||
- is_apply(rel->op) ||
is_select(rel->op) ||
is_topn(rel->op)) {
if (rel->l)
return rel_bind_column2(sql, rel->l, tname, cname, f);
+ } else if (is_apply(rel->op)) {
+ sql_exp *e = NULL;//exps_bind_column2(rel->exps, tname, cname);
+
+ if (!e && rel->l)
+ e = rel_bind_column2(sql, rel->l, tname, cname, f);
+ if (!e && rel->r && (rel->flag == APPLY_JOIN || rel->flag ==
APPLY_LOJ))
+ return rel_bind_column2(sql, rel->r, tname, cname, f);
+ return e;
}
return NULL;
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jul2017 - fixed crash with lateral joins, should not fr...
Changeset: 3abee02be92c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3abee02be92c Modified Files: sql/server/rel_select.c Branch: Jul2017 Log Message: fixed crash with lateral joins, should not free the left side twice diffs (12 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 @@ -4958,6 +4958,8 @@ rel_query(mvc *sql, sql_rel *rel, symbol fnd = table_ref(sql, rel, n->data.sym, 0); } used = 1; + if (!fnd && lateral) + res = NULL; } if (!fnd) ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jul2017 - Pre-release version number update.
Changeset: 74cdffa1a71f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=74cdffa1a71f
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.0
+%define version 11.27.1
%{!?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"
/* 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.0"
+#define PACKAGE_VERSION "11.27.1"
/* 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.0
+VERSION=11.27.1
# ^^
# 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,0,1
- PRODUCTVERSION 11,27,0,1
+ FILEVERSION 11,27,1,1
+ PRODUCTVERSION 11,27,1,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.0\0"
+ VALUE "FileVersion", "11.27.1\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.0\0"
+ VALUE "ProductVersion", "11.27.1\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,0,1
- PRODUCTVERSION 11,27,0,1
+ FILEVERSION 11,27,1,1
+ PRODUCTVERSION 11,27,1,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.0\0"
+ VALUE "FileVersion", "11.27.1\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.0\0"
+ VALUE "ProductVersion", "11.27.1\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,0,1
- PRODUCTVERSION 11,27,0,1
+ FILEVERSION 11,27,1,1
+ PRODUCTVERSION 11,27,1,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.0"
+VALUE "FileVersion", "11.27.1"
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2017"
MonetDB: default - Merge with Jul2017 branch, not changing any f...
Changeset: 5bcb05dbad8e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5bcb05dbad8e 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 - Moved contents of ChangeLog.Jul2017 to MonetD...
Changeset: e6552cdd3180 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e6552cdd3180
Modified Files:
ChangeLog-Archive
ChangeLog.Jul2017
MonetDB.spec
clients/ChangeLog-Archive
clients/ChangeLog.Jul2017
debian/changelog
gdk/ChangeLog-Archive
gdk/ChangeLog.Jul2017
monetdb5/ChangeLog-Archive
monetdb5/ChangeLog.Jul2017
sql/ChangeLog-Archive
sql/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 (truncated from 737 to 300 lines):
diff --git a/ChangeLog-Archive b/ChangeLog-Archive
--- a/ChangeLog-Archive
+++ b/ChangeLog-Archive
@@ -1,6 +1,31 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Thu Apr 13 2017 Mark Raasveldt <m.raasve...@cwi.nl> - 11.27.1-20170705
+- Added a new server-side protocol implementation. The new protocol
+ is backwards compatible with the old protocol. Clients can choose
+ whether they want to use the old or the new protocol during the initial
+ handshake with the server. The new protocol is a binary column-based
+ protocol that is significantly faster than the old protocol when
+ transferring large result sets. In addition, the new protocol supports
+ compression using Snappy or LZ4.
+
+* Mon Feb 20 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.1-20170705
+- Moved the sphinx extension module to its own repository.
+ See https://dev.monetdb.org/hg/MonetDB-sphinx/.
+
+* Thu Feb 16 2017 Sjoerd Mullender <sjo...@acm.org> - 11.27.1-20170705
+- Removed GSL module: it's now a separate (extension) package.
+ See https://dev.monetdb.org/hg/MonetDB-gsl/.
+- The PCRE library is now optional for systems that support POSIX regular
+ expressions.
+
+* Thu Jan 12 2017 Martin van Dinther <martin.van.dint...@monetdbsolutions.com>
- 11.27.1-20170705
+- Added 5 new sys schema tables: function_languages, function_types,
+ key_types, index_types and privilege_codes. They are pre-loaded with
+ static content and contain descriptive names for the various integer
+ type and code values. See also sql/scripts/51_sys_schema_extension.sql
+
* Thu Sep 22 2016 Sjoerd Mullender <sjo...@acm.org> - 11.25.1-20161214
- The Perl, PHP, and Python clients, and the JDBC driver each now have
their own repositories and release cycles. The Python client is
diff --git a/ChangeLog.Jul2017 b/ChangeLog.Jul2017
--- a/ChangeLog.Jul2017
+++ b/ChangeLog.Jul2017
@@ -1,27 +1,3 @@
# ChangeLog file for devel
# This file is updated with Maddlog
-* Thu Apr 13 2017 Mark Raasveldt <m.raasve...@cwi.nl>
-- Added a new server-side protocol implementation. The new protocol
- is backwards compatible with the old protocol. Clients can choose
- whether they want to use the old or the new protocol during the initial
- handshake with the server. The new protocol is a binary column-based
- protocol that is significantly faster than the old protocol when
- transferring large result sets. In addition, the new protocol supports
- compression using Snappy or LZ4.
-
-* Mon Feb 20 2017 Sjoerd Mullender <sjo...@acm.org>
-- Moved the sphinx extension module to its own repository.
- See https://dev.monetdb.org/hg/MonetDB-sphinx/.
-
-* Thu Feb 16 2017 Sjoerd Mullender <sjo...@acm.org>
-- Removed GSL module: it's now a separate (extension) package.
- See https://dev.monetdb.org/hg/MonetDB-gsl/.
-- The PCRE library is now optional for systems that support POSIX regular
- expressions.
-
-* Thu Jan 12 2017 Martin van Dinther <martin.van.dint...@monetdbsolutions.com>
-- Added 5 new sys schema tables: function_languages, function_types,
- key_types, index_types and privilege_codes. They are pre-loaded with
- static content and contain descriptive names for the various integer
- type and code values. See also sql/scripts/51_sys_schema_extension.sql
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/Dec2016-SP5/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Jul2017/%{name}-%{version}.tar.bz2
# we need systemd for the _unitdir macro to exist
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
@@ -960,6 +960,153 @@ rm -f %{buildroot}%{_bindir}/Maddlog
%postun -p /sbin/ldconfig
%changelog
+* 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
+- BZ#3545: monetdb commands don't work with -h -P -p options (locally
+ and remotely)
+- BZ#3996: select * from sys.c
MonetDB: default - Merge with Jul2017 branch, not changing any f...
Changeset: 6ab81f07f1c6 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6ab81f07f1c6 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 - Post release build.
Changeset: 54b453c13539 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=54b453c13539
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.1
+%define version 11.27.2
%{!?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"
+#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.1"
+#define PACKAGE_VERSION "11.27.2"
/* 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.1
+VERSION=11.27.2
# ^^
# 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,1,1
- PRODUCTVERSION 11,27,1,1
+ FILEVERSION 11,27,2,1
+ PRODUCTVERSION 11,27,2,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.1\0"
+ VALUE "FileVersion", "11.27.2\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.1\0"
+ VALUE "ProductVersion", "11.27.2\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,1,1
- PRODUCTVERSION 11,27,1,1
+ FILEVERSION 11,27,2,1
+ PRODUCTVERSION 11,27,2,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.1\0"
+ VALUE "FileVersion", "11.27.2\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.1\0"
+ VALUE "ProductVersion", "11.27.2\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,1,1
- PRODUCTVERSION 11,27,1,1
+ FILEVERSION 11,27,2,1
+ PRODUCTVERSION 11,27,2,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.1"
+VALUE "FileVersion", "11.27.2"
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2017"
MonetDB: Jul2017 - Setting tags Jul2017_1 and Jul2017 for the re...
Changeset: e51441222af6 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e51441222af6 Modified Files: .hgtags Branch: Jul2017 Log Message: Setting tags Jul2017_1 and Jul2017 for the release build. diffs (9 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -673,3 +673,5 @@ c57454c6c6f6e77fbbdf70de32a7cc845b67d1dd 05f4e62bc67911a25f19be7fe742009ab1ee41c7 Dec2016_SP4_release 8b3d3f7c487cb6e34dab1167797a61862cba2124 Dec2016_23 8b3d3f7c487cb6e34dab1167797a61862cba2124 Dec2016_SP5_release +e6552cdd3180bcd35f959954807cab986a6042a5 Jul2017_1 +e6552cdd3180bcd35f959954807cab986a6042a5 Jul2017_release ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Jul2017 - Updated library versions.
Changeset: 3a418dfb0ed5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3a418dfb0ed5
Added Files:
debian/libmonetdb-client9.install
debian/libmonetdb15.install
Removed Files:
debian/libmonetdb-client8.install
debian/libmonetdb13.install
Modified Files:
debian/control
libversions
Branch: Jul2017
Log Message:
Updated library versions.
diffs (74 lines):
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 5), autotoo
Standards-Version: 3.8.0
X-Python-Version: >= 2.6
-Package: libmonetdb13
+Package: libmonetdb15
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflicts: libmonetdb5-server-geom (<< ${source:Version})
@@ -32,7 +32,7 @@ Description: MonetDB core library
Package: libmonetdb-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libatomic-ops-dev,
- libmonetdb13, libmonetdb-stream-dev
+ libmonetdb15, libmonetdb-stream-dev
Description: MonetDB development files
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -67,7 +67,7 @@ Description: MonetDB stream library deve
This package contains the files to develop with the
libmonetdb-stream8 library.
-Package: libmonetdb-client8
+Package: libmonetdb-client9
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: MonetDB client/server interface library
@@ -82,14 +82,14 @@ Description: MonetDB client/server inter
Package: libmonetdb-client-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb-client8 (= ${source:Version})
+ libmonetdb-client9 (= ${source:Version})
Description: MonetDB client/server interface library development files
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
automatic index management, extensibility of data types and search
accelerators. It also has an SQL frontend.
.
- This package contains the files to develop with the libmonetdb-client8
+ This package contains the files to develop with the libmonetdb-client9
library.
Package: monetdb-client
diff --git a/debian/libmonetdb-client8.install
b/debian/libmonetdb-client9.install
rename from debian/libmonetdb-client8.install
rename to debian/libmonetdb-client9.install
diff --git a/debian/libmonetdb13.install b/debian/libmonetdb15.install
rename from debian/libmonetdb13.install
rename to debian/libmonetdb15.install
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=14:7:1
+GDK_VERSION=15:0:0
# version of the MAPI library (subdirectory clients/mapilib)
-MAPI_VERSION=8:2:0
+MAPI_VERSION=9:0:0
# version of the MONETDB5 library (subdirectory monetdb5, not including extras)
-MONETDB5_VERSION=22:7:1
+MONETDB5_VERSION=23:0:0
# version of the STREAM library (subdirectory common/stream)
-STREAM_VERSION=9:1:1
+STREAM_VERSION=10:0:2
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: timetrails - Trying to add add START CONTINUE PROCEDURE...
Changeset: f37e6abcd44c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f37e6abcd44c
Modified Files:
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_cquery.c
sql/include/sql_catalog.h
sql/server/rel_psm.c
sql/server/rel_select.c
sql/server/rel_semantic.c
sql/server/sql_mvc.h
sql/server/sql_parser.h
sql/server/sql_parser.y
sql/server/sql_scan.c
Branch: timetrails
Log Message:
Trying to add add START CONTINUE PROCEDURE name (args) statements but with no
luck :(
diffs (truncated from 514 to 300 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -17,6 +17,7 @@
#include "rel_updates.h"
#include "rel_optimizer.h"
#include "sql_env.h"
+#include "sql_cquery.h"
#define OUTER_ZERO 64
@@ -168,7 +169,7 @@ static stmt *column(backend *be, stmt *v
return val;
}
-static stmt *Column(backend *be, stmt *val )
+static stmt *RelColumn(backend *be, stmt *val )
{
if (val->nrcols == 0)
val = const_column(be, val);
@@ -453,7 +454,22 @@ exp_bin(backend *be, sql_exp *e, stmt *l
if (f->func->rel)
s = stmt_func(be, stmt_list(be, l), sa_strdup(sql->sa,
f->func->base.name), f->func->rel, (f->func->type == F_UNION));
else
- s = stmt_Nop(be, stmt_list(be, l), e->f);
+ s = stmt_Nop(be, stmt_list(be, l), e->f);
+
+ if (f->func->type == F_CONTINUOUS_PROCEDURE) {
+ char *petrinetResponse;
+ char *sname = f->func->s->base.name;
+ char *fname = f->func->base.name;
+ if (!CQlocate(sname, fname)) { //if the continuous
procedure is not registered in the catalog then we register it
+ petrinetResponse =
CQregisterInternal(MCgetClient(sql->clientid), sname, fname);
+ }
+ if (!petrinetResponse) {
+ petrinetResponse = CQresumeInternal(sname,
fname);
+ }
+ if (petrinetResponse) {
+ return sql_error(sql, 02, "M0M27!START
CONTINUOUS PROCEDURE internal error: %s", petrinetResponse);
+ }
+ }
} break;
case e_aggr: {
list *attr = e->l;
@@ -1851,7 +1867,7 @@ rel2bin_join(backend *be, sql_rel *rel,
/* as append isn't save, we append to a new copy */
if (rel->op == op_left || rel->op == op_full || rel->op ==
op_right)
- s = Column(be, s);
+ s = RelColumn(be, s);
if (rel->op == op_left || rel->op == op_full)
s = stmt_append(be, s, stmt_project(be, ld, c));
if (rel->op == op_right || rel->op == op_full)
@@ -1868,7 +1884,7 @@ rel2bin_join(backend *be, sql_rel *rel,
/* as append isn't save, we append to a new copy */
if (rel->op == op_left || rel->op == op_full || rel->op ==
op_right)
- s = Column(be, s);
+ s = RelColumn(be, s);
if (rel->op == op_left || rel->op == op_full)
s = stmt_append(be, s, stmt_const(be, ld,
(c->flag_ZERO)?stmt_atom_lng(be, 0):stmt_atom(be, atom_general(sql->sa,
tail_type(c), NULL;
if (rel->op == op_right || rel->op == op_full)
@@ -2119,7 +2135,7 @@ rel2bin_union(backend *be, sql_rel *rel,
const char *nme = column_name(sql->sa, c1);
stmt *s;
- s = stmt_append(be, Column(be, c1), c2);
+ s = stmt_append(be, RelColumn(be, c1), c2);
s = stmt_alias(be, s, rnme, nme);
list_append(l, s);
}
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
@@ -726,17 +726,16 @@ static str
continuous_procedure(mvc *sql, char *sname, char *cpname, int fid, int action)
{
sql_schema *s = NULL;
- char *F;
- Client cntxt;
+ char *F = NULL;
str petrinetResponse = MAL_SUCCEED;
switch (action) {
- case START_CONTINUOUS_PROCEDURE:
- F = "START CONTINUOUS PROCEDURE";
- break;
case INTERRUPT_CONTINUOUS_PROCEDURE:
F = "INTERRUPT CONTINUOUS PROCEDURE";
break;
+ case CONTINUE_CONTINUOUS_PROCEDURE:
+ F = "CONTINUE CONTINUOUS PROCEDURE";
+ break;
case HALT_CONTINUOUS_PROCEDURE:
F = "HALT CONTINUOUS
