MonetDB: default - Removed SORTIDX property. It was no longer used

[Pedro Ferreira]

Changeset: e7199daf25ff for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e7199daf25ff
Modified Files:
        sql/server/rel_dump.c
        sql/server/rel_optimizer.c
        sql/server/rel_prop.c
        sql/server/rel_prop.h
Branch: default
Log Message:

Removed SORTIDX property. It was no longer used


diffs (59 lines):

diff --git a/sql/server/rel_dump.c b/sql/server/rel_dump.c
--- a/sql/server/rel_dump.c
+++ b/sql/server/rel_dump.c
@@ -909,12 +909,6 @@ read_exp_properties(mvc *sql, sql_exp *e
                                exp->p = prop_create(sql->sa, PROP_HASHIDX, 
exp->p);
                        skipWS(r,pos);
                        found = true;
-               } else if (strncmp(r+*pos, "SORTIDX",  strlen("SORTIDX")) == 0) 
{
-                       (*pos)+= (int) strlen("SORTIDX");
-                       if (!find_prop(exp->p, PROP_SORTIDX))
-                               exp->p = prop_create(sql->sa, PROP_SORTIDX, 
exp->p);
-                       skipWS(r,pos);
-                       found = true;
                } else if (strncmp(r+*pos, "HASHCOL",  strlen("HASHCOL")) == 0) 
{
                        (*pos)+= (int) strlen("HASHCOL");
                        if (!find_prop(exp->p, PROP_HASHCOL))
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
@@ -5629,8 +5629,6 @@ score_gbe(visitor *v, sql_rel *rel, sql_
                res += 700;
        if (c && v->storage_based_opt && mvc_is_sorted(v->sql, c))
                res += 500;
-       if (find_prop(e->p, PROP_SORTIDX)) /* has sort index */
-               res += 300;
        if (find_prop(e->p, PROP_HASHIDX)) /* has hash index */
                res += 200;
 
@@ -7425,8 +7423,6 @@ score_se_base(visitor *v, sql_rel *rel, 
        /* can we find out if the underlying table is sorted */
        if ((c = exp_find_column(rel, e, -2)) && v->storage_based_opt && 
mvc_is_sorted(v->sql, c))
                res += 600;
-       if (find_prop(e->p, PROP_SORTIDX)) /* has sort index */
-               res += 400;
 
        /* prefer the shorter var types over the longer ones */
        res += sql_class_base_score(v, c, t, 
is_equality_or_inequality_exp(e->flag)); /* smaller the type, better */
diff --git a/sql/server/rel_prop.c b/sql/server/rel_prop.c
--- a/sql/server/rel_prop.c
+++ b/sql/server/rel_prop.c
@@ -70,7 +70,6 @@ propkind2string( prop *p)
                PT(COUNT);
                PT(JOINIDX);
                PT(HASHIDX);
-               PT(SORTIDX);
                PT(HASHCOL);
                PT(FETCH);
                PT(REMOTE);
diff --git a/sql/server/rel_prop.h b/sql/server/rel_prop.h
--- a/sql/server/rel_prop.h
+++ b/sql/server/rel_prop.h
@@ -13,7 +13,6 @@ typedef enum rel_prop {
        PROP_COUNT,
        PROP_JOINIDX,   /* could use join idx */
        PROP_HASHIDX,   /* is hash idx */
-       PROP_SORTIDX,   /* is sorted */
        PROP_HASHCOL,   /* could use hash idx */
        PROP_FETCH,     /* fetchjoin */
        PROP_REMOTE,    /* uri for remote execution */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list