Changeset: 5598d6f0f482 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5598d6f0f482
Modified Files:
clients/mapiclient/mnc.c
clients/mapilib/mapi.c
common/stream/stream.c
monetdb5/modules/mal/remote.c
monetdb5/optimizer/opt_octopus.mx
sql/backends/monet5/sql_result.mx
sql/server/rel_dump.c
sql/server/sql_datetime.c
sql/server/sql_statement.c
sql/server/sql_statement.h
testing/Mtest.py.in
Branch: default
Log Message:
Merge with Apr2012 branch.
diffs (truncated from 470 to 300 lines):
diff --git a/clients/mapiclient/mnc.c b/clients/mapiclient/mnc.c
--- a/clients/mapiclient/mnc.c
+++ b/clients/mapiclient/mnc.c
@@ -99,7 +99,7 @@ main(int argc, char **argv)
stream *in = NULL;
stream *out = NULL;
char buf[8096];
- size_t len;
+ ssize_t len;
fd_set fds;
char seeneof = 0;
char seenflush = 0;
@@ -271,8 +271,11 @@ main(int argc, char **argv)
select((int)s + 1, &fds, NULL, NULL, NULL);
if (FD_ISSET(s, &fds)) {
- if ((len = mnstr_read(in, buf, 1, sizeof(buf))) != 0) {
- if (!write(1, buf, len))
+ if ((len = mnstr_read(in, buf, 1, sizeof(buf))) > 0) {
+ /* on Windows: unsigned int,
+ * elsewhere: size_t, but then
+ * unsigned int shouldn't harm */
+ if (!write(1, buf, (unsigned int) len))
exit(2);
seenflush = 0;
} else {
@@ -285,8 +288,8 @@ main(int argc, char **argv)
}
}
if (FD_ISSET(0, &fds)) {
- if ((len = read(0, buf, sizeof(buf))) != 0) {
- mnstr_write(out, buf, len, 1);
+ if ((len = read(0, buf, sizeof(buf))) > 0) {
+ mnstr_write(out, buf, (size_t) len, 1);
seeneof = 0;
} else if (len == 0) {
/* EOF */
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -2554,7 +2554,7 @@ mapi_start_talking(Mapi mid)
* commas, and only allow full matches */
if (strstr(hashes, *algs) != NULL) {
char *pwh = mcrypt_hashPassword(*algs,
p, chal);
- int len;
+ size_t len;
if (pwh == NULL)
continue;
len = strlen(pwh) + 11 /* {RIPEMD160}
*/ + 1;
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -1460,8 +1460,9 @@ socket_update_timeout(stream *s)
tv.tv_sec = s->timeout;
tv.tv_usec = 0;
- setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &tv, (socklen_t) sizeof(tv));
- setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &tv, (socklen_t) sizeof(tv));
+ /* cast to char * for Windows, no harm on "normal" systems */
+ setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (char *) &tv, (socklen_t)
sizeof(tv));
+ setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, (char *) &tv, (socklen_t)
sizeof(tv));
}
static stream *
diff --git a/monetdb5/modules/mal/remote.c b/monetdb5/modules/mal/remote.c
--- a/monetdb5/modules/mal/remote.c
+++ b/monetdb5/modules/mal/remote.c
@@ -1240,7 +1240,7 @@ RMTinternalcopyfrom(BAT **ret, char *hdr
/* for strings, the width may not match, fix it to match what we
* retrieved */
if (bb.Ttype == TYPE_str && bb.size) {
- b->T->width = bb.tailsize / bb.size;
+ b->T->width = (unsigned short) (bb.tailsize / bb.size);
b->T->shift = ATOMelmshift(Tsize(b));
}
diff --git a/monetdb5/optimizer/opt_octopus.mx
b/monetdb5/optimizer/opt_octopus.mx
--- a/monetdb5/optimizer/opt_octopus.mx
+++ b/monetdb5/optimizer/opt_octopus.mx
@@ -1318,7 +1318,7 @@ OPTlegAdviceInternal(MalBlkPtr mb, MalSt
if ( msg == MAL_SUCCEED) {
b = BBPquickdesc(bid, FALSE);
if ( b != NULL && BATcount(b) > 0 )
- return BATcount(b);
+ return (int) BATcount(b);
}
/* return GDKnr_threads;*/
}
diff --git a/sql/backends/monet5/sql_result.mx
b/sql/backends/monet5/sql_result.mx
--- a/sql/backends/monet5/sql_result.mx
+++ b/sql/backends/monet5/sql_result.mx
@@ -611,7 +611,7 @@ mvc_import_table(Client cntxt, mvc *m, b
if (sz < 0 || sz > (lng)REMAP_PAGE_MAXSIZE)
BATmmap(b, STORE_MMAP,
STORE_MMAP, STORE_MMAP, STORE_MMAP, 1);
if (sz > (lng)BATTINY)
- b = BATextend(b, sz);
+ b = BATextend(b, (BUN) sz);
HASHremove(b);
HASHremove(BATmirror(b));
diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -635,7 +635,7 @@ read_prop( mvc *sql, sql_exp *exp, char
sql_schema *s = NULL;
prop *p;
- (*pos)+= strlen("JOINIDX");
+ (*pos)+= (int) strlen("JOINIDX");
skipWS(r, pos);
/* schema.table.index */
sname = r+*pos;
@@ -793,12 +793,12 @@ exp_read(mvc *sql, sql_rel *lrel, sql_re
skipWS(r, pos);
if (r[*pos] == 'u') {
unique = 1;
- (*pos)+= strlen("unique");
+ (*pos)+= (int) strlen("unique");
skipWS(r, pos);
}
if (r[*pos] == 'n') {
no_nils = 1;
- (*pos)+= strlen("no nil");
+ (*pos)+= (int) strlen("no nil");
skipWS(r, pos);
}
}
@@ -840,30 +840,30 @@ exp_read(mvc *sql, sql_rel *lrel, sql_re
}
/* [ ASC ] */
if (strncmp(r+*pos, "ASC", strlen("ASC")) == 0) {
- (*pos)+= strlen("NOT");
+ (*pos)+= (int) strlen("NOT");
skipWS(r, pos);
set_direction(exp, ASCENDING);
}
/* [ NOT ] NULL */
if (strncmp(r+*pos, "NOT", strlen("NOT")) == 0) {
- (*pos)+= strlen("NOT");
+ (*pos)+= (int) strlen("NOT");
skipWS(r, pos);
not = 1;
}
if (strncmp(r+*pos, "NULL", strlen("NULL")) == 0) {
- (*pos)+= strlen("NULL");
+ (*pos)+= (int) strlen("NULL");
skipWS(r, pos);
if (not)
set_has_no_nil(exp);
}
if (strncmp(r+*pos, "HASHIDX", strlen("HASHIDX")) == 0) {
- (*pos)+= strlen("HASHIDX");
+ (*pos)+= (int) strlen("HASHIDX");
exp->p = prop_create(sql->sa, PROP_HASHIDX, exp->p);
skipWS(r,pos);
}
if (strncmp(r+*pos, "FETCH", strlen("FETCH")) == 0) {
- (*pos)+= strlen("FETCH");
+ (*pos)+= (int) strlen("FETCH");
exp->p = prop_create(sql->sa, PROP_FETCH, exp->p);
skipWS(r,pos);
}
@@ -947,7 +947,7 @@ rel_read(mvc *sql, char *r, int *pos)
skipWS(r,pos);
if (r[*pos] == 'd') {
- *pos += strlen("distinct");
+ *pos += (int) strlen("distinct");
skipWS(r, pos);
distinct = 1;
}
@@ -957,7 +957,7 @@ rel_read(mvc *sql, char *r, int *pos)
sql_schema *s = NULL;
sql_table *t = NULL;
char *sname, *tname, *e;
- *pos += strlen("table");
+ *pos += (int) strlen("table");
skipWS(r, pos);
if (r[*pos] != '(')
return sql_error(sql, -1, "table: missing
'('\n");
@@ -995,7 +995,7 @@ rel_read(mvc *sql, char *r, int *pos)
rel->exps = exps;
return rel;
} else { /* top N */
- *pos += strlen("top N");
+ *pos += (int) strlen("top N");
skipWS(r, pos);
if (r[*pos] != '(')
return sql_error(sql, -1, "top N: missing
'('\n");
@@ -1012,7 +1012,7 @@ rel_read(mvc *sql, char *r, int *pos)
}
break;
case 'p':
- *pos += strlen("project");
+ *pos += (int) strlen("project");
skipWS(r, pos);
if (r[*pos] != '(')
@@ -1036,7 +1036,7 @@ rel_read(mvc *sql, char *r, int *pos)
distinct = 0;
return rel;
case 'g':
- *pos += strlen("group by");
+ *pos += (int) strlen("group by");
skipWS(r, pos);
if (r[*pos] != '(')
@@ -1058,7 +1058,7 @@ rel_read(mvc *sql, char *r, int *pos)
rel->exps = exps;
return rel;
case 's':
- *pos += strlen("sample");
+ *pos += (int) strlen("sample");
skipWS(r, pos);
if (r[*pos] != '(')
return sql_error(sql, -1, "sample: missing '('\n");
@@ -1074,7 +1074,7 @@ rel_read(mvc *sql, char *r, int *pos)
return rel;
case 'a':
if (r[*pos+2] == 'l') {
- *pos += strlen("select");
+ *pos += (int) strlen("select");
skipWS(r, pos);
if (r[*pos] != '(')
return sql_error(sql, -1, "select: missing
'('\n");
@@ -1097,7 +1097,7 @@ rel_read(mvc *sql, char *r, int *pos)
if (r[*pos+1] == 'n')
j = op_anti;
- *pos += strlen("semijoin");
+ *pos += (int) strlen("semijoin");
skipWS(r, pos);
if (r[*pos] != '(')
return sql_error(sql, -1, "semijoin: missing
'('\n");
@@ -1125,30 +1125,30 @@ rel_read(mvc *sql, char *r, int *pos)
}
break;
case 'l':
- *pos += strlen("left outer join");
+ *pos += (int) strlen("left outer join");
j = op_left;
/* fall through */
case 'r':
if (j == op_basetable) {
- *pos += strlen("right outer join");
+ *pos += (int) strlen("right outer join");
j = op_right;
}
/* fall through */
case 'f':
if (j == op_basetable) {
- *pos += strlen("full outer join");
+ *pos += (int) strlen("full outer join");
j = op_full;
}
/* fall through */
case 'c':
if (j == op_basetable) {
- *pos += strlen("crossproduct");
+ *pos += (int) strlen("crossproduct");
j = op_join;
}
/* fall through */
case 'j':
if (j == op_basetable) {
- *pos += strlen("join");
+ *pos += (int) strlen("join");
j = op_join;
}
skipWS(r, pos);
@@ -1178,17 +1178,17 @@ rel_read(mvc *sql, char *r, int *pos)
return rel;
case 'u':
if (j != op_basetable) {
- *pos += strlen("union");
+ *pos += (int) strlen("union");
j = op_union;
}
case 'i':
if (j != op_basetable) {
- *pos += strlen("intersect");
+ *pos += (int) strlen("intersect");
j = op_inter;
}
case 'e':
if (j != op_basetable) {
- *pos += strlen("except");
+ *pos += (int) strlen("except");
j = op_except;
}
skipWS(r, pos);
diff --git a/sql/server/sql_datetime.c b/sql/server/sql_datetime.c
--- a/sql/server/sql_datetime.c
+++ b/sql/server/sql_datetime.c
@@ -129,7 +129,7 @@ parse_interval_(mvc *sql, lng sign, char
char *nn;
msec = strtol(n+1, &nn, 10);
if (msec && nn) {
- int d = nn-(n+1);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
