Changeset: 21d208d4a526 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=21d208d4a526
Modified Files:
sql/backends/monet5/sql.h
sql/backends/monet5/sql_assert.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_scenario.h
sql/backends/monet5/sql_transaction.h
sql/common/sql_types.h
sql/server/rel_exp.h
sql/server/rel_select.c
sql/server/sql_env.h
sql/server/sql_mvc.h
sql/server/sql_parser.y
sql/server/sql_privileges.h
sql/server/sql_tokens.h
Branch: default
Log Message:
Removed unused definitions in the SQL layer, Datacell code, unused SQL parser
tokens.
diffs (truncated from 932 to 300 lines):
diff --git a/sql/backends/monet5/sql.h b/sql/backends/monet5/sql.h
--- a/sql/backends/monet5/sql.h
+++ b/sql/backends/monet5/sql.h
@@ -90,11 +90,6 @@ sql5_export str mvc_table_result_wrap(Cl
sql5_export str mvc_export_table_wrap( Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci);
-sql5_export str mvc_declared_table_wrap(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci);
-sql5_export str mvc_declared_table_column_wrap(Client cntxt, MalBlkPtr mb,
MalStkPtr stk, InstrPtr pci);
-sql5_export str mvc_drop_declared_table_wrap(Client cntxt, MalBlkPtr mb,
MalStkPtr stk, InstrPtr pci);
-sql5_export str mvc_drop_declared_tables_wrap(Client cntxt, MalBlkPtr mb,
MalStkPtr stk, InstrPtr pci);
-
sql5_export str mvc_affected_rows_wrap(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci);
sql5_export str mvc_export_result_wrap(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci);
sql5_export str mvc_export_head_wrap(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci);
@@ -132,8 +127,6 @@ sql5_export str SQLshrink(Client cntxt,
sql5_export str SQLreuse(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
sql5_export str SQLvacuum(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
sql5_export str SQLdrop_hash(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-sql5_export str SQLnewDictionary(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-sql5_export str SQLdropDictionary(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
sql5_export str SQLargRecord(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
sql5_export str SQLoptimizersUpdate(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
sql5_export str month_interval_str(int *ret, const str *s, const int *ek,
const int *sk);
diff --git a/sql/backends/monet5/sql_assert.c b/sql/backends/monet5/sql_assert.c
--- a/sql/backends/monet5/sql_assert.c
+++ b/sql/backends/monet5/sql_assert.c
@@ -26,6 +26,7 @@
*/
#include "monetdb_config.h"
#include "mal_backend.h"
+#include "sql_assert.h"
#include "sql_scenario.h"
/*
* Assertion errors detected during the execution of a code block
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -50,7 +50,7 @@ static int SQLinitialized = 0;
static int SQLnewcatalog = 0;
int SQLdebug = 0;
static const char *sqlinit = NULL;
-MT_Lock sql_contextLock = MT_LOCK_INITIALIZER("sql_contextLock");
+static MT_Lock sql_contextLock = MT_LOCK_INITIALIZER("sql_contextLock");
static void
monet5_freestack(int clientid, backend_stack stk)
diff --git a/sql/backends/monet5/sql_scenario.h
b/sql/backends/monet5/sql_scenario.h
--- a/sql/backends/monet5/sql_scenario.h
+++ b/sql/backends/monet5/sql_scenario.h
@@ -29,13 +29,7 @@ sql5_export str SQLreader(Client c);
sql5_export str SQLparser(Client c);
sql5_export str SQLengine(Client c);
sql5_export str SQLcallback(Client c, str msg);
-sql5_export str SQLassert(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-sql5_export str SQLassertInt(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-sql5_export str SQLassertLng(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
sql5_export str handle_error(mvc *m, int pstatus, str msg);
-#ifdef HAVE_HGE
-sql5_export str SQLassertHge(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-#endif
sql5_export str SQLstatement(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
sql5_export str SQLcompile(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
@@ -46,5 +40,4 @@ sql5_export str SQLescapeString(str s);
sql5_export str SYSupdate_tables(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
sql5_export str SYSupdate_schemas(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-sql5_export MT_Lock sql_contextLock;
#endif /* _SQL_SCENARIO_H_ */
diff --git a/sql/backends/monet5/sql_transaction.h
b/sql/backends/monet5/sql_transaction.h
--- a/sql/backends/monet5/sql_transaction.h
+++ b/sql/backends/monet5/sql_transaction.h
@@ -33,9 +33,7 @@
sql5_export str SQLtransaction_begin(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci) ;
sql5_export str SQLtransaction_release(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci) ;
sql5_export str SQLtransaction_commit(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci) ;
-sql5_export str SQLtransaction_abort(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci) ;
sql5_export str SQLtransaction_rollback(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci) ;
-sql5_export str SQLtransaction(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci) ;
#endif /* _SQL_TRANSACTION_H */
diff --git a/sql/common/sql_types.h b/sql/common/sql_types.h
--- a/sql/common/sql_types.h
+++ b/sql/common/sql_types.h
@@ -84,8 +84,6 @@ extern int is_subtype(sql_subtype *t1, s
extern char *subtype2string(sql_subtype *t);
extern char *subtype2string2(sql_subtype *tpe);
-extern void type_destroy(sql_type *t);
-
extern sql_arg *sql_create_arg(sql_allocator *sa, const char *name,
sql_subtype *t, char inout);
extern sql_arg *arg_dup(sql_allocator *sa, sql_arg *a);
diff --git a/sql/server/rel_exp.h b/sql/server/rel_exp.h
--- a/sql/server/rel_exp.h
+++ b/sql/server/rel_exp.h
@@ -17,7 +17,6 @@
#define new_exp_list(sa) sa_list(sa)
#define exp2list(sa,e) append(sa_list(sa),e)
-#define new_compare_list(sa, l, r) exp2list(sa, exp_compare(sa, l, r,
cmp_equal))
extern comp_type swap_compare( comp_type t );
extern comp_type range2lcompare( int r );
@@ -96,7 +95,6 @@ extern sql_exp * exp_copy( sql_allocator
extern list * exps_copy( sql_allocator *sa, list *exps);
extern list * exps_alias( sql_allocator *sa, list *exps);
-
extern void exp_swap( sql_exp *e );
extern sql_subtype * exp_subtype( sql_exp *e );
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -672,41 +672,6 @@ rel_op_(mvc *sql, sql_schema *s, char *f
}
}
-/* special class of table returning function, but with a table input as well */
-static sql_rel *
-rel_named_table_operator(sql_query *query, sql_rel *rel, symbol *ast)
-{
- mvc *sql = query->sql;
- exp_kind ek = {type_value, card_relation, TRUE};
- sql_rel *sq = rel_subquery(query, rel, ast->data.lval->h->data.sym, ek);
- list *exps;
- node *en;
- char *tname = NULL;
-
- if (!sq)
- return NULL;
-
- if (ast->data.lval->h->next->data.sym) {
- dlist *column_spec =
ast->data.lval->h->next->data.sym->data.lval->h->next->data.lval;
-
- tname =
ast->data.lval->h->next->data.sym->data.lval->h->data.sval;
- if (column_spec) {
- dnode *n = column_spec->h;
-
- sq = rel_project(sql->sa, sq, rel_projections(sql, sq,
NULL, 1, 1));
- for (en = sq->exps->h; n && en; n = n->next, en =
en->next)
- exp_setname(sql->sa, en->data, tname,
n->data.sval );
- }
- }
-
- exps = new_exp_list(sql->sa);
- for (en = sq->exps->h; en; en = en->next) {
- sql_exp *e = en->data;
- append(exps, exp_column(sql->sa, tname, exp_name(e),
exp_subtype(e), CARD_MULTI, has_nil(e), 0));
- }
- return rel_relational_func(sql->sa, sq, exps);
-}
-
static sql_rel *
rel_values(sql_query *query, symbol *tableref)
{
@@ -795,9 +760,7 @@ rel_values(sql_query *query, symbol *tab
static int
check_is_lateral(symbol *tableref)
{
- if (tableref->token == SQL_NAME ||
- tableref->token == SQL_TABLE ||
- tableref->token == SQL_TABLE_OPERATOR) {
+ if (tableref->token == SQL_NAME || tableref->token == SQL_TABLE) {
if (dlist_length(tableref->data.lval) == 3)
return tableref->data.lval->h->next->next->data.i_val;
return 0;
@@ -901,8 +864,6 @@ table_ref(sql_query *query, sql_rel *rel
return rel_values(query, tableref);
} else if (tableref->token == SQL_TABLE) {
return rel_named_table_function(query, rel, tableref, lateral);
- } else if (tableref->token == SQL_TABLE_OPERATOR) {
- return rel_named_table_operator(query, rel, tableref);
} else if (tableref->token == SQL_SELECT) {
return rel_subquery_optname(query, rel, tableref);
} else {
diff --git a/sql/server/sql_env.h b/sql/server/sql_env.h
--- a/sql/server/sql_env.h
+++ b/sql/server/sql_env.h
@@ -21,7 +21,4 @@ extern str sql_update_var(mvc *sql, cons
extern int sql_create_env(mvc *sql, sql_schema *s);
-#define NR_KEEPQUERY_ARGS 4
-#define NR_KEEPCALL_ARGS 9
-
#endif /* _SQL_ENV_H_ */
diff --git a/sql/server/sql_mvc.h b/sql/server/sql_mvc.h
--- a/sql/server/sql_mvc.h
+++ b/sql/server/sql_mvc.h
@@ -57,7 +57,6 @@
#define QUERY_MODE(m) (m==m_normal || m==m_instantiate || m==m_deps)
-
/* different query execution modifiers (emod) */
#define mod_none 0
#define mod_debug 1
@@ -203,7 +202,6 @@ extern sql_column *mvc_null(mvc *c, sql_
extern sql_column *mvc_default(mvc *c, sql_column *col, char *val);
extern sql_column *mvc_drop_default(mvc *c, sql_column *col);
extern sql_column *mvc_storage(mvc *c, sql_column *col, char *storage);
-extern sql_column *mvc_rename_column(mvc *c, sql_column *col, char *new_name);
extern sql_table * mvc_access(mvc *m, sql_table *t, sht access);
extern int mvc_is_sorted(mvc *c, sql_column *col);
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -2900,7 +2900,6 @@ transaction_mode_list:
{ $$ = ($1 | $3); }
;
-
transaction_mode:
READ ONLY { $$ = tr_readonly; }
| READ WRITE { $$ = tr_writable; }
@@ -2998,8 +2997,6 @@ copyfrom_stmt:
append_int(l, 0);
$$ = _symbol_create_list( SQL_COPYTO, l ); }
;
-
-
opt_fwf_widths:
/* empty */ { $$ = NULL; }
@@ -3610,7 +3607,7 @@ table_ref:
append_symbol(l, $3);
append_int(l, 1);
$$ = _symbol_create_list(SQL_TABLE, l); }
- | subquery_with_orderby table_name
+ | subquery_with_orderby table_name
{
$$ = $1;
if ($$->token == SQL_SELECT) {
@@ -3620,7 +3617,7 @@ table_ref:
append_symbol($1->data.lval, $2);
}
}
- | LATERAL subquery table_name
+ | LATERAL subquery table_name
{
$$ = $2;
if ($$->token == SQL_SELECT) {
@@ -3639,17 +3636,6 @@ table_ref:
}
| joined_table { $$ = $1;
append_symbol($1->data.lval, NULL); }
-/* Basket expression, TODO window */
- | '['
- { m->caching = 0; }
- select_no_parens ']' table_name
- {
- dlist *op = L();
-
- append_symbol(op, $3);
- append_symbol(op, $5);
- $$ = _symbol_create_list(SQL_TABLE_OPERATOR, op);
- }
;
table_name:
@@ -6542,189 +6528,171 @@ int find_subgeometry_type(char* geoSubTy
char *token2string(tokens token)
{
switch (token) {
+ // Please keep this list sorted for easy of maintenance
#define SQL(TYPE) case SQL_##TYPE : return #TYPE
- SQL(CREATE_SCHEMA);
- SQL(CREATE_TABLE);
- SQL(CREATE_TABLE_LOADER);
- SQL(CREATE_VIEW);
+ SQL(AGGR);
+ SQL(ALTER_SEQ);
+ SQL(ALTER_TABLE);
+ SQL(ALTER_USER);
+ SQL(ANALYZE);
+ SQL(AND);
+ SQL(ASSIGN);
+ SQL(ATOM);
+ SQL(BETWEEN);
+ SQL(BINCOPYFROM);
+ SQL(BINOP);
+ SQL(CACHE);
+ SQL(CALL);
+ SQL(CASE);
+ SQL(CAST);
+ SQL(CHARSET);
+ SQL(CHECK);
+ SQL(COALESCE);
+ SQL(COLUMN);
+ SQL(COLUMN_OPTIONS);
+ SQL(COMMENT);
+ SQL(COMPARE);
+ SQL(CONSTRAINT);
+ SQL(COPYFROM);
+ SQL(COPYLOADER);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
