Changeset: bb5a691a8f20 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bb5a691a8f20
Modified Files:
sql/backends/monet5/sql_scenario.c
sql/server/sql_mvc.c
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_table.c
sql/storage/store.c
Branch: newstorage
Log Message:
added hashtags to debug code
HG
diffs (truncated from 1572 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
@@ -1933,7 +1933,7 @@ SQLparser(Client c)
}
finalize:
- printf("-----finalizing\n");
+ printf("#-----finalizing\n");
if (msg)
sqlcleanup(m, 0);
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
@@ -182,7 +182,7 @@ mvc_trans(mvc *m)
int schema_changed = 0, err = m->session->status;
assert(!m->session->active); /* can only start a new transaction */
- printf("in mvc_trans\n");
+ printf("#in mvc_trans\n");
store_lock();
schema_changed = sql_trans_begin(m->session);
@@ -208,7 +208,7 @@ mvc_commit(mvc *m, int chain, char *name
assert(tr);
assert(m->session->active); /* only commit an active transaction */
- printf("in mvc commit\n");
+ printf("#in mvc commit\n");
if (mvc_debug)
fprintf(stderr, "#mvc_commit %s\n", (name) ? name : "");
@@ -309,7 +309,7 @@ mvc_rollback(mvc *m, int chain, char *na
int res = 0;
sql_trans *tr = m->session->tr;
- printf("in mvc_rollback");
+ printf("#in mvc_rollback");
if (mvc_debug)
fprintf(stderr, "#mvc_rollback %s\n", (name) ? name : "");
diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -86,7 +86,7 @@ delta_bind_ubat(sql_delta *bat, int acce
#ifdef NDEBUG
(void) access; /* satisfy compiler */
#endif
- printf("in delta_bind_ubat\n");
+ printf("#in delta_bind_ubat\n");
assert(access == RD_UPD);
if (bat->ubid)
@@ -102,7 +102,7 @@ bind_ucol(sql_trans *tr, sql_column *c,
{
BAT *u = NULL, *d, *r;
- printf("in bind_ucol\n");
+ printf("#in bind_ucol\n");
if (!c->data) {
sql_column *oc = tr_find_column(tr->parent, c);
@@ -128,7 +128,7 @@ bind_uidx(sql_trans *tr, sql_idx * i, in
{
BAT *u = NULL, *d, *r;
- printf("in bind_uidx\n");
+ printf("#in bind_uidx\n");
if (!i->data) {
sql_idx *oi = tr_find_idx(tr->parent, i);
@@ -154,7 +154,7 @@ delta_bind_bat( sql_delta *bat, int acce
{
BAT *b;
- printf("in delta_bind_bat\n");
+ printf("#in delta_bind_bat\n");
assert(access == RDONLY || access == RD_INS);
assert(bat != NULL);
@@ -186,7 +186,7 @@ delta_bind_bat( sql_delta *bat, int acce
static BAT *
bind_col(sql_trans *tr, sql_column *c, int access)
{
- printf("in bind_col\n");
+ printf("#in bind_col\n");
if (!c->data) {
sql_column *oc = tr_find_column(tr->parent, c);
@@ -203,7 +203,7 @@ static BAT *
bind_idx(sql_trans *tr, sql_idx * i, int access)
{
- printf("in bind_idx\n");
+ printf("#in bind_idx\n");
if (!i->data) {
sql_idx *oi = tr_find_idx(tr->parent, i);
@@ -222,7 +222,7 @@ delta_update_bat( sql_delta *bat, BAT *t
BAT *b;
BAT *upd = BATleftfetchjoin(BATmirror(tids), updates, BATcount(tids));
- printf("in delta_update_bat\n");
+ printf("#in delta_update_bat\n");
if (bat->cached) {
bat_destroy(bat->cached);
@@ -283,7 +283,7 @@ delta_update_val( sql_delta *bat, oid ri
{
BAT *b = NULL;
- printf("in delta_update_val\n");
+ printf("#in delta_update_val\n");
assert(rid != oid_nil);
@@ -324,7 +324,7 @@ static int
dup_delta(sql_trans *tr, sql_delta *obat, sql_delta *bat, int type, int
oc_isnew, int c_isnew, int temp, int sz)
{
- printf("in dup_delta\n");
+ printf("#in dup_delta\n");
if (!obat)
return LOG_OK;
@@ -388,7 +388,7 @@ dup_delta(sql_trans *tr, sql_delta *obat
int
dup_bat(sql_trans *tr, sql_table *t, sql_delta *obat, sql_delta *bat, int
type, int oc_isnew, int c_isnew)
{
- printf("in dup_bat\n");
+ printf("#in dup_bat\n");
return dup_delta( tr, obat, bat, type, oc_isnew, c_isnew,
isTempTable(t), t->sz);
}
@@ -399,7 +399,7 @@ update_col(sql_trans *tr, sql_column *c,
BAT *b = tids;
sql_delta *bat;
- printf("in update_col\n");
+ printf("#in update_col\n");
if (tpe == TYPE_bat && !BATcount(b))
return;
@@ -426,7 +426,7 @@ update_idx(sql_trans *tr, sql_idx * i, v
BAT *b = tids;
sql_delta *bat;
- printf("in update_idx\n");
+ printf("#in update_idx\n");
if (tpe == TYPE_bat && !BATcount(b))
return;
@@ -457,7 +457,7 @@ delta_append_bat( sql_delta *bat, BAT *i
assert(!c || c->htype == TYPE_void);
#endif
- printf("in delta_append_bat\n");
+ printf("#in delta_append_bat\n");
if (!BATcount(i))
return ;
@@ -504,7 +504,7 @@ delta_append_val( sql_delta *bat, void *
assert(!c || c->htype == TYPE_void);
#endif
- printf("in delta append val\n");
+ printf("#in delta append val\n");
assert(b->htype == TYPE_void);
if (bat->cached) {
@@ -543,7 +543,7 @@ dup_idx(sql_trans *tr, sql_idx *i, sql_i
{
int ok = LOG_OK;
- printf("in dup_idx\n");
+ printf("#in dup_idx\n");
if (i->data) {
int type = (ni->type==join_idx)?TYPE_oid:TYPE_wrd;
@@ -557,7 +557,7 @@ dup_idx(sql_trans *tr, sql_idx *i, sql_i
static int
dup_dbat( sql_trans *tr, sql_dbat *obat, sql_dbat *bat, int is_new, int temp)
{
- printf("in dup_dbat\n");
+ printf("#in dup_dbat\n");
bat->dbid = obat->dbid;
bat->cnt = obat->cnt;
@@ -629,7 +629,7 @@ append_col(sql_trans *tr, sql_column *c,
BAT *b = i;
sql_delta *bat;
- printf("in append_col\n");
+ printf("#in append_col\n");
if (tpe == TYPE_bat && !BATcount(b))
return;
@@ -659,7 +659,7 @@ append_idx(sql_trans *tr, sql_idx * i, v
BAT *b = ib;
sql_delta *bat;
- printf("in append_idx\n");
+ printf("#in append_idx\n");
if (tpe == TYPE_bat && !BATcount(b))
return;
@@ -685,7 +685,7 @@ delta_delete_bat (sql_dbat *bat, BAT *i)
{
BAT *b = temp_descriptor(bat->dbid);
- printf("in delta_delete_bat\n");
+ printf("#in delta_delete_bat\n");
if (isEbat(b)) {
temp_destroy(bat->dbid);
@@ -705,7 +705,7 @@ delta_delete_val(sql_dbat *bat, oid rid)
{
BAT *b = temp_descriptor(bat->dbid);
- printf("in delta_delete_val\n");
+ printf("#in delta_delete_val\n");
if (isEbat(b)) {
temp_destroy(bat->dbid);
@@ -727,7 +727,7 @@ delete_tab(sql_trans *tr, sql_table * t,
sql_dbat *bat;
node *n;
- printf("in delete_tab\n");
+ printf("#in delete_tab\n");
if (tpe == TYPE_bat && !BATcount(b))
return;
@@ -784,7 +784,7 @@ count_col(sql_trans *tr, sql_column *c,
{
sql_delta *b;
- printf("in count_col\n");
+ printf("#in count_col\n");
if (!c->data) {
sql_column *oc = tr_find_column(tr->parent, c);
@@ -804,7 +804,7 @@ count_idx(sql_trans *tr, sql_idx *i, int
{
sql_delta *b;
- printf("in count_idx\n");
+ printf("#in count_idx\n");
if (!i->data) {
sql_idx *oi = tr_find_idx(tr->parent, i);
@@ -824,7 +824,7 @@ count_del(sql_trans *tr, sql_table *t)
{
sql_dbat *d;
- printf("in count_del\n");
+ printf("#in count_del\n");
if (!t->data) {
sql_table *ot = tr_find_table(tr->parent, t);
@@ -843,7 +843,7 @@ find_col( sql_trans *tr, char *sname, ch
sql_table *t = NULL;
sql_column *c = NULL;
- printf("in find_col\n");
+ printf("#in find_col\n");
if (s)
t = find_sql_table(s, tname);
@@ -857,7 +857,7 @@ sorted_col(sql_trans *tr, sql_column *co
{
int sorted = 0;
- printf("in sorted_col\n");
+ printf("#in sorted_col\n");
/* fallback to central bat */
if (tr && tr->parent && !col->data) {
@@ -881,7 +881,7 @@ load_delta(sql_delta *bat, int bid, int
{
BAT *b;
- printf("in load_delta\n");
+ printf("#in load_delta\n");
b = quick_descriptor(bid);
if (!b)
@@ -900,7 +900,7 @@ load_bat(sql_delta *bat, int type)
{
int bid = logger_find_bat(bat_logger, bat->name);
- printf("in load_bat\n");
+ printf("#in load_bat\n");
return load_delta(bat, bid, type);
}
@@ -913,7 +913,7 @@ log_create_delta(sql_delta *bat)
temp_descriptor(bat->bid):
temp_descriptor(bat->ibid);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
