Changeset: 7467088093a4 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7467088093a4 Modified Files: sql/backends/monet5/sql_gencode.c sql/server/rel_distribute.c Branch: remote_auth Log Message:
Change the relational property to record table name instead of uris diffs (58 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 @@ -277,14 +277,15 @@ static int MalBlkPtr curBlk = 0; InstrPtr curInstr = 0, p, o; Symbol backup = NULL; - const char *uri = mapiuri_uri(prp->value, m->sa); + // const char *uri = mapiuri_uri(prp->value, m->sa); + const char *local_tbl = prp->value; node *n; int i, q, v; int *lret, *rret; char *lname; sql_rel *r = rel; - if(uri == NULL) + if(local_tbl == NULL) return -1; lname = GDKstrdup(name); @@ -356,9 +357,9 @@ static int lret[i] = getArg(p, 0); } - /* q := remote.connect("uri", "msql"); */ + /* q := remote.connect("schema.table", "msql"); */ p = newStmt(curBlk, remoteRef, connectRef); - p = pushStr(curBlk, p, uri); + p = pushStr(curBlk, p, local_tbl); p = pushStr(curBlk, p, "msql"); q = getArg(p, 0); diff --git a/sql/server/rel_distribute.c b/sql/server/rel_distribute.c --- a/sql/server/rel_distribute.c +++ b/sql/server/rel_distribute.c @@ -285,15 +285,13 @@ distribute(mvc *sql, sql_rel *rel) /* set_remote() */ if (t && isRemote(t)) { - char *uri = t->query; - /* char *local_name = sa_strconcat(sql->sa, sa_strconcat(sql->sa, t->s->base.name, "."), t->base.name); + //char *uri = t->query; + char *local_name = sa_strconcat(sql->sa, sa_strconcat(sql->sa, t->s->base.name, "."), t->base.name); + p = rel->p = prop_create(sql->sa, PROP_REMOTE, rel->p); + p->value = local_name; - * p = rel->p = prop_create(sql->sa, PROP_REMOTE2, rel->p); - * p->value = local_name; - */ - - p = rel->p = prop_create(sql->sa, PROP_REMOTE, rel->p); - p->value = uri; + //p = rel->p = prop_create(sql->sa, PROP_REMOTE2, rel->p); + //p->value = local_name; } break; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list