Changeset: ead24ada9888 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ead24ada9888
Modified Files:
monetdb5/mal/mal_client.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/tablet.c
Branch: Jul2021
Log Message:
Removed unused variables.
diffs (69 lines):
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -573,7 +573,7 @@ MCreadClient(Client c)
in->pos++;
if (in->pos >= in->len || in->mode) {
- ssize_t rd, sum = 0;
+ ssize_t rd;
if (in->eof || !isa_block_stream(c->fdout)) {
if (!isa_block_stream(c->fdout) && c->promptlength > 0)
@@ -582,7 +582,6 @@ MCreadClient(Client c)
in->eof = false;
}
while ((rd = bstream_next(in)) > 0 && !in->eof) {
- sum += rd;
if (!in->mode) /* read one line at a time in line mode
*/
break;
}
diff --git a/monetdb5/modules/mal/pcre.c b/monetdb5/modules/mal/pcre.c
--- a/monetdb5/modules/mal/pcre.c
+++ b/monetdb5/modules/mal/pcre.c
@@ -285,8 +285,6 @@ mywstrcasestr(const char *restrict hayst
if (nlen == 0)
return atend ? haystack + strlen(haystack) : haystack;
- size_t hlen = strlen(haystack);
-
while (*haystack) {
size_t i;
size_t h;
@@ -312,7 +310,6 @@ mywstrcasestr(const char *restrict hayst
if (i == nlen && (!atend || haystack[h] == 0))
return haystack;
haystack += step;
- hlen -= step;
}
return NULL;
}
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -1550,7 +1550,7 @@ SQLload_file(Client cntxt, Tablet *as, b
READERtask task;
READERtask ptask[MAXWORKERS];
int threads = (maxrow< 0 || maxrow > (1 << 16)) && GDKnr_threads > 1 ?
(GDKnr_threads < MAXWORKERS ? GDKnr_threads - 1 : MAXWORKERS - 1) : 1;
- lng lio = 0, tio, t1 = 0, total = 0, iototal = 0;
+ lng tio, t1 = 0;
char name[MT_NAME_LEN];
/* TRC_DEBUG(MAL_SERVER, "Prepare copy work for '%d' threads col '%s' rec
'%s' quot '%c'\n", threads, csep, rsep, quote);*/
@@ -1722,8 +1722,6 @@ SQLload_file(Client cntxt, Tablet *as, b
if (task.ateof && !task.top[task.cur])
break;
t1 = GDKusec() - t1;
- total += t1;
- iototal += tio;
/* TRC_DEBUG(MAL_SERVER, "Break: %d rows\n", task.top[task.cur]);*/
t1 = GDKusec();
@@ -1757,7 +1755,6 @@ SQLload_file(Client cntxt, Tablet *as, b
"Fill the BATs '%d' " BUNFMT " cap " BUNFMT "\n",
task.top[task.cur], task.cnt,
BATcapacity(as->format[task.cur].c));*/
- lio += GDKusec() - t1; /* row break done */
if (task.top[task.cur]) {
if (res == 0) {
SQLworkdivider(&task, ptask, (int)
as->nr_attrs, threads);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
