Changeset: ec69edf39eff for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec69edf39eff
Modified Files:
sql/backends/monet5/sql_scenario.c
sql/include/sql_catalog.h
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/storage/sql_storage.h
sql/storage/store.c
Branch: context
Log Message:
some more cleanup
diffs (truncated from 305 to 300 lines):
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
@@ -270,7 +270,7 @@ SQLprepareClient(Client c, int login)
backend *be;
if (c->sqlcontext == 0) {
- m = mvc_create(c->idx, 0, SQLdebug, c->fdin, c->fdout);
+ m = mvc_create(c->idx, SQLdebug, c->fdin, c->fdout);
if( m == NULL) {
throw(SQL,"sql.initClient",SQLSTATE(HY001)
MAL_MALLOC_FAIL);
}
@@ -394,7 +394,7 @@ SQLinit(Client c)
SQLdebug |= 64;
if (readonly)
SQLdebug |= 32;
- if ((SQLnewcatalog = mvc_init(SQLdebug, GDKinmemory() ? store_mem :
store_bat, readonly, single_user, 0)) < 0) {
+ if ((SQLnewcatalog = mvc_init(SQLdebug, GDKinmemory() ? store_mem :
store_bat, readonly, single_user)) < 0) {
MT_lock_unset(&sql_contextLock);
throw(SQL, "SQLinit", SQLSTATE(42000) "Catalogue initialization
failed");
}
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
@@ -258,7 +258,6 @@ typedef struct sql_trans {
sql_allocator *sa; /* transaction allocator */
struct sql_trans *parent; /* multilevel transaction support */
- backend_stack stk;
} sql_trans;
typedef struct sql_schema {
@@ -648,7 +647,6 @@ typedef struct sql_session {
int level; /* TRANSACTION isolation level */
int active; /* active transaction */
int status; /* status, ok/error */
- backend_stack stk;
} sql_session;
extern void schema_destroy(sql_schema *s);
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -56,7 +56,7 @@ sql_create_comments(mvc *m, sql_schema *
}
int
-mvc_init(int debug, store_type store, int ro, int su, backend_stack stk)
+mvc_init(int debug, store_type store, int ro, int su)
{
int first = 0;
sql_schema *s;
@@ -75,12 +75,12 @@ mvc_init(int debug, store_type store, in
return -1;
}
- if ((first = store_init(debug, store, ro, su, stk)) < 0) {
+ if ((first = store_init(debug, store, ro, su)) < 0) {
fprintf(stderr, "!mvc_init: unable to create system tables\n");
return -1;
}
- m = mvc_create(0, stk, 0, NULL, NULL);
+ m = mvc_create(0, 0, NULL, NULL);
if (!m) {
fprintf(stderr, "!mvc_init: malloc failure\n");
return -1;
@@ -396,7 +396,7 @@ mvc_commit(mvc *m, int chain, const char
if (mvc_debug)
fprintf(stderr, "#mvc_savepoint\n");
store_lock();
- m->session->tr = sql_trans_create(m->session->stk, tr, name);
+ m->session->tr = sql_trans_create(tr, name);
if(!m->session->tr) {
store_unlock();
msg = createException(SQL, "sql.commit",
SQLSTATE(HY001) "%s allocation failure while committing the transaction, will
ROLLBACK instead", operation);
@@ -623,7 +623,7 @@ mvc_release(mvc *m, const char *name)
}
mvc *
-mvc_create(int clientid, backend_stack stk, int debug, bstream *rs, stream *ws)
+mvc_create(int clientid, int debug, bstream *rs, stream *ws)
{
mvc *m;
@@ -680,7 +680,7 @@ mvc_create(int clientid, backend_stack s
m->cascade_action = NULL;
store_lock();
- m->session = sql_session_create(stk, 1 /*autocommit on*/);
+ m->session = sql_session_create(1 /*autocommit on*/);
store_unlock();
if(!m->session) {
qc_destroy(m->qc);
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
@@ -126,12 +126,12 @@ typedef struct mvc {
list *cascade_action; /* protection against recursive cascade actions
*/
} mvc;
-extern int mvc_init(int debug, store_type store, int ro, int su, backend_stack
stk);
+extern int mvc_init(int debug, store_type store, int ro, int su);
extern void mvc_exit(void);
extern void mvc_logmanager(void);
extern void mvc_idlemanager(void);
-extern mvc *mvc_create(int clientid, backend_stack stk, int debug, bstream
*rs, stream *ws);
+extern mvc *mvc_create(int clientid, int debug, bstream *rs, stream *ws);
extern int mvc_reset(mvc *m, bstream *rs, stream *ws, int debug, int
globalvars);
extern void mvc_destroy(mvc *c);
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
@@ -339,7 +339,7 @@ extern res_table *res_tables_remove(res_
extern void res_tables_destroy(res_table *results);
extern res_table *res_tables_find(res_table *results, int res_id);
-extern int store_init(int debug, store_type store, int readonly, int
singleuser, backend_stack stk);
+extern int store_init(int debug, store_type store, int readonly, int
singleuser);
extern void store_exit(void);
extern void store_apply_deltas(void);
@@ -351,7 +351,7 @@ extern void store_lock(void);
extern void store_unlock(void);
extern int store_next_oid(void);
-extern sql_trans *sql_trans_create(backend_stack stk, sql_trans *parent, const
char *name);
+extern sql_trans *sql_trans_create(sql_trans *parent, const char *name);
extern sql_trans *sql_trans_destroy(sql_trans *tr);
extern bool sql_trans_validate(sql_trans *tr);
extern int sql_trans_commit(sql_trans *tr);
@@ -420,7 +420,7 @@ extern void sql_trans_drop_sequence(sql_
extern sql_sequence *sql_trans_alter_sequence(sql_trans *tr, sql_sequence
*seq, lng min, lng max, lng inc, lng cache, bit cycle);
extern lng sql_trans_sequence_restart(sql_trans *tr, sql_sequence *seq, lng
start);
-extern sql_session * sql_session_create(backend_stack stk, int autocommit);
+extern sql_session * sql_session_create(int autocommit);
extern void sql_session_destroy(sql_session *s);
extern int sql_session_reset(sql_session *s, int autocommit);
extern int sql_trans_begin(sql_session *s);
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -36,8 +36,6 @@ int store_readonly = 0;
int store_singleuser = 0;
int store_initialized = 0;
-backend_stack backend_stk;
-
store_functions store_funcs;
table_functions table_funcs;
logger_functions logger_funcs;
@@ -1237,7 +1235,7 @@ load_schema(sql_trans *tr, sqlid id, oid
}
static sql_trans *
-create_trans(sql_allocator *sa, backend_stack stk)
+create_trans(sql_allocator *sa)
{
sql_trans *t = ZNEW(sql_trans);
@@ -1253,7 +1251,6 @@ create_trans(sql_allocator *sa, backend_
t->status = 0;
t->parent = NULL;
- t->stk = stk;
cs_new(&t->schemas, t->sa, (fdestroy) &schema_destroy);
return t;
@@ -1778,7 +1775,7 @@ store_load(void) {
if(!sequences_init())
return -1;
- gtrans = tr = create_trans(sa, backend_stk);
+ gtrans = tr = create_trans(sa);
if(!gtrans)
return -1;
@@ -1790,7 +1787,7 @@ store_load(void) {
if (store_readonly) {
return -1;
}
- tr = sql_trans_create(backend_stk, NULL, NULL);
+ tr = sql_trans_create(NULL, NULL);
if(!tr)
return -1;
} else {
@@ -1984,12 +1981,11 @@ store_load(void) {
}
int
-store_init(int debug, store_type store, int readonly, int singleuser,
backend_stack stk)
+store_init(int debug, store_type store, int readonly, int singleuser)
{
int v = 1;
- backend_stk = stk;
logger_debug = debug;
bs_debug = debug&2;
store_readonly = readonly;
@@ -2217,7 +2213,7 @@ idle_manager(void)
continue;
}
- s = sql_session_create(gtrans->stk, 0);
+ s = sql_session_create(0);
if(!s) {
MT_lock_unset(&bs_lock);
continue;
@@ -3052,7 +3048,7 @@ schema_dup(sql_trans *tr, int flags, sql
}
static sql_trans *
-trans_init(sql_trans *t, backend_stack stk, sql_trans *ot)
+trans_init(sql_trans *t, sql_trans *ot)
{
t->wtime = t->rtime = 0;
t->stime = ot->wtime;
@@ -3065,7 +3061,6 @@ trans_init(sql_trans *t, backend_stack s
t->schema_number = store_schema_number();
t->parent = ot;
- t->stk = stk;
t->name = NULL;
if (bs_debug)
@@ -3075,7 +3070,7 @@ trans_init(sql_trans *t, backend_stack s
}
static sql_trans *
-trans_dup(backend_stack stk, sql_trans *ot, const char *newname)
+trans_dup(sql_trans *ot, const char *newname)
{
node *n;
sql_trans *t = ZNEW(sql_trans);
@@ -3088,7 +3083,7 @@ trans_dup(backend_stack stk, sql_trans *
_DELETE(t);
return NULL;
}
- t = trans_init(t, stk, ot);
+ t = trans_init(t, ot);
cs_new(&t->schemas, t->sa, (fdestroy) &schema_destroy);
@@ -4043,7 +4038,7 @@ reset_trans(sql_trans *tr, sql_trans *pt
}
sql_trans *
-sql_trans_create(backend_stack stk, sql_trans *parent, const char *name)
+sql_trans_create(sql_trans *parent, const char *name)
{
sql_trans *tr = NULL;
@@ -4054,7 +4049,7 @@ sql_trans_create(backend_stack stk, sql_
fprintf(stderr, "#reuse trans (%p) %d\n", tr, spares);
#endif
} else {
- tr = trans_dup(stk, (parent) ? parent : gtrans, name);
+ tr = trans_dup((parent) ? parent : gtrans, name);
#ifdef STORE_DEBUG
fprintf(stderr, "#new trans (%p)\n", tr);
#endif
@@ -6465,7 +6460,7 @@ sql_trans_sequence_restart(sql_trans *tr
}
sql_session *
-sql_session_create(backend_stack stk, int ac )
+sql_session_create(int ac )
{
sql_session *s;
@@ -6475,14 +6470,13 @@ sql_session_create(backend_stack stk, in
s = ZNEW(sql_session);
if (!s)
return NULL;
- s->tr = sql_trans_create(s->stk, NULL, NULL);
+ s->tr = sql_trans_create(NULL, NULL);
if(!s->tr) {
_DELETE(s);
return NULL;
}
s->schema_name = NULL;
s->active = 0;
- s->stk = stk;
if(!sql_session_reset(s, ac)) {
sql_trans_destroy(s->tr);
_DELETE(s);
@@ -6553,12 +6547,12 @@ sql_trans_begin(sql_session *s)
if (!list_empty(tr->moved_tables)) {
tr->name = (char*)1; /* make sure it get destroyed
properly */
sql_trans_destroy(tr);
- s->tr = tr = sql_trans_create(s->stk, NULL, NULL);
+ s->tr = tr = sql_trans_create(NULL, NULL);
} else {
reset_trans(tr, gtrans);
}
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
