MonetDB: default - Fixes global properties cnt array max size

[stefanos mavros via checkin-list]

Changeset: f9b2caf29e0a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f9b2caf29e0a
Modified Files:
        sql/include/sql_relation.h
        sql/server/rel_optimizer_private.h
Branch: default
Log Message:

Fixes global properties cnt array max size


diffs (34 lines):

diff --git a/sql/include/sql_relation.h b/sql/include/sql_relation.h
--- a/sql/include/sql_relation.h
+++ b/sql/include/sql_relation.h
@@ -141,8 +141,7 @@ typedef enum ddl_statement {
        ddl_comment_on,
        ddl_rename_schema,
        ddl_rename_table,
-       ddl_rename_column,
-       ddl_maxops /* evaluated to the max value, should be always kept at the 
bottom */
+       ddl_rename_column
 } ddl_statement;
 
 typedef enum operator_type {
@@ -167,7 +166,7 @@ typedef enum operator_type {
        op_update,      /* update(l=table, r update expressions) */
        op_delete,      /* delete(l=table, r delete expression) */
        op_truncate, /* truncate(l=table) */
-       op_merge
+       op_merge         /* IMPORTANT: keep op_merge last */
 } operator_type;
 
 #define is_atom(et)            (et == e_atom)
diff --git a/sql/server/rel_optimizer_private.h 
b/sql/server/rel_optimizer_private.h
--- a/sql/server/rel_optimizer_private.h
+++ b/sql/server/rel_optimizer_private.h
@@ -15,7 +15,7 @@
 
 /* relations counts */
 typedef struct global_props {
-       int cnt[ddl_maxops];
+       int cnt[op_merge + 1];
        uint8_t
                instantiate:1,
                needs_mergetable_rewrite:1,
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org