Changeset: 64b24d792d61 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=64b24d792d61
Modified Files:
gdk/gdk_logger.c
monetdb5/extras/rdf/rdf_shredder.c
monetdb5/modules/mal/querylog.c
sql/test/leaks/Tests/check0_gsl.stable.out
sql/test/leaks/Tests/check0_nogeom.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1_gsl.stable.out
sql/test/leaks/Tests/check1_nogeom.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2_gsl.stable.out
sql/test/leaks/Tests/check2_nogeom.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3_gsl.stable.out
sql/test/leaks/Tests/check3_nogeom.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4_gsl.stable.out
sql/test/leaks/Tests/check4_nogeom.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5_gsl.stable.out
sql/test/leaks/Tests/check5_nogeom.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/drop3_gsl.stable.out
sql/test/leaks/Tests/drop3_nogeom.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select1_gsl.stable.out
sql/test/leaks/Tests/select1_nogeom.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/select2_gsl.stable.out
sql/test/leaks/Tests/select2_nogeom.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp1_gsl.stable.out
sql/test/leaks/Tests/temp1_nogeom.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp2_gsl.stable.out
sql/test/leaks/Tests/temp2_nogeom.stable.out
sql/test/leaks/Tests/temp3.stable.out
sql/test/leaks/Tests/temp3_gsl.stable.out
sql/test/leaks/Tests/temp3_nogeom.stable.out
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (truncated from 2172 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
@@ -130,13 +130,12 @@ logbat_destroy(BAT *b)
}
static BAT *
-logbat_new(int ht, int tt, BUN size)
+logbat_new(int tt, BUN size)
{
- BAT *nb = BATnew(ht, tt, size);
+ BAT *nb = BATnew(TYPE_void, tt, size);
if (nb) {
- if (ht == TYPE_void)
- BATseqbase(nb, 0);
+ BATseqbase(nb, 0);
nb->batDirty |= 2;
}
return nb;
@@ -1095,8 +1094,8 @@ logger_new(int debug, char *fn, char *lo
if ( b == 0)
logger_fatal("Logger_new: inconsistent database, '%s'
does not exist",bak,0,0);
- lg->catalog_bid = logbat_new(TYPE_void, TYPE_int, BATSIZE);
- lg->catalog_nme = logbat_new(TYPE_void, TYPE_str, BATSIZE);
+ lg->catalog_bid = logbat_new(TYPE_int, BATSIZE);
+ lg->catalog_nme = logbat_new(TYPE_str, BATSIZE);
v = BATmark(b, 0);
BATappend(lg->catalog_bid, BATmirror(v), FALSE);
@@ -1127,7 +1126,7 @@ logger_new(int debug, char *fn, char *lo
if ( b == 0)
logger_fatal("Logger_new: inconsistent database, '%s'
snapshots does not exist",bak,0,0);
- lg->snapshots_bid = logbat_new(TYPE_void, TYPE_int, 1);
+ lg->snapshots_bid = logbat_new(TYPE_int, 1);
v = BATmark(b, 0);
BATappend(lg->snapshots_bid, BATmirror(v), FALSE);
BBPunfix(v->batCacheid);
@@ -1136,7 +1135,7 @@ logger_new(int debug, char *fn, char *lo
BBPrename(lg->snapshots_bid->batCacheid, bak);
logger_add_bat(lg, lg->snapshots_bid, "snapshots_bid");
- lg->snapshots_tid = logbat_new(TYPE_void, TYPE_int, 1);
+ lg->snapshots_tid = logbat_new(TYPE_int, 1);
v = BATmark(BATmirror(b), 0);
BATappend(lg->snapshots_tid, BATmirror(v), FALSE);
BBPunfix(v->batCacheid);
@@ -1153,7 +1152,7 @@ logger_new(int debug, char *fn, char *lo
if ( b == 0)
logger_fatal("Logger_new: inconsistent database, '%s'
seqs does not exist",bak,0,0);
- lg->seqs_id = logbat_new(TYPE_void, TYPE_int, 1);
+ lg->seqs_id = logbat_new(TYPE_int, 1);
v = BATmark(b, 0);
BATappend(lg->seqs_id, BATmirror(v), FALSE);
BBPunfix(v->batCacheid);
@@ -1162,7 +1161,7 @@ logger_new(int debug, char *fn, char *lo
BBPrename(lg->seqs_id->batCacheid, bak);
logger_add_bat(lg, lg->seqs_id, "seqs_id");
- lg->seqs_val = logbat_new(TYPE_void, TYPE_lng, 1);
+ lg->seqs_val = logbat_new(TYPE_lng, 1);
v = BATmark(BATmirror(b), 0);
BATappend(lg->seqs_val, BATmirror(v), FALSE);
BBPunfix(v->batCacheid);
@@ -1204,8 +1203,8 @@ logger_new(int debug, char *fn, char *lo
goto error;
}
- lg->catalog_bid = logbat_new(TYPE_void, TYPE_int, BATSIZE);
- lg->catalog_nme = logbat_new(TYPE_void, TYPE_str, BATSIZE);
+ lg->catalog_bid = logbat_new(TYPE_int, BATSIZE);
+ lg->catalog_nme = logbat_new(TYPE_str, BATSIZE);
if (debug & 1)
fprintf(stderr, "create %s catalog\n", fn);
@@ -1281,13 +1280,13 @@ logger_new(int debug, char *fn, char *lo
}
seqs_id = logger_find_bat(lg, "seqs_id");
if (seqs_id == 0) {
- lg->seqs_id = logbat_new(TYPE_void, TYPE_int, 1);
+ lg->seqs_id = logbat_new(TYPE_int, 1);
BATmode(lg->seqs_id, PERSISTENT);
snprintf(bak, BUFSIZ, "%s_seqs_id", fn);
BBPrename(lg->seqs_id->batCacheid, bak);
logger_add_bat(lg, lg->seqs_id, "seqs_id");
- lg->seqs_val = logbat_new(TYPE_void, TYPE_lng, 1);
+ lg->seqs_val = logbat_new(TYPE_lng, 1);
BATmode(lg->seqs_val, PERSISTENT);
snprintf(bak, BUFSIZ, "%s_seqs_val", fn);
BBPrename(lg->seqs_val->batCacheid, bak);
@@ -1296,13 +1295,13 @@ logger_new(int debug, char *fn, char *lo
BUNappend(lg->seqs_id, &id, FALSE);
BUNappend(lg->seqs_val, &lg->id, FALSE);
- lg->snapshots_bid = logbat_new(TYPE_void, TYPE_int, 1);
+ lg->snapshots_bid = logbat_new(TYPE_int, 1);
BATmode(lg->snapshots_bid, PERSISTENT);
snprintf(bak, BUFSIZ, "%s_snapshots_bid", fn);
BBPrename(lg->snapshots_bid->batCacheid, bak);
logger_add_bat(lg, lg->snapshots_bid, "snapshots_bid");
- lg->snapshots_tid = logbat_new(TYPE_void, TYPE_int, 1);
+ lg->snapshots_tid = logbat_new(TYPE_int, 1);
BATmode(lg->snapshots_tid, PERSISTENT);
snprintf(bak, BUFSIZ, "%s_snapshots_tid", fn);
BBPrename(lg->snapshots_tid->batCacheid, bak);
@@ -1992,7 +1991,7 @@ bm_commit(logger *lg)
{
BUN p, q;
BAT *b = lg->catalog_bid;
- BAT *n = logbat_new(TYPE_void, TYPE_str, BATcount(lg->freed));
+ BAT *n = logbat_new(TYPE_str, BATcount(lg->freed));
int res;
/* remove the destroyed bats */
diff --git a/monetdb5/extras/rdf/rdf_shredder.c
b/monetdb5/extras/rdf/rdf_shredder.c
--- a/monetdb5/extras/rdf/rdf_shredder.c
+++ b/monetdb5/extras/rdf/rdf_shredder.c
@@ -33,7 +33,6 @@
typedef struct graphBATdef {
graphBATType batType; /* BAT type */
str name; /* name of the BAT */
- int headType; /* type of left column */
int tailType; /* type of right column */
} graphBATdef;
@@ -42,33 +41,33 @@ static BUN batsz = 10000000;
/* this list should be kept alligned with the graphBATType enum */
#if STORE == TRIPLE_STORE
static graphBATdef graphdef[N_GRAPH_BAT] = {
- {S_sort, "_s_sort", TYPE_void, TYPE_oid},
- {P_sort, "_p_sort", TYPE_void, TYPE_oid},
- {O_sort, "_o_sort", TYPE_void, TYPE_oid},
+ {S_sort, "_s_sort", TYPE_oid},
+ {P_sort, "_p_sort", TYPE_oid},
+ {O_sort, "_o_sort", TYPE_oid},
- {P_PO, "_p_po", TYPE_void, TYPE_oid},
- {O_PO, "_o_po", TYPE_void, TYPE_oid},
- {P_OP, "_p_op", TYPE_void, TYPE_oid},
- {O_OP, "_o_op", TYPE_void, TYPE_oid},
+ {P_PO, "_p_po", TYPE_oid},
+ {O_PO, "_o_po", TYPE_oid},
+ {P_OP, "_p_op", TYPE_oid},
+ {O_OP, "_o_op", TYPE_oid},
- {S_SO, "_s_so", TYPE_void, TYPE_oid},
- {O_SO, "_o_so", TYPE_void, TYPE_oid},
- {S_OS, "_s_os", TYPE_void, TYPE_oid},
- {O_OS, "_o_os", TYPE_void, TYPE_oid},
+ {S_SO, "_s_so", TYPE_oid},
+ {O_SO, "_o_so", TYPE_oid},
+ {S_OS, "_s_os", TYPE_oid},
+ {O_OS, "_o_os", TYPE_oid},
- {S_SP, "_s_sp", TYPE_void, TYPE_oid},
- {P_SP, "_p_sp", TYPE_void, TYPE_oid},
- {S_PS, "_s_ps", TYPE_void, TYPE_oid},
- {P_PS, "_p_ps", TYPE_void, TYPE_oid},
+ {S_SP, "_s_sp", TYPE_oid},
+ {P_SP, "_p_sp", TYPE_oid},
+ {S_PS, "_s_ps", TYPE_oid},
+ {P_PS, "_p_ps", TYPE_oid},
- {MAP_LEX, "_map_lex", TYPE_void, TYPE_str}
+ {MAP_LEX, "_map_lex", TYPE_str}
};
#elif STORE == MLA_STORE
static graphBATdef graphdef[N_GRAPH_BAT] = {
- {S_sort, "_s_sort", TYPE_void, TYPE_oid},
- {P_sort, "_p_sort", TYPE_void, TYPE_oid},
- {O_sort, "_o_sort", TYPE_void, TYPE_oid},
- {MAP_LEX, "_map_lex", TYPE_void, TYPE_str}
+ {S_sort, "_s_sort", TYPE_oid},
+ {P_sort, "_p_sort", TYPE_oid},
+ {O_sort, "_o_sort", TYPE_oid},
+ {MAP_LEX, "_map_lex", TYPE_str}
};
#endif /* STORE */
@@ -259,9 +258,9 @@ tripleHandler(void* user_data, const rap
*/
/* creates a BAT for the triple table */
static BAT*
-create_BAT(int ht, int tt, int size)
+create_BAT(int tt, int size)
{
- BAT *b = BATnew(ht, tt, size);
+ BAT *b = BATnew(TYPE_void, tt, size);
if (b == NULL) {
return b;
}
@@ -303,7 +302,6 @@ parserData_create (str location, BAT** g
*/
for (i = 0; i <= O_sort; i++) {
pdata->graph[i] = create_BAT (
- graphdef[i].headType,
graphdef[i].tailType,
batsz); /* DOTO: estimate
size */
if (pdata->graph[i] == NULL) {
@@ -313,7 +311,6 @@ parserData_create (str location, BAT** g
/* create the MAP_LEX BAT */
pdata->graph[MAP_LEX] = create_BAT (
- graphdef[MAP_LEX].headType,
graphdef[MAP_LEX].tailType,
batsz); /* DOTO: estimate
size */
if (pdata->graph[MAP_LEX] == NULL) {
diff --git a/monetdb5/modules/mal/querylog.c b/monetdb5/modules/mal/querylog.c
--- a/monetdb5/modules/mal/querylog.c
+++ b/monetdb5/modules/mal/querylog.c
@@ -96,17 +96,17 @@ QLOGcatalog(BAT **r)
int i;
for ( i=0;i < 7; i++)
r[i]=0;
- if (initQlog())
- return ;
- MT_lock_set(&mal_profileLock, "querylogLock");
- r[0] = BATcopy(QLOG_cat_id, TYPE_oid, QLOG_cat_id->ttype, 0);
- r[1] = BATcopy(QLOG_cat_user, TYPE_oid, QLOG_cat_user->ttype,0);
- r[2] = BATcopy(QLOG_cat_defined, TYPE_oid, QLOG_cat_defined->ttype,0);
- r[3] = BATcopy(QLOG_cat_query, TYPE_oid, QLOG_cat_query->ttype,0);
- r[4] = BATcopy(QLOG_cat_pipe, TYPE_oid, QLOG_cat_pipe->ttype,0);
- r[5] = BATcopy(QLOG_cat_mal, TYPE_oid, QLOG_cat_mal->ttype,0);
- r[6] = BATcopy(QLOG_cat_optimize, TYPE_oid, QLOG_cat_optimize->ttype,0);
- MT_lock_unset(&mal_profileLock, "querylogLock");
+ if (initQlog())
+ return ;
+ MT_lock_set(&mal_profileLock, "querylogLock");
+ r[0] = BATcopy(QLOG_cat_id, TYPE_void, QLOG_cat_id->ttype, 0);
+ r[1] = BATcopy(QLOG_cat_user, TYPE_void, QLOG_cat_user->ttype,0);
+ r[2] = BATcopy(QLOG_cat_defined, TYPE_void, QLOG_cat_defined->ttype,0);
+ r[3] = BATcopy(QLOG_cat_query, TYPE_void, QLOG_cat_query->ttype,0);
+ r[4] = BATcopy(QLOG_cat_pipe, TYPE_void, QLOG_cat_pipe->ttype,0);
+ r[5] = BATcopy(QLOG_cat_mal, TYPE_void, QLOG_cat_mal->ttype,0);
+ r[6] = BATcopy(QLOG_cat_optimize, TYPE_void,
QLOG_cat_optimize->ttype,0);
+ MT_lock_unset(&mal_profileLock, "querylogLock");
}
void
@@ -115,20 +115,20 @@ QLOGcalls(BAT **r)
int i;
for ( i=0;i < 10; i++)
r[i]=0;
- if (initQlog())
- return ;
- MT_lock_set(&mal_profileLock, "querylogLock");
- r[0] = BATcopy(QLOG_calls_id, TYPE_oid, QLOG_calls_id->ttype, 0);
- r[1] = BATcopy(QLOG_calls_start, TYPE_oid, QLOG_calls_start->ttype,0);
- r[2] = BATcopy(QLOG_calls_stop, TYPE_oid, QLOG_calls_stop->ttype,0);
- r[3] = BATcopy(QLOG_calls_arguments, TYPE_oid,
QLOG_calls_arguments->ttype,0);
- r[4] = BATcopy(QLOG_calls_tuples, TYPE_oid, QLOG_calls_tuples->ttype,0);
- r[5] = BATcopy(QLOG_calls_exec, TYPE_oid, QLOG_calls_exec->ttype,0);
- r[6] = BATcopy(QLOG_calls_result, TYPE_oid, QLOG_calls_result->ttype,0);
- r[7] = BATcopy(QLOG_calls_cpuload, TYPE_oid,
QLOG_calls_cpuload->ttype,0);
- r[8] = BATcopy(QLOG_calls_iowait, TYPE_oid, QLOG_calls_iowait->ttype,0);
- r[9] = BATcopy(QLOG_calls_space, TYPE_oid, QLOG_calls_space->ttype,0);
- MT_lock_unset(&mal_profileLock, "querylogLock");
+ if (initQlog())
+ return ;
+ MT_lock_set(&mal_profileLock, "querylogLock");
+ r[0] = BATcopy(QLOG_calls_id, TYPE_void, QLOG_calls_id->ttype, 0);
+ r[1] = BATcopy(QLOG_calls_start, TYPE_void, QLOG_calls_start->ttype,0);
+ r[2] = BATcopy(QLOG_calls_stop, TYPE_void, QLOG_calls_stop->ttype,0);
+ r[3] = BATcopy(QLOG_calls_arguments, TYPE_void,
QLOG_calls_arguments->ttype,0);
+ r[4] = BATcopy(QLOG_calls_tuples, TYPE_void,
QLOG_calls_tuples->ttype,0);
+ r[5] = BATcopy(QLOG_calls_exec, TYPE_void, QLOG_calls_exec->ttype,0);
+ r[6] = BATcopy(QLOG_calls_result, TYPE_void,
QLOG_calls_result->ttype,0);
+ r[7] = BATcopy(QLOG_calls_cpuload, TYPE_void,
QLOG_calls_cpuload->ttype,0);
+ r[8] = BATcopy(QLOG_calls_iowait, TYPE_void,
QLOG_calls_iowait->ttype,0);
+ r[9] = BATcopy(QLOG_calls_space, TYPE_void, QLOG_calls_space->ttype,0);
+ MT_lock_unset(&mal_profileLock, "querylogLock");
}
static bat commitlist[32];
@@ -137,25 +137,25 @@ static int committop=1;
static BAT *
QLOGcreate(str hnme, str tnme, int tt)
{
- BAT *b;
- char buf[128];
+ BAT *b;
+ char buf[128];
- snprintf(buf, 128, "querylog_%s_%s", hnme, tnme);
- b = BATdescriptor(BBPindex(buf));
- if (b)
+ snprintf(buf, 128, "querylog_%s_%s", hnme, tnme);
+ b = BATdescriptor(BBPindex(buf));
+ if (b)
return b;
- b = BATnew(TYPE_void, tt, 1 << 16);
- if (b == NULL)
- return NULL;
+ b = BATnew(TYPE_void, tt, 1 << 16);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
