Changeset: c82c305d4574 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c82c305d4574
Modified Files:
sql/backends/monet5/datacell/actuator.c
sql/backends/monet5/datacell/datacell.c
sql/backends/monet5/datacell/opt_datacell.c
sql/backends/monet5/datacell/petrinet.c
Branch: Aug2011
Log Message:
commenting out set but never used variables;
maybe they can be removed completely?
diffs (127 lines):
diff --git a/sql/backends/monet5/datacell/actuator.c
b/sql/backends/monet5/datacell/actuator.c
--- a/sql/backends/monet5/datacell/actuator.c
+++ b/sql/backends/monet5/datacell/actuator.c
@@ -200,7 +200,7 @@
{
int i;
char *err = NULL;
- char name[MYBUFSIZ + 1];
+ /*char name[MYBUFSIZ + 1];*/
char hostname[1024];
static SOCKET sockfd;
Actuator ac = NULL;
@@ -326,7 +326,7 @@
ac = ACnew(actuator);
- name[0] = 0;
+ /*name[0] = 0;*/
err = NULL;
if ( mode == PASSIVE) {
ac->fromServer = udp_rastream(host, port, actuator);
diff --git a/sql/backends/monet5/datacell/datacell.c
b/sql/backends/monet5/datacell/datacell.c
--- a/sql/backends/monet5/datacell/datacell.c
+++ b/sql/backends/monet5/datacell/datacell.c
@@ -56,7 +56,7 @@
#define DCINITIALIZED 2
#define DCPAUSED 3
-static int DCprepared;
+/*static int DCprepared;*/
/*
* grab all tables in the datacell schema and turn them into baskets.
@@ -71,14 +71,14 @@
backend *be;
node *o;
sql_func *f;
- sql_trans *tr;
+ /*sql_trans *tr;*/
if ( msg)
return msg;
s = mvc_bind_schema(m, schema);
if (s == NULL)
throw(SQL, "datacell.query", "Schema missing");
- tr = m->session->tr;
+ /*tr = m->session->tr;*/
for (o = s->funcs.set->h; o; o = o->next) {
f = o->data;
if ( strcmp(f->base.name, nme) == 0 ){
@@ -115,7 +115,7 @@
f = o->data;
printf("function %s\n", f->base.name);
}
- DCprepared = DCINITIALIZED;
+ /*DCprepared = DCINITIALIZED;*/
(void) stk;
(void) pci;
return msg;
@@ -363,7 +363,7 @@
(void) mb;
(void) stk;
(void) pci;
- DCprepared = DCNONINITIALIZED;
+ /*DCprepared = DCNONINITIALIZED;*/
return MAL_SUCCEED;
}
diff --git a/sql/backends/monet5/datacell/opt_datacell.c
b/sql/backends/monet5/datacell/opt_datacell.c
--- a/sql/backends/monet5/datacell/opt_datacell.c
+++ b/sql/backends/monet5/datacell/opt_datacell.c
@@ -42,14 +42,14 @@
OPTdatacellImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci)
{
int actions = 0, fnd, mvc= 0;
- int bskt, i, j, k, limit, vlimit, slimit;
+ int bskt, i, j, k, limit, /*vlimit,*/ slimit;
InstrPtr r, p, *old;
str col;
int maxbasket= 128, m=0,a=0;
char *tables[128] = {NULL};
char *appends[128] = {NULL};
InstrPtr q[128], qa[128] = {NULL};
- lng clk,t;
+ lng clk/*,t*/;
int *alias;
char buf[BUFSIZ];
@@ -63,7 +63,7 @@
old= mb->stmt;
limit = mb->stop;
slimit = mb->ssize;
- vlimit = mb->vtop;
+ /*vlimit = mb->vtop;*/
if ( newMalBlkStmt(mb, slimit) < 0)
return 0;
@@ -235,7 +235,7 @@
"history,multiplex,accumulators,garbageCollector");
/* extend the plan with the new optimizer pipe required */
clk= GDKusec();
- optimizerCheck(cntxt, mb, "optimizer.datacell", 1, t =
(GDKusec() - clk), OPT_CHECK_ALL);
+ optimizerCheck(cntxt, mb, "optimizer.datacell", 1, /*t =*/
(GDKusec() - clk), OPT_CHECK_ALL);
addtoMalBlkHistory(mb, "datacell");
}
GDKfree(alias);
diff --git a/sql/backends/monet5/datacell/petrinet.c
b/sql/backends/monet5/datacell/petrinet.c
--- a/sql/backends/monet5/datacell/petrinet.c
+++ b/sql/backends/monet5/datacell/petrinet.c
@@ -55,7 +55,7 @@
#define PNcontrolInfinit 1 /* infinit loop of PNController */
#define PNcontrolEnd 2 /* when all factories are disable PNController
exits */
-static int controlRounds = PNcontrolInfinit;
+/*static int controlRounds = PNcontrolInfinit;*/
static MT_Lock petriLock;
@@ -573,7 +573,7 @@
if ( status != PNstopped )
status = PNrunning;
mal_unset_lock(petriLock,"pncontroller");
- controlRounds = PNcontrolEnd;
+ /*controlRounds = PNcontrolEnd;*/
PNcontroller(&s);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
