MonetDB: default - More sqlids and flags.

[Pedro Ferreira]

Changeset: f8a6a15b0bde for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f8a6a15b0bde
Modified Files:
        sql/storage/sql_catalog.c
        sql/storage/store.c
Branch: default
Log Message:

More sqlids and flags.


diffs (90 lines):

diff --git a/sql/storage/sql_catalog.c b/sql/storage/sql_catalog.c
--- a/sql/storage/sql_catalog.c
+++ b/sql/storage/sql_catalog.c
@@ -136,7 +136,7 @@ list_find_id(list *l, sqlid id)
                for (n = l->h; n; n = n->next) {
 
                        /* check if ids match */
-                       if (id == *(int *) n->data) {
+                       if (id == *(sqlid *) n->data) {
                                return n;
                        }
                }
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1673,7 +1673,7 @@ bootstrap_create_table(sql_trans *tr, sq
 
 
 static sql_schema *
-bootstrap_create_schema(sql_trans *tr, char *name, int auth_id, int owner)
+bootstrap_create_schema(sql_trans *tr, char *name, sqlid auth_id, int owner)
 {
        sql_schema *s = SA_ZNEW(tr->sa, sql_schema);
 
@@ -2206,9 +2206,9 @@ store_unlock(void)
 }
 
 static sql_kc *
-kc_dup_(sql_trans *tr, int flag, sql_kc *kc, sql_table *t, int copy)
-{
-       sql_allocator *sa = (newFlagSet(flag) && !copy)?tr->parent->sa:tr->sa;
+kc_dup_(sql_trans *tr, int flags, sql_kc *kc, sql_table *t, int copy)
+{
+       sql_allocator *sa = (newFlagSet(flags) && !copy)?tr->parent->sa:tr->sa;
        sql_kc *nkc = SA_ZNEW(sa, sql_kc);
        sql_column *c = find_sql_column(t, kc->c->base.name);
 
@@ -2219,9 +2219,9 @@ kc_dup_(sql_trans *tr, int flag, sql_kc 
 }
 
 static sql_kc *
-kc_dup(sql_trans *tr, int flag, sql_kc *kc, sql_table *t)
-{
-       return kc_dup_(tr, flag, kc, t, 0);
+kc_dup(sql_trans *tr, int flags, sql_kc *kc, sql_table *t)
+{
+       return kc_dup_(tr, flags, kc, t, 0);
 }
 
 static sql_key *
@@ -2325,9 +2325,9 @@ key_dup_(sql_trans *tr, int flags, sql_k
 }
 
 static sql_key *
-key_dup(sql_trans *tr, int flag, sql_key *k, sql_table *t)
-{
-       return key_dup_(tr, flag, k, t, 0);
+key_dup(sql_trans *tr, int flags, sql_key *k, sql_table *t)
+{
+       return key_dup_(tr, flags, k, t, 0);
 }
 
 sql_key *
@@ -3067,7 +3067,7 @@ trans_dup(backend_stack stk, sql_trans *
 typedef int (*rfufunc) (sql_trans *tr, sql_base * fs, sql_base * ts, int mode);
 typedef sql_base *(*rfcfunc) (sql_trans *tr, sql_base * b, int mode);
 typedef int (*rfdfunc) (sql_trans *tr, sql_base * b, int mode);
-typedef sql_base *(*dupfunc) (sql_trans *tr, int flag, sql_base * b, sql_base 
* p);
+typedef sql_base *(*dupfunc) (sql_trans *tr, int flags, sql_base * b, sql_base 
* p);
 
 static int
 rollforward_changeset_updates(sql_trans *tr, changeset * fs, changeset * ts, 
sql_base * b, rfufunc rollforward_updates, rfcfunc rollforward_creates, rfdfunc 
rollforward_deletes, dupfunc fd, int mode)
@@ -3578,7 +3578,7 @@ rollforward_update_seq(sql_trans *tr, sq
 }
 
 static sql_table *
-conditional_table_dup(sql_trans *tr, int flag, sql_table *ot, sql_schema *s)
+conditional_table_dup(sql_trans *tr, int flags, sql_table *ot, sql_schema *s)
 {
        int p = (tr->parent == gtrans);
 
@@ -3586,7 +3586,7 @@ conditional_table_dup(sql_trans *tr, int
        if ((p && isGlobal(ot)) ||
            /* allways dup in recursive mode */
            tr->parent != gtrans)
-               return table_dup(tr, flag, ot, s);
+               return table_dup(tr, flags, ot, s);
        else if (!isGlobal(ot)){/* is local temp, may need to be cleared */
                if (ot->commit_action == CA_DELETE) {
                        sql_trans_clear_table(tr, ot);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list