MonetDB: nospare - the fdestroy interface changed, ie now fixed ...

[Niels Nes]

Changeset: 78be879a822b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=78be879a822b
Modified Files:
        sql/server/rel_optimizer.c
        sql/server/sql_mvc.c
        sql/storage/store_dependency.c
        sql/storage/store_sequence.c
Branch: nospare
Log Message:

the fdestroy interface changed, ie now fixed all uses of this.


diffs (118 lines):

diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -1045,6 +1045,12 @@ rel_neg_in_size(sql_rel *r)
        return 0;
 }
 
+static void _rel_destroy(void *dummy, sql_rel *rel)
+{
+       (void)dummy;
+       rel_destroy(rel);
+}
+
 static list *
 push_in_join_down(mvc *sql, list *rels, list *exps)
 {
@@ -1056,7 +1062,7 @@ push_in_join_down(mvc *sql, list *rels, 
        nrels = list_sort(rels, (fkeyvalue)&rel_neg_in_size, (fdup)&rel_dup);
 
        /* we need to cleanup, the new refs ! */
-       rels->destroy = (fdestroy)rel_destroy;
+       rels->destroy = (fdestroy)_rel_destroy;
        list_destroy(rels);
        rels = nrels;
 
@@ -9617,7 +9623,7 @@ optimize_rel(mvc *sql, sql_rel *rel, int
                gp.cnt[op_left] || gp.cnt[op_right] || gp.cnt[op_full] ||
                gp.cnt[op_semi] || gp.cnt[op_anti] ||
                gp.cnt[op_select]) {
-               
+
                rel = rel_exp_visitor_bottomup(&v, rel, &rel_merge_cmp_or_null, 
false);
                rel = rel_visitor_bottomup(&v, rel, &rel_find_range);
                if (value_based_opt) {
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -700,6 +700,13 @@ mvc_release(mvc *m, const char *name)
        return msg;
 }
 
+static void
+_free(void *dummy, void *data)
+{
+       (void)dummy;
+       GDKfree(data);
+}
+
 mvc *
 mvc_create(sql_store *store, sql_allocator *pa, int clientid, int debug, 
bstream *rs, stream *ws)
 {
@@ -755,7 +762,7 @@ mvc_create(sql_store *store, sql_allocat
        m->label = 0;
        m->cascade_action = NULL;
 
-       if (!(m->schema_path = list_create((fdestroy)GDKfree))) {
+       if (!(m->schema_path = list_create((fdestroy)_free))) {
                qc_destroy(m->qc);
                list_destroy(m->global_vars);
                return NULL;
diff --git a/sql/storage/store_dependency.c b/sql/storage/store_dependency.c
--- a/sql/storage/store_dependency.c
+++ b/sql/storage/store_dependency.c
@@ -9,6 +9,13 @@
 #include "monetdb_config.h"
 #include "store_dependency.h"
 
+static void
+_free(void *dummy, void *data)
+{
+       (void)dummy;
+       GDKfree(data);
+}
+
 static sqlid
 list_find_func_id(list *ids, sqlid id)
 {
@@ -86,7 +93,7 @@ sql_trans_get_dependencies(sql_trans* tr
        sql_schema *s = find_sql_schema(tr, "sys");
        sql_table *deps = find_sql_table(tr, s, "dependencies");
        sql_column *dep_id, *dep_dep_id, *dep_dep_type, *tri_id, *table_id;
-       list *dep_list = list_create((fdestroy) GDKfree);
+       list *dep_list = list_create((fdestroy) _free);
        oid rid;
        rids *rs;
 
@@ -198,7 +205,7 @@ sql_trans_schema_user_dependencies(sql_t
        sql_table *auths = find_sql_table(tr, s, "auths");
        sql_column *auth_id = find_sql_column(auths, "id");
        sql_dependency type = USER_DEPENDENCY;
-       list *l = list_create((fdestroy) GDKfree);
+       list *l = list_create((fdestroy) _free);
        rids *users;
        oid rid;
 
@@ -235,7 +242,7 @@ sql_trans_owner_schema_dependencies(sql_
        sql_column *schema_owner = find_sql_column(schemas, "authorization");
        sql_column *schema_id = find_sql_column(schemas, "id");
        sql_dependency type = SCHEMA_DEPENDENCY;
-       list *l = list_create((fdestroy) GDKfree);
+       list *l = list_create((fdestroy) _free);
        rids *rs;
        oid rid;
 
diff --git a/sql/storage/store_sequence.c b/sql/storage/store_sequence.c
--- a/sql/storage/store_sequence.c
+++ b/sql/storage/store_sequence.c
@@ -20,8 +20,9 @@ typedef struct store_sequence {
 static list *sql_seqs = NULL;
 
 static void
-sequence_destroy( store_sequence *s )
+sequence_destroy( void *dummy, store_sequence *s )
 {
+       (void)dummy;
        _DELETE(s);
 }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list