MonetDB: HTM - Merge with the default branch

[Dimitar Nedev]

Changeset: 488fdcec554d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=488fdcec554d
Modified Files:
        sql/storage/bat/bat_utils.c
Branch: HTM
Log Message:

Merge with the default branch


diffs (36 lines):

diff --git a/sql/storage/bat/bat_utils.c b/sql/storage/bat/bat_utils.c
--- a/sql/storage/bat/bat_utils.c
+++ b/sql/storage/bat/bat_utils.c
@@ -241,7 +241,11 @@ tr_find_table( sql_trans *tr, sql_table 
        while ((!nt || !nt->data) && tr) {
                sql_schema *s = tr_find_schema( tr, t->s);
 
-               nt = find_sql_table_id(s, t->base.id);
+               if (list_length(s->tables.set) < HASH_MIN_SIZE)
+                       nt = find_sql_table_id(s, t->base.id);
+               else
+                       nt = find_sql_table(s, t->base.name);
+               assert(nt->base.id == t->base.id);
                tr = tr->parent;
        }
        return nt;
@@ -253,8 +257,7 @@ tr_find_column( sql_trans *tr, sql_colum
        sql_column *nc = NULL;
 
        while ((!nc || !nc->data) && tr) {
-               sql_schema *s = tr_find_schema( tr, c->t->s);
-               sql_table *t =  find_sql_table_id(s, c->t->base.id);
+               sql_table *t =  tr_find_table(tr, c->t);
                node *n = cs_find_id(&t->columns, c->base.id);
                if (n)
                        nc = n->data;
@@ -269,8 +272,7 @@ tr_find_idx( sql_trans *tr, sql_idx *i)
        sql_idx *ni = NULL;
 
        while ((!ni || !ni->data) && tr) {
-               sql_schema *s = tr_find_schema( tr, i->t->s);
-               sql_table *t =  find_sql_table_id(s, i->t->base.id);
+               sql_table *t =  tr_find_table(tr, i->t);
                node *n = cs_find_id(&t->idxs, i->base.id);
                if (n)
                        ni = n->data;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list