Changeset: 369a839dad9f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=369a839dad9f
Modified Files:
monetdb5/optimizer/opt_costModel.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_volcano.c
sql/backends/monet5/sql_gencode.c
Branch: default
Log Message:
Undo previous change
diffs (73 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,6 +104,14 @@ 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 ) {
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,6 +68,7 @@ str dataflowRef;
str datacyclotronRef;
str dblRef;
str defineRef;
+str deleteRef;
str depositRef;
str subdiffRef;
str diffRef;
@@ -281,6 +282,7 @@ 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,6 +66,7 @@ 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_volcano.c b/monetdb5/optimizer/opt_volcano.c
--- a/monetdb5/optimizer/opt_volcano.c
+++ b/monetdb5/optimizer/opt_volcano.c
@@ -68,7 +68,8 @@ OPTvolcanoImplementation(Client cntxt, M
getFunctionId(p) == bindidxRef ||
getFunctionId(p)== tidRef ||
getFunctionId(p)== appendRef ||
- getFunctionId(p)== updateRef
+ getFunctionId(p)== updateRef ||
+ getFunctionId(p)== deleteRef
){
setArg(p,p->retc,mvcvar);
}
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -2364,7 +2364,7 @@ static int
if (r < 0)
return -1;
- q = newStmt(mb, mod, "delete");
+ q = newStmt(mb, mod, deleteRef);
q = pushArgument(mb, q, sql->mvc_var);
if (q == NULL)
return -1;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
