Changeset: d13103cfa197 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d13103cfa197
Modified Files:
sql/backends/monet5/miniseed/miniseed.c
Branch: DVframework
Log Message:
mount in records mode passes file id.
diffs (31 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
@@ -8,7 +8,8 @@ str MiniseedMount(Client cntxt, MalBlkPt
{
bat** ret;
- str *targetfile = (str*) getArgReference(stk,pci,4); /* arg 1: string
containing the input file path. */
+ int file_id = *(int*) getArgReference(stk,pci,4); /* arg 1: file_id of
the input file. */
+ str *targetfile = (str*) getArgReference(stk,pci,5); /* arg 2: string
containing the input file path. */
BAT *btime, *bdata, *bfile, *bseqno; /* BATs to return, representing
columns of a table. */
lng num_rows = 0;
@@ -35,7 +36,7 @@ str MiniseedMount(Client cntxt, MalBlkPt
cntxt = cntxt; /* to escape 'unused' parameter error. */
mb = mb; /* to escape 'unused' parameter error. */
- bfile = BATnew(TYPE_void, TYPE_str, 0); /* create empty BAT for ret0. */
+ bfile = BATnew(TYPE_void, TYPE_int, 0); /* create empty BAT for ret0. */
if ( bfile == NULL)
throw(MAL,"miniseed.mount",MAL_MALLOC_FAIL);
BATseqbase(bfile, 0);
@@ -84,7 +85,7 @@ str MiniseedMount(Client cntxt, MalBlkPt
MTIMEtimestamp_lng(&sampling_timestamp, &st);
/* For each sample add one row to the table */
- BUNappend(bfile, (ptr) *targetfile, FALSE);
+ BUNappend(bfile, (ptr) &file_id, FALSE);
BUNappend(bseqno, (ptr) &seq_no, FALSE);
BUNappend(btime, (ptr) &sampling_timestamp, FALSE);
BUNappend(bdata, (ptr) (data_samples+i), FALSE);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
