Changeset: 14869954e6e3 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=14869954e6e3
Modified Files:
monetdb5/extras/dvf/dvf.c
monetdb5/extras/dvf/dvf.mal
monetdb5/extras/dvf/opt_dvf.mx
sql/backends/monet5/miniseed/79_registrar.sql
sql/backends/monet5/miniseed/miniseed.c
sql/backends/monet5/miniseed/miniseed.mal
sql/backends/monet5/miniseed/registrar.c
sql/backends/monet5/miniseed/registrar.h
sql/backends/monet5/miniseed/registrar.mal
Branch: DVframework
Log Message:
Unnecessary comments removed.
diffs (truncated from 457 to 300 lines):
diff --git a/monetdb5/extras/dvf/dvf.c b/monetdb5/extras/dvf/dvf.c
--- a/monetdb5/extras/dvf/dvf.c
+++ b/monetdb5/extras/dvf/dvf.c
@@ -6,14 +6,12 @@
#include "../../modules/atoms/mtime.h"
#include "sql.h"
#include "dvf.h"
-//#include "../../optimizer/opt_mergetable.h"
#include "mal_interpreter.h"
#define NUM_RET_MOUNT 4
int get_column_num(str schema_name, str table_name, str column_name);
int get_column_type(str schema_name, str table_name, int column_num);
-// static int OPTmergetableImplementation(Client cntxt, MalBlkPtr mb,
MalStkPtr stk, InstrPtr p);
int get_column_type(str schema_name, str table_name, int column_num)
{
@@ -146,7 +144,6 @@ str plan_modifier(Client cntxt, MalBlkPt
{
startpc = i;
pushInstruction(mb, copyInstruction(old[i]));
-// save_pci = copyInstruction(old[i]);
}
/* check for
* v7 := sql.bind(..., schema_name, data_table_name, ..., ...);
@@ -179,8 +176,6 @@ str plan_modifier(Client cntxt, MalBlkPt
//create mount instruction
q = newInstruction(mb, ASSIGNsymbol);
- //q->argc = NUM_RET_MOUNT + 1;
- //q->retc = NUM_RET_MOUNT;
setModuleId(q, miniseedRef);
setFunctionId(q, mountRef);
for(; a < NUM_RET_MOUNT; a++)
@@ -198,9 +193,6 @@ str plan_modifier(Client cntxt, MalBlkPt
low.value.val.oval += 1;
high.value.val.oval += 1;
- // copy the value of constant string
from stack. Otherwise cannot reach the actual value
-//
VALcopy(&stk->stk[q->argv[NUM_RET_MOUNT]], &getVarConstant(mb, getArg(q,
NUM_RET_MOUNT)));
-
mounts[which_fl] = q;
which_fl++;
// push the new instruction
@@ -217,12 +209,9 @@ str plan_modifier(Client cntxt, MalBlkPt
// new mat.new for the column being binded
r = newInstruction(mb, ASSIGNsymbol);
- //r->argc = num_fl + 1;
- //r->retc = 1;
setModuleId(r, matRef);
setFunctionId(r, newRef);
r = pushReturn(mb, r, newTmpVariable(mb, TYPE_any)); //
push tmp var to pass to markH.
-// r = pushReturn(mb, r, getArg(p, 0));
which_column = get_column_num(*schema_name,
getVarConstant(mb, getArg(p, 3)).val.sval,
getVarConstant(mb,
getArg(p, 4)).val.sval);
if(which_column < 0)
@@ -287,49 +276,10 @@ str plan_modifier(Client cntxt, MalBlkPt
*
*optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();
optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.groups();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.history();optimizer.multiplex();optimizer.accumulators();optimizer.garbageCollector();
*/
-// o = newFcnCall(mb, "optimizer", "inline");
-// typeChecker(cntxt->fdout, cntxt->nspace, mb, o, FALSE);
-// o = newFcnCall(mb, "optimizer", "remap");
-// typeChecker(cntxt->fdout, cntxt->nspace, mb, o, FALSE);
-// o = newFcnCall(mb, "optimizer", "evaluate");
-// typeChecker(cntxt->fdout, cntxt->nspace, mb, o, FALSE);
-// o = newFcnCall(mb, "optimizer", "costModel");
-// typeChecker(cntxt->fdout, cntxt->nspace, mb, o, FALSE);
-// o = newFcnCall(mb, "optimizer", "coercions");
-// typeChecker(cntxt->fdout, cntxt->nspace, mb, o, FALSE);
-// o = newFcnCall(mb, "optimizer", "emptySet");
-// typeChecker(cntxt->fdout, cntxt->nspace, mb, o, FALSE);
-// o = newFcnCall(mb, "optimizer", "aliases");
-// typeChecker(cntxt->fdout, cntxt->nspace, mb, o, FALSE);
o = newFcnCall(mb, "optimizer", "mergetable");
typeChecker(cntxt->fdout, cntxt->nspace, mb, o, FALSE);
-// o = newFcnCall(mb, "optimizer", "deadcode");
-// typeChecker(cntxt->fdout, cntxt->nspace, mb, o, FALSE);
-// o = newFcnCall(mb, "optimizer", "commonTerms");
-// typeChecker(cntxt->fdout, cntxt->nspace, mb, o, FALSE);
-// o = newFcnCall(mb, "optimizer", "groups");
-// typeChecker(cntxt->fdout, cntxt->nspace, mb, o, FALSE);
-// o = newFcnCall(mb, "optimizer", "joinPath");
-// typeChecker(cntxt->fdout, cntxt->nspace, mb, o, FALSE);
-// o = newFcnCall(mb, "optimizer", "reorder");
-// typeChecker(cntxt->fdout, cntxt->nspace, mb, o, FALSE);
-// o = newFcnCall(mb, "optimizer", "deadcode");
-// typeChecker(cntxt->fdout, cntxt->nspace, mb, o, FALSE);
-// o = newFcnCall(mb, "optimizer", "reduce");
-// typeChecker(cntxt->fdout, cntxt->nspace, mb, o, FALSE);
-// o = newFcnCall(mb, "optimizer", "history");
-// typeChecker(cntxt->fdout, cntxt->nspace, mb, o, FALSE);
-// o = newFcnCall(mb, "optimizer", "multiplex");
-// typeChecker(cntxt->fdout, cntxt->nspace, mb, o, FALSE);
-// o = newFcnCall(mb, "optimizer", "accumulators");
-// typeChecker(cntxt->fdout, cntxt->nspace, mb, o, FALSE);
-// o = newFcnCall(mb, "optimizer", "garbageCollector");
-// typeChecker(cntxt->fdout, cntxt->nspace, mb, o, FALSE);
+
optimizeMALBlock(cntxt, mb);
- //o = o;
-
-// chkProgram(cntxt->fdout, cntxt->nspace, mb);
-// printFunction(cntxt->fdout,mb, 0, LIST_MAL_EXPLAIN);
/* New variables might have been created by the optimizers, so their
values has to be copied into the stack. However, there might not be enough
space in stack for them. We cannot reallocate the stack, but we may create our
own enlarged stack, then run the rest of the plan with our own stack. */
@@ -379,11 +329,6 @@ str plan_modifier(Client cntxt, MalBlkPt
// adjust variable lifetimes
malGarbageCollector(mb);
- // checks
- // chkTypes(cntxt->fdout, cntxt->nspace, mb, FALSE);
- // chkFlow(cntxt->fdout, mb);
- // chkDeclarations(cntxt->fdout, mb);
-
// chkProgram(cntxt->fdout, cntxt->nspace, mb);
// printFunction(cntxt->fdout,mb, 0, LIST_MAL_EXPLAIN);
@@ -391,16 +336,11 @@ str plan_modifier(Client cntxt, MalBlkPt
// run rest of the plan
msg = runMALsequence(cntxt, mb, startpc+1, mb->stop, stk_new, stk_new,
mb->stmt[startpc]);
-// msg = runMAL(cntxt, mb, startpc+1, mb, stk, save_pci);
-
if(msg != MAL_SUCCEED)
{
throw(MAL, "dvf.plan_modifier", "From the recursive call: %s",
msg);
}
- // restore the commented out old plan
-// mb->stmt = old;
-
// chkProgram(cntxt->fdout, cntxt->nspace, copy_old);
// printFunction(cntxt->fdout, copy_old, 0, LIST_MAL_EXPLAIN);
diff --git a/monetdb5/extras/dvf/dvf.mal b/monetdb5/extras/dvf/dvf.mal
--- a/monetdb5/extras/dvf/dvf.mal
+++ b/monetdb5/extras/dvf/dvf.mal
@@ -1,9 +1,5 @@
module dvf;
-#pattern plan_modifier(schema_name:str, file_locations:bat[:oid,:any]):void
-#address plan_modifier
-#comment "Modify the rest of the plan in the execution time according to the
files to be mounted.";
-
pattern plan_modifier{unsafe}(schema_name:str,
file_locations:bat[:oid,:str]):void
address plan_modifier
comment "Modify the rest of the plan in the execution time according to the
files to be mounted.";
\ No newline at end of file
diff --git a/monetdb5/extras/dvf/opt_dvf.mx b/monetdb5/extras/dvf/opt_dvf.mx
--- a/monetdb5/extras/dvf/opt_dvf.mx
+++ b/monetdb5/extras/dvf/opt_dvf.mx
@@ -229,7 +229,6 @@ OPTdvfImplementation(Client cntxt, MalBl
strcmp(getVarConstant(mb, getArg(p, 2)).val.sval,
getVarConstant(mb, getArg(old[i1], 2)).val.sval) == 0 &&
strstr(getVarConstant(mb, getArg(p, 3)).val.sval,
data_table_identifier) != NULL)
{
- //str schema_name = GDKstrdup(getVarConstant(mb,
getArg(p, 2)).val.sval);
switch(state)
{
@@ -277,7 +276,6 @@ OPTdvfImplementation(Client cntxt, MalBl
setFunctionId(q, planmodifierRef);
q = pushReturn(mb, q,
newTmpVariable(mb, TYPE_void));
getArg(q, 1) = getArg(p, 2);
- //q = pushArgument(mb, q,
getArg(old[i2], 0));
getArg(q, 2) = getArg(t, 0);
// insert the new instruction in pc i2+1
diff --git a/sql/backends/monet5/miniseed/79_registrar.sql
b/sql/backends/monet5/miniseed/79_registrar.sql
--- a/sql/backends/monet5/miniseed/79_registrar.sql
+++ b/sql/backends/monet5/miniseed/79_registrar.sql
@@ -17,41 +17,9 @@ Copyright August 2008-2012 MonetDB B.V.
All Rights Reserved.
*/
--- Register a repository
--- CREATE FUNCTION get_tables_of_schema(schema_name string)
--- RETURNS table
--- BEGIN
--- RETURN SELECT t.id, t.name FROM _tables AS t, schemas AS s WHERE s.name
= schema_name AND s.id = t.schema_id;
--- END;
---
---
--- CREATE FUNCTION get_columns_of_table(table_id integer)
--- RETURNS table
--- BEGIN
--- RETURN SELECT c.name, c.type, c.number FROM _columns AS c WHERE
c.table_id = table_id;
--- END;
-
-
CREATE PROCEDURE register_repo(repo string, mode int)
external name registrar.register_repo;
--- CREATE FUNCTION register_read(repo string)
--- RETURNS bigint external name registrar.register_read;
---
--- CREATE FUNCTION mseed_register_fil(ticket bigint)
--- RETURNS table(file_location string, dataquality char, network string,
station string, location string, channel string, encoding tinyint, byte_order
boolean) external name registrar.mseed_register_fil;
---
--- CREATE FUNCTION mseed_register_cat(ticket bigint)
--- RETURNS table(file_location string, seq_no integer, record_length integer,
start_time timestamp, frequency double, sample_count bigint, sample_type char)
external name registrar.mseed_register_cat;
---
--- CREATE PROCEDURE mseed_register_repo(repo string)
--- BEGIN
--- DECLARE ticket BIGINT;
--- SET ticket = register_read(repo);
--- INSERT INTO mseed.files SELECT * FROM mseed_register_fil(ticket);
--- INSERT INTO mseed.catalog SELECT * FROM mseed_register_cat(ticket);
--- register_cleanup(ticket);
--- END;
@@ -60,4 +28,3 @@ external name registrar.register_repo;
-
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,10 +8,6 @@ str MiniseedMount(Client cntxt, MalBlkPt
{
bat** ret;
-// int *ret0 = (int*) getArgReference(stk,pci,0); //return value 1: BAT
containing file_locations.
-// int *ret1 = (int*) getArgReference(stk,pci,1); //return value 2: BAT
containing seq_nos.
-// int *ret2 = (int*) getArgReference(stk,pci,2); //return value 3: BAT
containing timestamps.
-// int *ret3 = (int*) getArgReference(stk,pci,3); //return value 4: BAT
containing integer data.
str *targetfile = (str*) getArgReference(stk,pci,4); //arg 1: string
containing the input file path.
BAT *btime, *bdata, *bfile, *bseqno; // BATs to return, representing
columns of a table.
@@ -23,7 +19,6 @@ str MiniseedMount(Client cntxt, MalBlkPt
int verbose = 1;
int r;
-// printf("num_rets: %d\n", pci->retc);
ret = (bat**) GDKmalloc(pci->retc*sizeof(bat*));
if(ret == NULL)
{
@@ -84,16 +79,9 @@ str MiniseedMount(Client cntxt, MalBlkPt
long num_samples = msr->numsamples;
int *data_samples = msr->datasamples;
- //long *sample_timestamps =
(long*)malloc(num_samples*sizeof(long));
-
- //sample_timestamps[0] = start_time;
-
int i = 0;
for(;i<num_samples;i++)
{
-// char* space = (char*) malloc(27*sizeof(char));
-// ms_hptime2isotimestr(sampling_time, space, 1);
-
timestamp sampling_timestamp;
lng st = (lng) sampling_time / 1000;
MTIMEtimestamp_lng(&sampling_timestamp, &st);
@@ -131,11 +119,6 @@ str MiniseedMount(Client cntxt, MalBlkPt
varSetProp(mb, getArg(pci, 3), PropertyIndex("hlb"), op_gte, (ptr)
&low.value);
varSetProp(mb, getArg(pci, 3), PropertyIndex("hub"), op_lt, (ptr)
&high.value);
-// BBPkeepref(*ret0 = bfile->batCacheid); //return BAT.
-// BBPkeepref(*ret1 = bseqno->batCacheid); //return BAT.
-// BBPkeepref(*ret2 = btime->batCacheid); //return BAT.
-// BBPkeepref(*ret3 = bdata->batCacheid); //return BAT.
-
BBPkeepref(*ret[0] = bfile->batCacheid); //return BAT.
BBPkeepref(*ret[1] = bseqno->batCacheid); //return BAT.
BBPkeepref(*ret[2] = btime->batCacheid); //return BAT.
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,9 +1,5 @@
module miniseed;
-#pattern
mount{unsafe}(entry:str)(:bat[:oid,:str],:bat[:oid,:int],:bat[:oid,:timestamp],:bat[:oid,:int])
-#address MiniseedMount
-#comment "Mount the content of a mseed file into BATs in table form";
-
pattern mount{unsafe}(entry:str):bat[:oid,:any]...
address MiniseedMount
comment "Mount the content of a mseed file into BATs in table form";
\ No newline at end of file
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
@@ -4,7 +4,6 @@
#include "monetdb_config.h"
#include "registrar.h"
-//#include "vault.h"
#include "mtime.h"
#include "sql_mvc.h"
@@ -570,7 +569,6 @@ str mseed_register(str file_path, temp_c
if ((aBAT =
BATdescriptor(ret_tc->tables_columns[0].column_bats[1])) == NULL)
throw(MAL, "mseed_register",
RUNTIME_OBJECT_MISSING);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
