Changeset: 6d47bf713764 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6d47bf713764
Modified Files:
sql/server/rel_propagate.c
sql/server/rel_schema.c
sql/storage/store.c
Branch: merge-partitions
Log Message:
Compilation fixes
diffs (82 lines):
diff --git a/sql/server/rel_propagate.c b/sql/server/rel_propagate.c
--- a/sql/server/rel_propagate.c
+++ b/sql/server/rel_propagate.c
@@ -649,7 +649,6 @@ rel_propagate_update(mvc *sql, sql_rel *
sel = rel_generate_subupdates(sql, rel, t, changes);
sel = rel_exception(sql->sa, sel, NULL, NULL);
sel->p = prop_create(sql->sa, PROP_DISTRIBUTE, sel->p);
- return sel;
} else { //harder scenario, has to insert and delete across partitions.
/*sql_exp *exception = NULL;
sql_rel *inserts = NULL, *deletes = NULL, *anti_rel = NULL;
@@ -661,6 +660,7 @@ rel_propagate_update(mvc *sql, sql_rel *
return rel_list(sql->sa, deletes, inserts);*/
assert(0);
}
+ return sel;
}
static sql_rel*
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -1458,8 +1458,8 @@ sql_alter_table(mvc *sql, dlist *qname,
if (te && (te->token == SQL_TABLE || te->token ==
SQL_DROP_TABLE)) {
dlist *nqname = te->data.lval->h->data.lval;
- sql_schema *spt;
- sql_table *pt;
+ sql_schema *spt = NULL;
+ sql_table *pt = NULL;
char *nsname = qname_schema(nqname);
char *ntname = qname_table(nqname);
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1509,11 +1509,9 @@ dup_sql_part(sql_allocator *sa, sql_tabl
}
if(isRangePartitionTable(ot)) {
- sql_part *err = cs_add_with_validate(&mt->members, pt, TR_NEW,
sql_range_part_validate_and_insert);
- assert(!err);
+ (void) cs_add_with_validate(&mt->members, pt, TR_NEW,
sql_range_part_validate_and_insert);
} else if(isListPartitionTable(ot)) {
- sql_part *err = cs_add_with_validate(&mt->members, pt, TR_NEW,
sql_values_part_validate_and_insert);
- assert(!err);
+ (void) cs_add_with_validate(&mt->members, pt, TR_NEW,
sql_values_part_validate_and_insert);
} else {
cs_add(&mt->members, pt, TR_NEW);
}
@@ -4885,21 +4883,17 @@ sql_trans_del_table(sql_trans *tr, sql_t
if (is_oid_nil(obj_oid))
return NULL;
- if(isRangePartitionTable(mt) || isListPartitionTable(mt)) {
- sql_part *ppt = n->data;
- assert(ppt);
- if(isRangePartitionTable(mt)) {
- sql_table *ranges = find_sql_table(syss,
"_range_partitions");
- rid = table_funcs.column_find_row(tr,
find_sql_column(ranges, "id"), &pt->base.id, NULL);
- table_funcs.table_delete(tr, ranges, rid);
- } else if(isListPartitionTable(mt)) {
- sql_table *values = find_sql_table(syss,
"_value_partitions");
- rids *rs = table_funcs.rids_select(tr,
find_sql_column(values, "id"), &pt->base.id, &pt->base.id, NULL);
- for(rid = table_funcs.rids_next(rs); !is_oid_nil(rid);
rid = table_funcs.rids_next(rs)) {
- table_funcs.table_delete(tr, values, rid);
- }
- table_funcs.rids_destroy(rs);
+ if(isRangePartitionTable(mt)) {
+ sql_table *ranges = find_sql_table(syss, "_range_partitions");
+ rid = table_funcs.column_find_row(tr, find_sql_column(ranges,
"id"), &pt->base.id, NULL);
+ table_funcs.table_delete(tr, ranges, rid);
+ } else if(isListPartitionTable(mt)) {
+ sql_table *values = find_sql_table(syss, "_value_partitions");
+ rids *rs = table_funcs.rids_select(tr, find_sql_column(values,
"id"), &pt->base.id, &pt->base.id, NULL);
+ for(rid = table_funcs.rids_next(rs); !is_oid_nil(rid); rid =
table_funcs.rids_next(rs)) {
+ table_funcs.table_delete(tr, values, rid);
}
+ table_funcs.rids_destroy(rs);
}
/* merge table depends on part table */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
