Changeset: 5350d69b8fbd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5350d69b8fbd
Modified Files:
sql/backends/monet5/miniseed/81_miniseed.sql
sql/backends/monet5/miniseed/miniseed.c
sql/backends/monet5/miniseed/miniseed.mal
Branch: DVframework
Log Message:
mount function passes the file id.
diffs (55 lines):
diff --git a/sql/backends/monet5/miniseed/81_miniseed.sql
b/sql/backends/monet5/miniseed/81_miniseed.sql
--- a/sql/backends/monet5/miniseed/81_miniseed.sql
+++ b/sql/backends/monet5/miniseed/81_miniseed.sql
@@ -18,5 +18,5 @@ All Rights Reserved.
*/
-- Mount an mseed file
-create function mount(file_path string)
-returns table(file_location string, seq_no integer, sample_time timestamp,
sample_value integer) external name miniseed.mount;
\ No newline at end of file
+create function mount(file_id integer, file_path string)
+returns table(file_id integer, seq_no integer, sample_time timestamp,
sample_value integer) external name miniseed.mount;
\ No newline at end of file
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
@@ -116,7 +116,8 @@ str MiniseedMountSegmentMode(Client cntx
{
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, *bvalue, *bfile, *bsegid; /* BATs to return, representing
columns of a table. */
lng num_rows = 0;
@@ -155,7 +156,7 @@ str MiniseedMountSegmentMode(Client cntx
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);
@@ -230,7 +231,7 @@ str MiniseedMountSegmentMode(Client cntx
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(bsegid, (ptr) &segment_id,
FALSE);
BUNappend(btime, (ptr)
&sampling_timestamp, FALSE);
BUNappend(bvalue, (ptr)
(data_samples+i), FALSE);
diff --git a/sql/backends/monet5/miniseed/miniseed.mal
b/sql/backends/monet5/miniseed/miniseed.mal
--- a/sql/backends/monet5/miniseed/miniseed.mal
+++ b/sql/backends/monet5/miniseed/miniseed.mal
@@ -1,5 +1,5 @@
module miniseed;
-pattern mount(entry:str):bat[:oid,:any]...
+pattern mount(file_id:int, file_loc:str):bat[:oid,:any]...
address MiniseedMountSegmentMode
comment "Mount the content of a mseed file into BATs in table form";
\ No newline at end of file
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
