Changeset: 8428e8ce3226 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8428e8ce3226
Modified Files:
gdk/gdk_logger.c
sql/backends/monet5/sql.mx
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_table.c
sql/storage/store.c
Branch: newstorage
Log Message:
small fixes
1) make sure we always log (for now we log too much, ie each time the
full timestamp bats)
see new tr_pos_tsbats.
2) use length of real bat (not too long timestamp bats)
in bat_table.c
3) cleanup some more code/debug statements
diffs (truncated from 774 to 300 lines):
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1744,7 +1744,7 @@ log_delta(logger *lg, BAT *b, char *name
ok = (ok == GDK_FAIL) ? ok : wt(t, lg->log, 1);
}
- if (lg->debug & 1)
+ //if (lg->debug & 1)
fprintf(stderr, "Logged %s %d inserts\n", name, l.nr);
}
return (ok == GDK_SUCCEED) ? LOG_OK : LOG_ERR;
@@ -1793,7 +1793,7 @@ log_bat(logger *lg, BAT *b, char *name)
}
}
- if (lg->debug & 1)
+// if (lg->debug & 1)
fprintf(stderr, "Logged %s %d inserts\n", name, l.nr);
}
l.nr = (int) (b->batFirst - b->batDeleted);
@@ -1817,7 +1817,7 @@ log_bat(logger *lg, BAT *b, char *name)
ok = (ok == GDK_FAIL) ? ok : wt(t, lg->log, 1);
}
- if (lg->debug & 1)
+// if (lg->debug & 1)
fprintf(stderr, "Logged %s %d deletes\n", name, l.nr);
}
return (ok == GDK_SUCCEED) ? LOG_OK : LOG_ERR;
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -3759,7 +3759,8 @@ SQLtid(Client cntxt, MalBlkPtr mb, MalSt
sql_column *c;
BAT *tids;
BAT *insb, *delb;
- oid *fid, *id, *ip, *dp;
+ oid *fid, *id;
+ int *ip, *dp;
BUN p, q;
size_t nr, inr = 0;
oid sb = 0;
@@ -3799,12 +3800,9 @@ SQLtid(Client cntxt, MalBlkPtr mb, MalSt
(void)sb;
/* create void,void bat with length and oid's set */
- nr = store_funcs.count_col(tr, c, 0);
tids = BATnew(TYPE_void, TYPE_oid, (BUN) nr);
- //tids = BATnew(TYPE_void, TYPE_void, 0);
tids->H->seq = 0;
tids->T->seq = 0;
- //BATsetcount(tids, (BUN) nr);
tids->H->revsorted = 0;
tids->T->revsorted = 0;
tids->T->key = 1;
@@ -3815,11 +3813,11 @@ SQLtid(Client cntxt, MalBlkPtr mb, MalSt
fid = id = (oid*)Tloc(tids, BUNfirst(tids));
- ip = (oid *) Tloc(insb, BUNfirst(insb));
- dp = (oid *) Tloc(delb, BUNfirst(delb));
+ ip = (int *) Tloc(insb, BUNfirst(insb));
+ dp = (int *) Tloc(delb, BUNfirst(delb));
BATloop(insb, p, q) {
- if ((*ip>0 || *ip == (unsigned) (tr->btime * -1)) && (*dp ==
(unsigned) int_nil)) {
+ if ((*ip>0 || *ip == (tr->btime * -1)) && (*dp == int_nil)) {
*id++ = p - BUNfirst(insb) + insb->hseqbase;
}
ip++; dp++;
@@ -3829,18 +3827,7 @@ SQLtid(Client cntxt, MalBlkPtr mb, MalSt
BBPunfix(insb->batCacheid);
BBPunfix(delb->batCacheid);
- /*if (store_funcs.count_del(tr, t)) {
- BAT *d = store_funcs.bind_del(tr, t, RD_INS);
- BAT *diff = BATkdiff(tids, BATmirror(d));
-
- BBPunfix(tids->batCacheid);
- tids = BATmirror(BATmark(diff, sb));
- BBPunfix(diff->batCacheid);
- BBPunfix(d->batCacheid);
- }*/
-
BBPkeepref( *res = tids->batCacheid );
-
return MAL_SUCCEED;
}
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
@@ -23,6 +23,8 @@
#include <sql_string.h>
#include <algebra.h>
+static int bat_debug = 1;
+
#define SNAPSHOT_MINSIZE ((BUN) 1024*128)
sql_delta *
@@ -144,7 +146,8 @@ delta_bind_ubat(sql_delta *bat, int acce
#ifdef NDEBUG
(void) access; /* satisfy compiler */
#endif
- printf("#in delta_bind_ubat\n");
+ if (bat_debug==2)
+ printf("#in delta_bind_ubat\n");
assert(access == RD_UPD);
@@ -162,7 +165,8 @@ bind_ucol(sql_trans *tr, sql_column *c,
{
BAT *u = NULL, *r;
- printf("#in bind_ucol\n");
+ if (bat_debug==2)
+ printf("#in bind_ucol\n");
if (!c->data) {
sql_column *oc = tr_find_column(tr->parent, c);
@@ -258,7 +262,8 @@ delta_update_bat( sql_delta *bat, BAT *t
BAT *b = NULL;
BAT *upd = BATleftfetchjoin(BATmirror(tids), updates, BATcount(tids));
- printf("#in delta_update_bat\n");
+ if (bat_debug==2)
+ printf("#in delta_update_bat\n");
if (bat->cached) {
bat_destroy(bat->cached);
@@ -320,7 +325,8 @@ delta_update_val( sql_delta *bat, oid ri
{
BAT *b = NULL;
- printf("#in delta_update_val\n");
+ if (bat_debug==2)
+ printf("#in delta_update_val\n");
assert(rid != oid_nil);
@@ -407,7 +413,8 @@ update_col(sql_trans *tr, sql_column *c,
BAT *b = tids;
sql_delta *bat;
- printf("#in update_col\n");
+ if (bat_debug==2)
+ printf("#in update_col\n");
if (tpe == TYPE_bat && !BATcount(b))
return;
@@ -434,7 +441,8 @@ update_idx(sql_trans *tr, sql_idx * i, v
BAT *b = tids;
sql_delta *bat;
- printf("#in update_idx\n");
+ if (bat_debug==2)
+ printf("#in update_idx\n");
if (tpe == TYPE_bat && !BATcount(b))
return;
@@ -465,7 +473,8 @@ delta_append_bat( sql_delta *bat, BAT *i
assert(!c || c->htype == TYPE_void);
#endif
- printf("#in delta_append_bat\n");
+ if (bat_debug==2)
+ printf("#in delta_append_bat\n");
if (!BATcount(i))
return ;
@@ -533,7 +542,8 @@ delta_append_val( sql_delta *bat, void *
assert(!c || c->htype == TYPE_void);
#endif
- printf("#in delta append val\n");
+ if (bat_debug==2)
+ printf("#in delta append val\n");
assert(b->htype == TYPE_void);
if (bat->cached) {
@@ -572,7 +582,8 @@ dup_idx(sql_trans *tr, sql_idx *i, sql_i
{
int ok = LOG_OK;
- printf("#in dup_idx\n");
+ if (bat_debug==2)
+ printf("#in dup_idx\n");
if (i->data) {
int type = (ni->type==join_idx)?TYPE_oid:TYPE_wrd;
@@ -586,7 +597,8 @@ 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");
+ if (bat_debug==2)
+ printf("#in dup_dbat\n");
bat->dbid = obat->dbid;
bat->cnt = obat->cnt;
@@ -723,7 +735,8 @@ claim_tab(sql_trans *tr, sql_table *t, w
BAT *insb, *delb = NULL;
- printf("#in CLAIM\n");
+ if (bat_debug==2)
+ printf("#in CLAIM\n");
store_lock();
@@ -851,7 +864,8 @@ append_col(sql_trans *tr, sql_column *c,
BAT *b = i;
sql_delta *bat;
- printf("#in append_col\n");
+ if (bat_debug==2)
+ printf("#in append_col\n");
if (tpe == TYPE_bat && !BATcount(b))
return;
@@ -881,7 +895,8 @@ append_idx(sql_trans *tr, sql_idx * i, v
BAT *b = ib;
sql_delta *bat;
- printf("#in append_idx\n");
+ if (bat_debug==2)
+ printf("#in append_idx\n");
if (tpe == TYPE_bat && !BATcount(b))
return;
@@ -937,7 +952,8 @@ delta_delete_bat(sql_dbat *bat, BAT *i)
{
BAT *b = temp_descriptor(bat->dbid);
- printf("#in delta_delete_bat\n");
+ if (bat_debug==2)
+ printf("#in delta_delete_bat\n");
if (isEbat(b)) {
temp_destroy(bat->dbid);
@@ -974,7 +990,8 @@ delta_delete_val(sql_dbat *bat, oid rid)
{
BAT *b = temp_descriptor(bat->dbid);
- printf("#in delta_delete_val\n");
+ if (bat_debug==2)
+ printf("#in delta_delete_val\n");
if (isEbat(b)) {
temp_destroy(bat->dbid);
@@ -999,7 +1016,8 @@ delete_tab(sql_trans *tr, sql_table *t,
store_lock();
- printf("#in delete_tab\n");
+ if (bat_debug==2)
+ printf("#in delete_tab\n");
if (tpe == TYPE_bat && !BATcount(b))
return;
@@ -1071,7 +1089,8 @@ count_col(sql_trans *tr, sql_column *c,
{
sql_delta *b;
- printf("#in count_col\n");
+ if (bat_debug==2)
+ printf("#in count_col\n");
if (!c->data) {
sql_column *oc = tr_find_column(tr->parent, c);
@@ -1091,7 +1110,8 @@ count_idx(sql_trans *tr, sql_idx *i, int
{
sql_delta *b;
- printf("#in count_idx\n");
+ if (bat_debug==2)
+ printf("#in count_idx\n");
if (!i->data) {
sql_idx *oi = tr_find_idx(tr->parent, i);
@@ -1111,7 +1131,8 @@ count_del(sql_trans *tr, sql_table *t)
{
sql_dbat *d;
- printf("#in count_del\n");
+ if (bat_debug==2)
+ printf("#in count_del\n");
if (!t->data) {
sql_table *ot = tr_find_table(tr->parent, t);
@@ -1146,7 +1167,8 @@ find_col( sql_trans *tr, char *sname, ch
sql_table *t = NULL;
sql_column *c = NULL;
- printf("#in find_col\n");
+ if (bat_debug==2)
+ printf("#in find_col\n");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
