Changeset: b2207d55fede for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b2207d55fede
Modified Files:
monetdb5/optimizer/opt_generator.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
Branch: generator
Log Message:
Minor renaming in optimizer
diffs (85 lines):
diff --git a/monetdb5/optimizer/opt_generator.c
b/monetdb5/optimizer/opt_generator.c
--- a/monetdb5/optimizer/opt_generator.c
+++ b/monetdb5/optimizer/opt_generator.c
@@ -64,9 +64,6 @@ OPTgeneratorImplementation(Client cntxt,
{
InstrPtr p,q;
int i,j,k, used= 0, cases, blocked;
- str vaultRef = putName("vault",5);
- str generateRef = putName("generate_series",15);
- str paramRef = putName("parameters",10);
(void) cntxt;
(void) stk;
@@ -74,7 +71,7 @@ OPTgeneratorImplementation(Client cntxt,
for( i=1; i < mb->stop; i++){
p = getInstrPtr(mb,i);
- if ( getModuleId(p) == vaultRef && getFunctionId(p) ==
generateRef){
+ if ( getModuleId(p) == generatorRef && getFunctionId(p) ==
seriesRef){
/* found a target for propagation */
if ( assignedOnce(mb, getArg(p,0)) ){
cases = useCount(mb, getArg(p,0));
@@ -120,7 +117,7 @@ OPTgeneratorImplementation(Client cntxt,
// fix the original, only when all use cases
are replaced by the overloaded function
if(used == cases && blocked == 0){
setModuleId(p, generatorRef);
- setFunctionId(p, paramRef);
+ setFunctionId(p, parametersRef);
typeChecker(cntxt->fdout,
cntxt->nspace, mb, p, TRUE);
} else used = 0;
#ifdef VLT_DEBUG
diff --git a/monetdb5/optimizer/opt_prelude.c b/monetdb5/optimizer/opt_prelude.c
--- a/monetdb5/optimizer/opt_prelude.c
+++ b/monetdb5/optimizer/opt_prelude.c
@@ -175,6 +175,7 @@ str oidRef;
str octopusRef;
str openRef;
str optimizerRef;
+str parametersRef;
str packRef;
str pack2Ref;
str passRef;
@@ -215,6 +216,7 @@ str rsColumnRef;
str schedulerRef;
str selectNotNilRef;
str selectRef;
+str seriesRef;
str semaRef;
str semijoinRef;
str semijoinPathRef;
@@ -438,6 +440,7 @@ void optimizerInit(void)
octopusRef = putName("octopus",7);
optimizerRef = putName("optimizer",9);
openRef = putName("open",4);
+ parametersRef = putName("parameters",10);
packRef = putName("pack",4);
pack2Ref = putName("pack2",5);
passRef = putName("pass",4);
@@ -477,6 +480,7 @@ void optimizerInit(void)
schedulerRef = putName("scheduler",9);
selectNotNilRef = putName("selectNotNil",12);
selectRef = putName("select",6);
+ seriesRef = putName("series",6);
semaRef = putName("sema",4);
semijoinRef = putName("semijoin",8);
semijoinPathRef = putName("semijoinPath",12);
diff --git a/monetdb5/optimizer/opt_prelude.h b/monetdb5/optimizer/opt_prelude.h
--- a/monetdb5/optimizer/opt_prelude.h
+++ b/monetdb5/optimizer/opt_prelude.h
@@ -173,6 +173,7 @@ opt_export str oidRef;
opt_export str octopusRef;
opt_export str openRef;
opt_export str optimizerRef;
+opt_export str parametersRef;
opt_export str packRef;
opt_export str pack2Ref;
opt_export str passRef;
@@ -212,6 +213,7 @@ opt_export str rsColumnRef;
opt_export str schedulerRef;
opt_export str selectNotNilRef;
opt_export str selectRef;
+opt_export str seriesRef;
opt_export str semaRef;
opt_export str semijoinRef;
opt_export str semijoinPathRef;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
