Changeset: bb42690366b7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bb42690366b7
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
sql/backends/monet5/sql_gencode.c
Branch: default
Log Message:
merged
diffs (48 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
@@ -112,7 +112,7 @@ OPTcostModelImplementation(Client cntxt,
/* 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_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/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
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
