Changeset: 3ac77dfbadc7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3ac77dfbadc7
Modified Files:
sql/backends/monet5/miniseed/miniseed.c
sql/backends/monet5/miniseed/registrar.c
Branch: DVframework
Log Message:
correctly replacing BBPreleaseref.
diffs (truncated from 520 to 300 lines):
diff --git a/sql/backends/monet5/miniseed/miniseed.c
b/sql/backends/monet5/miniseed/miniseed.c
--- a/sql/backends/monet5/miniseed/miniseed.c
+++ b/sql/backends/monet5/miniseed/miniseed.c
@@ -57,13 +57,13 @@ str MiniseedMount(Client cntxt, MalBlkPt
if(bfile == NULL || bseqno == NULL || btime == NULL || bdata == NULL)
/* exception handling. */
{
if(bfile)
- BBPdecref(bfile->batCacheid, TRUE);
+ BBPdecref(bfile->batCacheid, FALSE);
if(bseqno)
- BBPdecref(bseqno->batCacheid, TRUE);
+ BBPdecref(bseqno->batCacheid, FALSE);
if(btime)
- BBPdecref(btime->batCacheid, TRUE);
+ BBPdecref(btime->batCacheid, FALSE);
if(bdata)
- BBPdecref(bdata->batCacheid, TRUE);
+ BBPdecref(bdata->batCacheid, FALSE);
throw(MAL,"miniseed.mount", MAL_MALLOC_FAIL);
}
@@ -178,13 +178,13 @@ str MiniseedMountSegmentMode(Client cntx
if(bfile == NULL || bsegid == NULL || btime == NULL || bvalue == NULL)
/* exception handling. */
{
if(bfile)
- BBPdecref(bfile->batCacheid, TRUE);
+ BBPdecref(bfile->batCacheid, FALSE);
if(bsegid)
- BBPdecref(bsegid->batCacheid, TRUE);
+ BBPdecref(bsegid->batCacheid, FALSE);
if(btime)
- BBPdecref(btime->batCacheid, TRUE);
+ BBPdecref(btime->batCacheid, FALSE);
if(bvalue)
- BBPdecref(bvalue->batCacheid, TRUE);
+ BBPdecref(bvalue->batCacheid, FALSE);
throw(MAL,"miniseed.mount", MAL_MALLOC_FAIL);
}
diff --git a/sql/backends/monet5/miniseed/registrar.c
b/sql/backends/monet5/miniseed/registrar.c
--- a/sql/backends/monet5/miniseed/registrar.c
+++ b/sql/backends/monet5/miniseed/registrar.c
@@ -1025,48 +1025,48 @@ str mseed_register(int assigned_file_id,
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[0])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) &assigned_file_id, FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[0],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[0],
FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[1])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) file_path, FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[1],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[1],
FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[2])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
ch[0] = msr->dataquality;
BUNappend(aBAT, (ptr) ch, FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[2],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[2],
FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[3])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) msr->network, FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[3],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[3],
FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[4])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) msr->station, FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[4],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[4],
FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[5])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) msr->location, FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[5],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[5],
FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[6])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) msr->channel, FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[6],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[6],
FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[7])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) &(msr->encoding), FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[7],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[7],
FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[8])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) &(msr->byteorder), FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[8],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[8],
FALSE);
files_done = TRUE;
}
@@ -1074,41 +1074,41 @@ str mseed_register(int assigned_file_id,
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[1].column_bats[0])) == NULL)
throw(MAL, "mseed_register", RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) &assigned_file_id, FALSE);
- BBPdecref(ret_tc->tables_columns[1].column_bats[0], TRUE);
+ BBPdecref(ret_tc->tables_columns[1].column_bats[0], FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[1].column_bats[1])) == NULL)
throw(MAL, "mseed_register", RUNTIME_OBJECT_MISSING);
/* BUNappend(aBAT, (ptr) &(msr->sequence_number), FALSE); */
BUNappend(aBAT, (ptr) &(seq_no_fake), FALSE);
- BBPdecref(ret_tc->tables_columns[1].column_bats[1], TRUE);
+ BBPdecref(ret_tc->tables_columns[1].column_bats[1], FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[1].column_bats[2])) == NULL)
throw(MAL, "mseed_register", RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) &(msr->reclen), FALSE);
- BBPdecref(ret_tc->tables_columns[1].column_bats[2], TRUE);
+ BBPdecref(ret_tc->tables_columns[1].column_bats[2], FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[1].column_bats[3])) == NULL)
throw(MAL, "mseed_register", RUNTIME_OBJECT_MISSING);
st = (lng) msr->starttime / 1000;
MTIMEtimestamp_lng(&start_timestamp, &st);
BUNappend(aBAT, (ptr) &start_timestamp, FALSE);
- BBPdecref(ret_tc->tables_columns[1].column_bats[3], TRUE);
+ BBPdecref(ret_tc->tables_columns[1].column_bats[3], FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[1].column_bats[4])) == NULL)
throw(MAL, "mseed_register", RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) &(msr->samprate), FALSE);
- BBPdecref(ret_tc->tables_columns[1].column_bats[4], TRUE);
+ BBPdecref(ret_tc->tables_columns[1].column_bats[4], FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[1].column_bats[5])) == NULL)
throw(MAL, "mseed_register", RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) &(msr->samplecnt), FALSE);
- BBPdecref(ret_tc->tables_columns[1].column_bats[5], TRUE);
+ BBPdecref(ret_tc->tables_columns[1].column_bats[5], FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[1].column_bats[6])) == NULL)
throw(MAL, "mseed_register", RUNTIME_OBJECT_MISSING);
ch[0] = msr->sampletype;
BUNappend(aBAT, (ptr) ch, FALSE);
- BBPdecref(ret_tc->tables_columns[1].column_bats[6], TRUE);
+ BBPdecref(ret_tc->tables_columns[1].column_bats[6], FALSE);
seq_no_fake++;
}
@@ -1162,48 +1162,48 @@ str mseed_register_and_mount(int assigne
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[0])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) &assigned_file_id, FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[0],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[0],
FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[1])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) file_path, FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[1],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[1],
FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[2])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
ch[0] = msr->dataquality;
BUNappend(aBAT, (ptr) ch, FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[2],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[2],
FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[3])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) msr->network, FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[3],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[3],
FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[4])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) msr->station, FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[4],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[4],
FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[5])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) msr->location, FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[5],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[5],
FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[6])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) msr->channel, FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[6],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[6],
FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[7])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) &(msr->encoding), FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[7],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[7],
FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[8])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) &(msr->byteorder), FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[8],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[8],
FALSE);
files_done = TRUE;
}
@@ -1211,41 +1211,41 @@ str mseed_register_and_mount(int assigne
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[1].column_bats[0])) == NULL)
throw(MAL, "mseed_register", RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) &assigned_file_id, FALSE);
- BBPdecref(ret_tc->tables_columns[1].column_bats[0], TRUE);
+ BBPdecref(ret_tc->tables_columns[1].column_bats[0], FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[1].column_bats[1])) == NULL)
throw(MAL, "mseed_register", RUNTIME_OBJECT_MISSING);
/* BUNappend(aBAT, (ptr) &(msr->sequence_number), FALSE); */
BUNappend(aBAT, (ptr) &(seq_no_fake), FALSE);
- BBPdecref(ret_tc->tables_columns[1].column_bats[1], TRUE);
+ BBPdecref(ret_tc->tables_columns[1].column_bats[1], FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[1].column_bats[2])) == NULL)
throw(MAL, "mseed_register", RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) &(msr->reclen), FALSE);
- BBPdecref(ret_tc->tables_columns[1].column_bats[2], TRUE);
+ BBPdecref(ret_tc->tables_columns[1].column_bats[2], FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[1].column_bats[3])) == NULL)
throw(MAL, "mseed_register", RUNTIME_OBJECT_MISSING);
st = (lng) msr->starttime / 1000;
MTIMEtimestamp_lng(&start_timestamp, &st);
BUNappend(aBAT, (ptr) &start_timestamp, FALSE);
- BBPdecref(ret_tc->tables_columns[1].column_bats[3], TRUE);
+ BBPdecref(ret_tc->tables_columns[1].column_bats[3], FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[1].column_bats[4])) == NULL)
throw(MAL, "mseed_register", RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) &(msr->samprate), FALSE);
- BBPdecref(ret_tc->tables_columns[1].column_bats[4], TRUE);
+ BBPdecref(ret_tc->tables_columns[1].column_bats[4], FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[1].column_bats[5])) == NULL)
throw(MAL, "mseed_register", RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) &(msr->samplecnt), FALSE);
- BBPdecref(ret_tc->tables_columns[1].column_bats[5], TRUE);
+ BBPdecref(ret_tc->tables_columns[1].column_bats[5], FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[1].column_bats[6])) == NULL)
throw(MAL, "mseed_register", RUNTIME_OBJECT_MISSING);
ch[0] = msr->sampletype;
BUNappend(aBAT, (ptr) ch, FALSE);
- BBPdecref(ret_tc->tables_columns[1].column_bats[6], TRUE);
+ BBPdecref(ret_tc->tables_columns[1].column_bats[6], FALSE);
/* mount */
{
@@ -1280,10 +1280,10 @@ str mseed_register_and_mount(int assigne
sampling_time += sample_interval;
}
- BBPdecref(ret_tc->tables_columns[2].column_bats[0],
TRUE);
- BBPdecref(ret_tc->tables_columns[2].column_bats[1],
TRUE);
- BBPdecref(ret_tc->tables_columns[2].column_bats[2],
TRUE);
- BBPdecref(ret_tc->tables_columns[2].column_bats[3],
TRUE);
+ BBPdecref(ret_tc->tables_columns[2].column_bats[0],
FALSE);
+ BBPdecref(ret_tc->tables_columns[2].column_bats[1],
FALSE);
+ BBPdecref(ret_tc->tables_columns[2].column_bats[2],
FALSE);
+ BBPdecref(ret_tc->tables_columns[2].column_bats[3],
FALSE);
}
seq_no_fake++;
@@ -1346,48 +1346,48 @@ str mseed_register_segments_mode(int ass
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[0])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) &assigned_file_id, FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[0],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[0],
FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[1])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) file_path, FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[1],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[1],
FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[2])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
ch[0] = msr->dataquality;
BUNappend(aBAT, (ptr) ch, FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[2],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[2],
FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[3])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) msr->network, FALSE);
- BBPdecref(ret_tc->tables_columns[0].column_bats[3],
TRUE);
+ BBPdecref(ret_tc->tables_columns[0].column_bats[3],
FALSE);
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[4])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
BUNappend(aBAT, (ptr) msr->station, FALSE);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
