Changeset: abdca1ea9b93 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=abdca1ea9b93
Modified Files:
clients/Tests/exports.stable.out
common/stream/stream.c
common/stream/stream.h
sql/backends/monet5/mal_backend.c
sql/backends/monet5/mal_backend.h
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
Branch: default
Log Message:
Some type fixes.
diffs (267 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
@@ -2728,7 +2728,7 @@ int getFileNo(stream *s);
size_t getFileSize(stream *s);
stream *iconv_rstream(stream *restrict ss, const char *restrict charset, const
char *restrict name);
stream *iconv_wstream(stream *restrict ss, const char *restrict charset, const
char *restrict name);
-int isa_block_stream(stream *s);
+bool isa_block_stream(stream *s);
int mnstr_byteorder(stream *s);
void mnstr_clearerr(stream *s);
void mnstr_close(stream *s);
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -4692,7 +4692,7 @@ bs2_setpos(stream *ss, size_t pos)
s->nr = pos;
}
-int
+bool
isa_block_stream(stream *s)
{
assert(s != NULL);
@@ -5184,11 +5184,11 @@ bstream_create(stream *s, size_t size)
{
bstream *b;
- if (s == NULL || size >= (1 << 30))
+ if (s == NULL)
return NULL;
if ((b = malloc(sizeof(*b))) == NULL)
return NULL;
- b->mode = (int) size;
+ b->mode = size;
if (size == 0)
size = BUFSIZ;
b->s = s;
@@ -5200,7 +5200,7 @@ bstream_create(stream *s, size_t size)
b->size = size;
b->pos = 0;
b->len = 0;
- b->eof = 0;
+ b->eof = false;
return b;
}
@@ -5236,7 +5236,7 @@ bstream_read(bstream *s, size_t size)
s->buf = p;
}
- if (size > s->size - s->len)
+ if (s->len + size > s->size)
size = s->size - s->len;
rd = s->s->read(s->s, s->buf + s->len, 1, size);
@@ -5245,7 +5245,7 @@ bstream_read(bstream *s, size_t size)
return rd;
if (rd == 0) {
- s->eof = 1;
+ s->eof = true;
return 0;
}
s->len += (size_t) rd;
@@ -5298,7 +5298,7 @@ bstream_readline(bstream *s)
rd = strlen(s->buf + s->len);
if (rd == 0) {
- s->eof = 1;
+ s->eof = true;
return 0;
}
s->len += rd;
@@ -5313,7 +5313,7 @@ bstream_next(bstream *s)
if (s == NULL)
return -1;
if (s->mode > 0) {
- return bstream_read(s, (size_t) s->mode);
+ return bstream_read(s, s->mode);
} else if (s->s->read == file_read) {
return bstream_readline(s);
} else {
@@ -5345,6 +5345,10 @@ bstream_destroy(bstream *s)
}
/* ------------------------------------------------------------------ */
+/* callback stream
+ *
+ * read-only stream which calls a user-provided callback function in
+ * order to get more data to be returned to the reader */
struct cbstream {
void *private;
diff --git a/common/stream/stream.h b/common/stream/stream.h
--- a/common/stream/stream.h
+++ b/common/stream/stream.h
@@ -213,7 +213,7 @@ stream_export buffer *mnstr_get_buffer(s
* found. The next read will then start with a new major block.
*/
stream_export stream *block_stream(stream *s);
-stream_export int isa_block_stream(stream *s);
+stream_export bool isa_block_stream(stream *s);
stream_export stream *bs_stream(stream *s);
@@ -243,10 +243,10 @@ typedef struct bstream {
stream *s;
char *buf;
size_t size; /* size of buf */
- size_t pos; /* the data cursor (ie read uptil pos) */
- size_t len; /* len of the data (could < size but usually ==
size) */
- int eof;
- int mode; /* 0 line mode else size for block mode */
+ size_t pos; /* the data cursor (ie read until pos) */
+ size_t len; /* len of the data (<= size) */
+ size_t mode; /* 0 line mode else size for block mode */
+ bool eof;
} bstream;
stream_export bstream *bstream_create(stream *rs, size_t chunk_size);
diff --git a/sql/backends/monet5/mal_backend.c
b/sql/backends/monet5/mal_backend.c
--- a/sql/backends/monet5/mal_backend.c
+++ b/sql/backends/monet5/mal_backend.c
@@ -22,7 +22,7 @@ backend_reset(backend *b)
b->mb = NULL;
b->mvc_var = 0;
b->cur_append = 0;
- b->first_statement_generated = 0;
+ b->first_statement_generated = false;
b->output_format = OFMT_CSV;
return b;
}
@@ -39,7 +39,7 @@ backend_create(mvc *m, Client c)
b->client = c;
b->mvc_var = 0;
b->cur_append = 0;
- b->first_statement_generated = 0;
+ b->first_statement_generated = false;
b->output_format = OFMT_CSV;
return backend_reset(b);
}
diff --git a/sql/backends/monet5/mal_backend.h
b/sql/backends/monet5/mal_backend.h
--- a/sql/backends/monet5/mal_backend.h
+++ b/sql/backends/monet5/mal_backend.h
@@ -36,17 +36,17 @@ typedef enum output_format {
* generated or not */
typedef struct backend {
- char console;
+ bool console;
char language; /* 'S' or 's' or 'X' */
char depth;
- bit first_statement_generated;
+ bool first_statement_generated;
mvc *mvc;
stream *out;
ofmt output_format; /* csv, json */
Client client;
MalBlkPtr mb; /* needed during mal generation */
int mvc_var;
- int cur_append;
+ int cur_append;
int vtop; /* top of the variable stack before the current
function */
cq *q; /* pointer to the cached query */
} backend;
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
@@ -5403,7 +5403,7 @@ output_rel_bin(backend *be, sql_rel *rel
if(be->cur_append) { /* finish the output bat */
s->nr = be->cur_append;
be->cur_append = 0;
- be->first_statement_generated = 0;
+ be->first_statement_generated = false;
}
s = stmt_affected_rows(be, s);
}
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -839,15 +839,15 @@ SQLinclude(Client cntxt, MalBlkPtr mb, M
str
SQLreader(Client c)
{
- int go = TRUE;
+ bool go = true;
str msg = MAL_SUCCEED;
- int more = TRUE;
- int commit_done = FALSE;
+ bool more = true;
+ bool commit_done = false;
backend *be = (backend *) c->sqlcontext;
bstream *in = c->fdin;
int language = -1;
mvc *m = NULL;
- int blocked = isa_block_stream(in->s);
+ bool blocked = isa_block_stream(in->s);
if (SQLinitialized == FALSE) {
c->mode = FINISHCLIENT;
@@ -877,7 +877,7 @@ SQLreader(Client c)
* Distinguish between console reading and mclient connections.
*/
while (more) {
- more = FALSE;
+ more = false;
/* Different kinds of supported statements sequences
A; -- single line s
@@ -890,7 +890,7 @@ SQLreader(Client c)
if (m->scanner.mode == LINE_N && !commit_done) {
msg = SQLautocommit(m);
go = msg == MAL_SUCCEED;
- commit_done = TRUE;
+ commit_done = true;
}
if (go && in->pos >= in->len) {
@@ -914,18 +914,18 @@ SQLreader(Client c)
if (!(m->emod & mod_debug) && !commit_done) {
msg = SQLautocommit(m);
go = msg == MAL_SUCCEED;
- commit_done = TRUE;
+ commit_done = true;
}
if (go && ((!blocked && mnstr_write(c->fdout,
c->prompt, c->promptlength, 1) != 1) || mnstr_flush(c->fdout))) {
- go = FALSE;
+ go = false;
break;
}
in->eof = 0;
}
if (in->buf == NULL) {
- more = FALSE;
- go = FALSE;
+ more = false;
+ go = false;
} else if (go && (rd = bstream_next(in)) <= 0) {
#ifdef _SQL_READER_DEBUG
fprintf(stderr, "#rd %d language %d eof %d\n",
rd, language, in->eof);
@@ -936,10 +936,10 @@ SQLreader(Client c)
if (rd == 0 && language !=0 && in->eof &&
!be->console) {
/* we hadn't seen the EOF before, so
just try again
(this time with prompt) */
- more = TRUE;
+ more = true;
continue;
}
- go = FALSE;
+ go = false;
break;
} else if (go && !be->console && language == 0) {
if (in->buf[in->pos] == 's' && !in->eof) {
diff --git a/sql/backends/monet5/sql_statement.c
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -137,7 +137,7 @@ add_to_merge_partitions_accumulator(back
q = pushArgument(mb, q, help);
q = pushArgument(mb, q, nr);
- be->first_statement_generated = 1; /* set the first statement as
generated */
+ be->first_statement_generated = true; /* set the first statement as
generated */
return getDestVar(q);
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
