Changeset: 56e674e36eb8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=56e674e36eb8
Modified Files:
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_recycle.c
monetdb5/modules/atoms/mtime.mal
monetdb5/modules/kernel/Makefile.ag
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/cbp.c
monetdb5/modules/mal/cbp.mal
monetdb5/modules/mal/mal_init.mal
monetdb5/modules/mal/mkey.c
monetdb5/optimizer/opt_commonTerms.c
monetdb5/optimizer/opt_compression.c
monetdb5/optimizer/opt_costModel.c
monetdb5/optimizer/opt_crackers.c
monetdb5/optimizer/opt_datacell.c
monetdb5/optimizer/opt_emptySet.c
monetdb5/optimizer/opt_garbagecollector.c
monetdb5/optimizer/opt_joinselect.c
monetdb5/optimizer/opt_mapreduce.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_multiplex.c
monetdb5/optimizer/opt_octopus.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_pushranges.c
monetdb5/optimizer/opt_qep.c
monetdb5/optimizer/opt_recycler.c
monetdb5/optimizer/opt_remap.c
monetdb5/optimizer/opt_remoteQueries.c
monetdb5/optimizer/opt_selcrack.c
monetdb5/optimizer/opt_singleton.c
monetdb5/optimizer/opt_strengthReduction.c
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/opt_tarantula.c
Branch: headless
Log Message:
A whole bunch of minor changes.
diffs (truncated from 1584 to 300 lines):
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -1175,7 +1175,7 @@
putName(cntxt->nspace->name,
strlen(cntxt->nspace->name)));
if(isModuleDefined(cntxt->nspace,getModuleId(curInstr)) == FALSE)
- return (MalBlkPtr) parseError(cntxt, "<module> not defined\n");
+ parseError(cntxt, "<module> not defined\n");
/* get calling parameters */
ch= currChar(cntxt);
diff --git a/monetdb5/mal/mal_recycle.c b/monetdb5/mal/mal_recycle.c
--- a/monetdb5/mal/mal_recycle.c
+++ b/monetdb5/mal/mal_recycle.c
@@ -784,18 +784,18 @@
bit
isBindInstr(InstrPtr p)
{
- static str sqlRef = 0, bindRef = 0, binddbatRef = 0, bindidxRef = 0;
+ static str sqlRef = 0, bindRef = 0, binddcolRef = 0, bindidxRef = 0;
if (sqlRef == 0) {
sqlRef = putName("sql",3);
bindRef = putName("bind",4);
- binddbatRef = putName("bind_dbat",9);
+ binddcolRef = putName("bind_dbat",9);
bindidxRef = putName("bind_idxbat",11);
}
if ( getModuleId(p) != sqlRef ) return 0;
return ( bindRef == getFunctionId(p) ||
- binddbatRef == getFunctionId(p) ||
+ binddcolRef == getFunctionId(p) ||
bindidxRef == getFunctionId(p));
}
@@ -2514,7 +2514,7 @@
int *b;
ValRecord *v;
InstrPtr q;
- static str sqlRef = 0, bindRef = 0, bind_idxRef = 0, bind_dbatRef = 0;
+ static str sqlRef = 0, bindRef = 0, bind_idxRef = 0, bind_dcolRef = 0;
int bid;
COL *bref = NULL;
lng t0 = GDKusec();
@@ -2525,8 +2525,8 @@
bindRef = putName("bind",4);
if (bind_idxRef == 0)
bind_idxRef = putName("bind_idxbat",11);
- if (bind_dbatRef == 0)
- bind_dbatRef = putName("bind_dbat",9);
+ if (bind_dcolRef == 0)
+ bind_dcolRef = putName("bind_dbat",9);
#ifdef _DEBUG_RESET_
mnstr_printf(cntxt->fdout,"RECYCLE reset\n");
@@ -2566,7 +2566,7 @@
getFunctionId(q) == bind_idxRef ) &&
( getVarConstant(recycleBlk,
getArg(q,5))->val.ival <=
getVarConstant(mb,
getArg(p,1))->val.ival )) ||
- ( getFunctionId(q) == bind_dbatRef ) ){
+ ( getFunctionId(q) == bind_dcolRef ) ){
for (j=p->retc+1; j<p->argc; j++)
if( VALcmp(
&stk->stk[getArg(p,j)], getVarValue(recycleBlk,getArg(q,j))))
break;
diff --git a/monetdb5/modules/atoms/mtime.mal b/monetdb5/modules/atoms/mtime.mal
--- a/monetdb5/modules/atoms/mtime.mal
+++ b/monetdb5/modules/atoms/mtime.mal
@@ -116,7 +116,6 @@
address MTIMEdaytime_isnil
comment "Nil test for daytime value";
-module mtime;
command calc.==(v:daytime,w:daytime):bit
address MTIMEdaytime_EQ
comment "Equality of two daytimes";
@@ -194,7 +193,6 @@
address MTIMEtimestamp_isnil
comment "Nil test for timestamp value";
-module mtime;
command calc.==(v:timestamp,w:timestamp):bit
address MTIMEtimestamp_EQ
comment "Equality of two timestamps";
@@ -259,8 +257,6 @@
comment "Introduce a synomym timezone rule.";
-module batmtime;
-module mtime;
command date_sub_sec_interval(t:date,s:int):date
address MTIMEdate_sub_sec_interval_wrap
comment "Subtract seconds from a date";
@@ -378,50 +374,34 @@
address MTIMEdate_extract_year
comment "extracts year from date (nonzero
value between -5867411 and +5867411).";
-command batmtime.year(d:bat[:any_1,:date]):bat[:any_1,:int]
-address MTIMEdate_extract_year_bulk;
command month(d:date) :int
address MTIMEdate_extract_month
comment "extracts month from date";
-command batmtime.month(d:bat[:any_1,:date]):bat[:any_1,:int]
-address MTIMEdate_extract_month_bulk;
command day(d:date) :int
address MTIMEdate_extract_day
comment "extracts day from date ";
-command batmtime.day(d:bat[:any_1,:date]):bat[:any_1,:int]
-address MTIMEdate_extract_day_bulk;
command hours(h:daytime) :int
address MTIMEdaytime_extract_hours
comment "extracts hour from daytime";
-command batmtime.hours(d:bat[:any_1,:daytime]):bat[:any_1,:int]
-address MTIMEdaytime_extract_hours_bulk;
command minutes(d:daytime) :int
address MTIMEdaytime_extract_minutes
comment "extracts minutes from daytime";
-command minutes(d:bat[:any_1,:daytime]):bat[:any_1,:int]
-address MTIMEdaytime_extract_minutes_bulk;
command seconds(d:daytime) :int
address MTIMEdaytime_extract_seconds
comment "extracts seconds from daytime";
-command batmtime.seconds(d:bat[:any_1,:daytime]):bat[:any_1,:int]
-address MTIMEdaytime_extract_seconds_bulk;
command sql_seconds(d:daytime) :int
address MTIMEdaytime_extract_sql_seconds
comment "extracts seconds (with fractional milliseconds) from daytime";
-command batmtime.sql_seconds(d:bat[:any_1,:daytime]):bat[:any_1,:int]
-address MTIMEdaytime_extract_sql_seconds_bulk;
command milliseconds(d:daytime) :int
address MTIMEdaytime_extract_milliseconds
comment "extracts milliseconds from daytime";
-command batmtime.milliseconds(d:bat[:any_1,:daytime]):bat[:any_1,:int]
-address MTIMEdaytime_extract_milliseconds_bulk;
command daytime(t:timestamp) :daytime
address MTIMEtimestamp_extract_daytime_default
diff --git a/monetdb5/modules/kernel/Makefile.ag
b/monetdb5/modules/kernel/Makefile.ag
--- a/monetdb5/modules/kernel/Makefile.ag
+++ b/monetdb5/modules/kernel/Makefile.ag
@@ -38,8 +38,7 @@
# aggr_bge_prod.mx \
# aggr_bge_sum.mx \
# aggr.mx \
- alarm.h.mx \
- alarm.mal.mx \
+ alarm.c\
# algebra.mx \
# array.mx \
column.h.mx \
@@ -76,7 +75,7 @@
DIR = libdir/monetdb5
SOURCES = calc.mal.mx \
aggr.mx \
- alarm.mal.mx \
+ alarm.mal \
algebra.mx \
array.mx \
colcolor.mal.mx \
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
@@ -41,7 +41,7 @@
manual.c \
# mat.c \
mdb.c \
- mkey.mx \
+# mkey.c \
pcrelib.c \
# pqueue.mx \
profiler.c \
@@ -62,7 +62,7 @@
DIR = libdir/monetdb5
SOURCES = language.mal mal_init.mal cbp.mal \
profiler.mal attach.mal extensions.mal \
- inspect.mal manual.mal inout.mal pqueue.mx mkey.mx \
+ inspect.mal manual.mal inout.mal pqueue.mx mkey.mal \
clients.mal \
factories.mal groupby.mal mdb.mal pcrelib.mal tablet.mal \
# mat.mal \
diff --git a/monetdb5/modules/mal/cbp.c b/monetdb5/modules/mal/cbp.c
--- a/monetdb5/modules/mal/cbp.c
+++ b/monetdb5/modules/mal/cbp.c
@@ -282,7 +282,7 @@
b = COLnew(TYPE_str, CBPsize);
if (b == 0)
- throw(MAL, "catalog.bbpNames", MAL_MALLOC_FAIL);
+ throw(MAL, "catalog.cbpNames", MAL_MALLOC_FAIL);
CBPlock("CBPNames");
for (i = 1; i < CBPsize; i++)
@@ -326,7 +326,7 @@
b = COLnew(TYPE_lng, CBPsize);
if (b == 0)
- throw(MAL, "catalog.bbpCount", MAL_MALLOC_FAIL);
+ throw(MAL, "catalog.cbpCount", MAL_MALLOC_FAIL);
for (i = 1; i < CBPsize; i++)
if (i != b->cacheid) {
@@ -354,11 +354,11 @@
char cwd[MAXPATHLEN];
if (getcwd(cwd, MAXPATHLEN) == NULL)
- throw(MAL, "catalog.bbpLocation", RUNTIME_DIR_ERROR);
+ throw(MAL, "catalog.cbpLocation", RUNTIME_DIR_ERROR);
b = COLnew(TYPE_str, CBPsize);
if (b == 0)
- throw(MAL, "catalog.bbpLocation", MAL_MALLOC_FAIL);
+ throw(MAL, "catalog.cbpLocation", MAL_MALLOC_FAIL);
CBPlock("CBPLocation");
for (i = 1; i < CBPsize; i++)
@@ -384,7 +384,7 @@
b = COLnew(TYPE_int, CBPsize);
if (b == 0)
- throw(MAL, "catalog.bbpHeat", MAL_MALLOC_FAIL);
+ throw(MAL, "catalog.cbpHeat", MAL_MALLOC_FAIL);
CBPlock("CBPHeat");
for (i = 1; i < CBPsize; i++)
@@ -412,7 +412,7 @@
b = COLnew(TYPE_str, CBPsize);
if (b == 0)
- throw(MAL, "catalog.bbpDirty", MAL_MALLOC_FAIL);
+ throw(MAL, "catalog.cbpDirty", MAL_MALLOC_FAIL);
CBPlock("CBPDirty");
for (i = 1; i < CBPsize; i++)
@@ -437,7 +437,7 @@
b = COLnew(TYPE_str, CBPsize);
if (b == 0)
- throw(MAL, "catalog.bbpStatus", MAL_MALLOC_FAIL);
+ throw(MAL, "catalog.cbpStatus", MAL_MALLOC_FAIL);
CBPlock("CBPStatus");
for (i = 1; i < CBPsize; i++)
@@ -461,7 +461,7 @@
b = COLnew(TYPE_str, CBPsize);
if (b == 0)
- throw(MAL, "catalog.bbpKind", MAL_MALLOC_FAIL);
+ throw(MAL, "catalog.cbpKind", MAL_MALLOC_FAIL);
CBPlock("CBPKind");
for (i = 1; i < CBPsize; i++)
@@ -489,7 +489,7 @@
b = COLnew(TYPE_int, CBPsize);
if (b == 0)
- throw(MAL, "catalog.bbpRefCount", MAL_MALLOC_FAIL);
+ throw(MAL, "catalog.cbpRefCount", MAL_MALLOC_FAIL);
CBPlock("CBPRefCount");
for (i = 1; i < CBPsize; i++)
@@ -512,7 +512,7 @@
b = COLnew(TYPE_int, CBPsize);
if (b == 0)
- throw(MAL, "catalog.bbpLRefCount", MAL_MALLOC_FAIL);
+ throw(MAL, "catalog.cbpLRefCount", MAL_MALLOC_FAIL);
CBPlock("CBPLRefCount");
for (i = 1; i < CBPsize; i++)
diff --git a/monetdb5/modules/mal/cbp.mal b/monetdb5/modules/mal/cbp.mal
--- a/monetdb5/modules/mal/cbp.mal
+++ b/monetdb5/modules/mal/cbp.mal
@@ -15,60 +15,60 @@
# Copyright August 2008-2011 MonetDB B.V.
# All Rights Reserved.
-module bbp;
+module cbp;
command compress(b:col[:any_1],fnme:str):col[:any_1]
-address CMDbbpcompress
+address CMDcbpcompress
comment "Generate a compressed image of the column on a specific file";
command decompress(b:col[:any_1],fnme:str):col[:any_1]
-address CMDbbpdecompress
+address CMDcbpdecompress
comment "Obtain a temporary decompressed image of a column from a specific
file";
command truncate(b:col[:any_1],fnme:str):col[:any_1]
-address CMDbbptruncate
+address CMDcbptruncate
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
