MonetDB: default - Approve tests after Niels' fixes.
Changeset: 3879b636402f for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3879b636402f Modified Files: sql/benchmarks/tpcds/Tests/12.stable.out sql/benchmarks/tpcds/Tests/18.stable.out sql/benchmarks/tpcds/Tests/20.stable.out sql/benchmarks/tpcds/Tests/31.stable.out sql/benchmarks/tpcds/Tests/36.stable.out sql/benchmarks/tpcds/Tests/39a.stable.out sql/benchmarks/tpcds/Tests/39b.stable.out sql/benchmarks/tpcds/Tests/47.stable.out sql/benchmarks/tpcds/Tests/57.stable.out sql/benchmarks/tpcds/Tests/58.stable.out sql/benchmarks/tpcds/Tests/63.stable.out sql/benchmarks/tpcds/Tests/78.stable.out sql/benchmarks/tpcds/Tests/83.stable.out sql/benchmarks/tpcds/Tests/89.stable.out sql/benchmarks/tpcds/Tests/98.stable.out Branch: default Log Message: Approve tests after Niels' fixes. diffs (truncated from 6292 to 300 lines): diff --git a/sql/benchmarks/tpcds/Tests/12.stable.out b/sql/benchmarks/tpcds/Tests/12.stable.out --- a/sql/benchmarks/tpcds/Tests/12.stable.out +++ b/sql/benchmarks/tpcds/Tests/12.stable.out @@ -44,107 +44,108 @@ Ready. % i_item_id, i_item_desc,i_category, i_class, i_current_price,itemrevenue,revenueratio # name % char,varchar,char, char, decimal,decimal, decimal # type % 16, 200,50, 50, 9, 40, 40 # length -[ "AAKA", "Small, political activities help great, bad policies. Therefore square features provide on a machines. Rules make over me", "Books","arts", 2.42, 2742.6, 3.71752049 ] -[ "BHDC", "Minor heads close common children; recently strong firms provide. Useful, young men ought to create changes. Popular, common regulations might decide. Points fit. Obvious, glad officials", "Books", "arts", 3.88, 4258.84,5.77274301 ] -[ "CKEA", "Legs appear eventually soci", "Books","arts", 35.27, 4010.65,5.43632814 ] -[ "CMDC", "Black, powerful others go now years. Diverse orders might not mean away medium minutes; tight authorities ought to put however for the things","Books","arts", 2.75, 1156.4, 1.56746908 ] -[ "CNED", "Particularly labour stores get farmers. Hence true records see rel", "Books","arts", 6.89, 6606.82,8.95536671 ] -[ "DCCD", "Glad users understand very almost original jobs. Towns can understand. Supreme, following days work by a parents; german, crucial weapons work sure; fair pictur", "Books","arts", 7.18, 10391.81, 14.0858188 ] -[ "DJFC", "Significant, preliminary boys can remain lightly more pale discussion","Books","arts", 2.74, 8279.54, 11.2226937 ] -[ "DPCC", "Especially true items might supply particularly. Black, automatic words might develop post-war problems. Fresh, visible workers could not appe", "Books","arts", 4.23, 351.78, .476828323 ] -[ "EDKD", "Times live now to a sales. British years bring all financ","Books","arts", 4.24, 11699.92, 15.8589267 ] -[ "EGAE", "Far injuries pay so various arms. Courses could go anywhere universal possibilities; talks stand since mean, colonial scho", "Books","arts", 9.57, 51.84, .070267725 ] -[ "FCFB", "Golden estates meet as yet hands. About solid proteins used to tell. Once causal boots imagine frequently new elections; flexible, other ways find re","Books","arts", 9.76, 59.01, .079986467 ] -[ "GHOB", "Fully existing proceedings could not tak", "Books","arts", 8.66, 625.65, .848051738 ] -[ "IEPC", "New, popular years should think. Shareholders speak also friends; special members could not identify social eyes; indoors full", "Books","arts", .91,1390.83,1.88523264 ] -[ "IHKB", "Very historic arms may happen even able exis", "Books","arts", 9.19, 13439.76, 18.217233 ] -[ "IIPD", "Af", "Books","arts", 6.04, 109.23, .148058325 ] -[ "IJGA", "Then western animals could teach somewhere. Today waiting servants confuse", "Books","arts", 4.1,868.5, 1.17722838 ] -[ "KKIA", "Naked, popular schemes campaign then offices. Underlying shares may join", "Books","arts", 79.28, 1841.04, 2.49548017 ] -[ "KNBC", "Early, powerful towns add mainly english savings. Years assist then new, public colleagues. Things might encounter then right new features", "Books","arts", 6.89, 365.6, .495560961 ] -[ "OKPB", "Just good settings must not make; payments
MonetDB: default - many small fixes for the tpcds queries.
Changeset: a339d40c21a7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a339d40c21a7
Modified Files:
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
sql/benchmarks/tpch/LOCKED/Tests/14.stable.out.int128
sql/benchmarks/tpch/Tests/01-22.stable.out
sql/benchmarks/tpch/Tests/01-22.stable.out.int128
sql/benchmarks/tpch/Tests/14.stable.out.int128
sql/common/sql_types.c
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/server/sql_parser.y
sql/test/BugTracker/Tests/caching.SF-1651599.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/analytics/Tests/analytics09.stable.err
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/mergetables/Tests/mergedb.Bug-6820.stable.out
Branch: default
Log Message:
many small fixes for the tpcds queries.
1) no longer strip zero's add the end of a literal (ie 0.0100 is now a
decimal(5.4) not a (3.2)
2) analytical avg returns doubles for decimals (like the group by aggregate
case)
3) improved handling of conditional execution (case statements). Referenced
relations are optimized
only once (which is a requirement for the case_fixup rewriter (as it introduces
new expressions))
4) other analytical window functions now return a type based on the input (is
sets scale)
diffs (truncated from 950 to 300 lines):
diff --git a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
--- a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
+++ b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out
@@ -134,7 +134,7 @@ Ready.
# o_orderpriority
#order by
# o_orderpriority;
-% sys.orders, sys.L10 # table_name
+% sys.orders, sys.L12 # table_name
% o_orderpriority, order_count # name
% char,bigint # type
% 15, 3 # length
@@ -610,7 +610,7 @@ Ready.
# and l_shipdate < l_commitdate
# and l_receiptdate >= date '1994-01-01'
# and l_receiptdate < date '1994-01-01' + interval '1' year
-% sys.lineitem,sys.L6, sys.L11 # table_name
+% sys.lineitem,sys.L4, sys.L7 # table_name
% l_shipmode, high_line_count,low_line_count # name
% char,bigint, bigint # type
% 10, 2, 2 # length
@@ -641,7 +641,7 @@ Ready.
#order by
# custdist desc,
# c_count desc;
-% .c_orders, .L10 # table_name
+% .c_orders, .L7 # table_name
% c_count, custdist # name
% bigint, bigint # type
% 2, 3 # length
@@ -743,7 +743,7 @@ Ready.
# p_brand,
# p_type,
# p_size;
-% sys.part,sys.part, sys.part, sys.L13 # table_name
+% sys.part,sys.part, sys.part, sys.L11 # table_name
% p_brand, p_type, p_size, supplier_cnt # name
% char,varchar,int,bigint # type
% 10, 25, 2, 1 # length
@@ -1108,8 +1108,8 @@ Ready.
# o_totalprice desc,
# o_orderdate
#limit 100;
-% sys.customer,sys.customer, sys.orders, sys.orders,
sys.orders, sys.L17 # table_name
-% c_name, c_custkey, o_orderkey, o_orderdate,o_totalprice,
L16 # name
+% sys.customer,sys.customer, sys.orders, sys.orders,
sys.orders, sys.L14 # table_name
+% c_name, c_custkey, o_orderkey, o_orderdate,o_totalprice,
L14 # name
% varchar, int,int,date, decimal,decimal # type
% 18, 3, 5, 10, 17, 20 # length
[ "Customer#00667",667,29158, 1995-10-21, 439687.23,
305.00 ]
@@ -1140,7 +1140,7 @@ Ready.
# and p_brand = 'Brand#23'
# and p_container in ('MED BAG', 'MED BOX', 'MED PKG', 'MED PACK')
# and l_quantity >= 10 and l_quantity <= 10 + 10
-% sys.L33 # table_name
+% sys.L22 # table_name
% revenue # name
% decimal # type
% 20 # length
@@ -1187,7 +1187,7 @@ Ready.
# l3.l_orderkey = l1.l_orderkey
# and l3.l_suppkey <> l1.l_suppkey
# and l3.l_receiptdate > l3.l_commitdate
-% sys.supplier,sys.L22 # table_name
+% sys.supplier,sys.L23 # table_name
% s_name, numwait # name
% char,bigint # type
% 25, 1 # length
@@ -1225,7 +1225,7 @@ Ready.
# select
# *
# from
-% sys.custsale,sys.L21,sys.L24 # table_name
+% sys.custsale,sys.L20,sys.L23 # table_name
% cntrycode, numcust,totacctbal # name
% clob,bigint, decimal # type
% 2, 2, 20 # length
diff --git a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
b/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
--- a/sql/benchmarks/tpch/LOCKED/Tests/01-22.stable.out.int128
+++
MonetDB: in-value-list - Merge with default.
/merovingian/daemon/discoveryrunner.h
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/forkmserver.h
tools/merovingian/daemon/handlers.c
tools/merovingian/daemon/handlers.h
tools/merovingian/daemon/merovingian.c
tools/merovingian/daemon/merovingian.h
tools/merovingian/daemon/multiplex-funnel.c
tools/merovingian/daemon/multiplex-funnel.h
tools/merovingian/daemon/proxy.c
tools/merovingian/daemon/proxy.h
tools/merovingian/utils/Makefile.ag
tools/merovingian/utils/control.c
tools/merovingian/utils/control.h
tools/merovingian/utils/database.c
tools/merovingian/utils/database.h
tools/merovingian/utils/glob.c
tools/merovingian/utils/glob.h
tools/merovingian/utils/properties.c
tools/merovingian/utils/properties.h
tools/merovingian/utils/utils.c
tools/merovingian/utils/utils.h
tools/monetdbbincopy
tools/mserver/Makefile.ag
tools/mserver/monet_version.c.in
tools/mserver/monet_version.h
tools/mserver/mserver5.c
tools/mserver/shutdowntest.c
vertoo.data
Branch: in-value-list
Log Message:
Merge with default.
diffs (truncated from 29797 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -717,3 +717,5 @@ a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d
24d62811fd9372b1ee7525aa1cf2fc8860d20bf7 Aug2018_11
a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_SP1_release
24d62811fd9372b1ee7525aa1cf2fc8860d20bf7 Aug2018_SP1_release
+a4e8c9372aa244d6a18c3ef8f1513905650d812c Aug2018_13
+a4e8c9372aa244d6a18c3ef8f1513905650d812c Aug2018_SP2_release
diff --git a/ChangeLog-Archive b/ChangeLog-Archive
--- a/ChangeLog-Archive
+++ b/ChangeLog-Archive
@@ -1,6 +1,8 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Wed Oct 10 2018 Sjoerd Mullender - 11.31.13-20190104
+
* Wed Oct 10 2018 Sjoerd Mullender - 11.31.11-20181011
- Some subtle dependencies between RPMs have been fixed.
diff --git a/HowToStart.rst b/HowToStart.rst
--- a/HowToStart.rst
+++ b/HowToStart.rst
@@ -2,7 +2,7 @@
.. License, v. 2.0. If a copy of the MPL was not distributed with this
.. file, You can obtain one at http://mozilla.org/MPL/2.0/.
..
-.. Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
+.. Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
How To Start with MonetDB
=
diff --git a/Makefile.ag b/Makefile.ag
--- a/Makefile.ag
+++ b/Makefile.ag
@@ -2,7 +2,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-# Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
+# Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
SUBDIRS = buildtools common clients \
HAVE_GDK?gdk \
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -113,7 +113,7 @@ Group: Applications/Databases
License: MPLv2.0
URL: https://www.monetdb.org/
BugURL: https://bugs.monetdb.org/
-Source:
https://www.monetdb.org/downloads/sources/Aug2018-SP1/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Aug2018-SP2/%{name}-%{version}.tar.bz2
# we need systemd for the _unitdir macro to exist
# we need checkpolicy and selinux-policy-devel for the SELinux policy
@@ -1061,6 +1061,37 @@ done
%postun -p /sbin/ldconfig
%changelog
+* Fri Jan 04 2019 Sjoerd Mullender - 11.31.13-20190104
+- Rebuilt.
+- BZ#6643: schema name qualifier in create global temporary table
+ json.table6643 ... is not honered
+- BZ#6645: optimizer treats all the functions with no or constant
+ parameters as constant
+- BZ#6650: PREPARE SQL statement fails to compile user defined functions
+ with parameter/s
+- BZ#6651: Multi-column IN clause for subquery produces wrong results
+- BZ#6653: CREATE TABLE accepts empty table/column name
+- BZ#6654: Incorrect handling of 'TRUE' in compound select
+- BZ#6657: Restart sequence with a non atomic sub-query cardinality
+ gives wrong error message
+- BZ#6660: GRANTing a ROLE is not idempotent
+- BZ#6662: Concurrency Conflicts Exception string "!transaction is
+ aborted because of concurrency conflicts, will ROLLBACK instead" not
+ shown on prompt.
+- BZ#6664: mserver5 crash: infinite recursive happens at rel_bin.c:489
+- BZ#6665: Creation of serial types does not accept negative numbers
+- BZ#: COPY INTO from .. LOCKED doubles input data
+- BZ#6668: The SAMPLE key word doesn't work in a subquery.
+- BZ#6669: COPY [xxx RECORDS] INTO foo FROM STDIN ... doesn't work
+ without specifying nr of to be copied records
+- BZ#6672: SQLGetData with SQL_C_WCHAR string truncation and invalid
+ StrLen_or_Ind value
+
+* Tue Oct 30 2018 Sjoerd Mullender - 11.31.13-20190104
+- sql: Disabled function sys.getcontent(url).
+
+* Thu Oct 11 2018 Sjoerd
MonetDB: in-value-list - Backed out changeset 9a203eca21c8
Changeset: 47dafd54172e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=47dafd54172e
Modified Files:
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
Branch: in-value-list
Log Message:
Backed out changeset 9a203eca21c8
diffs (truncated from 384 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
@@ -256,7 +256,7 @@ row2cols(backend *be, stmt *sub)
}
static stmt *
-value_list(backend *be, list *vals, stmt *left, stmt *sel)
+value_list(backend *be, list *vals, stmt *left)
{
node *n;
stmt *s;
@@ -265,7 +265,7 @@ value_list(backend *be, list *vals, stmt
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, left, NULL, NULL, NULL, NULL, sel);
+ stmt *i = exp_bin(be, e, left, NULL, NULL, NULL, NULL, NULL);
if (!i)
return NULL;
@@ -347,7 +347,7 @@ handle_in_exps(backend *be, sql_exp *ce,
s = distinct_value_list(be, nl, _null_value);
s = stmt_project(be, stmt_selectnonil(be, s, NULL), s); // The
actual in-value-list should not contain null values.
- s = stmt_join(be, c, s, NULL, in, cmp_equal);
+ s = stmt_join(be, c, s, in, cmp_equal);
s = stmt_result(be, s, 0);
if (!in) {
@@ -502,7 +502,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, left, sel);
+ s = value_list(be, e->f, left);
} else {/* arguments */
s = stmt_varnr(be, e->flag, e->tpe.type?>tpe:NULL);
}
@@ -866,9 +866,9 @@ exp_bin(backend *be, sql_exp *e, stmt *l
if (r2) {
s = stmt_join2(be, l, r, r2,
(comp_type)e->flag, is_anti(e), swapped);
} else if (swapped) {
- s = stmt_join(be, r, l, NULL, is_anti(e),
swap_compare((comp_type)e->flag));
+ s = stmt_join(be, r, l, is_anti(e),
swap_compare((comp_type)e->flag));
} else {
- s = stmt_join(be, l, r, NULL, is_anti(e),
(comp_type)e->flag);
+ s = stmt_join(be, l, r, is_anti(e),
(comp_type)e->flag);
}
} else {
if (r2) {
@@ -1722,12 +1722,12 @@ rel2bin_hash_lookup(backend *be, sql_rel
}
if (h && h->nrcols) {
if (!swap_rel) {
- return stmt_join(be, idx, h, NULL, 0, comp);
+ return stmt_join(be, idx, h, 0, cmp_equal);
} else {
- return stmt_join(be, h, idx, NULL, 0, comp);
+ return stmt_join(be, h, idx, 0, cmp_equal);
}
} else {
- return stmt_uselect(be, idx, h, comp, NULL, 0);
+ return stmt_uselect(be, idx, h, cmp_equal, NULL, 0);
}
}
@@ -1767,7 +1767,7 @@ releqjoin( backend *be, list *l1, list *
if (list_length(l1) <= 1) {
l = l1->h->data;
r = l2->h->data;
- r = stmt_join(be, l, r, NULL, 0, cmp_op);
+ r = stmt_join(be, l, r, 0, cmp_op);
if (need_left)
r->flag = cmp_left;
return r;
@@ -1777,11 +1777,11 @@ releqjoin( backend *be, list *l1, list *
r = n2->data;
n1 = n1->next;
n2 = n2->next;
- res = stmt_join(be, l, r, NULL, 0, cmp_op);
+ res = stmt_join(be, l, r, 0, cmp_op);
} else { /* need hash */
l = join_hash_key(be, l1);
r = join_hash_key(be, l2);
- res = stmt_join(be, l, r, NULL, 0, cmp_op == cmp_equal ?
cmp_equal_nil : cmp_op);
+ res = stmt_join(be, l, r, 0, cmp_op == cmp_equal ?
cmp_equal_nil : cmp_op);
}
if (need_left)
res->flag = cmp_left;
@@ -1804,7 +1804,7 @@ releqjoin( backend *be, list *l1, list *
l = stmt_project(be, cmp, l );
r = stmt_project(be, cmp, r );
}
- res = stmt_join(be, l, r, NULL, 0, cmp_joined);
+ res = stmt_join(be, l, r, 0, cmp_joined);
return res;
}
@@ -1866,7 +1866,7 @@ rel2bin_join(backend *be, sql_rel *rel,
if (!join &&
MonetDB: in-value-list - Factor out a loop.
Changeset: da0a600ae9d0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=da0a600ae9d0
Modified Files:
sql/backends/monet5/rel_bin.c
Branch: in-value-list
Log Message:
Factor out a loop.
diffs (84 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
@@ -279,26 +279,33 @@ value_list(backend *be, list *vals, stmt
}
static stmt*
-distinct_value_list(backend *be, stmt *list)
+distinct_value_list(backend *be, list *vals, stmt ** last_null_value)
{
+ node *n;
+ stmt *s;
+
+ /* create bat append values */
+ 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);
+
+ if (exp_is_null(be->mvc, e))
+ *last_null_value = i;
+
+ if (!i)
+ return NULL;
+
+ s = stmt_append(be, s, i);
+ }
+
// Probably faster to filter out the values directly in the underlying
list of atoms.
// But for now use groupby to filter out duplicate values.
- stmt* groupby = stmt_group(be, list, NULL, NULL, NULL, 1);
+ stmt* groupby = stmt_group(be, s, NULL, NULL, NULL, 1);
stmt* ext = stmt_result(be, groupby, 1);
- return stmt_project(be, ext, list);
-}
-
-static sql_exp* in_value_list_contains_null(mvc* sql, list *vals) {
- for(node* n = vals->h; n; n = n->next) {
- sql_exp *e = n->data;
-
- if (exp_is_null(sql, e))
- return e;
- }
-
- return NULL;
+ return stmt_project(be, ext, s);
}
static stmt * stmt_selectnonil( backend *be, stmt *col, stmt *s );
@@ -334,17 +341,17 @@ handle_in_exps(backend *be, sql_exp *ce,
stmt_const(be, bin_first_column(be, left), s),
stmt_bool(be, 1), cmp_equal, sel, 0);
} else {
- s = value_list(be, nl, NULL, NULL);
+ stmt* last_null_value = NULL; // CORNER CASE ALERT: See
description below.
- s = distinct_value_list(be, s); // The actual in-value-list
should not contain duplicates to ensure that final join results are unique.
+ // The actual in-value-list should not contain duplicates to
ensure that final join results are unique.
+ s = distinct_value_list(be, nl, _null_value);
s = stmt_project(be, stmt_selectnonil(be, s, NULL), s); // The
actual in-value-list should not contain null values.
s = stmt_join(be, c, s, NULL, in, cmp_equal);
s = stmt_result(be, s, 0);
if (!in) {
- sql_exp* null_value;
- if ((null_value = in_value_list_contains_null(be->mvc,
nl))) {
+ if (last_null_value) {
// CORNER CASE ALERT:
// In case of a not-in-expression with the
associated in-value-list containing a null value,
// the entire in-predicate is forced to always
return false, i.e. an empty candidate list.
@@ -354,9 +361,7 @@ handle_in_exps(backend *be, sql_exp *ce,
// Ugly trick to return empty candidate list,
because for all x it holds that: (x == null) == false.
//list* singleton_bat = sa_list(sql->sa);
// list_append(singleton_bat, null_value);
- stmt* null_value_stmt;
- null_value_stmt = exp_bin(be, null_value, left,
right, grp, ext, cnt, NULL);
- s = stmt_uselect(be, c, null_value_stmt,
cmp_equal, NULL, 0);
+ s = stmt_uselect(be, c, last_null_value,
cmp_equal, NULL, 0);
return s;
}
else {
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: in-value-list - Add naive cornercase handling for not-i...
Changeset: 5d684f0e58ef for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5d684f0e58ef
Modified Files:
sql/backends/monet5/rel_bin.c
Branch: in-value-list
Log Message:
Add naive cornercase handling for not-in-predicates with nulls.
diffs (55 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
@@ -290,6 +290,17 @@ distinct_value_list(backend *be, stmt *l
return stmt_project(be, ext, list);
}
+static sql_exp* in_value_list_contains_null(mvc* sql, list *vals) {
+ for(node* n = vals->h; n; n = n->next) {
+ sql_exp *e = n->data;
+
+ if (exp_is_null(sql, e))
+ return e;
+ }
+
+ return NULL;
+}
+
static stmt * stmt_selectnonil( backend *be, stmt *col, stmt *s );
static stmt *
@@ -332,10 +343,29 @@ handle_in_exps(backend *be, sql_exp *ce,
s = stmt_result(be, s, 0);
if (!in) {
- stmt* oid_c;
- oid_c = stmt_mirror(be, c);
- // TODO: Somehow stmt_tdiff only allows BAT[oid]
arguments hence the mirror op.
- s = stmt_tdiff(be, oid_c, s);
+ sql_exp* null_value;
+ if ((null_value = in_value_list_contains_null(be->mvc,
nl))) {
+ // CORNER CASE ALERT:
+ // In case of a not-in-expression with the
associated in-value-list containing a null value,
+ // the entire in-predicate is forced to always
return false, i.e. an empty candidate list.
+ // This is similar to postgres behavior.
+ // TODO: However I do not think this behavior
is in accordance with SQL standard 2003.
+
+ // Ugly trick to return empty candidate list,
because for all x it holds that: (x == null) == false.
+ //list* singleton_bat = sa_list(sql->sa);
+ // list_append(singleton_bat, null_value);
+ stmt* null_value_stmt;
+ null_value_stmt = exp_bin(be, null_value, left,
right, grp, ext, cnt, NULL);
+ s = stmt_uselect(be, c, null_value_stmt,
cmp_equal, NULL, 0);
+ return s;
+ }
+ else {
+ // BACK TO HAPPY FLOW:
+ stmt* oid_c;
+ // TODO: Somehow stmt_tdiff only allows
BAT[oid] arguments hence the mirror op.
+ oid_c = stmt_mirror(be, c);
+ s = stmt_tdiff(be, oid_c, s);
+ }
}
if (sel) {
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: in-value-list - Copy in-predicate test and results from...
Changeset: a3e86cc404af for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a3e86cc404af Added Files: sql/test/in-value-list/Tests/various-in-value-list-queries.stable.err sql/test/in-value-list/Tests/various-in-value-list-queries.stable.out Modified Files: sql/test/in-value-list/Tests/various-in-value-list-queries.sql Branch: in-value-list Log Message: Copy in-predicate test and results from default to this branch. diffs (truncated from 382 to 300 lines): diff --git a/sql/test/in-value-list/Tests/various-in-value-list-queries.sql b/sql/test/in-value-list/Tests/various-in-value-list-queries.sql --- a/sql/test/in-value-list/Tests/various-in-value-list-queries.sql +++ b/sql/test/in-value-list/Tests/various-in-value-list-queries.sql @@ -58,3 +58,9 @@ select * from foo where i = 40 and i not select * from foo where i = 40 and i in (null) order by i; select * from foo where i = 40 and i in (select bar.i from foo as bar where i in (10, 20)) order by i; + +select * from foo where i = 40 or i in (select bar.i from foo as bar where i in (10, 20)) order by i; + +select * from foo where i = 40 and i not in (select bar.i from foo as bar where i in (10, 20)) order by i; + +select * from foo where i = 40 or i not in (select bar.i from foo as bar where i in (10, 20)) order by i; diff --git a/sql/test/in-value-list/Tests/various-in-value-list-queries.stable.err b/sql/test/in-value-list/Tests/various-in-value-list-queries.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/in-value-list/Tests/various-in-value-list-queries.stable.err @@ -0,0 +1,35 @@ +stderr of test 'various-in-value-list-queries` in directory 'sql/test/in-value-list` itself: + + +# 11:12:26 > +# 11:12:26 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31520" "--set" "mapi_usock=/var/tmp/mtest-28282/.s.monetdb.31520" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/aris/Installations/default-env/var/MonetDB/mTests_sql_test_in-value-list" "--set" "embedded_c=true" +# 11:12:26 > + +# builtin opt gdk_dbpath = /home/aris/Installations/default-env/var/monetdb5/dbfarm/demo +# builtin opt gdk_debug = 0 +# builtin opt gdk_vmtrim = no +# builtin opt monet_prompt = > +# builtin opt monet_daemon = no +# builtin opt mapi_port = 5 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# cmdline opt gdk_nr_threads = 0 +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 31520 +# cmdline opt mapi_usock = /var/tmp/mtest-28282/.s.monetdb.31520 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /home/aris/Installations/default-env/var/MonetDB/mTests_sql_test_in-value-list +# cmdline opt embedded_c = true +# cmdline opt gdk_debug = 553648138 + +# 11:12:27 > +# 11:12:27 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-28282" "--port=31520" +# 11:12:27 > + + +# 11:12:27 > +# 11:12:27 > "Done." +# 11:12:27 > + diff --git a/sql/test/in-value-list/Tests/various-in-value-list-queries.stable.out b/sql/test/in-value-list/Tests/various-in-value-list-queries.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/in-value-list/Tests/various-in-value-list-queries.stable.out @@ -0,0 +1,324 @@ +stdout of test 'various-in-value-list-queries` in directory 'sql/test/in-value-list` itself: + + +# 11:12:26 > +# 11:12:26 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31520" "--set" "mapi_usock=/var/tmp/mtest-28282/.s.monetdb.31520" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/aris/Installations/default-env/var/MonetDB/mTests_sql_test_in-value-list" "--set" "embedded_c=true" +# 11:12:26 > + +# MonetDB 5 server v11.32.0 (hg id: a2909c9af1b7+) +# This is an unreleased version +# Serving database 'mTests_sql_test_in-value-list', using 4 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers +# Found 15.551 GiB available main-memory. +# Copyright (c) 1993 - July 2008 CWI. +# Copyright (c) August 2008 - 2019 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://aris-MonetDB:31520/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-28282/.s.monetdb.31520 +# SQL catalog created, loading sql scripts once +# loading sql script: 09_like.sql +# loading sql script: 10_math.sql +# loading sql script: 11_times.sql +# loading sql script: 12_url.sql +# loading sql script: 13_date.sql +# loading sql script: 14_inet.sql +# loading sql script: 15_querylog.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_temporal.sql +# loading sql script: 18_index.sql +# loading sql script: 20_vacuum.sql +# loading sql script: 21_dependency_views.sql +# loading sql script: 22_clients.sql +# loading
MonetDB: in-value-list - Introduce a simple test suite for in-va...
Changeset: 093fbfa791ac for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=093fbfa791ac Added Files: sql/test/in-value-list/Tests/various-in-value-list-queries.sql Modified Files: sql/test/in-value-list/Tests/All Branch: in-value-list Log Message: Introduce a simple test suite for in-value-lists. diffs (70 lines): diff --git a/sql/test/in-value-list/Tests/All b/sql/test/in-value-list/Tests/All --- a/sql/test/in-value-list/Tests/All +++ b/sql/test/in-value-list/Tests/All @@ -0,0 +1,1 @@ +various-in-value-list-queries diff --git a/sql/test/in-value-list/Tests/various-in-value-list-queries.sql b/sql/test/in-value-list/Tests/various-in-value-list-queries.sql new file mode 100644 --- /dev/null +++ b/sql/test/in-value-list/Tests/various-in-value-list-queries.sql @@ -0,0 +1,60 @@ +create table foo (i int); +insert into foo values (null), (10), (null), (20), (10), (30), (30), (30), (50), (40), (50); + +select * from foo where i in (10, 20, 20, 30, 30) order by i; + +select * from foo where i not in (10, 20, 20, 30, 30) order by i; + +select * from foo where i = 40 or i in (10, 20, 20, 30, 30) order by i; + +select * from foo where i = 40 or i not in (10, 20, 20, 30, 30) order by i; + +select * from foo where i = 40 and i in (10, 20, 20, 30, 30) order by i; + +select * from foo where i = 40 and i not in (10, 20, 20, 30, 30) order by i; + +select * from foo where i in (10, 20, 20, 30, 30) and i in (20, 30, 40) order by i; + +select * from foo where i not in (10, 20, 20, 30, 30) and i not in (20, 30, 40) order by i; + +select * from foo where i in (10, 20, 20, 30, 30) and i not in (20, 30, 40) order by i; + +select * from foo where i not in (10, 20, 20, 30, 30) and i in (20, 30, 40) order by i; + +select * from foo where i in (10, 20, 20, 30, 30) or i in (20, 30, 40) order by i; + +select * from foo where i not in (10, 20, 20, 30, 30) or i not in (20, 30, 40) order by i; + +select * from foo where i in (10, 20, 20, 30, 30) or i not in (20, 30, 40) order by i; + +select * from foo where i not in (10, 20, 20, 30, 30) or i in (20, 30, 40) order by i; + +select * from foo where i = 40 and i not in (10, 20 + 20, 30) order by i; + +select * from foo where i = 40 and i in (2*10 + 10, null, i - 1, i, i + 1, null) order by i; + +select * from foo where i = 40 and i not in (2*10 + 10, null, i - 1, i, i + 1, null) order by i; + +select * from foo where i = 40 and (i + 10) in (2*10 + 10, null, i - 1, i, i + 10, null) order by i; + +select * from foo where i = 40 and (i + 10) not in (2*10 + 10, null, i - 1, i, i + 10, null) order by i; + +select * from foo where i = 40 or i not in (10, 20 + 20, 30) order by i; + +select * from foo where i = 40 or i in (2*10 + 10, null, i - 1, i, i + 1, null) order by i; + +select * from foo where i = 40 or i not in (2*10 + 10, null, i - 1, i, i + 1, null) order by i; + +select * from foo where i = 40 or (i + 10) in (2*10 + 10, null, i - 1, i, i + 10, null) order by i; + +select * from foo where i = 40 or (i + 10) not in (2*10 + 10, null, i - 1, i, i + 10, null) order by i; + +select * from foo where i in (10, null, 20, null) order by i; + +select * from foo where i not in (10, null, 20, null) order by i; + +select * from foo where i = 40 and i not in (null) order by i; + +select * from foo where i = 40 and i in (null) order by i; + +select * from foo where i = 40 and i in (select bar.i from foo as bar where i in (10, 20)) order by i; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: in-value-list - Move python script to separate python d...
Changeset: 027c7415761f for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=027c7415761f Added Files: sql/test/in-value-list/python-scripts/create-copy-into-query.py sql/test/in-value-list/python-scripts/create-select-query.py sql/test/in-value-list/python-scripts/generate-query.py sql/test/in-value-list/python-scripts/init-db.py Removed Files: sql/test/in-value-list/Tests/init-db.py sql/test/in-value-list/create-copy-into-query.py sql/test/in-value-list/create-select-query.py sql/test/in-value-list/generate-query.py Branch: in-value-list Log Message: Move python script to separate python directory. diffs (12 lines): diff --git a/sql/test/in-value-list/create-copy-into-query.py b/sql/test/in-value-list/python-scripts/create-copy-into-query.py rename from sql/test/in-value-list/create-copy-into-query.py rename to sql/test/in-value-list/python-scripts/create-copy-into-query.py diff --git a/sql/test/in-value-list/create-select-query.py b/sql/test/in-value-list/python-scripts/create-select-query.py rename from sql/test/in-value-list/create-select-query.py rename to sql/test/in-value-list/python-scripts/create-select-query.py diff --git a/sql/test/in-value-list/generate-query.py b/sql/test/in-value-list/python-scripts/generate-query.py rename from sql/test/in-value-list/generate-query.py rename to sql/test/in-value-list/python-scripts/generate-query.py diff --git a/sql/test/in-value-list/Tests/init-db.py b/sql/test/in-value-list/python-scripts/init-db.py rename from sql/test/in-value-list/Tests/init-db.py rename to sql/test/in-value-list/python-scripts/init-db.py ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: in-value-list - Add template python db-init script.
Changeset: ba61ee2f2650 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ba61ee2f2650
Added Files:
sql/test/in-value-list/Tests/init-db.py
Branch: in-value-list
Log Message:
Add template python db-init script.
diffs (51 lines):
diff --git a/sql/test/in-value-list/Tests/init-db.py
b/sql/test/in-value-list/Tests/init-db.py
new file mode 100644
--- /dev/null
+++ b/sql/test/in-value-list/Tests/init-db.py
@@ -0,0 +1,46 @@
+import os, sys
+try:
+from MonetDBtesting import process
+except ImportError:
+import process
+
+def server_start(args):
+sys.stderr.write('#mserver: "%s"\n' % ' '.join(args))
+sys.stderr.flush()
+srv = process.server(args = args, stdin = process.PIPE,
+ stdout = process.PIPE, stderr = process.PIPE)
+return srv
+
+def client(lang, file):
+sys.stderr.write('#client: "%s"\n' % file)
+sys.stderr.flush()
+clt = process.client(lang.lower(), stdin = open(file),
+ stdout = process.PIPE, stderr = process.PIPE)
+return clt.communicate()
+
+def delete_where_in_mega_value_list_query_statement(size, period):
+values = [str(x) for x in range(0, size-1) if x % period == 0]
+
+return "delete from table1 where id in ({});".format(','.join(values))
+
+def main():
+srv = server_start([])
+
+out, err = client('SQL',
+ os.path.join(os.getenv('RELSRCDIR'),
+ 'create-and-fill-table.sql'))
+sys.stdout.write(out)
+sys.stderr.write(err)
+
+c = process.client('sql', stdin = process.PIPE, stdout = process.PIPE,
stderr = process.PIPE)
+
+out, err =
c.communicate(delete_where_in_mega_value_list_query_statement(100, 5))
+
+sys.stdout.write(out)
+sys.stderr.write(err)
+
+out, err = srv.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err)
+
+main()
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Add all TPC-DS tests and provide stable output.
Changeset: 7ff3e94ad025 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7ff3e94ad025 Added Files: sql/benchmarks/tpcds/Tests/01.reqtests sql/benchmarks/tpcds/Tests/01.sql sql/benchmarks/tpcds/Tests/01.stable.err sql/benchmarks/tpcds/Tests/01.stable.out sql/benchmarks/tpcds/Tests/02.reqtests sql/benchmarks/tpcds/Tests/02.sql sql/benchmarks/tpcds/Tests/02.stable.err sql/benchmarks/tpcds/Tests/02.stable.out sql/benchmarks/tpcds/Tests/03.reqtests sql/benchmarks/tpcds/Tests/03.sql sql/benchmarks/tpcds/Tests/03.stable.err sql/benchmarks/tpcds/Tests/03.stable.out sql/benchmarks/tpcds/Tests/04.reqtests sql/benchmarks/tpcds/Tests/04.sql sql/benchmarks/tpcds/Tests/04.stable.err sql/benchmarks/tpcds/Tests/04.stable.out sql/benchmarks/tpcds/Tests/05.reqtests sql/benchmarks/tpcds/Tests/05.sql sql/benchmarks/tpcds/Tests/05.stable.err sql/benchmarks/tpcds/Tests/05.stable.out sql/benchmarks/tpcds/Tests/06.reqtests sql/benchmarks/tpcds/Tests/06.sql sql/benchmarks/tpcds/Tests/06.stable.err sql/benchmarks/tpcds/Tests/06.stable.out sql/benchmarks/tpcds/Tests/07.reqtests sql/benchmarks/tpcds/Tests/07.sql sql/benchmarks/tpcds/Tests/07.stable.err sql/benchmarks/tpcds/Tests/07.stable.out sql/benchmarks/tpcds/Tests/08.reqtests sql/benchmarks/tpcds/Tests/08.sql sql/benchmarks/tpcds/Tests/08.stable.err sql/benchmarks/tpcds/Tests/08.stable.out sql/benchmarks/tpcds/Tests/09.reqtests sql/benchmarks/tpcds/Tests/09.sql sql/benchmarks/tpcds/Tests/09.stable.err sql/benchmarks/tpcds/Tests/09.stable.out sql/benchmarks/tpcds/Tests/10.reqtests sql/benchmarks/tpcds/Tests/10.sql sql/benchmarks/tpcds/Tests/10.stable.err sql/benchmarks/tpcds/Tests/10.stable.out sql/benchmarks/tpcds/Tests/11.stable.err sql/benchmarks/tpcds/Tests/11.stable.out sql/benchmarks/tpcds/Tests/12.reqtests sql/benchmarks/tpcds/Tests/12.sql sql/benchmarks/tpcds/Tests/12.stable.err sql/benchmarks/tpcds/Tests/12.stable.out sql/benchmarks/tpcds/Tests/13.reqtests sql/benchmarks/tpcds/Tests/13.sql sql/benchmarks/tpcds/Tests/13.stable.err sql/benchmarks/tpcds/Tests/13.stable.out sql/benchmarks/tpcds/Tests/14a.reqtests sql/benchmarks/tpcds/Tests/14a.sql sql/benchmarks/tpcds/Tests/14a.stable.err sql/benchmarks/tpcds/Tests/14a.stable.out sql/benchmarks/tpcds/Tests/14b.reqtests sql/benchmarks/tpcds/Tests/14b.sql sql/benchmarks/tpcds/Tests/14b.stable.err sql/benchmarks/tpcds/Tests/14b.stable.out sql/benchmarks/tpcds/Tests/15.reqtests sql/benchmarks/tpcds/Tests/15.sql sql/benchmarks/tpcds/Tests/15.stable.err sql/benchmarks/tpcds/Tests/15.stable.out sql/benchmarks/tpcds/Tests/16.reqtests sql/benchmarks/tpcds/Tests/16.sql sql/benchmarks/tpcds/Tests/16.stable.err sql/benchmarks/tpcds/Tests/16.stable.out sql/benchmarks/tpcds/Tests/17.reqtests sql/benchmarks/tpcds/Tests/17.sql sql/benchmarks/tpcds/Tests/17.stable.err sql/benchmarks/tpcds/Tests/17.stable.out sql/benchmarks/tpcds/Tests/18.reqtests sql/benchmarks/tpcds/Tests/18.sql sql/benchmarks/tpcds/Tests/18.stable.err sql/benchmarks/tpcds/Tests/18.stable.out sql/benchmarks/tpcds/Tests/19.reqtests sql/benchmarks/tpcds/Tests/19.sql sql/benchmarks/tpcds/Tests/19.stable.err sql/benchmarks/tpcds/Tests/19.stable.out sql/benchmarks/tpcds/Tests/20.reqtests sql/benchmarks/tpcds/Tests/20.sql sql/benchmarks/tpcds/Tests/20.stable.err sql/benchmarks/tpcds/Tests/20.stable.out sql/benchmarks/tpcds/Tests/21.reqtests sql/benchmarks/tpcds/Tests/21.sql sql/benchmarks/tpcds/Tests/21.stable.err sql/benchmarks/tpcds/Tests/21.stable.out sql/benchmarks/tpcds/Tests/22.reqtests sql/benchmarks/tpcds/Tests/22.sql sql/benchmarks/tpcds/Tests/22.stable.err sql/benchmarks/tpcds/Tests/22.stable.out sql/benchmarks/tpcds/Tests/23a.reqtests sql/benchmarks/tpcds/Tests/23a.sql sql/benchmarks/tpcds/Tests/23a.stable.err sql/benchmarks/tpcds/Tests/23a.stable.out sql/benchmarks/tpcds/Tests/23b.reqtests sql/benchmarks/tpcds/Tests/23b.sql sql/benchmarks/tpcds/Tests/23b.stable.err sql/benchmarks/tpcds/Tests/23b.stable.out sql/benchmarks/tpcds/Tests/24a.reqtests sql/benchmarks/tpcds/Tests/24a.sql sql/benchmarks/tpcds/Tests/24a.stable.err sql/benchmarks/tpcds/Tests/24a.stable.out sql/benchmarks/tpcds/Tests/24b.reqtests
MonetDB: default - Merge with Aug2018 branch, not changing any f...
Changeset: 1cc3f8d7e714 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1cc3f8d7e714 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: 9d95972be7c6 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9d95972be7c6
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 (227 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.13
+%global version 11.31.14
%{!?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-SP2"
+#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.13"
+#define PACKAGE_VERSION "11.31.14"
/* 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 - 2019 MonetDB B.V.
-VERSION=11.31.13
+VERSION=11.31.14
# ^^
# 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,13,1
- PRODUCTVERSION 11,31,13,1
+ FILEVERSION 11,31,14,1
+ PRODUCTVERSION 11,31,14,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.13\0"
+ VALUE "FileVersion", "11.31.14\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.13\0"
+ VALUE "ProductVersion", "11.31.14\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,13,1
- PRODUCTVERSION 11,31,13,1
+ FILEVERSION 11,31,14,1
+ PRODUCTVERSION 11,31,14,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.13\0"
+ VALUE "FileVersion", "11.31.14\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.13\0"
+ VALUE "ProductVersion", "11.31.14\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,13,1
- PRODUCTVERSION 11,31,13,1
+ FILEVERSION 11,31,14,1
+ PRODUCTVERSION 11,31,14,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.13"
+VALUE "FileVersion", "11.31.14"
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2019"
MonetDB: default - Merge with Aug2018 branch.
Changeset: 3fa321c39a72 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3fa321c39a72
Modified Files:
.hgtags
ChangeLog-Archive
MonetDB.spec
debian/changelog
libversions
sql/ChangeLog-Archive
sql/ChangeLog.Aug2018
Branch: default
Log Message:
Merge with Aug2018 branch.
diffs (160 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -717,3 +717,5 @@ a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d
24d62811fd9372b1ee7525aa1cf2fc8860d20bf7 Aug2018_11
a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_SP1_release
24d62811fd9372b1ee7525aa1cf2fc8860d20bf7 Aug2018_SP1_release
+a4e8c9372aa244d6a18c3ef8f1513905650d812c Aug2018_13
+a4e8c9372aa244d6a18c3ef8f1513905650d812c Aug2018_SP2_release
diff --git a/ChangeLog-Archive b/ChangeLog-Archive
--- a/ChangeLog-Archive
+++ b/ChangeLog-Archive
@@ -1,6 +1,8 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Wed Oct 10 2018 Sjoerd Mullender - 11.31.13-20190104
+
* Wed Oct 10 2018 Sjoerd Mullender - 11.31.11-20181011
- Some subtle dependencies between RPMs have been fixed.
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -113,7 +113,7 @@ Group: Applications/Databases
License: MPLv2.0
URL: https://www.monetdb.org/
BugURL: https://bugs.monetdb.org/
-Source:
https://www.monetdb.org/downloads/sources/Aug2018-SP1/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Aug2018-SP2/%{name}-%{version}.tar.bz2
# we need systemd for the _unitdir macro to exist
# we need checkpolicy and selinux-policy-devel for the SELinux policy
@@ -1061,6 +1061,37 @@ done
%postun -p /sbin/ldconfig
%changelog
+* Fri Jan 04 2019 Sjoerd Mullender - 11.31.13-20190104
+- Rebuilt.
+- BZ#6643: schema name qualifier in create global temporary table
+ json.table6643 ... is not honered
+- BZ#6645: optimizer treats all the functions with no or constant
+ parameters as constant
+- BZ#6650: PREPARE SQL statement fails to compile user defined functions
+ with parameter/s
+- BZ#6651: Multi-column IN clause for subquery produces wrong results
+- BZ#6653: CREATE TABLE accepts empty table/column name
+- BZ#6654: Incorrect handling of 'TRUE' in compound select
+- BZ#6657: Restart sequence with a non atomic sub-query cardinality
+ gives wrong error message
+- BZ#6660: GRANTing a ROLE is not idempotent
+- BZ#6662: Concurrency Conflicts Exception string "!transaction is
+ aborted because of concurrency conflicts, will ROLLBACK instead" not
+ shown on prompt.
+- BZ#6664: mserver5 crash: infinite recursive happens at rel_bin.c:489
+- BZ#6665: Creation of serial types does not accept negative numbers
+- BZ#: COPY INTO from .. LOCKED doubles input data
+- BZ#6668: The SAMPLE key word doesn't work in a subquery.
+- BZ#6669: COPY [xxx RECORDS] INTO foo FROM STDIN ... doesn't work
+ without specifying nr of to be copied records
+- BZ#6672: SQLGetData with SQL_C_WCHAR string truncation and invalid
+ StrLen_or_Ind value
+
+* Tue Oct 30 2018 Sjoerd Mullender - 11.31.13-20190104
+- sql: Disabled function sys.getcontent(url).
+
+* Thu Oct 11 2018 Sjoerd Mullender - 11.31.13-20190104
+
* Thu Oct 11 2018 Sjoerd Mullender - 11.31.11-20181011
- Rebuilt.
- BZ#6648: key property potentially wrong after type conversion
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,43 @@
+monetdb (11.31.13) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#6643: schema name qualifier in create global temporary table
+json.table6643 ... is not honered
+ * BZ#6645: optimizer treats all the functions with no or constant
+parameters as constant
+ * BZ#6650: PREPARE SQL statement fails to compile user defined functions
+with parameter/s
+ * BZ#6651: Multi-column IN clause for subquery produces wrong results
+ * BZ#6653: CREATE TABLE accepts empty table/column name
+ * BZ#6654: Incorrect handling of 'TRUE' in compound select
+ * BZ#6657: Restart sequence with a non atomic sub-query cardinality
+gives wrong error message
+ * BZ#6660: GRANTing a ROLE is not idempotent
+ * BZ#6662: Concurrency Conflicts Exception string "!transaction is
+aborted because of concurrency conflicts, will ROLLBACK instead" not
+shown on prompt.
+ * BZ#6664: mserver5 crash: infinite recursive happens at rel_bin.c:489
+ * BZ#6665: Creation of serial types does not accept negative numbers
+ * BZ#: COPY INTO from .. LOCKED doubles input data
+ * BZ#6668: The SAMPLE key word doesn't work in a subquery.
+ * BZ#6669: COPY [xxx RECORDS] INTO foo FROM STDIN ... doesn't work
+without specifying nr of to be copied records
+ * BZ#6672: SQLGetData with SQL_C_WCHAR string truncation and invalid
+StrLen_or_Ind value
+
+ -- Sjoerd Mullender Fri, 04 Jan 2019 10:34:42 +0100
+
+monetdb (11.31.13) unstable; urgency=low
+
+ * sql: Disabled fun
MonetDB: Aug2018 - Setting tags Aug2018_13 and Aug2018_SP2 for t...
Changeset: 1313ab6e3866 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1313ab6e3866 Modified Files: .hgtags Branch: Aug2018 Log Message: Setting tags Aug2018_13 and Aug2018_SP2 for the release build. diffs (9 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -717,3 +717,5 @@ a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d 24d62811fd9372b1ee7525aa1cf2fc8860d20bf7 Aug2018_11 a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_SP1_release 24d62811fd9372b1ee7525aa1cf2fc8860d20bf7 Aug2018_SP1_release +a4e8c9372aa244d6a18c3ef8f1513905650d812c Aug2018_13 +a4e8c9372aa244d6a18c3ef8f1513905650d812c Aug2018_SP2_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: a4e8c9372aa2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a4e8c9372aa2
Modified Files:
ChangeLog-Archive
MonetDB.spec
debian/changelog
sql/ChangeLog-Archive
sql/ChangeLog.Aug2018
Branch: Aug2018
Log Message:
Moved contents of ChangeLog.Aug2018 to MonetDB.spec, debian/changelog and
ChangeLog-Archive.
diffs (132 lines):
diff --git a/ChangeLog-Archive b/ChangeLog-Archive
--- a/ChangeLog-Archive
+++ b/ChangeLog-Archive
@@ -1,6 +1,8 @@
# DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
# This file contains past ChangeLog entries
+* Wed Oct 10 2018 Sjoerd Mullender - 11.31.13-20190104
+
* Wed Oct 10 2018 Sjoerd Mullender - 11.31.11-20181011
- Some subtle dependencies between RPMs have been fixed.
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -108,7 +108,7 @@ Group: Applications/Databases
License: MPLv2.0
URL: https://www.monetdb.org/
BugURL: https://bugs.monetdb.org/
-Source:
https://www.monetdb.org/downloads/sources/Aug2018-SP1/%{name}-%{version}.tar.bz2
+Source:
https://www.monetdb.org/downloads/sources/Aug2018-SP2/%{name}-%{version}.tar.bz2
# we need systemd for the _unitdir macro to exist
# we need checkpolicy and selinux-policy-devel for the SELinux policy
@@ -1022,6 +1022,37 @@ done
%postun -p /sbin/ldconfig
%changelog
+* Fri Jan 04 2019 Sjoerd Mullender - 11.31.13-20190104
+- Rebuilt.
+- BZ#6643: schema name qualifier in create global temporary table
+ json.table6643 ... is not honered
+- BZ#6645: optimizer treats all the functions with no or constant
+ parameters as constant
+- BZ#6650: PREPARE SQL statement fails to compile user defined functions
+ with parameter/s
+- BZ#6651: Multi-column IN clause for subquery produces wrong results
+- BZ#6653: CREATE TABLE accepts empty table/column name
+- BZ#6654: Incorrect handling of 'TRUE' in compound select
+- BZ#6657: Restart sequence with a non atomic sub-query cardinality
+ gives wrong error message
+- BZ#6660: GRANTing a ROLE is not idempotent
+- BZ#6662: Concurrency Conflicts Exception string "!transaction is
+ aborted because of concurrency conflicts, will ROLLBACK instead" not
+ shown on prompt.
+- BZ#6664: mserver5 crash: infinite recursive happens at rel_bin.c:489
+- BZ#6665: Creation of serial types does not accept negative numbers
+- BZ#: COPY INTO from .. LOCKED doubles input data
+- BZ#6668: The SAMPLE key word doesn't work in a subquery.
+- BZ#6669: COPY [xxx RECORDS] INTO foo FROM STDIN ... doesn't work
+ without specifying nr of to be copied records
+- BZ#6672: SQLGetData with SQL_C_WCHAR string truncation and invalid
+ StrLen_or_Ind value
+
+* Tue Oct 30 2018 Sjoerd Mullender - 11.31.13-20190104
+- sql: Disabled function sys.getcontent(url).
+
+* Thu Oct 11 2018 Sjoerd Mullender - 11.31.13-20190104
+
* Thu Oct 11 2018 Sjoerd Mullender - 11.31.11-20181011
- Rebuilt.
- BZ#6648: key property potentially wrong after type conversion
diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,43 @@
+monetdb (11.31.13) unstable; urgency=low
+
+ * Rebuilt.
+ * BZ#6643: schema name qualifier in create global temporary table
+json.table6643 ... is not honered
+ * BZ#6645: optimizer treats all the functions with no or constant
+parameters as constant
+ * BZ#6650: PREPARE SQL statement fails to compile user defined functions
+with parameter/s
+ * BZ#6651: Multi-column IN clause for subquery produces wrong results
+ * BZ#6653: CREATE TABLE accepts empty table/column name
+ * BZ#6654: Incorrect handling of 'TRUE' in compound select
+ * BZ#6657: Restart sequence with a non atomic sub-query cardinality
+gives wrong error message
+ * BZ#6660: GRANTing a ROLE is not idempotent
+ * BZ#6662: Concurrency Conflicts Exception string "!transaction is
+aborted because of concurrency conflicts, will ROLLBACK instead" not
+shown on prompt.
+ * BZ#6664: mserver5 crash: infinite recursive happens at rel_bin.c:489
+ * BZ#6665: Creation of serial types does not accept negative numbers
+ * BZ#: COPY INTO from .. LOCKED doubles input data
+ * BZ#6668: The SAMPLE key word doesn't work in a subquery.
+ * BZ#6669: COPY [xxx RECORDS] INTO foo FROM STDIN ... doesn't work
+without specifying nr of to be copied records
+ * BZ#6672: SQLGetData with SQL_C_WCHAR string truncation and invalid
+StrLen_or_Ind value
+
+ -- Sjoerd Mullender Fri, 04 Jan 2019 10:34:42 +0100
+
+monetdb (11.31.13) unstable; urgency=low
+
+ * sql: Disabled function sys.getcontent(url).
+
+ -- Sjoerd Mullender Tue, 30 Oct 2018 10:34:42 +0100
+
+monetdb (11.31.13) unstable; urgency=low
+
+
+ -- Sjoerd Mullender Thu, 11 Oct 2018 10:34:42 +0100
+
monetdb (11.31.11) unstable; urgency=low
* Rebuilt.
diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive
--- a/sql/ChangeLog-Archive
+++ b/sql/ChangeLog-Archive
@@ -1,6 +1
MonetDB: Aug2018 - Updated library versions.
Changeset: 439d82edd7e7 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=439d82edd7e7 Modified Files: libversions Branch: Aug2018 Log Message: Updated library versions. diffs (19 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:3:0 +GDK_VERSION=17:4: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:3:0 +MONETDB5_VERSION=26:0:1 # version of the STREAM library (subdirectory common/stream) 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: 2ed0d9eff7bd for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2ed0d9eff7bd 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: a777598369fc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a777598369fc
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 (228 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.12
+%global version 11.31.13
%{!?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-SP2"
/* 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.12"
+#define PACKAGE_VERSION "11.31.13"
/* 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 - 2019 MonetDB B.V.
-VERSION=11.31.12
+VERSION=11.31.13
# ^^
# 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,12,1
- PRODUCTVERSION 11,31,12,1
+ FILEVERSION 11,31,13,1
+ PRODUCTVERSION 11,31,13,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.12\0"
+ VALUE "FileVersion", "11.31.13\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.12\0"
+ VALUE "ProductVersion", "11.31.13\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,12,1
- PRODUCTVERSION 11,31,12,1
+ FILEVERSION 11,31,13,1
+ PRODUCTVERSION 11,31,13,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.12\0"
+ VALUE "FileVersion", "11.31.13\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.12\0"
+ VALUE "ProductVersion", "11.31.13\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,12,1
- PRODUCTVERSION 11,31,12,1
+ FILEVERSION 11,31,13,1
+ PRODUCTVERSION 11,31,13,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.12"
+VALUE "FileVersion", "11.31.13"
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright © MonetDB
MonetDB: default - Merge with Aug2018 branch.
Changeset: 4652fa2d34c9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4652fa2d34c9
Modified Files:
clients/mapiclient/mhelp.c
tools/merovingian/client/monetdb.c
Branch: default
Log Message:
Merge with Aug2018 branch.
diffs (truncated from 351 to 300 lines):
diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -41,9 +41,7 @@ typedef struct {
const char *comments;
} SQLhelp;
-#define NUMBER_MAJOR_COMMANDS 76 // The number of major commands to show in
case of no query
-
-SQLhelp sqlhelp[] = {
+SQLhelp sqlhelp1[] = {
// major commands
{"ALTER TABLE",
"",
@@ -58,25 +56,25 @@ SQLhelp sqlhelp[] = {
"ALTER TABLE [ IF EXISTS ] qname SET { { READ | INSERT } ONLY | READ
WRITE }\n"
"ALTER TABLE [ IF EXISTS ] qname RENAME TO ident\n"
"ALTER TABLE [ IF EXISTS ] qname SET SCHEMA ident",
-"column_def,table_constraint",
+"qname,column_def,table_constraint,ident",
"See also https://www.monetdb.org/Documentation/SQLreference/Alter"},
{"ALTER MERGE TABLE",
"",
"ALTER TABLE [ IF EXISTS ] qname ADD TABLE qname [ AS PARTITION
opt_partition_spec ]\n"
"ALTER TABLE [ IF EXISTS ] qname DROP TABLE qname [ RESTRICT | CASCADE
]\n"
"ALTER TABLE [ IF EXISTS ] qname SET TABLE qname AS PARTITION
opt_partition_spec",
-"opt_partition_spec",
+"qname,opt_partition_spec",
"See also
https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/DataPartitioning"},
{"ALTER SCHEMA",
"",
"ALTER SCHEMA [ IF EXISTS ] ident RENAME TO ident",
-NULL,
+"ident",
"See also https://www.monetdb.org/Documentation/SQLreference/Alter"},
{"ALTER SEQUENCE",
"",
-"ALTER SEQUENCE ident [ AS datatype] [ RESTART [WITH start]]
[INCREMENT BY increment]\n"
+"ALTER SEQUENCE ident [ AS data_type] [ RESTART [WITH start]]
[INCREMENT BY increment]\n"
"[MINVALUE minvalue | NO MINVALUE] [MAXVALUE maxvalue | NO MAXVALUE]
[CACHE cachevalue] [[NO] CYCLE]",
-NULL,
+"ident,data_type",
"See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/SerialTypes"},
{"ALTER USER",
"",
@@ -85,7 +83,7 @@ SQLhelp sqlhelp[] = {
"ALTER USER ident WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string SET
SCHEMA schemaname\n"
"ALTER USER RENAME TO ident\n"
"ALTER USER SET [ENCRYPTED | UNENCRYPTED] PASSWORD string USING OLD
PASSWORD string",
-NULL,
+"ident",
"See also https://www.monetdb.org/Documentation/SQLreference/Users"},
{"ANALYZE",
"Collect column data statistics for optimizations",
@@ -107,7 +105,7 @@ SQLhelp sqlhelp[] = {
"COMMENT ON { SCHEMA | TABLE | VIEW | COLUMN | INDEX | SEQUENCE |\n"
" FUNCTION | PROCEDURE | AGGREGATE | FILTER FUNCTION |
LOADER }\n"
" qname IS { 'my description text' | NULL | '' }",
-NULL,
+"qname",
NULL},
{"COMMIT",
"Commit the current transaction",
@@ -117,7 +115,7 @@ SQLhelp sqlhelp[] = {
{"COPY BINARY",
"Append binary representations into a table",
"COPY [nrofrecords] BINARY INTO qname [column_list] FROM string [','
...] [ON { CLIENT | SERVER }] [NO CONSTRAINT]",
-"nrofrecords",
+"nrofrecords,qname,column_list",
"See also
https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/BinaryBulkLoad"},
{"COPY INTO",
"Parse a csv file into a table or write a query result to a csv file",
@@ -125,13 +123,13 @@ SQLhelp sqlhelp[] = {
" [NULL [AS] string] [LOCKED] [BEST EFFORT] [NO CONSTRAINT] [FWF '('
integer [',' ...] ')'\n"
"COPY [nrofrecords] INTO qname [column_list] FROM STDIN [headerlist] [
separators]\n"
" [NULL [AS] string] [LOCKED] [BEST EFFORT] [NO CONSTRAINT]\n"
-"COPY query_expression INTO [STDOUT | string [ON { CLIENT | SERVER }]]
[seps] [NULL [AS] string]",
-"nrofrecords,headerlist,separators",
+"COPY query_expression INTO [STDOUT | string [ON { CLIENT | SERVER }]]
[separators] [NULL [AS] string]",
+"nrofrecords,qname,column_list,headerlist,separators",
"See also
https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/LoadingBulkData"},
{"COPY LOADER",
"Copy into using a user supplied parsing function",
"COPY LOADER INTO qname FROM qname '(' [ scalar_expression ... ] ')'",
-NULL,
+"qname",
NULL},
{"CREATE AGGREGATE",
"",
@@ -141,7 +139,7 @@ SQLhelp sqlhelp[] = {
"CREATE [ OR REPLACE ] AGGREGATE qname '(' { '*' | [ param [',' ...]]
} ')'\n"
"RETURNS { data_type | TABLE '(' function_return [',' ...] ')' }\n"
"LANGUAGE ident external_code",
-
