MonetDB: default - Let get_with_comments_as_clause() in dump.c a...
Changeset: 2740f9b258ce for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2740f9b258ce
Modified Files:
clients/mapiclient/dump.c
clients/mapiclient/mclient.c
Branch: default
Log Message:
Let get_with_comments_as_clause() in dump.c always return a non NULL const char
*, which is either the new_clause or the old_clause string.
This allows us to reduce code in dump.c and mclient.c.
diffs (147 lines):
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -58,22 +58,20 @@ get_with_comments_as_clause(Mapi mid)
"WHERE id = language_id"
")";
- MapiHdl hdl;
- const char *comments_clause;
-
- hdl = mapi_query(mid, query);
- if (mapi_error(mid)) {
- if (hdl) {
+ bool has_sys_comments = false;
+ MapiHdl hdl = mapi_query(mid, query);
+ if (hdl) {
+ if (mapi_error(mid)) {
mapi_explain_result(hdl, stderr);
- mapi_close_handle(hdl);
- } else
- mapi_explain(mid, stderr);
- return NULL;
- }
- comments_clause = mapi_fetch_row(hdl) ? new_clause : old_clause;
- mapi_close_handle(hdl);
+ } else {
+ if (mapi_fetch_row(hdl))
+ has_sys_comments = true;
+ }
+ mapi_close_handle(hdl);
+ } else
+ mapi_explain(mid, stderr);
- return comments_clause;
+ return has_sys_comments ? new_clause : old_clause;
}
const char *
@@ -82,6 +80,7 @@ get_comments_clause(Mapi mid)
static const char *comments_clause = NULL;
if (comments_clause == NULL) {
comments_clause = get_with_comments_as_clause(mid);
+ assert(comments_clause != NULL);
}
return comments_clause;
}
@@ -935,9 +934,6 @@ describe_table(Mapi mid, const char *sch
bool hashge;
const char *comments_clause = get_comments_clause(mid);
- if (comments_clause == NULL)
- return 1;
-
if (schema == NULL) {
if ((sname = strchr(tname, '.')) != NULL) {
size_t len = sname - tname;
@@ -1252,9 +1248,6 @@ describe_sequence(Mapi mid, const char *
char *sname = NULL;
const char *comments_clause = get_comments_clause(mid);
- if (comments_clause == NULL)
- return 1;
-
if (schema == NULL) {
if ((sname = strchr(tname, '.')) != NULL) {
size_t len = sname - tname;
@@ -1354,9 +1347,6 @@ describe_schema(Mapi mid, const char *sn
char schemas[5120];
const char *comments_clause = get_comments_clause(mid);
- if (comments_clause == NULL)
- return 1;
-
snprintf(schemas, sizeof(schemas),
"%s "
"SELECT s.name, a.name, c.remark "
@@ -1612,10 +1602,8 @@ dump_function(Mapi mid, stream *toConsol
int flang, ftype;
const char *comments_clause = get_comments_clause(mid);
- if (comments_clause == NULL)
- return 1;
-
- if ((query = malloc(query_size)) == NULL)
+ query = malloc(query_size);
+ if (query == NULL)
return 1;
query_len = snprintf(query, query_size,
@@ -2162,9 +2150,6 @@ dump_database(Mapi mid, stream *toConsol
int query_len = 0;
const char *comments_clause = get_comments_clause(mid);
- if (comments_clause == NULL)
- return 1;
-
query = malloc(query_size);
if (!query)
goto bailout;
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2614,20 +2614,15 @@ doFile(Mapi mid, stream *fp, bool useins
"LEFT OUTER JOIN
comments c ON s.id = c.id\n"
" ORDER BY system,
name, sname, ntype)\n"
;
- size_t len =
strlen(with_clause) + 1500 + strlen(line);
+ const char *comments_clause =
get_comments_clause(mid);
+ size_t len =
strlen(comments_clause) + strlen(with_clause) + 400 + strlen(line);
char *query = malloc(len);
char *q = query, *endq = query
+ len;
- char *name_column = hasSchema ?
"fullname" : "name";
- const char *comments_clause =
get_comments_clause(mid);
MonetDB: default - Cosmetics: use bool, use const, proper indent.
Changeset: 63b16d9f430f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=63b16d9f430f
Modified Files:
gdk/gdk_logger.c
gdk/gdk_logger.h
sql/storage/bat/bat_logger.c
sql/storage/sql_storage.h
sql/storage/store.c
Branch: default
Log Message:
Cosmetics: use bool, use const, proper indent.
I really dislike a for loop as the body of an if without the indent.
diffs (220 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -97,7 +97,7 @@
#define NAME(name,tpe,id) (name?name:"tpe id")
-static char *log_commands[] = {
+static const char *log_commands[] = {
NULL,
"LOG_START",
"LOG_END",
@@ -1560,7 +1560,7 @@ bm_subcommit(logger *lg, BAT *list_bid,
*/
static int
logger_set_logdir_path(char *filename, const char *fn,
- const char *logdir, int shared)
+ const char *logdir, bool shared)
{
int role = PERSISTENT; /* default role is persistent, i.e. the default
dbfarm */
@@ -1804,7 +1804,7 @@ logger_load(int debug, const char *fn, c
if (BUNappend(t, , false) != GDK_SUCCEED)
goto error;
}
- lg->with_ids = 0;
+ lg->with_ids = false;
}
snprintf(bak, sizeof(bak), "%s_catalog_oid", fn);
@@ -1827,7 +1827,7 @@ logger_load(int debug, const char *fn, c
if (BUNappend(o, , false) != GDK_SUCCEED)
goto error;
}
- lg->with_ids = 0;
+ lg->with_ids = false;
}
snprintf(bak, sizeof(bak), "%s_dcatalog", fn);
@@ -1972,7 +1972,7 @@ logger_load(int debug, const char *fn, c
bat seqs_val = logger_find_bat(lg, "seqs_val", 0, 0);
bat snapshots_tid = logger_find_bat(lg, "snapshots_tid", 0, 0);
bat dsnapshots = logger_find_bat(lg, "dsnapshots", 0, 0);
- int needcommit = 0;
+ bool needcommit = false;
int dbg = GDKdebug;
if (seqs_id) {
@@ -2044,7 +2044,7 @@ logger_load(int debug, const char *fn, c
"%s failed", bak);
goto error;
}
- needcommit = 1;
+ needcommit = true;
}
GDKdebug &= ~CHECKMASK;
if (needcommit && bm_commit(lg) != GDK_SUCCEED) {
@@ -2138,7 +2138,7 @@ logger_load(int debug, const char *fn, c
goto error;
}
/* set the flag that we need to convert */
- lg->convert_nil_nan = 1;
+ lg->convert_nil_nan = true;
} else if ((fp1 = GDKfileopen(farmid, NULL, cvfile,
NULL, "r")) != NULL) {
/* the versioned conversion file
* exists: check version */
@@ -2148,7 +2148,7 @@ logger_load(int debug, const char *fn, c
newid == curid) {
/* versions match, we need to
* convert */
- lg->convert_nil_nan = 1;
+ lg->convert_nil_nan = true;
}
fclose(fp1);
if (!lg->convert_nil_nan) {
@@ -2170,7 +2170,7 @@ logger_load(int debug, const char *fn, c
/* we converted, remove versioned file and
* reset conversion flag */
GDKunlink(0, NULL, cvfile, NULL);
- lg->convert_nil_nan = 0;
+ lg->convert_nil_nan = false;
}
#endif
if (lg->postfuncp && (*lg->postfuncp)(lg) != GDK_SUCCEED)
@@ -2207,7 +2207,7 @@ logger_load(int debug, const char *fn, c
/* Initialize a new logger
* It will load any data in the logdir and persist it in the BATs*/
static logger *
-logger_new(int debug, const char *fn, const char *logdir, int version,
preversionfix_fptr prefuncp, postversionfix_fptr postfuncp, int shared, const
char *local_logdir)
+logger_new(int debug, const char *fn, const char *logdir, int version,
preversionfix_fptr prefuncp, postversionfix_fptr postfuncp, bool shared, const
char *local_logdir)
{
logger *lg = GDKmalloc(sizeof(struct logger));
char filename[FILENAME_MAX];
@@ -2224,12 +2224,12 @@ logger_new(int debug, const char *fn, co
lg->changes = 0;
lg->version = version;
- lg->with_ids = 1;
+ lg->with_ids = true;
MonetDB: default - merge
Changeset: b2f6cde2e80e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b2f6cde2e80e
Modified Files:
gdk/gdk_logger.c
gdk/gdk_logger.h
sql/storage/bat/bat_logger.c
sql/storage/bat/bat_storage.c
sql/storage/sql_storage.h
sql/storage/store.c
Branch: default
Log Message:
merge
diffs (241 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -97,7 +97,7 @@
#define NAME(name,tpe,id) (name?name:"tpe id")
-static char *log_commands[] = {
+static const char *log_commands[] = {
NULL,
"LOG_START",
"LOG_END",
@@ -1431,7 +1431,7 @@ static gdk_return
bm_subcommit(logger *lg, BAT *list_bid, BAT *list_nme, BAT *catalog_bid, BAT
*catalog_nme, BAT *catalog_tpe, BAT *catalog_oid, BAT *dcatalog, BAT *extra,
int debug)
{
BUN p, q;
- BUN nn = 6 + BATcount(list_bid) + (extra ? BATcount(extra) : 0);
+ BUN nn = 10 + BATcount(list_bid) + (extra ? BATcount(extra) : 0);
bat *n = GDKmalloc(sizeof(bat) * nn);
int i = 0;
BATiter iter = (list_nme)?bat_iterator(list_nme):bat_iterator(list_bid);
@@ -1560,7 +1560,7 @@ bm_subcommit(logger *lg, BAT *list_bid,
*/
static int
logger_set_logdir_path(char *filename, const char *fn,
- const char *logdir, int shared)
+ const char *logdir, bool shared)
{
int role = PERSISTENT; /* default role is persistent, i.e. the default
dbfarm */
@@ -1804,7 +1804,7 @@ logger_load(int debug, const char *fn, c
if (BUNappend(t, , false) != GDK_SUCCEED)
goto error;
}
- lg->with_ids = 0;
+ lg->with_ids = false;
}
snprintf(bak, sizeof(bak), "%s_catalog_oid", fn);
@@ -1827,7 +1827,7 @@ logger_load(int debug, const char *fn, c
if (BUNappend(o, , false) != GDK_SUCCEED)
goto error;
}
- lg->with_ids = 0;
+ lg->with_ids = false;
}
snprintf(bak, sizeof(bak), "%s_dcatalog", fn);
@@ -1972,7 +1972,7 @@ logger_load(int debug, const char *fn, c
bat seqs_val = logger_find_bat(lg, "seqs_val", 0, 0);
bat snapshots_tid = logger_find_bat(lg, "snapshots_tid", 0, 0);
bat dsnapshots = logger_find_bat(lg, "dsnapshots", 0, 0);
- int needcommit = 0;
+ bool needcommit = false;
int dbg = GDKdebug;
if (seqs_id) {
@@ -2044,7 +2044,7 @@ logger_load(int debug, const char *fn, c
"%s failed", bak);
goto error;
}
- needcommit = 1;
+ needcommit = true;
}
GDKdebug &= ~CHECKMASK;
if (needcommit && bm_commit(lg) != GDK_SUCCEED) {
@@ -2138,7 +2138,7 @@ logger_load(int debug, const char *fn, c
goto error;
}
/* set the flag that we need to convert */
- lg->convert_nil_nan = 1;
+ lg->convert_nil_nan = true;
} else if ((fp1 = GDKfileopen(farmid, NULL, cvfile,
NULL, "r")) != NULL) {
/* the versioned conversion file
* exists: check version */
@@ -2148,7 +2148,7 @@ logger_load(int debug, const char *fn, c
newid == curid) {
/* versions match, we need to
* convert */
- lg->convert_nil_nan = 1;
+ lg->convert_nil_nan = true;
}
fclose(fp1);
if (!lg->convert_nil_nan) {
@@ -2170,7 +2170,7 @@ logger_load(int debug, const char *fn, c
/* we converted, remove versioned file and
* reset conversion flag */
GDKunlink(0, NULL, cvfile, NULL);
- lg->convert_nil_nan = 0;
+ lg->convert_nil_nan = false;
}
#endif
if (lg->postfuncp && (*lg->postfuncp)(lg) != GDK_SUCCEED)
@@ -2207,7 +2207,7 @@ logger_load(int debug, const char *fn, c
/* Initialize a new logger
* It will load any data in the logdir and persist it in the BATs*/
static logger *
-logger_new(int debug, const char *fn, const char *logdir, int version,
preversionfix_fptr prefuncp, postversionfix_fptr postfuncp, int shared, const
char
MonetDB: rename-sql - Alter table statements with "if exists" ch...
Changeset: 34050ce51a7d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=34050ce51a7d
Added Files:
sql/test/rename/Tests/rename06.sql
sql/test/rename/Tests/rename06.stable.err
sql/test/rename/Tests/rename06.stable.out
Modified Files:
clients/mapiclient/mhelp.c
sql/server/rel_schema.c
sql/server/sql_parser.y
sql/test/rename/Tests/All
Branch: rename-sql
Log Message:
Alter table statements with "if exists" checks.
diffs (truncated from 599 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
@@ -47,28 +47,28 @@ SQLhelp sqlhelp[] = {
// major commands
{"ALTER TABLE",
"",
-"ALTER TABLE qname ADD [ COLUMN ] { column_def | table_constraint }\n"
-"ALTER TABLE qname ALTER [ COLUMN ] ident SET DEFAULT value\n"
-"ALTER TABLE qname ALTER [ COLUMN ] ident SET [NOT] NULL\n"
-"ALTER TABLE qname ALTER [ COLUMN ] ident DROP DEFAULT\n"
-"ALTER TABLE qname ALTER [ COLUMN ] ident SET STORAGE {string |
NULL}\n"
-"ALTER TABLE qname ALTER [ COLUMN ] ident RENAME TO ident\n"
-"ALTER TABLE qname DROP [ COLUMN ] ident [ RESTRICT | CASCADE ]\n"
-"ALTER TABLE qname DROP CONSTRAINT ident [ RESTRICT | CASCADE ]\n"
-"ALTER TABLE qname SET { { READ | INSERT } ONLY | READ WRITE }\n"
-"ALTER TABLE qname RENAME TO ident",
+"ALTER TABLE [ IF EXISTS ] qname ADD [ COLUMN ] { column_def |
table_constraint }\n"
+"ALTER TABLE [ IF EXISTS ] qname ALTER [ COLUMN ] ident SET DEFAULT
value\n"
+"ALTER TABLE [ IF EXISTS ] qname ALTER [ COLUMN ] ident SET [NOT]
NULL\n"
+"ALTER TABLE [ IF EXISTS ] qname ALTER [ COLUMN ] ident DROP DEFAULT\n"
+"ALTER TABLE [ IF EXISTS ] qname ALTER [ COLUMN ] ident SET STORAGE
{string | NULL}\n"
+"ALTER TABLE [ IF EXISTS ] qname ALTER [ COLUMN ] ident RENAME TO
ident\n"
+"ALTER TABLE [ IF EXISTS ] qname DROP [ COLUMN ] ident [ RESTRICT |
CASCADE ]\n"
+"ALTER TABLE [ IF EXISTS ] qname DROP CONSTRAINT ident [ RESTRICT |
CASCADE ]\n"
+"ALTER TABLE [ IF EXISTS ] qname SET { { READ | INSERT } ONLY | READ
WRITE }\n"
+"ALTER TABLE [ IF EXISTS ] qname RENAME TO ident",
"column_def,table_constraint",
"See also https://www.monetdb.org/Documentation/SQLreference/Alter"},
{"ALTER MERGE TABLE",
"",
-"ALTER TABLE qname ADD TABLE qname [ AS PARTITION opt_partition_spec
]\n"
-"ALTER TABLE qname DROP TABLE qname [ RESTRICT | CASCADE ]\n"
-"ALTER TABLE qname SET TABLE qname AS PARTITION opt_partition_spec",
+"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",
"See also
https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/DataPartitioning"},
{"ALTER SCHEMA",
"",
-"ALTER SCHEMA ident RENAME TO ident",
+"ALTER SCHEMA [ IF EXISTS ] ident RENAME TO ident",
NULL,
"See also https://www.monetdb.org/Documentation/SQLreference/Alter"},
{"ALTER SEQUENCE",
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -1413,7 +1413,7 @@ get_schema_name( mvc *sql, char *sname,
}
static sql_rel *
-sql_alter_table(mvc *sql, dlist *qname, symbol *te, symbol *extra)
+sql_alter_table(mvc *sql, dlist *dl, dlist *qname, symbol *te, int if_exists)
{
char *sname = qname_schema(qname);
char *tname = qname_table(qname);
@@ -1421,8 +1421,9 @@ sql_alter_table(mvc *sql, dlist *qname,
sql_table *t = NULL;
if (sname && !(s=mvc_bind_schema(sql, sname))) {
- (void) sql_error(sql, 02, SQLSTATE(3F000) "ALTER TABLE: no such
schema '%s'", sname);
- return NULL;
+ if(if_exists)
+ return rel_psm_block(sql->sa, new_exp_list(sql->sa));
+ return sql_error(sql, 02, SQLSTATE(3F000) "ALTER TABLE: no such
schema '%s'", sname);
}
if (!s)
s = cur_schema(sql);
@@ -1430,6 +1431,8 @@ sql_alter_table(mvc *sql, dlist *qname,
if ((t = mvc_bind_table(sql, s, tname)) == NULL) {
if (mvc_bind_table(sql, mvc_bind_schema(sql, "tmp"), tname) !=
NULL)
return sql_error(sql, 02, SQLSTATE(42S02) "ALTER TABLE:
not supported on TEMPORARY table '%s'", tname);
+ if(if_exists)
+ return rel_psm_block(sql->sa, new_exp_list(sql->sa));
return sql_error(sql, 02, SQLSTATE(42S02) "ALTER TABLE: no such
table '%s' in schema '%s'", tname,
MonetDB: default - Prevent crash.
Changeset: f6e7f1c7ae19 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f6e7f1c7ae19
Modified Files:
sql/storage/bat/bat_storage.c
Branch: default
Log Message:
Prevent crash.
Apparently it's possible to have a declared index (e.g. an ordered
one) without bat.
diffs (12 lines):
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -1596,7 +1596,7 @@ upgrade_idx(sql_idx *i)
{
sql_delta *bat = i->data;
- if (!i->t->bootstrap)
+ if (!i->t->bootstrap && bat != NULL)
return upgrade_delta(bat, LOG_IDX, i->base.id);
return LOG_OK;
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - move free(buf) to bailout section to simplify...
Changeset: f34ec7992d23 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f34ec7992d23
Modified Files:
clients/mapiclient/mclient.c
Branch: default
Log Message:
move free(buf) to bailout section to simplify code
diffs (53 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2330,11 +2330,11 @@ doFile(Mapi mid, stream *fp, bool useins
bufsiz = READBLOCK;
buf = malloc(bufsiz);
-
if (buf == NULL) {
fprintf(stderr,"Malloc for doFile failed");
exit(2);
}
+
do {
bool seen_null_byte = false;
@@ -2392,7 +2392,6 @@ doFile(Mapi mid, stream *fp, bool useins
/* end of file */
if (hdl == NULL) {
/* nothing more to do */
- free(buf);
goto bailout;
}
@@ -2426,20 +2425,17 @@ doFile(Mapi mid, stream *fp, bool useins
line[6] = prepno % 10 + '0';
}
if (strcmp(line, "exit\n") == 0) {
- free(buf);
goto bailout;
}
break;
case 'q':
if (strcmp(line, "quit\n") == 0) {
- free(buf);
goto bailout;
}
break;
case '\\':
switch (line[1]) {
case 'q':
- free(buf);
goto bailout;
case 'X':
/* toggle interaction trace */
@@ -2960,6 +2956,7 @@ doFile(Mapi mid, stream *fp, bool useins
/* reached on end of file */
assert(hdl == NULL);
bailout:
+ free(buf);
#ifdef HAVE_LIBREADLINE
if (prompt)
deinit_readline();
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Allocate enough memory.
Changeset: b3a2c5f45d5c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3a2c5f45d5c
Modified Files:
gdk/gdk_logger.c
Branch: default
Log Message:
Allocate enough memory.
diffs (12 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1431,7 +1431,7 @@ static gdk_return
bm_subcommit(logger *lg, BAT *list_bid, BAT *list_nme, BAT *catalog_bid, BAT
*catalog_nme, BAT *catalog_tpe, BAT *catalog_oid, BAT *dcatalog, BAT *extra,
int debug)
{
BUN p, q;
- BUN nn = 6 + BATcount(list_bid) + (extra ? BATcount(extra) : 0);
+ BUN nn = 10 + BATcount(list_bid) + (extra ? BATcount(extra) : 0);
bat *n = GDKmalloc(sizeof(bat) * nn);
int i = 0;
BATiter iter = (list_nme)?bat_iterator(list_nme):bat_iterator(list_bid);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: analytics - Cast output as bigint for non hugeint platf...
Changeset: d9fa049d6627 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d9fa049d6627 Modified Files: sql/test/analytics/Tests/analytics06.sql sql/test/analytics/Tests/analytics06.stable.out sql/test/emptydb/Tests/check.stable.out sql/test/emptydb/Tests/check.stable.out.32bit sql/test/emptydb/Tests/check.stable.out.int128 Branch: analytics Log Message: Cast output as bigint for non hugeint platforms. diffs (117 lines): diff --git a/sql/test/analytics/Tests/analytics06.sql b/sql/test/analytics/Tests/analytics06.sql --- a/sql/test/analytics/Tests/analytics06.sql +++ b/sql/test/analytics/Tests/analytics06.sql @@ -3,7 +3,7 @@ insert into testing values (15, 3, 15), start transaction; -select count(aa) over (partition by bb), 75 + count(aa) over (partition by bb) from testing where bb <> 1; +select count(aa) over (partition by bb), cast(75 + count(aa) over (partition by bb) as bigint) from testing where bb <> 1; with relation as (select row_number() over () as dd, aa, bb from testing where bb <> 1) select aa, bb, dd, diff --git a/sql/test/analytics/Tests/analytics06.stable.out b/sql/test/analytics/Tests/analytics06.stable.out --- a/sql/test/analytics/Tests/analytics06.stable.out +++ b/sql/test/analytics/Tests/analytics06.stable.out @@ -71,7 +71,7 @@ Ready. #select count(aa) over (partition by bb), 75 + count(aa) over (partition by bb) from testing where bb <> 1; % sys.L4, sys.L11 # table_name % L4, L11 # name -% bigint, hugeint # type +% bigint, bigint # type % 1, 2 # length [ 2, 77 ] [ 2, 77 ] diff --git a/sql/test/emptydb/Tests/check.stable.out b/sql/test/emptydb/Tests/check.stable.out --- a/sql/test/emptydb/Tests/check.stable.out +++ b/sql/test/emptydb/Tests/check.stable.out @@ -3720,19 +3720,27 @@ drop function pcre_replace(string, strin [ "sys", "week", "SYSTEM", "weekofyear", "mtime", "Internal C", "Scalar function", false, false, false, "res_0", "int", 32, 0, "out", "arg_1","date", 0, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "weekofyear", "SYSTEM", "weekofyear", "mtime", "Internal C", "Scalar function", false, false, false, "res_0", "int", 32, 0, "out", "arg_1","date", 0, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL ] [ "sys", "window_following_bound", "SYSTEM", "window_following_bound", "sql", "Internal C", "Analytic function", false, false, false, "res_0","bigint", 64, 0, "out", "arg_1","any", 0, 0, "in", "arg_2","int", 32, 0, "in", "arg_3","int", 32, 0, "in", "arg_4", "bigint", 64, 0, "in", "arg_5","bigint", 64, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL] +[ "sys", "window_following_bound", "SYSTEM", "window_following_bound", "sql", "Internal C", "Analytic function", false, false, false, "res_0","bigint", 64, 0, "out", "arg_1","any", 0, 0, "in", "arg_2","int", 32, 0, "in", "arg_3","int", 32, 0, "in", "arg_4", "bigint", 64, 0, "in", "arg_5","double", 53, 0, "in", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
MonetDB: default - Approve changed output
Changeset: 6ab62f9824ff for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6ab62f9824ff Modified Files: sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows Branch: default Log Message: Approve changed output diffs (36 lines): diff --git a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out --- a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out +++ b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out @@ -37,7 +37,7 @@ Ready. [ 1, "one" ] [ 2, "two" ] #DELETE FROM sys.statistics; -[ 184 ] +[ 197 ] #SELECT /* column_id, */ type, width, /* stamp, */ "sample", "count", "unique", nils, minval, maxval, sorted, revsorted FROM sys.statistics; % sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics # table_name % type,width, sample, count, unique, nils, minval, maxval, sorted, revsorted # name diff --git a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD --- a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD +++ b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.FreeBSD @@ -37,7 +37,7 @@ Ready. [ 1, "one" ] [ 2, "two" ] #DELETE FROM sys.statistics; -[ 148 ] +[ 161 ] #SELECT /* column_id, */ type, width, /* stamp, */ "sample", "count", "unique", nils, minval, maxval, sorted, revsorted FROM sys.statistics; % sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics # table_name % type,width, sample, count, unique, nils, minval, maxval, sorted, revsorted # name diff --git a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows --- a/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows +++ b/sql/test/BugTracker-2017/Tests/cleanup_statistics.Bug-6439.stable.out.Windows @@ -37,7 +37,7 @@ Ready. [ 1, "one" ] [ 2, "two" ] #DELETE FROM sys.statistics; -[ 148 ] +[ 161 ] #SELECT /* column_id, */ type, width, /* stamp, */ "sample", "count", "unique", nils, minval, maxval, sorted, revsorted FROM sys.statistics; % sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics, sys.statistics # table_name % type,width, sample, count, unique, nils, minval, maxval, sorted, revsorted # name ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Aug2018 - Pre-release version number update.
Changeset: 9f09abef1c7c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f09abef1c7c
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: Aug2018
Log Message:
Pre-release version number update.
diffs (229 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.31.10
+%global version 11.31.11
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -642,7 +642,7 @@
#define MONETDB5_PASSWDHASH_TOKEN SHA512
/* Release name or "unreleased" */
-#define MONETDB_RELEASE "unreleased"
+#define MONETDB_RELEASE "Aug2018-SP1"
/* Define if you do not want assertions */
/* #undef NDEBUG */
@@ -666,7 +666,7 @@
#define PACKAGE_URL "https://www.monetdb.org/;
/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.31.10"
+#define PACKAGE_VERSION "11.31.11"
/* Path separator */
#define PATH_SEP ';'
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -6,7 +6,7 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
-VERSION=11.31.10
+VERSION=11.31.11
# ^^
# 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,10,1
- PRODUCTVERSION 11,31,10,1
+ FILEVERSION 11,31,11,1
+ PRODUCTVERSION 11,31,11,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.10\0"
+ VALUE "FileVersion", "11.31.11\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.10\0"
+ VALUE "ProductVersion", "11.31.11\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,10,1
- PRODUCTVERSION 11,31,10,1
+ FILEVERSION 11,31,11,1
+ PRODUCTVERSION 11,31,11,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.10\0"
+ VALUE "FileVersion", "11.31.11\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.10\0"
+ VALUE "ProductVersion", "11.31.11\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,10,1
- PRODUCTVERSION 11,31,10,1
+ FILEVERSION 11,31,11,1
+ PRODUCTVERSION 11,31,11,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.10"
+VALUE "FileVersion", "11.31.11"
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright © MonetDB
MonetDB: default - Merge with Aug2018 branch, not changing any f...
Changeset: f25f230ac53b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f25f230ac53b 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 - Updated library versions.
Changeset: 2ab9b4460493 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2ab9b4460493 Modified Files: libversions Branch: Aug2018 Log Message: Updated library versions. diffs (12 lines): diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -36,7 +36,7 @@ # version of the GDK library (subdirectory gdk; also includes # common/options and common/utils) -GDK_VERSION=17:2:0 +GDK_VERSION=17:3:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=11:0:1 ___ 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: 24d62811fd93 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=24d62811fd93 Modified Files: ChangeLog-Archive ChangeLog.Aug2018 MonetDB.spec debian/changelog Branch: Aug2018 Log Message: Moved contents of ChangeLog.Aug2018 to MonetDB.spec, debian/changelog and ChangeLog-Archive. diffs (61 lines): diff --git a/ChangeLog-Archive b/ChangeLog-Archive --- a/ChangeLog-Archive +++ b/ChangeLog-Archive @@ -1,6 +1,9 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed Oct 10 2018 Sjoerd Mullender - 11.31.11-20181011 +- Some subtle dependencies between RPMs have been fixed. + * Wed Feb 14 2018 Stefan Manegold - 11.29.1-20180315 - mclient's execution time profiling options and output format have been changed. Instead of implicitly via the "--interactive"/"-i" diff --git a/ChangeLog.Aug2018 b/ChangeLog.Aug2018 --- a/ChangeLog.Aug2018 +++ b/ChangeLog.Aug2018 @@ -1,5 +1,3 @@ # ChangeLog file for devel # This file is updated with Maddlog * Wed Oct 10 2018 Sjoerd Mullender -- Some subtle dependencies between RPMs have been fixed. - diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1021,6 +1021,14 @@ done %postun -p /sbin/ldconfig %changelog +* Thu Oct 11 2018 Sjoerd Mullender - 11.31.11-20181011 +- Rebuilt. +- BZ#6648: key property potentially wrong after type conversion +- BZ#6649: Projection inside within transaction gives wrong results + +* Wed Oct 10 2018 Sjoerd Mullender - 11.31.11-20181011 +- MonetDB: Some subtle dependencies between RPMs have been fixed. + * Fri Oct 05 2018 Sjoerd Mullender - 11.31.9-20181005 - Rebuilt. - BZ#6640: timestamp_to_str returning incorrectly adjusted results diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +monetdb (11.31.11) unstable; urgency=low + + * Rebuilt. + * BZ#6648: key property potentially wrong after type conversion + * BZ#6649: Projection inside within transaction gives wrong results + + -- Sjoerd Mullender Thu, 11 Oct 2018 09:48:25 +0200 + +monetdb (11.31.11) unstable; urgency=low + + * MonetDB: Some subtle dependencies between RPMs have been fixed. + + -- Sjoerd Mullender Wed, 10 Oct 2018 09:48:25 +0200 + monetdb (11.31.9) unstable; urgency=low * Rebuilt. ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Aug2018 - Setting tags Aug2018_11 and Aug2018_SP1 for t...
Changeset: a4dfcb90cf7e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a4dfcb90cf7e Modified Files: .hgtags Branch: Aug2018 Log Message: Setting tags Aug2018_11 and Aug2018_SP1 for the release build. diffs (10 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -714,3 +714,6 @@ 3aaf6c916bd870cc478d3973241bc24cafbe1655 a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_release a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_9 a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_SP1_release +24d62811fd9372b1ee7525aa1cf2fc8860d20bf7 Aug2018_11 +a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_SP1_release +24d62811fd9372b1ee7525aa1cf2fc8860d20bf7 Aug2018_SP1_release ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Aug2018 branch.
Changeset: 402a59d472e2 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=402a59d472e2 Modified Files: .hgtags ChangeLog-Archive ChangeLog.Aug2018 MonetDB.spec debian/changelog libversions Branch: default Log Message: Merge with Aug2018 branch. diffs (83 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -714,3 +714,6 @@ 3aaf6c916bd870cc478d3973241bc24cafbe1655 a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_release a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_9 a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_SP1_release +24d62811fd9372b1ee7525aa1cf2fc8860d20bf7 Aug2018_11 +a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_SP1_release +24d62811fd9372b1ee7525aa1cf2fc8860d20bf7 Aug2018_SP1_release diff --git a/ChangeLog-Archive b/ChangeLog-Archive --- a/ChangeLog-Archive +++ b/ChangeLog-Archive @@ -1,6 +1,9 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed Oct 10 2018 Sjoerd Mullender - 11.31.11-20181011 +- Some subtle dependencies between RPMs have been fixed. + * Wed Feb 14 2018 Stefan Manegold - 11.29.1-20180315 - mclient's execution time profiling options and output format have been changed. Instead of implicitly via the "--interactive"/"-i" diff --git a/ChangeLog.Aug2018 b/ChangeLog.Aug2018 --- a/ChangeLog.Aug2018 +++ b/ChangeLog.Aug2018 @@ -1,5 +1,3 @@ # ChangeLog file for devel # This file is updated with Maddlog * Wed Oct 10 2018 Sjoerd Mullender -- Some subtle dependencies between RPMs have been fixed. - diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1062,6 +1062,14 @@ done %postun -p /sbin/ldconfig %changelog +* Thu Oct 11 2018 Sjoerd Mullender - 11.31.11-20181011 +- Rebuilt. +- BZ#6648: key property potentially wrong after type conversion +- BZ#6649: Projection inside within transaction gives wrong results + +* Wed Oct 10 2018 Sjoerd Mullender - 11.31.11-20181011 +- MonetDB: Some subtle dependencies between RPMs have been fixed. + * Fri Oct 05 2018 Sjoerd Mullender - 11.31.9-20181005 - Rebuilt. - BZ#6640: timestamp_to_str returning incorrectly adjusted results diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +monetdb (11.31.11) unstable; urgency=low + + * Rebuilt. + * BZ#6648: key property potentially wrong after type conversion + * BZ#6649: Projection inside within transaction gives wrong results + + -- Sjoerd Mullender Thu, 11 Oct 2018 09:48:25 +0200 + +monetdb (11.31.11) unstable; urgency=low + + * MonetDB: Some subtle dependencies between RPMs have been fixed. + + -- Sjoerd Mullender Wed, 10 Oct 2018 09:48:25 +0200 + monetdb (11.31.9) unstable; urgency=low * Rebuilt. diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -36,7 +36,7 @@ # version of the GDK library (subdirectory gdk; also includes # common/options and common/utils) -GDK_VERSION=17:2:0 +GDK_VERSION=17:3:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=11:0:1 ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Aug2018 - Post release build.
Changeset: 15d25a086350 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=15d25a086350
Modified Files:
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
vertoo.data
Branch: Aug2018
Log Message:
Post release build.
diffs (229 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.31.11
+%global version 11.31.12
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -642,7 +642,7 @@
#define MONETDB5_PASSWDHASH_TOKEN SHA512
/* Release name or "unreleased" */
-#define MONETDB_RELEASE "Aug2018-SP1"
+#define MONETDB_RELEASE "unreleased"
/* Define if you do not want assertions */
/* #undef NDEBUG */
@@ -666,7 +666,7 @@
#define PACKAGE_URL "https://www.monetdb.org/;
/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.31.11"
+#define PACKAGE_VERSION "11.31.12"
/* Path separator */
#define PATH_SEP ';'
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -6,7 +6,7 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V.
-VERSION=11.31.11
+VERSION=11.31.12
# ^^
# 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,11,1
- PRODUCTVERSION 11,31,11,1
+ FILEVERSION 11,31,12,1
+ PRODUCTVERSION 11,31,12,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.11\0"
+ VALUE "FileVersion", "11.31.12\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.11\0"
+ VALUE "ProductVersion", "11.31.12\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,11,1
- PRODUCTVERSION 11,31,11,1
+ FILEVERSION 11,31,12,1
+ PRODUCTVERSION 11,31,12,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.11\0"
+ VALUE "FileVersion", "11.31.12\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.11\0"
+ VALUE "ProductVersion", "11.31.12\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,11,1
- PRODUCTVERSION 11,31,11,1
+ FILEVERSION 11,31,12,1
+ PRODUCTVERSION 11,31,12,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.11"
+VALUE "FileVersion", "11.31.12"
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2018"
MonetDB: default - Merge with Aug2018 branch, not changing any f...
Changeset: 0408683f803d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0408683f803d 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: default - Merge heads.
Changeset: 669c2dbcd155 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=669c2dbcd155 Modified Files: .hgtags ChangeLog-Archive ChangeLog.Aug2018 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 debian/changelog gdk/libbat.rc libversions monetdb5/tools/libmonetdb5.rc vertoo.data Branch: default Log Message: Merge heads. diffs (83 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -714,3 +714,6 @@ 3aaf6c916bd870cc478d3973241bc24cafbe1655 a242d6de1de3dc99a9583d96a61c53044108e576 Aug2018_release a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_9 a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_SP1_release +24d62811fd9372b1ee7525aa1cf2fc8860d20bf7 Aug2018_11 +a2d8e19ac9d6f847dd59c5f12ff48aae815e6b5d Aug2018_SP1_release +24d62811fd9372b1ee7525aa1cf2fc8860d20bf7 Aug2018_SP1_release diff --git a/ChangeLog-Archive b/ChangeLog-Archive --- a/ChangeLog-Archive +++ b/ChangeLog-Archive @@ -1,6 +1,9 @@ # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY # This file contains past ChangeLog entries +* Wed Oct 10 2018 Sjoerd Mullender - 11.31.11-20181011 +- Some subtle dependencies between RPMs have been fixed. + * Wed Feb 14 2018 Stefan Manegold - 11.29.1-20180315 - mclient's execution time profiling options and output format have been changed. Instead of implicitly via the "--interactive"/"-i" diff --git a/ChangeLog.Aug2018 b/ChangeLog.Aug2018 --- a/ChangeLog.Aug2018 +++ b/ChangeLog.Aug2018 @@ -1,5 +1,3 @@ # ChangeLog file for devel # This file is updated with Maddlog * Wed Oct 10 2018 Sjoerd Mullender -- Some subtle dependencies between RPMs have been fixed. - diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1062,6 +1062,14 @@ done %postun -p /sbin/ldconfig %changelog +* Thu Oct 11 2018 Sjoerd Mullender - 11.31.11-20181011 +- Rebuilt. +- BZ#6648: key property potentially wrong after type conversion +- BZ#6649: Projection inside within transaction gives wrong results + +* Wed Oct 10 2018 Sjoerd Mullender - 11.31.11-20181011 +- MonetDB: Some subtle dependencies between RPMs have been fixed. + * Fri Oct 05 2018 Sjoerd Mullender - 11.31.9-20181005 - Rebuilt. - BZ#6640: timestamp_to_str returning incorrectly adjusted results diff --git a/debian/changelog b/debian/changelog --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +monetdb (11.31.11) unstable; urgency=low + + * Rebuilt. + * BZ#6648: key property potentially wrong after type conversion + * BZ#6649: Projection inside within transaction gives wrong results + + -- Sjoerd Mullender Thu, 11 Oct 2018 09:48:25 +0200 + +monetdb (11.31.11) unstable; urgency=low + + * MonetDB: Some subtle dependencies between RPMs have been fixed. + + -- Sjoerd Mullender Wed, 10 Oct 2018 09:48:25 +0200 + monetdb (11.31.9) unstable; urgency=low * Rebuilt. diff --git a/libversions b/libversions --- a/libversions +++ b/libversions @@ -36,7 +36,7 @@ # version of the GDK library (subdirectory gdk; also includes # common/options and common/utils) -GDK_VERSION=17:2:0 +GDK_VERSION=17:3:0 # version of the MAPI library (subdirectory clients/mapilib) MAPI_VERSION=11:0:1 ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Aug2018 - Fix error handling code.
Changeset: d0e087a70a7a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d0e087a70a7a
Modified Files:
testing/Mtest.py.in
Branch: Aug2018
Log Message:
Fix error handling code.
diffs (12 lines):
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -2086,7 +2086,7 @@ def RunTest(env, TST, BusyPorts, COND, o
except IOError as err:
if not env.get('NOCLEAN'):
ErrMsg("SymlinkOrCopy('%s','%s') in '%s' failed with
#%d: '%s'."
- % (os.path.join(RELSRCDIR, f), f, os.getcwd(),
IOerrNo, IOerrStr))
+ % (os.path.join(RELSRCDIR, f), f, os.getcwd(),
err.errno, err.strerror))
except OSError:
if not env.get('NOCLEAN'):
raise
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: rename-sql - Allow to rename SQL objects only when ther...
Changeset: b3f35f11a223 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3f35f11a223 Modified Files: sql/backends/monet5/sql_cat.c sql/server/rel_schema.c sql/test/rename/Tests/rename01.sql sql/test/rename/Tests/rename01.stable.err sql/test/rename/Tests/rename01.stable.out sql/test/rename/Tests/rename05.sql sql/test/rename/Tests/rename05.stable.err sql/test/rename/Tests/rename05.stable.out Branch: rename-sql Log Message: Allow to rename SQL objects only when there are no dependencies on them. diffs (truncated from 308 to 300 lines): 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 @@ -1570,6 +1570,8 @@ SQLrename_schema(Client cntxt, MalBlkPtr throw(SQL, "sql.rename_schema", SQLSTATE(3F000) "ALTER SCHEMA: access denied for %s to schema '%s'", stack_get_string(sql, "current_user"), old_name); if (s->system) throw(SQL, "sql.rename_schema", SQLSTATE(3F000) "ALTER SCHEMA: cannot rename a system schema"); + if (!list_empty(s->tables.set) || !list_empty(s->types.set) || !list_empty(s->funcs.set) || !list_empty(s->seqs.set)) + throw(SQL, "sql.rename_schema", SQLSTATE(2BM37) "ALTER SCHEMA: unable to rename schema '%s' (there are database objects which depend on it)", old_name); if (!new_name || strcmp(new_name, str_nil) == 0) throw(SQL, "sql.rename_schema", SQLSTATE(3F000) "ALTER SCHEMA: invalid new schema name"); if (mvc_bind_schema(sql, new_name)) @@ -1603,6 +1605,8 @@ SQLrename_table(Client cntxt, MalBlkPtr throw(SQL, "sql.rename_table", SQLSTATE(42S02) "ALTER TABLE: no such table '%s' in schema '%s'", old_name, schema_name); if (t->system) throw(SQL, "sql.rename_table", SQLSTATE(42000) "ALTER TABLE: cannot rename a system table"); + if (mvc_check_dependency(sql, t->base.id, TABLE_DEPENDENCY, NULL)) + throw (SQL,"sql.rename_table", SQLSTATE(2BM37) "ALTER TABLE: unable to rename table %s (there are database objects which depend on it)", old_name); if (!new_name || strcmp(new_name, str_nil) == 0) throw(SQL, "sql.rename_table", SQLSTATE(3F000) "ALTER TABLE: invalid new table name"); if (mvc_bind_table(sql, s, new_name)) @@ -1624,6 +1628,7 @@ SQLrename_column(Client cntxt, MalBlkPtr str new_name = *getArgReference_str(stk, pci, 4); sql_schema *s; sql_table *t; + sql_column *col; initcontext(); if (!(s = mvc_bind_schema(sql, schema_name))) @@ -1635,13 +1640,15 @@ SQLrename_column(Client cntxt, MalBlkPtr if (t->system) throw(SQL, "sql.rename_column", SQLSTATE(42000) "ALTER TABLE: cannot rename a column in a system table"); if (isView(t)) - throw(SQL, "sql.rename_column", SQLSTATE(42000) "ALTER TABLE: cannot rename column '%s': '%s' is a view", old_name, t->base.name); - if (!mvc_bind_column(sql, t, old_name)) - throw(SQL, "sql.rename_column", SQLSTATE(42S22) "ALTER TABLE: no such column '%s' in table '%s'", old_name, t->base.name); + throw(SQL, "sql.rename_column", SQLSTATE(42000) "ALTER TABLE: cannot rename column '%s': '%s' is a view", old_name, table_name); + if (!(col = mvc_bind_column(sql, t, old_name))) + throw(SQL, "sql.rename_column", SQLSTATE(42S22) "ALTER TABLE: no such column '%s' in table '%s'", old_name, table_name); + if (mvc_check_dependency(sql, col->base.id, COLUMN_DEPENDENCY, NULL)) + throw(SQL, "sql.rename_column", SQLSTATE(2BM37) "ALTER TABLE: cannot rename column '%s' (there are database objects which depend on it)", old_name); if (!new_name || strcmp(new_name, str_nil) == 0) throw(SQL, "sql.rename_column", SQLSTATE(3F000) "ALTER TABLE: invalid new column name"); if (mvc_bind_column(sql, t, new_name)) - throw(SQL, "sql.rename_column", SQLSTATE(3F000) "ALTER TABLE: there is a column named '%s' in table '%s'", new_name, t->base.name); + throw(SQL, "sql.rename_column", SQLSTATE(3F000) "ALTER TABLE: there is a column named '%s' in table '%s'", new_name, table_name); if (!sql_trans_rename_column(sql->session->tr, t, old_name, new_name)) throw(SQL, "sql.rename_column",SQLSTATE(HY001) MAL_MALLOC_FAIL); diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c --- a/sql/server/rel_schema.c +++ b/sql/server/rel_schema.c @@ -2449,6 +2449,8 @@ rel_rename_schema(mvc *sql, char *old_na return sql_error(sql, 02, SQLSTATE(3F000) "ALTER SCHEMA: access denied for %s to schema '%s'", stack_get_string(sql, "current_user"), old_name); if (s->system) return sql_error(sql, 02, SQLSTATE(3F000) "ALTER SCHEMA: cannot rename a system
MonetDB: default - Removed unused file.
Changeset: 2a1cacaf585d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2a1cacaf585d Removed Files: buildtools/autogen/setup.py Branch: default Log Message: Removed unused file. diffs (26 lines): diff --git a/buildtools/autogen/setup.py b/buildtools/autogen/setup.py deleted file mode 100755 --- a/buildtools/autogen/setup.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python - -# This Source Code Form is subject to the terms of the Mozilla Public -# 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. - -from distutils.core import setup - -setup(name = "autogen", - version = "1.0", - description = "MonetDB autogen script", - author = "MonetDB Team, CWI", - author_email = "i...@monetdb.org", - url = "https://www.monetdb.org/;, - maintainer = "Sjoerd Mullender", - maintainer_email = "i...@monetdb.org", - license = "Mozilla Public License, v. 2.0", - packages = ['autogen'], - scripts = ['autogen.py']) ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Aug2018 - Added test for bug 6650
Changeset: a4254c9306da for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a4254c9306da
Added Files:
sql/test/BugTracker-2018/Tests/prepared-statement-with-udf.Bug-6650.sql
Modified Files:
sql/test/BugTracker-2018/Tests/All
Branch: Aug2018
Log Message:
Added test for bug 6650
diffs (22 lines):
diff --git a/sql/test/BugTracker-2018/Tests/All
b/sql/test/BugTracker-2018/Tests/All
--- a/sql/test/BugTracker-2018/Tests/All
+++ b/sql/test/BugTracker-2018/Tests/All
@@ -85,3 +85,4 @@ timestamp-as-boolean.Bug-6642
timestamp-roundtrip.Bug-6640
convert-key.Bug-6648
update-transaction-select.Bug-6649
+prepared-statement-with-udf.Bug-6650
diff --git
a/sql/test/BugTracker-2018/Tests/prepared-statement-with-udf.Bug-6650.sql
b/sql/test/BugTracker-2018/Tests/prepared-statement-with-udf.Bug-6650.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2018/Tests/prepared-statement-with-udf.Bug-6650.sql
@@ -0,0 +1,9 @@
+start transaction;
+create table onet (a text, b text, c text);
+insert into onet values ('a', 'b', 'c');
+create function get_onet(d text) returns table (aa text, bb text, cc text)
return table(select * from onet where a = d);
+prepare select * from get_onet(?);
+exec **('a');
+drop function get_onet;
+drop table onet;
+rollback;
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Added possibility in mclient to use quit or e...
Changeset: 60c1deab34d8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=60c1deab34d8
Modified Files:
clients/ChangeLog
clients/mapiclient/mclient.c
Branch: default
Log Message:
Added possibility in mclient to use quit or exit on the command-line to quit
the program.
This makes it easier for novice users not familiar with mclient (or psql)
special commands to quit the program, if they do not know that the standard
command to quit is \q.
This enhancement is inspired by psql which has added this possibility in
release 11, see https://www.postgresql.org/about/news/1855/section: User
Experience Enhancements
Excerpt:
"Another feature that fell into this category was the inability to intuitively
quit from the PostgreSQL command-line (psql). There has been numerous recorded
complaints of users trying to quit with the quit and exit commands, only to
learn that the command to do so was \q.
We have heard your frustrations and have now added the ability to quit the
command-line using the keywords quit and exit and hope that quitting a
PostgreSQL session is now as enjoyable as using PostgreSQL."
diffs (44 lines):
diff --git a/clients/ChangeLog b/clients/ChangeLog
--- a/clients/ChangeLog
+++ b/clients/ChangeLog
@@ -1,3 +1,8 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Thu Oct 11 2018 Martin van Dinther
+- The mclient program can now be quit by typing quit or exit on the
+ command-line. This makes it easier for novice users to quit the program
+ if they do not know that the standard command to quit is \q.
+
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2204,9 +2204,9 @@ showCommands(void)
mnstr_printf(toConsole, "\\f - format using renderer
{csv,tab,raw,sql,xml,trash,rowcount,expanded,sam}\n");
mnstr_printf(toConsole, "\\w# - set maximal page width
(-1=unlimited, 0=terminal width, >0=limit to num)\n");
mnstr_printf(toConsole, "\\r# - set maximum rows per page
(-1=raw)\n");
- mnstr_printf(toConsole, "\\L file - save client/server interaction\n");
+ mnstr_printf(toConsole, "\\L file - save client-server interaction\n");
mnstr_printf(toConsole, "\\X - trace mclient code\n");
- mnstr_printf(toConsole, "\\q - terminate session\n");
+ mnstr_printf(toConsole, "\\q - terminate session and quit
mclient\n");
}
#define MD_TABLE1
@@ -2425,6 +2425,16 @@ doFile(Mapi mid, stream *fp, bool useins
line[5] = prepno < 10 ? ' ' : prepno /
10 + '0';
line[6] = prepno % 10 + '0';
}
+ if (strcmp(line, "exit\n") == 0) {
+ free(buf);
+ goto bailout;
+ }
+ break;
+ case 'q':
+ if (strcmp(line, "quit\n") == 0) {
+ free(buf);
+ goto bailout;
+ }
break;
case '\\':
switch (line[1]) {
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Aug2018 - Future proof regular expression.
Changeset: af94c2a29e2a for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af94c2a29e2a Modified Files: testing/listexports.py.in Branch: Aug2018 Log Message: Future proof regular expression. Don't start a set with "[". Python 3.7 warns about that. diffs (12 lines): diff --git a/testing/listexports.py.in b/testing/listexports.py.in --- a/testing/listexports.py.in +++ b/testing/listexports.py.in @@ -33,7 +33,7 @@ srcdir = r'@SOURCE@' expre = re.compile(r'\b[a-zA-Z_0-9]+export\s+(?P[^;]*;)', re.MULTILINE) # the function or variable name -nmere = re.compile(r'\b(?P[a-zA-Z_][a-zA-Z_0-9]*)\s*[[(;]') +nmere = re.compile(r'\b(?P[a-zA-Z_][a-zA-Z_0-9]*)\s*[([;]') def extract(f): decls = [] ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Aug2018 - Improve RPM dependencies.
Changeset: d989cfe4436b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d989cfe4436b
Modified Files:
MonetDB.spec
Branch: Aug2018
Log Message:
Improve RPM dependencies.
diffs (18 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -837,10 +837,10 @@ Group: Applications/Databases
%if "%{?_selinux_policy_version}" != ""
Requires: selinux-policy >= %{?_selinux_policy_version}
%endif
-Requires(post): MonetDB5-server = %{version}-%{release}
-Requires(postun): MonetDB5-server
-Requires(post): %{name}-SQL-server5 = %{version}-%{release}
-Requires(postun): %{name}-SQL-server5
+Requires(post): MonetDB5-server%{?_isa} = %{version}-%{release}
+Requires(postun): MonetDB5-server%{?_isa} = %{version}-%{release}
+Requires(post): %{name}-SQL-server5%{?_isa} = %{version}-%{release}
+Requires(postun): %{name}-SQL-server5%{?_isa} = %{version}-%{release}
Requires(post): /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles
Requires(postun): /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles
BuildArch: noarch
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: subjoin - merge with default
Changeset: 971e1b8fd7bc for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=971e1b8fd7bc Added Files: ChangeLog.Aug2018 buildtools/ChangeLog.Aug2018 clients/ChangeLog.Aug2018 clients/mapilib/ChangeLog.Aug2018 clients/odbc/samples/testStmtAttr.c common/stream/ChangeLog.Aug2018 common/utils/strptime.cpp debian/libmonetdb17.install debian/libmonetdb5-server-cfitsio.install debian/monetdb-python3.install gdk/ChangeLog.Aug2018 geom/ChangeLog.Aug2018 monetdb5/ChangeLog.Aug2018 sql/ChangeLog.Aug2018 sql/backends/monet5/UDF/capi/Tests/capi14.sql sql/backends/monet5/UDF/capi/Tests/capi14.stable.err sql/backends/monet5/UDF/capi/Tests/capi14.stable.out sql/backends/monet5/UDF/capi/Tests/capi15.sql sql/backends/monet5/UDF/capi/Tests/capi15.stable.err sql/backends/monet5/UDF/capi/Tests/capi15.stable.out sql/backends/monet5/UDF/capi/Tests/capi16.sql sql/backends/monet5/UDF/capi/Tests/capi16.stable.err sql/backends/monet5/UDF/capi/Tests/capi16.stable.out sql/backends/monet5/UDF/capi/Tests/capi17.sql sql/backends/monet5/UDF/capi/Tests/capi17.stable.err sql/backends/monet5/UDF/capi/Tests/capi17.stable.out sql/backends/monet5/UDF/capi/Tests/capi18.sql sql/backends/monet5/UDF/capi/Tests/capi18.stable.err sql/backends/monet5/UDF/capi/Tests/capi18.stable.out sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh sql/jdbc/tests/Tests/SQLcopyinto.stable.err sql/jdbc/tests/Tests/SQLcopyinto.stable.out sql/server/rel_propagate.c sql/server/rel_propagate.h sql/server/sql_partition.c sql/server/sql_partition.h sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.sql sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.err sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.out sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.sql sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.err sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.out sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.sql sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.stable.err sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.stable.out sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.stable.err sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.stable.out sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.sql sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.err sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.out sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.sql sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.stable.err sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.stable.out sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.stable.err sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.stable.out sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.sql sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.err sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.out sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.sql sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.stable.err sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.stable.out sql/test/BugTracker-2018/Tests/or_in_subselect.Bug-6625.sql sql/test/BugTracker-2018/Tests/or_in_subselect.Bug-6625.stable.err sql/test/BugTracker-2018/Tests/or_in_subselect.Bug-6625.stable.out sql/test/BugTracker-2018/Tests/procedure-create-table.Bug-6604.sql sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.err sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.out sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.stable.err sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.stable.out
MonetDB: subjoin - fix some calls to exp_bin
Changeset: 25236f683e06 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=25236f683e06
Modified Files:
sql/backends/monet5/rel_bin.c
Branch: subjoin
Log Message:
fix some calls to exp_bin
diffs (51 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
@@ -403,7 +403,7 @@ exp_bin(backend *be, sql_exp *e, stmt *l
(void)stmt_control_end(be, wstmt);
return stmt_control_end(be, ifstmt);
} else if (e->flag & PSM_IF) {
- stmt *cond = exp_bin(be, e->l, left, right, grp, cnt,
ext, sel, rsel);
+ stmt *cond = exp_bin(be, e->l, left, right, grp, ext,
cnt, sel, rsel);
stmt *ifstmt = stmt_cond(be, cond, NULL, 0, 0), *res;
(void)exp_list(be, e->r, left, right, grp, cnt, ext,
sel, rsel);
res = stmt_control_end(be, ifstmt);
@@ -433,7 +433,7 @@ exp_bin(backend *be, sql_exp *e, stmt *l
return r;
return stmt_table(be, r, 1);
} else if (e->flag & PSM_EXCEPTION) {
- stmt *cond = exp_bin(be, e->l, left, right, grp, cnt,
ext, sel);
+ stmt *cond = exp_bin(be, e->l, left, right, grp, ext,
cnt, sel, rsel);
return stmt_exception(be, cond, (const char *) e->r, 0);
}
break;
@@ -2076,9 +2076,9 @@ rel2bin_semijoin(backend *be, sql_rel *r
r = e->r;
/* for each equality join add a rel_select(r is NULL) */
- s = exp_bin(be, r, right, NULL, NULL, NULL, NULL, NULL);
+ s = exp_bin(be, r, right, NULL, NULL, NULL, NULL, NULL,
NULL);
if (!s)
- s = exp_bin(be, l, right, NULL, NULL, NULL,
NULL, NULL);
+ s = exp_bin(be, l, right, NULL, NULL, NULL,
NULL, NULL, NULL);
if (s && !exp_is_atom(r)) {
sql_subaggr *cnt = sql_bind_aggr(sql->sa,
sql->session->schema, "count", NULL);
sql_subfunc *add =
sql_bind_func_result(sql->sa, sql->session->schema, "sql_add", lng, lng, lng);
@@ -5183,7 +5183,7 @@ rel2bin_partition_limits(backend *be, sq
if(rel->exps) {
for(n = rel->exps->h; n; n = n->next) {
sql_exp *e = n->data;
- stmt *s = exp_bin(be, e, l, r, NULL, NULL, NULL, NULL);
+ stmt *s = exp_bin(be, e, l, r, NULL, NULL, NULL, NULL,
NULL);
append(slist, s);
}
}
@@ -5208,7 +5208,7 @@ rel2bin_exception(backend *be, sql_rel *
if(rel->exps) {
for(n = rel->exps->h; n; n = n->next) {
sql_exp *e = n->data;
- stmt *s = exp_bin(be, e, l, r, NULL, NULL, NULL, NULL);
+ stmt *s = exp_bin(be, e, l, r, NULL, NULL, NULL, NULL,
NULL);
append(slist, s);
}
} else { //if there is no exception condition, just generate a
statement list
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: subjoin - merge with default
Changeset: 8ac56c9beaff for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8ac56c9beaff
Added Files:
clients/R/Tests/deps-install.timeout
Modified Files:
clients/R/Tests/dbapply.R
clients/R/Tests/deps-install.R
clients/R/Tests/deps-test.R
clients/R/Tests/deps-test.timeout
clients/R/Tests/dplyr-flights.R
clients/R/Tests/dplyr-flights.stable.err
clients/R/Tests/install.R
monetdb5/mal/mal_linker.c
monetdb5/optimizer/opt_candidates.c
monetdb5/optimizer/opt_macro.c
monetdb5/optimizer/opt_profiler.c
monetdb5/optimizer/opt_querylog.c
sql/backends/monet5/UDF/pyapi/type_conversion.c
sql/backends/monet5/UDF/pyapi/type_conversion.h
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/vaults/shp/shp.c
sql/common/sql_types.c
sql/server/rel_updates.c
sql/storage/store.c
sql/test/Tests/seq-default.stable.out
sql/test/seq-default.sql
sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128
testing/exportutils.py
Branch: subjoin
Log Message:
merge with default
diffs (truncated from 542 to 300 lines):
diff --git a/clients/R/Tests/dbapply.R b/clients/R/Tests/dbapply.R
--- a/clients/R/Tests/dbapply.R
+++ b/clients/R/Tests/dbapply.R
@@ -1,3 +1,5 @@
+cat("#~BeginProfilingOutput~#\n", file=stderr())
+
if (Sys.getenv("TSTTRGDIR") != "") {
.libPaths(c(.libPaths(), paste0(Sys.getenv("TSTTRGDIR"),"/rlibdir")))
}
@@ -81,4 +83,6 @@ print(res)
dbRemoveTable(con,tname)
stopifnot(identical(FALSE, dbExistsTable(con,tname)))
+cat("#~EndProfilingOutput~#\n", file=stderr())
+
print("SUCCESS")
diff --git a/clients/R/Tests/deps-install.R b/clients/R/Tests/deps-install.R
--- a/clients/R/Tests/deps-install.R
+++ b/clients/R/Tests/deps-install.R
@@ -1,6 +1,6 @@
# autoinstall DBI and digest, we need those to install MonetDB.R
options(warn = -1)
-packages_required <- c("digest", "DBI")
+packages_required <- c("digest", "DBI", "devtools")
cat("#~BeginProfilingOutput~#\n", file=stderr())
cat("#~BeginProfilingOutput~#\n", file=stdout())
diff --git a/clients/R/Tests/deps-install.timeout
b/clients/R/Tests/deps-install.timeout
new file mode 100644
--- /dev/null
+++ b/clients/R/Tests/deps-install.timeout
@@ -0,0 +1,1 @@
+2
diff --git a/clients/R/Tests/deps-test.R b/clients/R/Tests/deps-test.R
--- a/clients/R/Tests/deps-test.R
+++ b/clients/R/Tests/deps-test.R
@@ -1,4 +1,4 @@
-packages_required <-
c("assertthat","testthat","survey","nycflights13","RSQLite","dbplyr","dplyr","gdata","callr","devtools","DBItest")
+packages_required <-
c("assertthat","testthat","survey","nycflights13","RSQLite","dbplyr","dplyr","gdata","callr","DBItest")
install_or_upgrade_packages <- function(lp) {
np <- lp[!(lp %in% installed.packages()[,"Package"])]
diff --git a/clients/R/Tests/deps-test.timeout
b/clients/R/Tests/deps-test.timeout
--- a/clients/R/Tests/deps-test.timeout
+++ b/clients/R/Tests/deps-test.timeout
@@ -1,1 +1,1 @@
-5
+20
diff --git a/clients/R/Tests/dplyr-flights.R b/clients/R/Tests/dplyr-flights.R
--- a/clients/R/Tests/dplyr-flights.R
+++ b/clients/R/Tests/dplyr-flights.R
@@ -1,3 +1,5 @@
+cat("#~BeginProfilingOutput~#\n", file=stderr())
+
ff <- textConnection("asdf", open="w")
# hide output from connect and attach since it would blow up the test output
# dangerous since it might hide useful warnings
@@ -118,5 +120,6 @@ so(flights %>%
) %>%
filter(arr > 30 | dep > 30))
+cat("#~EndProfilingOutput~#\n", file=stderr())
print("SUCCESS")
diff --git a/clients/R/Tests/dplyr-flights.stable.err
b/clients/R/Tests/dplyr-flights.stable.err
--- a/clients/R/Tests/dplyr-flights.stable.err
+++ b/clients/R/Tests/dplyr-flights.stable.err
@@ -30,7 +30,6 @@ stderr of test 'dplyr-flights` in direct
# 11:44:05 > "R" "--vanilla" "--slave" "--args" "30588"
# 11:44:05 >
-Identifier(s) "year", "month", "day", "hour", "minute" are reserved SQL
keywords and need(s) to be quoted in queries.
# 11:44:15 >
# 11:44:15 > "Done."
diff --git a/clients/R/Tests/install.R b/clients/R/Tests/install.R
--- a/clients/R/Tests/install.R
+++ b/clients/R/Tests/install.R
@@ -2,13 +2,7 @@ options(warn = -1)
cat("#~BeginProfilingOutput~#\n", file=stderr())
cat("#~BeginProfilingOutput~#\n", file=stdout())
-install_submodule_git <- function(x, ...) {
- install_dir <- tempfile()
- system(paste("git clone --recursive --depth 1", shQuote(x),
-shQuote(install_dir)))
- devtools::install(install_dir, ...)
-}
-install_submodule_git("https://github.com/hannesmuehleisen/MonetDBLite-R;)
+devtools::install_github("hannesmuehleisen/MonetDBLite-R")
cat("#~EndProfilingOutput~#\n", file=stderr())
cat("#~EndProfilingOutput~#\n", file=stdout())
diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -233,6 +233,7 @@
MonetDB: subjoin - closed branch subjoin
Changeset: 32f9449371a0 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=32f9449371a0 Branch: subjoin Log Message: closed branch subjoin ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: batcalc-candidates - merge subjoin
Changeset: 5496b67af7d6 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5496b67af7d6 Added Files: ChangeLog.Aug2018 buildtools/ChangeLog.Aug2018 clients/ChangeLog.Aug2018 clients/R/Tests/deps-install.timeout clients/mapilib/ChangeLog.Aug2018 clients/odbc/samples/testStmtAttr.c common/stream/ChangeLog.Aug2018 common/utils/strptime.cpp debian/libmonetdb17.install debian/libmonetdb5-server-cfitsio.install debian/monetdb-python3.install gdk/ChangeLog.Aug2018 geom/ChangeLog.Aug2018 monetdb5/ChangeLog.Aug2018 sql/ChangeLog.Aug2018 sql/backends/monet5/UDF/capi/Tests/capi14.sql sql/backends/monet5/UDF/capi/Tests/capi14.stable.err sql/backends/monet5/UDF/capi/Tests/capi14.stable.out sql/backends/monet5/UDF/capi/Tests/capi15.sql sql/backends/monet5/UDF/capi/Tests/capi15.stable.err sql/backends/monet5/UDF/capi/Tests/capi15.stable.out sql/backends/monet5/UDF/capi/Tests/capi16.sql sql/backends/monet5/UDF/capi/Tests/capi16.stable.err sql/backends/monet5/UDF/capi/Tests/capi16.stable.out sql/backends/monet5/UDF/capi/Tests/capi17.sql sql/backends/monet5/UDF/capi/Tests/capi17.stable.err sql/backends/monet5/UDF/capi/Tests/capi17.stable.out sql/backends/monet5/UDF/capi/Tests/capi18.sql sql/backends/monet5/UDF/capi/Tests/capi18.stable.err sql/backends/monet5/UDF/capi/Tests/capi18.stable.out sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh sql/jdbc/tests/Tests/SQLcopyinto.stable.err sql/jdbc/tests/Tests/SQLcopyinto.stable.out sql/server/rel_propagate.c sql/server/rel_propagate.h sql/server/sql_partition.c sql/server/sql_partition.h sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.sql sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.err sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.out sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.sql sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.err sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.out sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.sql sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.stable.err sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.stable.out sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.stable.err sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.stable.out sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.sql sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.err sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.out sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.sql sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.stable.err sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.stable.out sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.stable.err sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.stable.out sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.sql sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.err sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.out sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.sql sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.stable.err sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.stable.out sql/test/BugTracker-2018/Tests/or_in_subselect.Bug-6625.sql sql/test/BugTracker-2018/Tests/or_in_subselect.Bug-6625.stable.err sql/test/BugTracker-2018/Tests/or_in_subselect.Bug-6625.stable.out sql/test/BugTracker-2018/Tests/procedure-create-table.Bug-6604.sql sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.err sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.out sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.stable.err
MonetDB: batcalc-candidates - approve clients/exports test
Changeset: bbfd739d6d39 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bbfd739d6d39 Modified Files: clients/Tests/exports.stable.out Branch: batcalc-candidates Log Message: approve clients/exports test diffs (158 lines): diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -22,31 +22,16 @@ atomDesc BATatoms[]; BAT *BATattach(int tt, const char *heapfile, int role); gdk_return BATbandjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, const void *c1, const void *c2, bool li, bool hi, BUN estimate) __attribute__((__warn_unused_result__)); BAT *BATcalcabsolute(BAT *b, BAT *s); -<<< local -BAT *BATcalcadd(BAT *b1, BAT *b2, BAT *s, int tp, int abort_on_error, int projected); -BAT *BATcalcaddcst(BAT *b, const ValRecord *v, BAT *s, int tp, int abort_on_error); +BAT *BATcalcadd(BAT *b1, BAT *b2, BAT *s, int tp, bool abort_on_error, int projected); +BAT *BATcalcaddcst(BAT *b, const ValRecord *v, BAT *s, int tp, bool abort_on_error); BAT *BATcalcand(BAT *b1, BAT *b2, BAT *s, int projected); -=== -BAT *BATcalcadd(BAT *b1, BAT *b2, BAT *s, int tp, bool abort_on_error); -BAT *BATcalcaddcst(BAT *b, const ValRecord *v, BAT *s, int tp, bool abort_on_error); -BAT *BATcalcand(BAT *b1, BAT *b2, BAT *s); ->>> other BAT *BATcalcandcst(BAT *b, const ValRecord *v, BAT *s); -<<< local -gdk_return BATcalcavg(BAT *b, BAT *s, dbl *avg, BUN *vals); -BAT *BATcalcbetween(BAT *b, BAT *lo, BAT *hi, BAT *s, int symmetric, int projected); -BAT *BATcalcbetweenbatcst(BAT *b, BAT *lo, const ValRecord *hi, BAT *s, int symmetric, int projected); -BAT *BATcalcbetweencstbat(BAT *b, const ValRecord *lo, BAT *hi, BAT *s, int symmetric, int projected); -BAT *BATcalcbetweencstcst(BAT *b, const ValRecord *lo, const ValRecord *hi, BAT *s, int symmetric); +gdk_return BATcalcavg(BAT *b, BAT *s, dbl *avg, BUN *vals, int scale); +BAT *BATcalcbetween(BAT *b, BAT *lo, BAT *hi, BAT *s, bool symmetric, int projected); +BAT *BATcalcbetweenbatcst(BAT *b, BAT *lo, const ValRecord *hi, BAT *s, bool symmetric, int projected); +BAT *BATcalcbetweencstbat(BAT *b, const ValRecord *lo, BAT *hi, BAT *s, bool symmetric, int projected); +BAT *BATcalcbetweencstcst(BAT *b, const ValRecord *lo, const ValRecord *hi, BAT *s, bool symmetric); BAT *BATcalccmp(BAT *b1, BAT *b2, BAT *s, int projected); -=== -gdk_return BATcalcavg(BAT *b, BAT *s, dbl *avg, BUN *vals, int scale); -BAT *BATcalcbetween(BAT *b, BAT *lo, BAT *hi, BAT *s, bool sym); -BAT *BATcalcbetweenbatcst(BAT *b, BAT *lo, const ValRecord *hi, BAT *s, bool sym); -BAT *BATcalcbetweencstbat(BAT *b, const ValRecord *lo, BAT *hi, BAT *s, bool sym); -BAT *BATcalcbetweencstcst(BAT *b, const ValRecord *lo, const ValRecord *hi, BAT *s, bool sym); -BAT *BATcalccmp(BAT *b1, BAT *b2, BAT *s); ->>> other BAT *BATcalccmpcst(BAT *b, const ValRecord *v, BAT *s); BAT *BATcalccstadd(const ValRecord *v, BAT *b, BAT *s, int tp, bool abort_on_error); BAT *BATcalccstand(const ValRecord *v, BAT *b, BAT *s); @@ -69,49 +54,28 @@ BAT *BATcalccstor(const ValRecord *v, BA BAT *BATcalccstrsh(const ValRecord *v, BAT *b, BAT *s, bool abort_on_error); BAT *BATcalccstsub(const ValRecord *v, BAT *b, BAT *s, int tp, bool abort_on_error); BAT *BATcalccstxor(const ValRecord *v, BAT *b, BAT *s); -<<< local -BAT *BATcalcdecr(BAT *b, BAT *s, int abort_on_error); -BAT *BATcalcdiv(BAT *b1, BAT *b2, BAT *s, int tp, int abort_on_error, int projected); -BAT *BATcalcdivcst(BAT *b, const ValRecord *v, BAT *s, int tp, int abort_on_error); +BAT *BATcalcdecr(BAT *b, BAT *s, bool abort_on_error); +BAT *BATcalcdiv(BAT *b1, BAT *b2, BAT *s, int tp, bool abort_on_error, int projected); +BAT *BATcalcdivcst(BAT *b, const ValRecord *v, BAT *s, int tp, bool abort_on_error); BAT *BATcalceq(BAT *b1, BAT *b2, BAT *s, int projected); -=== -BAT *BATcalcdecr(BAT *b, BAT *s, bool abort_on_error); -BAT *BATcalcdiv(BAT *b1, BAT *b2, BAT *s, int tp, bool abort_on_error); -BAT *BATcalcdivcst(BAT *b, const ValRecord *v, BAT *s, int tp, bool abort_on_error); -BAT *BATcalceq(BAT *b1, BAT *b2, BAT *s); ->>> other BAT *BATcalceqcst(BAT *b, const ValRecord *v, BAT *s); BAT *BATcalcge(BAT *b1, BAT *b2, BAT *s, int projected); BAT *BATcalcgecst(BAT *b, const ValRecord *v, BAT *s); BAT *BATcalcgt(BAT *b1, BAT *b2, BAT *s, int projected); BAT *BATcalcgtcst(BAT *b, const ValRecord *v, BAT *s); -<<< local BAT *BATcalcifthencstelse(BAT *b, const ValRecord *c1, BAT *b2, BAT *s, int projected); BAT *BATcalcifthencstelsecst(BAT *b, const ValRecord *c1, const ValRecord *c2, BAT *s); BAT *BATcalcifthenelse(BAT *b, BAT *b1, BAT *b2, BAT *s, int projected); BAT *BATcalcifthenelsecst(BAT *b, BAT *b1, const ValRecord *c2, BAT *s, int projected); -BAT *BATcalcincr(BAT *b, BAT *s, int abort_on_error); -=== -BAT *BATcalcifthencstelse(BAT *b, const ValRecord *c1, BAT
MonetDB: batcalc-candidates - approve opt_sql_append test
Changeset: e241aa2941d8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e241aa2941d8 Modified Files: monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out Branch: batcalc-candidates Log Message: approve opt_sql_append test diffs (33 lines): diff --git a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out --- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out +++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out @@ -54,13 +54,8 @@ Ready. % .L1 # table_name % def # name % clob # type -<<< local % 580 # length -[ "optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.postfix();optimizer.batcalc();optimizer.deadcode();optimizer.wlc();optimizer.garbageCollector();" ] -=== -% 560 # length -[ "optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.postfix();optimizer.deadcode();optimizer.wlc();optimizer.garbageCollector();" ] ->>> other +[ "optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.postfix();optimizer.batcalc();optimizer.deadcode();optimizer.wlc();optimizer.garbageCollector();" ] #explain copy into ttt from '/tmp/xyz'; % .explain # table_name % mal # name @@ -118,13 +113,8 @@ end user.s10_1; % .L1 # table_name % def # name % clob # type -<<< local % 603 # length -[ "optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.reorder();optimizer.deadcode();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.postfix();optimizer.batcalc();optimizer.deadcode();optimizer.wlc();optimizer.sql_append();optimizer.garbageCollector();" ] -=== -% 583 # length -[ "optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.postfix();optimizer.deadcode();optimizer.wlc();optimizer.sql_append();optimizer.garbageCollector();" ] ->>> other +[ "optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptybind();optimizer.pushselect();optimizer.aliases();optimizer.mergetable();optimizer.deadcode();optimizer.aliases();optimizer.constants();optimizer.commonTerms();optimizer.projectionpath();optimizer.deadcode();optimizer.reorder();optimizer.matpack();optimizer.querylog();optimizer.multiplex();optimizer.generator();optimizer.profiler();optimizer.candidates();optimizer.postfix();optimizer.batcalc();optimizer.deadcode();optimizer.wlc();optimizer.sql_append();optimizer.garbageCollector();" ] #explain copy into ttt from '/tmp/xyz'; % .explain # table_name % mal # name ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: config_rss - .ag cannot handle multiple file/dir condit...
Changeset: 0c67c07eb446 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0c67c07eb446 Modified Files: sql/backends/monet5/Makefile.ag Branch: config_rss Log Message: .ag cannot handle multiple file/dir conditions. diffs (12 lines): diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag --- a/sql/backends/monet5/Makefile.ag +++ b/sql/backends/monet5/Makefile.ag @@ -4,7 +4,7 @@ # # Copyright 1997 - July 2008 CWI, August 2008 - 2018 MonetDB B.V. -SUBDIRS = NOT_WIN32?vaults UDF generator HAVE_TESTING?WIN32?config_rss +SUBDIRS = NOT_WIN32?vaults UDF generator WIN32?config_rss INCLUDES = ../../include ../../common ../../storage ../../server \ ../../../monetdb5/modules/atoms \ ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: viewless - merge with batcalc-candidates
Changeset: e86e7252e686 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e86e7252e686 Added Files: ChangeLog.Aug2018 buildtools/ChangeLog.Aug2018 clients/ChangeLog.Aug2018 clients/R/Tests/deps-install.timeout clients/mapilib/ChangeLog.Aug2018 clients/odbc/samples/testStmtAttr.c common/stream/ChangeLog.Aug2018 common/utils/strptime.cpp debian/libmonetdb17.install debian/libmonetdb5-server-cfitsio.install debian/monetdb-python3.install gdk/ChangeLog.Aug2018 geom/ChangeLog.Aug2018 monetdb5/ChangeLog.Aug2018 sql/ChangeLog.Aug2018 sql/backends/monet5/UDF/capi/Tests/capi14.sql sql/backends/monet5/UDF/capi/Tests/capi14.stable.err sql/backends/monet5/UDF/capi/Tests/capi14.stable.out sql/backends/monet5/UDF/capi/Tests/capi15.sql sql/backends/monet5/UDF/capi/Tests/capi15.stable.err sql/backends/monet5/UDF/capi/Tests/capi15.stable.out sql/backends/monet5/UDF/capi/Tests/capi16.sql sql/backends/monet5/UDF/capi/Tests/capi16.stable.err sql/backends/monet5/UDF/capi/Tests/capi16.stable.out sql/backends/monet5/UDF/capi/Tests/capi17.sql sql/backends/monet5/UDF/capi/Tests/capi17.stable.err sql/backends/monet5/UDF/capi/Tests/capi17.stable.out sql/backends/monet5/UDF/capi/Tests/capi18.sql sql/backends/monet5/UDF/capi/Tests/capi18.stable.err sql/backends/monet5/UDF/capi/Tests/capi18.stable.out sql/jdbc/tests/Tests/SQLcopyinto.SQL.bat sql/jdbc/tests/Tests/SQLcopyinto.SQL.sh sql/jdbc/tests/Tests/SQLcopyinto.stable.err sql/jdbc/tests/Tests/SQLcopyinto.stable.out sql/server/rel_propagate.c sql/server/rel_propagate.h sql/server/sql_partition.c sql/server/sql_partition.h sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.sql sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.err sql/test/BugTracker-2018/Tests/comment-on-table-is-null.Bug-6639.stable.out sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.sql sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.err sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.out sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.sql sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.stable.err sql/test/BugTracker-2018/Tests/create_table_if_not_exists_returns_42000.Bug-6629.stable.out sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.stable.err sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.stable.out sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.sql sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.err sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.out sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.sql sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.stable.err sql/test/BugTracker-2018/Tests/ilike-foreign-characters.Bug-6633.stable.out sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.stable.err sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.stable.out sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.sql sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.err sql/test/BugTracker-2018/Tests/multi-column-hash-wrongly-NIL.Bug-6638.stable.out sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.sql sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.stable.err sql/test/BugTracker-2018/Tests/multiple-count.Bug-6599.stable.out sql/test/BugTracker-2018/Tests/or_in_subselect.Bug-6625.sql sql/test/BugTracker-2018/Tests/or_in_subselect.Bug-6625.stable.err sql/test/BugTracker-2018/Tests/or_in_subselect.Bug-6625.stable.out sql/test/BugTracker-2018/Tests/procedure-create-table.Bug-6604.sql sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.err sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.stable.out sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.stable.err
MonetDB: batcalc-candidates - closed branch batcalc-candidates
Changeset: ce9b1757658c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ce9b1757658c Branch: batcalc-candidates Log Message: closed branch batcalc-candidates ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: viewless - resolve conflicts
Changeset: 8dd5bb8658b2 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8dd5bb8658b2 Modified Files: clients/Tests/exports.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out Branch: viewless Log Message: resolve conflicts diffs (191 lines): diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -22,31 +22,16 @@ atomDesc BATatoms[]; BAT *BATattach(int tt, const char *heapfile, int role); gdk_return BATbandjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, const void *c1, const void *c2, bool li, bool hi, BUN estimate) __attribute__((__warn_unused_result__)); BAT *BATcalcabsolute(BAT *b, BAT *s); -<<< local -BAT *BATcalcadd(BAT *b1, BAT *b2, BAT *s, int tp, int abort_on_error, int projected); -BAT *BATcalcaddcst(BAT *b, const ValRecord *v, BAT *s, int tp, int abort_on_error); +BAT *BATcalcadd(BAT *b1, BAT *b2, BAT *s, int tp, bool abort_on_error, int projected); +BAT *BATcalcaddcst(BAT *b, const ValRecord *v, BAT *s, int tp, bool abort_on_error); BAT *BATcalcand(BAT *b1, BAT *b2, BAT *s, int projected); -=== -BAT *BATcalcadd(BAT *b1, BAT *b2, BAT *s, int tp, bool abort_on_error); -BAT *BATcalcaddcst(BAT *b, const ValRecord *v, BAT *s, int tp, bool abort_on_error); -BAT *BATcalcand(BAT *b1, BAT *b2, BAT *s); ->>> other BAT *BATcalcandcst(BAT *b, const ValRecord *v, BAT *s); -<<< local -gdk_return BATcalcavg(BAT *b, BAT *s, dbl *avg, BUN *vals); -BAT *BATcalcbetween(BAT *b, BAT *lo, BAT *hi, BAT *s, int symmetric, int projected); -BAT *BATcalcbetweenbatcst(BAT *b, BAT *lo, const ValRecord *hi, BAT *s, int symmetric, int projected); -BAT *BATcalcbetweencstbat(BAT *b, const ValRecord *lo, BAT *hi, BAT *s, int symmetric, int projected); -BAT *BATcalcbetweencstcst(BAT *b, const ValRecord *lo, const ValRecord *hi, BAT *s, int symmetric); +gdk_return BATcalcavg(BAT *b, BAT *s, dbl *avg, BUN *vals, int scale); +BAT *BATcalcbetween(BAT *b, BAT *lo, BAT *hi, BAT *s, bool symmetric, int projected); +BAT *BATcalcbetweenbatcst(BAT *b, BAT *lo, const ValRecord *hi, BAT *s, bool symmetric, int projected); +BAT *BATcalcbetweencstbat(BAT *b, const ValRecord *lo, BAT *hi, BAT *s, bool symmetric, int projected); +BAT *BATcalcbetweencstcst(BAT *b, const ValRecord *lo, const ValRecord *hi, BAT *s, bool symmetric); BAT *BATcalccmp(BAT *b1, BAT *b2, BAT *s, int projected); -=== -gdk_return BATcalcavg(BAT *b, BAT *s, dbl *avg, BUN *vals, int scale); -BAT *BATcalcbetween(BAT *b, BAT *lo, BAT *hi, BAT *s, bool sym); -BAT *BATcalcbetweenbatcst(BAT *b, BAT *lo, const ValRecord *hi, BAT *s, bool sym); -BAT *BATcalcbetweencstbat(BAT *b, const ValRecord *lo, BAT *hi, BAT *s, bool sym); -BAT *BATcalcbetweencstcst(BAT *b, const ValRecord *lo, const ValRecord *hi, BAT *s, bool sym); -BAT *BATcalccmp(BAT *b1, BAT *b2, BAT *s); ->>> other BAT *BATcalccmpcst(BAT *b, const ValRecord *v, BAT *s); BAT *BATcalccstadd(const ValRecord *v, BAT *b, BAT *s, int tp, bool abort_on_error); BAT *BATcalccstand(const ValRecord *v, BAT *b, BAT *s); @@ -69,49 +54,28 @@ BAT *BATcalccstor(const ValRecord *v, BA BAT *BATcalccstrsh(const ValRecord *v, BAT *b, BAT *s, bool abort_on_error); BAT *BATcalccstsub(const ValRecord *v, BAT *b, BAT *s, int tp, bool abort_on_error); BAT *BATcalccstxor(const ValRecord *v, BAT *b, BAT *s); -<<< local -BAT *BATcalcdecr(BAT *b, BAT *s, int abort_on_error); -BAT *BATcalcdiv(BAT *b1, BAT *b2, BAT *s, int tp, int abort_on_error, int projected); -BAT *BATcalcdivcst(BAT *b, const ValRecord *v, BAT *s, int tp, int abort_on_error); +BAT *BATcalcdecr(BAT *b, BAT *s, bool abort_on_error); +BAT *BATcalcdiv(BAT *b1, BAT *b2, BAT *s, int tp, bool abort_on_error, int projected); +BAT *BATcalcdivcst(BAT *b, const ValRecord *v, BAT *s, int tp, bool abort_on_error); BAT *BATcalceq(BAT *b1, BAT *b2, BAT *s, int projected); -=== -BAT *BATcalcdecr(BAT *b, BAT *s, bool abort_on_error); -BAT *BATcalcdiv(BAT *b1, BAT *b2, BAT *s, int tp, bool abort_on_error); -BAT *BATcalcdivcst(BAT *b, const ValRecord *v, BAT *s, int tp, bool abort_on_error); -BAT *BATcalceq(BAT *b1, BAT *b2, BAT *s); ->>> other BAT *BATcalceqcst(BAT *b, const ValRecord *v, BAT *s); BAT *BATcalcge(BAT *b1, BAT *b2, BAT *s, int projected); BAT *BATcalcgecst(BAT *b, const ValRecord *v, BAT *s); BAT *BATcalcgt(BAT *b1, BAT *b2, BAT *s, int projected); BAT *BATcalcgtcst(BAT *b, const ValRecord *v, BAT *s); -<<< local BAT *BATcalcifthencstelse(BAT *b, const ValRecord *c1, BAT *b2, BAT *s, int projected); BAT *BATcalcifthencstelsecst(BAT *b, const ValRecord *c1, const ValRecord *c2, BAT *s); BAT *BATcalcifthenelse(BAT *b, BAT *b1, BAT *b2, BAT *s, int projected); BAT *BATcalcifthenelsecst(BAT *b, BAT *b1, const ValRecord *c2, BAT *s, int projected); -BAT *BATcalcincr(BAT *b, BAT *s, int abort_on_error); -===
MonetDB: viewless - BATsubhash is not needed anymore
Changeset: 0f1fd60a6d79 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0f1fd60a6d79 Modified Files: gdk/gdk.h Branch: viewless Log Message: BATsubhash is not needed anymore diffs (12 lines): diff --git a/gdk/gdk.h b/gdk/gdk.h --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -1818,8 +1818,6 @@ gdk_export ptr ATOMdup(int id, const voi * structures. */ gdk_export gdk_return BAThash(BAT *b); -gdk_export gdk_return BATsubhash(BAT *b, BAT *s); - /* * @- Column Imprints Functions ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
