Changeset: 71317cfd10aa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=71317cfd10aa
Modified Files:
sql/backends/monet5/Makefile.ag
sql/backends/monet5/sql.c
sql/backends/monet5/sql_optimizer.c
Branch: default
Log Message:
Backing out changeset bd80a651ea86: it belongs on branch iot.
diffs (84 lines):
diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag
+++ b/sql/backends/monet5/Makefile.ag
@@ -4,7 +4,7 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
-SUBDIRS = NOT_WIN32?vaults UDF LSST HAVE_GSL?gsl generator iot
+SUBDIRS = NOT_WIN32?vaults UDF LSST HAVE_GSL?gsl generator
INCLUDES = ../../include ../../common ../../storage ../../server \
../../../monetdb5/modules/atoms \
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -1915,7 +1915,7 @@ mvc_bind_wrap(Client cntxt, MalBlkPtr mb
}
if (*sname && strcmp(*sname, str_nil) != 0)
throw(SQL, "sql.bind", "unable to find %s.%s(%s)", *sname,
*tname, *cname);
- throw(SQL, "sql.bind", "Unable to find %s.%s(%s) partition %d", *sname,
*tname, *cname, *access);
+ throw(SQL, "sql.bind", "unable to find %s(%s)", *tname, *cname);
}
/* str mvc_bind_idxbat_wrap(int *bid, str *sname, str *tname, str *iname, int
*access); */
diff --git a/sql/backends/monet5/sql_optimizer.c
b/sql/backends/monet5/sql_optimizer.c
--- a/sql/backends/monet5/sql_optimizer.c
+++ b/sql/backends/monet5/sql_optimizer.c
@@ -34,9 +34,7 @@ static lng
SQLgetSpace(mvc *m, MalBlkPtr mb)
{
sql_trans *tr = m->session->tr;
- lng space = 0, i,j;
- InstrPtr q;
- int last = 2;
+ lng space = 0, i;
for (i = 0; i < mb->stop; i++) {
InstrPtr p = mb->stmt[i];
@@ -58,7 +56,7 @@ SQLgetSpace(mvc *m, MalBlkPtr mb)
if (f == bindidxRef) {
sql_idx *i = mvc_bind_idx(m, s, cname);
- if (i && (!isRemote(i->t) &&
!isMergeTable(i->t) && !isStream(i->t))) {
+ if (i && (!isRemote(i->t) &&
!isMergeTable(i->t))) {
BAT *b = store_funcs.bind_idx(tr, i,
RDONLY);
if (b) {
space += getBatSpace(b);
@@ -69,35 +67,13 @@ SQLgetSpace(mvc *m, MalBlkPtr mb)
sql_table *t = mvc_bind_table(m, s, tname);
sql_column *c = mvc_bind_column(m, t, cname);
- if (c && (!isRemote(c->t) &&
!isMergeTable(c->t)) && !isStream(c->t)) {
+ if (c && (!isRemote(c->t) &&
!isMergeTable(c->t))) {
BAT *b = store_funcs.bind_col(tr, c,
RDONLY);
if (b) {
space += getBatSpace(b);
BBPunfix(b->batCacheid);
}
}
- if( c && isStream(c->t)){
- setModuleId(p, iotRef);
- p->argc = 5;
- delArgument(p,1);
- // stream information does not have to
inlined.
- for(j= 1; j < last; j++){
- p = getInstrPtr(mb,j);
- if(p ==0)
- break;
- if(p && getModuleId(p) ==
iotRef && getFunctionId(p) == registerRef &&
- strcmp(sname,
getVarConstant(mb,getArg(p,1)).val.sval) == 0 &&
- strcmp(tname,
getVarConstant(mb,getArg(p,2)).val.sval) == 0 )
- break; //
already registered
- }
- if( j == last || p == 0){
- q=
newStmt(mb,iotRef,registerRef);
- q= pushStr(mb,q, sname);
- q= pushStr(mb,q, tname);
- moveInstruction(mb, mb->stop -
1, 1);
- last ++;
- }
- }
}
}
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
