Changeset: 46596c359e7e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=46596c359e7e
Modified Files:
sql/backends/monet5/sql_gencode.c
sql/storage/store.c
Branch: default
Log Message:
use 'remote' namespace (not octopus)
properly load idx's also for remote tables
diffs (60 lines):
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -644,7 +644,7 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st
int ht = TYPE_oid;
int tt = s->op4.cval->type.type->localtype;
sql_table *t = s->op4.cval->t;
- str mod = isRemote(t)?octopusRef:sqlRef;
+ str mod = isRemote(t)?remoteRef:sqlRef;
q = newStmt2(mb, mod, bindRef);
setVarType(mb, getArg(q, 0), newBatType(ht, tt));
@@ -666,7 +666,7 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st
case st_dbat:{
int ht = TYPE_oid;
sql_table *t = s->op4.tval;
- str mod = isRemote(t)?octopusRef:sqlRef;
+ str mod = isRemote(t)?remoteRef:sqlRef;
q = newStmt2(mb, mod, binddbatRef);
setVarType(mb, getArg(q,0), newBatType(ht,TYPE_oid));
@@ -688,7 +688,7 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st
int tt;
int ht = TYPE_oid;
sql_table *t = s->op4.idxval->t;
- str mod = isRemote(t)?octopusRef:sqlRef;
+ str mod = isRemote(t)?remoteRef:sqlRef;
q = newStmt2(mb, mod, bindidxRef);
tt = tail_type(s)->type->localtype;
@@ -1673,7 +1673,7 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st
case st_delete:{
int r = _dumpstmt(sql, mb, s->op1);
sql_table *t = s->op4.tval;
- str mod = isRemote(t)?octopusRef:sqlRef;
+ str mod = isRemote(t)?remoteRef:sqlRef;
q = newStmt1(mb, mod, "delete");
q = pushArgument(mb, q, sql->mvc_var);
@@ -1685,7 +1685,7 @@ _dumpstmt(backend *sql, MalBlkPtr mb, st
} break;
case st_table_clear:{
sql_table *t = s->op4.tval;
- str mod = isRemote(t)?octopusRef:sqlRef;
+ str mod = isRemote(t)?remoteRef:sqlRef;
q = newStmt1(mb, mod, "clear_table");
q = pushSchema(mb, q, t);
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -628,7 +628,7 @@ load_table(sql_trans *tr, sql_schema *s,
cs_add(&t->columns, load_column(tr, t, rid), TR_OLD);
table_funcs.rids_destroy(rs);
- if (!isTable(t) && !isMergeTable(t))
+ if (!isTable(t) && !isMergeTable(t) && !isRemote(t))
return t;
/* load idx's first as the may be needed by the keys */
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
