Changeset: 5992f6632f9e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5992f6632f9e
Modified Files:
common/stream/stream.c
monetdb5/modules/mal/mal_mapi.c
sql/backends/monet5/sql_result.c
Branch: protocol
Log Message:
Fix some spacing issues and remove unnecessary comments.
diffs (74 lines):
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -94,7 +94,7 @@
#include <lzma.h>
#endif
#ifdef HAVE_LIBSNAPPY
-#include <snappy-c.h> // C forever
+#include <snappy-c.h>
#endif
#ifdef HAVE_LIBLZ4
#include <lz4.h>
@@ -3904,6 +3904,7 @@ bs_close(stream *ss)
assert(s);
if (s == NULL)
return;
+ assert(s->s);
if (s->s)
s->s->close(s->s);
}
@@ -3916,6 +3917,7 @@ 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);
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -160,7 +160,6 @@ doChallenge(void *data)
/* generate the challenge string */
generateChallenge(challenge, 8, 12);
algos = mcrypt_getHashAlgorithms();
- // FIXME: rename to 'capabilities' to hide the crime
// send the challenge over the block stream
mnstr_printf(fdout, "%s:mserver:9:%s:%s:%s:",
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -1344,23 +1344,22 @@ mvc_export_row(backend *b, stream *s, re
}
static int type_supports_binary_transfer(sql_type *type) {
- return
+ return
type->eclass == EC_BIT ||
type->eclass == EC_POS ||
- type->eclass == EC_CHAR ||
+ type->eclass == EC_CHAR ||
type->eclass == EC_STRING ||
- type->eclass == EC_DEC ||
+ type->eclass == EC_DEC ||
type->eclass == EC_BLOB ||
- type->eclass == EC_FLT ||
- type->eclass == EC_NUM ||
- type->eclass == EC_DATE ||
- type->eclass == EC_TIME ||
+ type->eclass == EC_FLT ||
+ type->eclass == EC_NUM ||
+ type->eclass == EC_DATE ||
+ type->eclass == EC_TIME ||
type->eclass == EC_SEC ||
- type->eclass == EC_MONTH ||
+ type->eclass == EC_MONTH ||
type->eclass == EC_TIMESTAMP;
}
-
static int write_str_term(stream* s, const char* const val) {
return mnstr_writeStr(s, val) && mnstr_writeBte(s, 0);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
