MonetDB: sciql - We now also have arrays

[Jennie Zhang]

Changeset: 76cfd797d5eb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=76cfd797d5eb
Modified Files:
        sql/backends/monet5/rel_bin.c
        sql/backends/monet5/sql_scenario.c
Branch: sciql
Log Message:

We now also have arrays

These changes seem to cause many sciql queries working again.
Now the generated MAL correctly bind all three BATs of a column, i.s.o., only 
the base BAT.


diffs (33 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
@@ -747,7 +747,7 @@ stmt_col( mvc *sql, sql_column *c, stmt 
        int readonly = (mvc_debug_on(sql, 32) || mvc_debug_on(sql, 64) || 
mvc_debug_on(sql, 8192));
        stmt *sc = stmt_bat(sql->sa, c, RDONLY);
 
-       if (isTable(c->t) && !c->t->readonly && !readonly &&
+       if (isTableOrArray(c->t) && !c->t->readonly && !readonly &&
           (c->base.flag != TR_NEW || c->t->base.flag != TR_NEW /* alter */) &&
           (c->t->persistence == SQL_PERSIST || c->t->persistence == 
SQL_DECLARED_TABLE) && !c->t->commit_action) {
                stmt *i = stmt_bat(sql->sa, c, RD_INS);
@@ -766,7 +766,7 @@ stmt_idx( mvc *sql, sql_idx *i, stmt *de
        int readonly = (mvc_debug_on(sql, 32) || mvc_debug_on(sql, 64) || 
mvc_debug_on(sql, 8192));
        stmt *sc = stmt_idxbat(sql->sa, i, RDONLY);
 
-       if (isTable(i->t) && !i->t->readonly && !readonly &&
+       if (isTableOrArray(i->t) && !i->t->readonly && !readonly &&
           (i->base.flag != TR_NEW || i->t->base.flag != TR_NEW /* alter */) &&
           (i->t->persistence == SQL_PERSIST || i->t->persistence == 
SQL_DECLARED_TABLE) && !i->t->commit_action) {
                stmt *ic = stmt_idxbat(sql->sa, i, RD_INS);
diff --git a/sql/backends/monet5/sql_scenario.c 
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -374,7 +374,7 @@ sql_update_dec2011( Client c, mvc *m )
                        for( ntab = (s)->tables.set->h ;ntab; ntab = 
ntab->next){
                                sql_table *t = ntab->data;
 
-                               if (!isTable(t) || !t->columns.set)
+                               if (!isTableOrArray(t) || !t->columns.set)
                                        continue;
                                for ( ncol = (t)->columns.set->h; ncol; ncol= 
ncol->next){
                                        sql_column *c = (sql_column *) 
ncol->data;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list