Changeset: 79a047aca529 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=79a047aca529
Modified Files:
monetdb5/optimizer/Makefile.ag
sql/backends/monet5/sql.mx
Branch: default
Log Message:
Merged from Mar2011
diffs (107 lines):
diff --git a/monetdb5/mal/mal_atom.mx b/monetdb5/mal/mal_atom.mx
--- a/monetdb5/mal/mal_atom.mx
+++ b/monetdb5/mal/mal_atom.mx
@@ -141,6 +141,7 @@
tpe = getTypeIndex(getModuleId(pci), (int)strlen(getModuleId(pci)),
TYPE_any);
if (tpe < 0 || tpe >= GDKatomcnt)
return 0;
+ assert(pci->fcn != NULL);
switch (name[0]) {
case 'd':
if (idcmp("del", name) == 0 && pci->argc == 1) {
diff --git a/monetdb5/mal/mal_parser.mx b/monetdb5/mal/mal_parser.mx
--- a/monetdb5/mal/mal_parser.mx
+++ b/monetdb5/mal/mal_parser.mx
@@ -1330,6 +1330,8 @@
setModuleScope(curInstr,
findModule(cntxt->nspace,
putName(modnme,strlen(modnme))) );
curInstr->fcn = getAddress(cntxt->srcFile, modnme, nme,TRUE);
+ if (curInstr->fcn == NULL)
+ return (MalBlkPtr) parseError(cntxt, "<address> not
found\n");
curBlk->binding = nme;
if( cntxt->nspace->isAtomModule)
malAtomProperty(curBlk, curInstr);
diff --git a/monetdb5/modules/mal/Makefile.ag b/monetdb5/modules/mal/Makefile.ag
--- a/monetdb5/modules/mal/Makefile.ag
+++ b/monetdb5/modules/mal/Makefile.ag
@@ -56,7 +56,6 @@
profiler.mx \
recycle.mx \
remote.mx \
- replication.mx \
sabaoth.mx \
statistics.mx \
tablet.mx \
@@ -80,7 +79,7 @@
urlbox.mx statistics.mx transaction.mx \
mal_mapi.mx sabaoth.mx remote.mx \
bpm.mx txtsim.mx recycle.mx \
- cluster.mx trader.mx replication.mx pma.mx \
+ cluster.mx trader.mx pma.mx \
tokenizer.mx zorder.mx
}
diff --git a/monetdb5/modules/mal/mal_init.mx b/monetdb5/modules/mal/mal_init.mx
--- a/monetdb5/modules/mal/mal_init.mx
+++ b/monetdb5/modules/mal/mal_init.mx
@@ -149,7 +149,6 @@
include opt_pushranges;
include opt_reduce;
include opt_remap;
-include opt_replication;
include opt_recycler;
include opt_singleton;
include opt_strengthReduction;
@@ -163,7 +162,6 @@
include cluster;
include opt_cluster;
include txtsim;
-include replication;
include tokenizer;
include zorder;
diff --git a/monetdb5/optimizer/Makefile.ag b/monetdb5/optimizer/Makefile.ag
--- a/monetdb5/optimizer/Makefile.ag
+++ b/monetdb5/optimizer/Makefile.ag
@@ -71,7 +71,6 @@
opt_remap.mx \
opt_remoteQueries.mx \
opt_reorder.mx \
- opt_replication.mx \
opt_selcrack.mx \
opt_sidcrack.mx \
opt_singleton.mx \
@@ -97,7 +96,7 @@
opt_evaluate.mx opt_inline.mx opt_pushranges.mx
opt_derivepath.mx \
opt_accessmode.mx opt_joinpath.mx opt_heuristics.mx
opt_remap.mx \
opt_statistics.mx opt_trace.mx opt_recycler.mx opt_dataflow.mx
\
- opt_cluster.mx opt_replication.mx opt_dictionary.mx
opt_mapreduce.mx \
+ opt_cluster.mx opt_dictionary.mx opt_mapreduce.mx \
opt_mitosis.mx opt_octopus.mx opt_tarantula.mx opt_history.mx
opt_selcrack.mx opt_sidcrack.mx
}
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -725,7 +725,6 @@
@:mal_interval(int)@
@:mal_interval(wrd)@
@:mal_interval(lng)@
-@:mal_interval(daytime)@
command calc.rowid(v:any_1, schema:str, table:str) :oid
address sql_rowid
@@ -4799,6 +4798,13 @@
@:c_interval(wrd)@
@:c_interval(lng)@
+@mal
+command calc.second_interval( v:daytime, ek:int, sk:int ) :lng
+address second_interval_daytime
+comment "cast daytime to a second_interval and check for overflow";
+@h
+sql5_export str second_interval_daytime( lng *res, daytime *s, int *ek, int
*sk );
+@c
str
second_interval_daytime( lng *res, daytime *s, int *d, int *sk )
{
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
