Changeset: f10f0cb973ac for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f10f0cb973ac
Modified Files:
common/stream/stream.c
Branch: default
Log Message:
Remove these assertions again.
These assertions were removed for a reason. When a client connects using the
new protocol the server switches from a bs_stream to a bs2_stream (so we can
support compression and bigger blocks).
As part of this switch we want to close the old bs_stream but NOT the
underlying stream (as we want to use that for our new bs2_stream).
These assertions were there to ensure that the underlying stream was also
destroyed when the block stream was destroyed; however, we want to destroy ONLY
the upper stream and not the underlying stream in this scenario.
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
@@ -3904,7 +3904,6 @@ bs_close(stream *ss)
assert(s);
if (s == NULL)
return;
- assert(s->s);
if (s->s)
s->s->close(s->s);
}
@@ -3917,7 +3916,6 @@ bs_destroy(stream *ss)
s = (bs *) ss->stream_data.p;
assert(s);
if (s) {
- assert(s->s);
if (s->s)
s->s->destroy(s->s);
free(s);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
