Changeset: 026af75c1929 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=026af75c1929
Added Files:
sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.err
sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.out
sql/test/BugTracker-2018/Tests/aggr-in-case.Bug-6526.stable.out.int128
sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.sql
sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.err
sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out
sql/test/BugTracker-2018/Tests/ilike.Bug-6547.sql
sql/test/BugTracker-2018/Tests/ilike.Bug-6547.stable.err
sql/test/BugTracker-2018/Tests/ilike.Bug-6547.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-in-cast-null.Bug-6529.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-in-cast-null.Bug-6529.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-in-query.Bug-6545.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-in-with-division.Bug-6546.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.err
sql/test/BugTracker-2018/Tests/sqlitelogictest-not-in-wrong-results.Bug-6530.stable.out
sql/test/BugTracker-2018/Tests/truncate_add_user.sql
sql/test/BugTracker-2018/Tests/truncate_add_user.stable.err
sql/test/BugTracker-2018/Tests/truncate_add_user.stable.out
sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.reqtests
sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.sql
sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.stable.err
sql/test/BugTracker-2018/Tests/truncate_bam_tables.Bug-6543.stable.out
sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.sql
sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.stable.err
sql/test/BugTracker-2018/Tests/truncate_empty_table.Bug-6544.stable.out
sql/test/BugTracker-2018/Tests/truncate_remove_user.sql
sql/test/BugTracker-2018/Tests/truncate_remove_user.stable.err
sql/test/BugTracker-2018/Tests/truncate_remove_user.stable.out
sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.reqtests
sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.sql
sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.stable.err
sql/test/BugTracker-2018/Tests/truncate_sys_netcdf_tables.Bug-6543.stable.out
sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.reqtests
sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.sql
sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.stable.err
sql/test/BugTracker-2018/Tests/truncate_sys_tables.Bug-6543.stable.out
sql/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.sql
Removed Files:
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.FreeBSD
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Windows
sql/test/BugTracker/Tests/mapi_connect_errors_vanish.SF-1432134.SQL.py
Modified Files:
clients/Tests/exports.stable.out
clients/mapiclient/mclient.c
clients/mapiclient/mhelp.c
clients/odbc/setup/drvcfg.h
gdk/ChangeLog.Mar2018
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_atomic.h
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_join.c
gdk/gdk_storage.c
monetdb5/mal/mal_readline.c
monetdb5/modules/kernel/bat5.c
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/inspect.c
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/mkey.c
monetdb5/modules/mal/pcre.c
monetdb5/optimizer/opt_candidates.c
sql/ChangeLog.Mar2018
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_fround_impl.h
sql/backends/monet5/sql_optimizer.h
sql/backends/monet5/sql_round_impl.h
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/vaults/bam/85_bam.sql
sql/backends/monet5/vaults/netcdf/74_netcdf.sql
sql/scripts/97_comments.sql
sql/server/rel_optimizer.c
sql/server/rel_schema.c
sql/server/rel_select.c
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_table.c
sql/storage/bat/bat_utils.c
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2012/Tests/rewrite_like_into_likesubselect.Bug-3179.stable.out
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.sql
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/BugTracker-2018/Tests/All
sql/test/BugTracker/Tests/All
sql/test/BugTracker/Tests/explain.SF-1739353.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Tests/comment-auth.stable.err
sql/test/Tests/comment-auth.stable.out
sql/test/Tests/comment-on.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/mapi/Tests/utf8test.SQL.py
sql/test/mapi/Tests/utf8test.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
testing/Mtest.py.in
Branch: data-vaults
Log Message:
Merge with default
diffs (truncated from 7673 to 300 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
@@ -159,7 +159,7 @@ BAT *BATproject(BAT *l, BAT *r);
BAT *BATprojectchain(BAT **bats);
gdk_return BATrangejoin(BAT **r1p, BAT **r2p, BAT *l, BAT *rl, BAT *rh, BAT
*sl, BAT *sr, int li, int hi, BUN estimate)
__attribute__((__warn_unused_result__));
gdk_return BATreplace(BAT *b, BAT *p, BAT *n, bit force)
__attribute__((__warn_unused_result__));
-void BATroles(BAT *b, const char *tnme);
+gdk_return BATroles(BAT *b, const char *tnme);
BAT *BATsample(BAT *b, BUN n);
BAT *BATselect(BAT *b, BAT *s, const void *tl, const void *th, int li, int hi,
int anti);
gdk_return BATsemijoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
int nil_matches, BUN estimate) __attribute__((__warn_unused_result__));
@@ -479,7 +479,7 @@ size_t strLen(const char *s);
int strNil(const char *s);
const char str_nil[2];
gdk_return void_inplace(BAT *b, oid id, const void *val, bit force)
__attribute__((__warn_unused_result__));
-BUN void_replace_bat(BAT *b, BAT *p, BAT *u, bit force)
__attribute__((__warn_unused_result__));
+gdk_return void_replace_bat(BAT *b, BAT *p, BAT *u, bit force)
__attribute__((__warn_unused_result__));
int win_mkdir(const char *, const int mode);
int win_rename(const char *, const char *);
int win_rmdir(const char *);
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -71,11 +71,11 @@ static stream *fromConsole = NULL;
static char *language = NULL;
static char *logfile = NULL;
static char promptbuf[16];
-static int echoquery = 0;
+static bool echoquery = false;
#ifdef HAVE_ICONV
static char *encoding;
#endif
-static int errseen = 0;
+static bool errseen = false;
#define setPrompt() sprintf(promptbuf, "%.*s>", (int) sizeof(promptbuf) - 2,
language)
#define debugMode() (strncmp(promptbuf, "mdb", 3) == 0)
@@ -94,7 +94,7 @@ enum formatters {
};
static enum formatters formatter = NOformatter;
char *separator = NULL; /* column separator for CSV/TAB format
*/
-int csvheader = 0; /* include header line in CSV format */
+bool csvheader = false; /* include header line in CSV format */
#define DEFWIDTH 80
@@ -123,9 +123,9 @@ static char *pager = 0; /* use external
#endif
static int rowsperpage = 0; /* for SQL pagination */
static int pagewidth = 0; /* -1: take whatever is necessary, >0: limit */
-static int pagewidthset = 0; /* whether the user set the width explicitly */
+static bool pagewidthset = false; /* whether the user set the width explicitly
*/
static int croppedfields = 0; /* whatever got cropped/truncated */
-static char firstcrop = 1; /* first time we see cropping/truncation */
+static bool firstcrop = true; /* first time we see cropping/truncation */
enum modifiers {
NOmodifier,
@@ -259,13 +259,13 @@ static enum itimers {
T_PERF // return detailed performance
} timermode = T_NONE;
-static int timerHumanCalled = 0;
+static bool timerHumanCalled = false;
static void
timerHuman(int64_t sqloptimizer, int64_t maloptimizer, int64_t querytime, int
singleinstr, int total)
{
timertype t = th - t0;
- timerHumanCalled = 1;
+ timerHumanCalled = true;
/*
* report only the times we do actually measure:
@@ -301,12 +301,10 @@ timerHuman(int64_t sqloptimizer, int64_t
fflush(stderr);
return;
}
- if (timermode == T_PERF) {
+ if (timermode == T_PERF && ((!singleinstr != !total) || !total)) {
/* for performance measures we use milliseconds as the base */
- if ((!singleinstr != !total) || !total) {
- fflush(stderr);
- mnstr_flush(toConsole);
- }
+ fflush(stderr);
+ mnstr_flush(toConsole);
if (!total)
fprintf(stderr, "sql:%" PRId64 ".%03d opt:%" PRId64
".%03d run:%" PRId64 ".%03d ",
sqloptimizer / 1000, (int) (sqloptimizer %
1000),
@@ -314,10 +312,8 @@ timerHuman(int64_t sqloptimizer, int64_t
querytime / 1000, (int) (querytime % 1000));
if (!singleinstr != !total)
fprintf(stderr, "clk:%" PRId64 ".%03d ", t / 1000,
(int) (t % 1000));
- if ((!singleinstr != !total) || !total) {
- fprintf(stderr, "ms\n");
- fflush(stderr);
- }
+ fprintf(stderr, "ms\n");
+ fflush(stderr);
return;
}
return;
@@ -575,7 +571,8 @@ utf8skip(char *s, size_t i)
static int
SQLrow(int *len, int *numeric, char **rest, int fields, int trim, char wm)
{
- int i, more, first = 1;
+ int i;
+ bool more, first = true;
char *t;
int rows = 0; /* return number of output lines printed */
size_t ulen;
@@ -602,7 +599,7 @@ SQLrow(int *len, int *numeric, char **re
cutafter[i] = -1;
do {
- more = 0;
+ more = false;
for (i = 0; i < fields; i++) {
if (rest[i] == NULL || *rest[i] == 0) {
mnstr_printf(toConsole, "%c %*s ",
@@ -701,7 +698,7 @@ SQLrow(int *len, int *numeric, char **re
if (cutafter[i] == 0)
rest[i] = NULL;
if (rest[i])
- more = 1;
+ more = true;
} else {
mnstr_printf(toConsole, "%c",
first ? '|' : i > 0 &&
cutafter[i - 1] == 0 ? '>' : ':');
@@ -740,7 +737,7 @@ SQLrow(int *len, int *numeric, char **re
mnstr_printf(toConsole, "%c%s\n",
first ? '|' : i > 0 && cutafter[i - 1] == 0 ? '>'
: ':',
wm ? ">" : "");
- first = 0;
+ first = false;
rows++;
} while (more);
@@ -1418,7 +1415,7 @@ SQLdebugRendering(MapiHdl hdl)
}
static void
-SQLpagemove(int *len, int fields, int *ps, int *silent)
+SQLpagemove(int *len, int fields, int *ps, bool *silent)
{
char buf[512];
ssize_t sz;
@@ -1431,11 +1428,11 @@ SQLpagemove(int *len, int fields, int *p
if (buf[0] == 'c')
*ps = 0;
if (buf[0] == 'q')
- *silent = 1;
+ *silent = true;
while (sz > 0 && buf[sz - 1] != '\n')
sz = mnstr_readline(fromConsole, buf, sizeof(buf));
}
- if (*silent == 0)
+ if (!*silent)
SQLseparator(len, fields, '-');
}
@@ -1447,7 +1444,8 @@ SQLrenderer(MapiHdl hdl)
int *len = NULL, *hdr = NULL, *numeric = NULL;
char **rest = NULL;
char buf[50];
- int ps = rowsperpage, silent = 0;
+ int ps = rowsperpage;
+ bool silent = false;
int64_t rows = 0;
croppedfields = 0;
@@ -1670,8 +1668,8 @@ SQLrenderer(MapiHdl hdl)
croppedfields, croppedfields != 1 ? "s" : "");
if (fields != printfields || croppedfields > 0) {
mnstr_printf(toConsole, "!");
- if (firstcrop == 1) {
- firstcrop = 0;
+ if (firstcrop) {
+ firstcrop = false;
mnstr_printf(toConsole, "\nnote: to disable dropping
columns and/or truncating fields use \\w-1");
}
}
@@ -1689,7 +1687,7 @@ setFormatter(const char *s)
if (separator)
free(separator);
separator = NULL;
- csvheader = 0;
+ csvheader = false;
#ifdef _TWO_DIGIT_EXPONENT
if (formatter == TESTformatter)
_set_output_format(0);
@@ -1715,7 +1713,7 @@ setFormatter(const char *s)
separator[strlen(separator) - 1] = 0;
} else
separator = strdup(s + 4);
- csvheader = 1;
+ csvheader = true;
} else if (strcmp(s, "tab") == 0) {
formatter = CSVformatter;
separator = strdup("\t");
@@ -1827,7 +1825,7 @@ format_result(Mapi mid, MapiHdl hdl, int
setWidth();
- timerHumanCalled = 0;
+ timerHumanCalled = false;
do {
/* handle errors first */
@@ -1839,7 +1837,7 @@ format_result(Mapi mid, MapiHdl hdl, int
mapi_noexplain(mid, NULL);
}
mapi_explain_result(hdl, stderr);
- errseen = 1;
+ errseen = true;
/* don't need to print something like '0
* tuples' if we got an error */
continue;
@@ -1986,7 +1984,7 @@ format_result(Mapi mid, MapiHdl hdl, int
if (mnstr_errnr(toConsole)) {
mnstr_clearerr(toConsole);
fprintf(stderr, "write error\n");
- errseen = 1;
+ errseen = true;
}
#ifdef HAVE_POPEN
end_pager(saveFD);
@@ -2011,7 +2009,7 @@ doRequest(Mapi mid, const char *buf)
mapi_noexplain(mid, NULL);
}
mapi_explain(mid, stderr);
- errseen = 1;
+ errseen = true;
return 1;
}
@@ -2043,7 +2041,7 @@ doRequest(Mapi mid, const char *buf)
hdl = NULL; \
} else \
mapi_explain(mid, stderr); \
- errseen = 1; \
+ errseen = true; \
break_or_continue; \
case MTIMEOUT: \
/* lost contact with the server */ \
@@ -2058,7 +2056,7 @@ doRequest(Mapi mid, const char *buf)
hdl = NULL; \
} else \
mapi_explain(mid, stderr); \
- errseen = 1; \
+ errseen = true; \
timerEnd(); \
if (buf) \
free(buf); \
@@ -2067,7 +2065,7 @@ doRequest(Mapi mid, const char *buf)
return 1; \
}
-static int
+static bool
doFileBulk(Mapi mid, stream *fp)
{
char *buf = NULL;
@@ -2082,7 +2080,7 @@ doFileBulk(Mapi mid, stream *fp)
fprintf(stderr, "cannot allocate memory for send buffer\n");
if (fp)
close_stream(fp);
- return 1;
+ return true;
}
timerStart();
@@ -2103,7 +2101,7 @@ doFileBulk(Mapi mid, stream *fp)
buf[length] = 0;
if (strlen(buf) < (size_t) length) {
fprintf(stderr, "NULL byte in input\n");
- errseen = 1;
+ errseen = true;
break;
}
}
@@ -2263,8 +2261,8 @@ mydestroy(void *private)
}
#endif
-static int
-doFile(Mapi mid, stream *fp, bool useinserts, int interactive, int
save_history)
+static bool
+doFile(Mapi mid, stream *fp, bool useinserts, bool interactive, int
save_history)
{
char *line = NULL;
char *buf = NULL;
@@ -2286,7 +2284,7 @@ doFile(Mapi mid, stream *fp, bool useins
&& formatter != TESTformatter
#endif
) {
- interactive = 1;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
