MonetDB: default - missing changes of the planner improvements

[Niels Nes]

Changeset: cc3e3eeb7fbc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cc3e3eeb7fbc
Modified Files:
        sql/include/sql_catalog.h
        sql/include/sql_relation.h
        sql/storage/sql_storage.h
Branch: default
Log Message:

missing changes of the planner improvements


diffs (35 lines):

diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h
--- a/sql/include/sql_catalog.h
+++ b/sql/include/sql_catalog.h
@@ -443,6 +443,7 @@ typedef struct sql_column {
        int drop_action;        /* only used for alter statements */
        char *storage_type;
        int sorted;             /* for DECLARED (dupped tables) we keep order 
info */
+       size_t dcount;
 
        struct sql_table *t;
        void *data;
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
@@ -155,6 +155,8 @@ typedef enum operator_type {
        (et == e_atom)
 #define is_func(et) \
        (et == e_func)
+#define is_map_op(et) \
+       (et == e_func || et == e_convert)
 #define is_column(et) \
        (et != e_cmp)
 #define is_rank_op(e) \
diff --git a/sql/storage/sql_storage.h b/sql/storage/sql_storage.h
--- a/sql/storage/sql_storage.h
+++ b/sql/storage/sql_storage.h
@@ -330,6 +330,8 @@ extern void sql_trans_drop_column(sql_tr
 extern sql_column *sql_trans_alter_null(sql_trans *tr, sql_column *col, int 
isnull);
 extern sql_column *sql_trans_alter_default(sql_trans *tr, sql_column *col, 
char *val);
 extern int sql_trans_is_sorted(sql_trans *tr, sql_column *col);
+extern size_t sql_trans_dist_count(sql_trans *tr, sql_column *col);
+extern int sql_trans_ranges(sql_trans *tr, sql_column *col, void **min, void 
**max);
 
 extern sql_key *sql_trans_create_ukey(sql_trans *tr, sql_table *t, const char 
*name, key_type kt);
 extern sql_key * sql_trans_key_done(sql_trans *tr, sql_key *k);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list