Changeset: fe4b68047d17 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/fe4b68047d17
Modified Files:
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
Branch: copyintobinary
Log Message:
Rename stmt_magic to stmt_blackbox_result
diffs (47 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -1162,7 +1162,7 @@ emit_loadcolumn(backend *be, stmt *impor
*count_var = new_count_var;
- stmt *s = stmt_magic(be, subtype, p);
+ stmt *s = stmt_blackbox_result(be, p, 0, subtype);
return s;
}
diff --git a/sql/backends/monet5/sql_statement.c
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -491,7 +491,7 @@ stmt_temp(backend *be, sql_subtype *t)
}
stmt *
-stmt_magic(backend *be, sql_subtype *t, InstrPtr q)
+stmt_blackbox_result(backend *be, InstrPtr q, int retnr, sql_subtype *t)
{
if (q == NULL)
return NULL;
@@ -499,8 +499,8 @@ stmt_magic(backend *be, sql_subtype *t,
s->op4.typeval = *t;
s->nrcols = 1;
s->q = q;
- s->nr = getDestVar(q);
- s->flag = 0;
+ s->nr = getArg(q, retnr);
+ s->flag = retnr;
return s;
}
diff --git a/sql/backends/monet5/sql_statement.h
b/sql/backends/monet5/sql_statement.h
--- a/sql/backends/monet5/sql_statement.h
+++ b/sql/backends/monet5/sql_statement.h
@@ -247,7 +247,7 @@ extern stmt *stmt_func(backend *be, stmt
extern stmt *stmt_direct_func(backend *be, InstrPtr q);
extern stmt *stmt_aggr(backend *be, stmt *op1, stmt *grp, stmt *ext,
sql_subfunc *op, int reduce, int no_nil, int nil_if_empty);
-extern stmt *stmt_magic(backend *be, sql_subtype *t, InstrPtr q);
+extern stmt *stmt_blackbox_result(backend *be, InstrPtr q, int retnr,
sql_subtype *t);
extern stmt *stmt_alias(backend *be, stmt *op1, const char *tname, const char
*name);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
