MonetDB: Jan2014 - removed dead code

[Niels Nes]

Changeset: 6bb67f7823d3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6bb67f7823d3
Modified Files:
        sql/backends/monet5/sql.c
        sql/include/sql_relation.h
Branch: Jan2014
Log Message:

removed dead code


diffs (76 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -696,46 +696,6 @@ drop_key(mvc *sql, char *sname, char *kn
 }
 
 static str
-create_index(mvc *sql, char *iname, int itype, char *sname, char *tname, 
MalStkPtr stk, InstrPtr pci)
-{
-       sql_schema *s = NULL;
-       sql_table *t = NULL;
-       sql_idx *i = NULL;
-
-       if (!(s = mvc_bind_schema(sql, sname)))
-               return sql_message("3F000!CREATE INDEX: no such schema '%s'", 
sname);
-
-       i = mvc_bind_idx(sql, s, iname);
-       t = mvc_bind_table(sql, s, tname);
-       if (i) {
-               return sql_message("42S11!CREATE INDEX: name '%s' already in 
use", iname);
-       } else if (!t) {
-               return sql_message("42S02!CREATE INDEX: no such table '%s'", 
tname);
-       } else if (isView(t)) {
-               return sql_message("42S02!CREATE INDEX: cannot create index on 
view '%s'", tname);
-       } else {
-               int n;
-               sql_idx *i = mvc_create_idx(sql, t, iname, (idx_type) itype);
-
-               if (!i)
-                       return sql_message("40000!CREATE INDEX: failed to 
create index '%s'", iname);
-
-               for (n = 6; n < pci->argc; n++) {
-                       char *cname = *(str *) getArgReference(stk, pci, n);
-                       sql_column *c = mvc_bind_column(sql, t, cname);
-
-                       if (!c) {
-                               return sql_message("42S22!CREATE INDEX: no such 
column '%s'", cname);
-                       } else {
-                               mvc_create_ic(sql, i, c);
-                               mvc_create_dependency(sql, c->base.id, 
i->base.id, INDEX_DEPENDENCY);
-                       }
-               }
-       }
-       return NULL;
-}
-
-static str
 drop_index(mvc *sql, char *sname, char *iname)
 {
        sql_schema *s = NULL;
@@ -1180,14 +1140,6 @@ SQLcatalog(Client cntxt, MalBlkPtr mb, M
                msg = sql_drop_role(sql, role);
                break;
        }
-       case DDL_CREATE_INDEX:{
-               int itype = *(int *) getArgReference(stk, pci, 3);
-               char *ssname = *(str *) getArgReference(stk, pci, 4);
-               char *tname = *(str *) getArgReference(stk, pci, 5);
-               assert(0); /* not used anymore */
-               msg = create_index(sql, sname, itype, ssname, tname, stk, pci);
-               break;
-       }
        case DDL_DROP_INDEX:{
                char *iname = *(str *) getArgReference(stk, pci, 3);
                msg = drop_index(sql, sname, iname);
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
@@ -107,7 +107,6 @@ typedef struct expression {
 #define DDL_CREATE_TYPE 30 
 #define DDL_DROP_TYPE   31 
 
-#define DDL_CREATE_INDEX  32   /* not used anymore */
 #define DDL_DROP_INDEX    33
 
 #define DDL_CREATE_FUNCTION 41 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list