Changeset: 3fcaa70af386 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3fcaa70af386
Modified Files:
monetdb5/extras/pyapi/pyapi.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
Branch: pyapi
Log Message:
Write errors to log while testing.
diffs (78 lines):
diff --git a/monetdb5/extras/pyapi/pyapi.c b/monetdb5/extras/pyapi/pyapi.c
--- a/monetdb5/extras/pyapi/pyapi.c
+++ b/monetdb5/extras/pyapi/pyapi.c
@@ -1190,6 +1190,9 @@ returnvalues:
f = fopen(benchmark_output, "a");
if (f != NULL) {
fprintf(f, "%llu\t%f\n", peak_memory_usage,
GET_ELAPSED_TIME(start_time, end_time));
+ if (msg != MAL_SUCCEED) {
+ fprintf(f, "Error: %s\n", msg);
+ }
fclose(f);
} else {
perror("Error");
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
@@ -1941,50 +1941,6 @@ mvc_bind_idxbat_wrap(Client cntxt, MalBl
throw(SQL, "sql.idxbind", "unable to find index %s for %s", *iname,
*tname);
}
-
-str
-mvc_append_intern(Client cntxt, str sname, str tname, str cname, ptr ins, int
tpe)
-{
- mvc *m = NULL;
- str msg;
- sql_schema *s;
- sql_table *t;
- sql_column *c;
- BAT *b = 0;
-
- if ((msg = getSQLContext(cntxt, NULL, &m, NULL)) != NULL)
- return msg;
- if ((msg = checkSQLContext(cntxt)) != NULL)
- return msg;
- if (tpe > GDKatomcnt)
- tpe = TYPE_bat;
- if (tpe == TYPE_bat && (ins = BATdescriptor(*(int *) ins)) == NULL)
- throw(SQL, "sql.append", "Cannot access descriptor");
- if (ATOMextern(tpe))
- ins = *(ptr *) ins;
- if ( tpe == TYPE_bat)
- b = (BAT*) ins;
- s = mvc_bind_schema(m, sname);
- if (s == NULL)
- throw(SQL, "sql.append", "Schema missing");
- t = mvc_bind_table(m, s, tname);
- if (t == NULL)
- throw(SQL, "sql.append", "Table missing");
- if( b && BATcount(b) > 4096 && b->batPersistence == PERSISTENT)
- BATmsync(b);
- if (cname[0] != '%' && (c = mvc_bind_column(m, t, cname)) != NULL) {
- store_funcs.append_col(m->session->tr, c, ins, tpe);
- } else if (cname[0] == '%') {
- sql_idx *i = mvc_bind_idx(m, s, cname + 1);
- if (i)
- store_funcs.append_idx(m->session->tr, i, ins, tpe);
- }
- if (tpe == TYPE_bat) {
- BBPunfix(((BAT *) ins)->batCacheid);
- }
- return MAL_SUCCEED;
-}
-
/*mvc_append_wrap(int *bid, str *sname, str *tname, str *cname, ptr d) */
str
mvc_append_wrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
diff --git a/sql/backends/monet5/sql.h b/sql/backends/monet5/sql.h
--- a/sql/backends/monet5/sql.h
+++ b/sql/backends/monet5/sql.h
@@ -74,7 +74,6 @@ sql5_export str SQLshutdown_wrap(Client
sql5_export str SQLtransaction2(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
sql5_export str SQLcatalog(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-sql5_export str mvc_append_intern(Client cntxt, str sname, str tname, str
cname, ptr ins, int tpe);
sql5_export str mvc_append_wrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
sql5_export str mvc_update_wrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
sql5_export str mvc_bind_wrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
