MonetDB: Apr2019 - In case of write error, we loose data.

[Sjoerd Mullender]

Changeset: 803961d8e2b9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=803961d8e2b9
Modified Files:
        common/stream/stream.c
Branch: Apr2019
Log Message:

In case of write error, we loose data.
This also fixes an assertion error that you might otherwise get.


diffs (19 lines):

diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -3763,6 +3763,7 @@ bs_write(stream *restrict ss, const void
                        if (!mnstr_writeSht(s->s, (int16_t) blksize) ||
                            s->s->write(s->s, s->buf, 1, s->nr) != (ssize_t) 
s->nr) {
                                ss->errnr = MNSTR_WRITE_ERROR;
+                               s->nr = 0; /* data is lost due to error */
                                return -1;
                        }
                        s->blks++;
@@ -3815,6 +3816,7 @@ bs_flush(stream *ss)
                     (s->nr > 0 &&
                      s->s->write(s->s, s->buf, 1, s->nr) != (ssize_t) s->nr))) 
{
                        ss->errnr = MNSTR_WRITE_ERROR;
+                       s->nr = 0; /* data is lost due to error */
                        return -1;
                }
                s->blks++;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list