Changeset: 1b6b49bb07b8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1b6b49bb07b8
Modified Files:
clients/Tests/exports.stable.out
common/stream/stream.c
common/stream/stream.h
monetdb5/modules/mal/mal_mapi.c
Branch: default
Log Message:
Removed unused code (column_compression).
diffs (100 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
@@ -2703,9 +2703,8 @@ str zero_or_oneRef;
# stream
stream *block_stream(stream *s);
-stream *block_stream2(stream *s, size_t bufsiz, compression_method comp,
column_compression colcomp);
+stream *block_stream2(stream *s, size_t bufsiz, compression_method comp);
buffer bs2_buffer(stream *s);
-column_compression bs2_colcomp(stream *ss);
void bs2_resetbuf(stream *ss);
int bs2_resizebuf(stream *ss, size_t bufsiz);
void bs2_setpos(stream *ss, size_t pos);
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -4164,7 +4164,6 @@ typedef struct bs2 {
size_t bufsiz;
size_t readpos;
compression_method comp;
- column_compression colcomp;
char *compbuf;
size_t compbufsiz;
char *buf;
@@ -4708,13 +4707,6 @@ bs2_setpos(stream *ss, size_t pos)
s->nr = pos;
}
-column_compression
-bs2_colcomp(stream *ss)
-{
- bs2 *s = (bs2 *) ss->stream_data.p;
- return s->colcomp;
-}
-
int
isa_block_stream(stream *s)
{
@@ -4787,7 +4779,7 @@ bs2_isalive(stream *ss)
}
stream *
-block_stream2(stream *s, size_t bufsiz, compression_method comp,
column_compression colcomp)
+block_stream2(stream *s, size_t bufsiz, compression_method comp)
{
stream *ns;
stream *os = NULL;
@@ -4811,7 +4803,6 @@ block_stream2(stream *s, size_t bufsiz,
destroy(ns);
return NULL;
}
- b->colcomp = colcomp;
/* blocksizes have a fixed little endian byteorder */
#ifdef WORDS_BIGENDIAN
ns->byteorder = 3412; /* simply != 1234 */
diff --git a/common/stream/stream.h b/common/stream/stream.h
--- a/common/stream/stream.h
+++ b/common/stream/stream.h
@@ -230,17 +230,11 @@ typedef enum {
COMPRESSION_AUTO = 255
} compression_method;
-typedef enum {
- COLUMN_COMPRESSION_NONE = 0,
- COLUMN_COMPRESSION_AUTO = 255
-} column_compression;
-
-stream_export stream *block_stream2(stream *s, size_t bufsiz,
compression_method comp, column_compression colcomp);
+stream_export stream *block_stream2(stream *s, size_t bufsiz,
compression_method comp);
stream_export void *bs2_stealbuf(stream *ss);
stream_export int bs2_resizebuf(stream *ss, size_t bufsiz);
stream_export void bs2_resetbuf(stream *ss);
stream_export buffer bs2_buffer(stream *s);
-stream_export column_compression bs2_colcomp(stream *ss);
stream_export void bs2_setpos(stream *ss, size_t pos);
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
@@ -140,7 +140,6 @@ doChallenge(void *data)
ssize_t len = 0;
protocol_version protocol = PROTOCOL_9;
size_t buflen = BLOCK;
- column_compression colcomp = COLUMN_COMPRESSION_NONE;
#ifdef _MSC_VER
srand((unsigned int) GDKusec());
@@ -236,8 +235,8 @@ doChallenge(void *data)
{
// convert the block_stream into a block_stream2
stream *from, *to;
- from = block_stream2(fdin, buflen, comp, colcomp);
- to = block_stream2(fdout, buflen, comp, colcomp);
+ from = block_stream2(fdin, buflen, comp);
+ to = block_stream2(fdout, buflen, comp);
if (from == NULL || to == NULL) {
GDKsyserror("SERVERlisten:"MAL_MALLOC_FAIL);
close_stream(fdin);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
