Changeset: 1b731e50b6b9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1b731e50b6b9
Modified Files:
monetdb5/optimizer/opt_costModel.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/opt_volcano.c
Branch: default
Log Message:
Remove the unused deleteRef
diffs (87 lines):
diff --git a/monetdb5/optimizer/opt_costModel.c
b/monetdb5/optimizer/opt_costModel.c
--- a/monetdb5/optimizer/opt_costModel.c
+++ b/monetdb5/optimizer/opt_costModel.c
@@ -104,15 +104,7 @@ OPTcostModelImplementation(Client cntxt,
/* insert scalars */
newRows(1,1, (c1 +1),1);
}
- } else if (getFunctionId(p) == deleteRef){
- if( isaBatType(getArgType(mb,p,2)) ){
- /* delete BAT */
- newRows(1, 2, (c2 >= c1 ? 1 : c1 - c2),
1);
- } else {
- /* insert scalars */
- newRows(1, 1, (c1 <= 1 ? 1 : c1 - 1),
1);
- }
- }
+ }
} else if (getModuleId(p)==groupRef) {
if (getFunctionId(p) ==subgroupRef ) {
newRows(1,1,( c1 / 10+1),0);
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
@@ -68,7 +68,6 @@ str dataflowRef;
str datacyclotronRef;
str dblRef;
str defineRef;
-str deleteRef;
str depositRef;
str subdiffRef;
str diffRef;
@@ -282,7 +281,6 @@ void optimizerInit(void)
datacyclotronRef = putName("datacyclotron",13);
dblRef = putName("dbl",3);
defineRef = putName("define",6);
- deleteRef = putName("delete",6);
depositRef = putName("deposit",7);
subdiffRef = putName("subdiff",7);
diffRef = putName("diff",4);
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
@@ -66,7 +66,6 @@ opt_export str dataflowRef;
opt_export str datacyclotronRef;
opt_export str dblRef;
opt_export str defineRef;
-opt_export str deleteRef;
opt_export str depositRef;
opt_export str subdiffRef;
opt_export str diffRef;
diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/optimizer/opt_support.c
--- a/monetdb5/optimizer/opt_support.c
+++ b/monetdb5/optimizer/opt_support.c
@@ -489,12 +489,17 @@ isProcedure(MalBlkPtr mb, InstrPtr p)
int
isUpdateInstruction(InstrPtr p){
- if ( (getModuleId(p) == batRef || getModuleId(p)==sqlRef) &&
+ if ( getModuleId(p) == sqlRef &&
( getFunctionId(p) == inplaceRef ||
getFunctionId(p) == appendRef ||
getFunctionId(p) == updateRef ||
- getFunctionId(p) == replaceRef ||
- getFunctionId(p) == deleteRef ))
+ getFunctionId(p) == replaceRef ))
+ return TRUE;
+ if ( getModuleId(p) == batRef &&
+ ( getFunctionId(p) == inplaceRef ||
+ getFunctionId(p) == appendRef ||
+ getFunctionId(p) == updateRef ||
+ getFunctionId(p) == replaceRef ))
return TRUE;
return FALSE;
}
diff --git a/monetdb5/optimizer/opt_volcano.c b/monetdb5/optimizer/opt_volcano.c
--- a/monetdb5/optimizer/opt_volcano.c
+++ b/monetdb5/optimizer/opt_volcano.c
@@ -68,8 +68,7 @@ OPTvolcanoImplementation(Client cntxt, M
getFunctionId(p) == bindidxRef ||
getFunctionId(p)== tidRef ||
getFunctionId(p)== appendRef ||
- getFunctionId(p)== updateRef ||
- getFunctionId(p)== deleteRef
+ getFunctionId(p)== updateRef
){
setArg(p,p->retc,mvcvar);
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
