Changeset: 0b739b0024f7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0b739b0024f7
Modified Files:
monetdb5/modules/mal/querylog.c
monetdb5/modules/mal/querylog.h
monetdb5/modules/mal/querylog.mal
monetdb5/optimizer/opt_costModel.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_querylog.c
monetdb5/optimizer/opt_support.c
Branch: default
Log Message:
Remove the insertRef name.
diffs (115 lines):
diff --git a/monetdb5/modules/mal/querylog.c b/monetdb5/modules/mal/querylog.c
--- a/monetdb5/modules/mal/querylog.c
+++ b/monetdb5/modules/mal/querylog.c
@@ -281,7 +281,7 @@ QLOGempty(void *ret)
}
str
-QLOGinsert(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
+QLOGappend(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
oid *ret = getArgReference_oid(stk,pci,0);
str *q = getArgReference_str(stk,pci,1);
diff --git a/monetdb5/modules/mal/querylog.h b/monetdb5/modules/mal/querylog.h
--- a/monetdb5/modules/mal/querylog.h
+++ b/monetdb5/modules/mal/querylog.h
@@ -30,7 +30,7 @@ qlog_export str QLOGdisable(void *ret);
qlog_export int QLOGisset(void);
qlog_export str QLOGissetFcn(int *ret);
qlog_export str QLOGempty(void *ret);
-qlog_export str QLOGinsert(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
+qlog_export str QLOGappend(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
qlog_export str QLOGdefineNaive(void *ret, str *qry, str *opt, int *nr);
qlog_export str QLOGcall(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
diff --git a/monetdb5/modules/mal/querylog.mal
b/monetdb5/modules/mal/querylog.mal
--- a/monetdb5/modules/mal/querylog.mal
+++ b/monetdb5/modules/mal/querylog.mal
@@ -26,8 +26,8 @@ command empty()
address QLOGempty
comment "Clear the query log tables";
-pattern insert(q:str, pipe:str, usr:str, tick:timestamp)
-address QLOGinsert
+pattern append(q:str, pipe:str, usr:str, tick:timestamp)
+address QLOGappend
comment "Add a new query call to the query log";
command define(q:str, pipe:str, size:int)
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
@@ -83,8 +83,7 @@ OPTcostModelImplementation(Client cntxt,
} else if (getModuleId(p) == batstrRef) {
newRows(1,1, c1,0);
} else if (getModuleId(p) == batRef) {
- if (getFunctionId(p) == appendRef ||
- getFunctionId(p) == insertRef ){
+ if (getFunctionId(p) == appendRef ){
/*
* Updates are a little more complicated,
because you have to
* propagate changes in the expected size up
the expression tree.
@@ -113,8 +112,6 @@ OPTcostModelImplementation(Client cntxt,
/* insert scalars */
newRows(1, 1, (c1 <= 1 ? 1 : c1 - 1),
1);
}
- } else if (getFunctionId(p) == insertRef){
- newRows(1,1,( c1 + 1),0); /* faked */
}
} 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
@@ -96,7 +96,6 @@ str hashRef;
str identityRef;
str ifthenelseRef;
str inplaceRef;
-str insertRef;
str intRef;
str ioRef;
str iteratorRef;
@@ -311,7 +310,6 @@ void optimizerInit(void)
identityRef = putName("identity",8);
ifthenelseRef = putName("ifthenelse",10);
inplaceRef = putName("inplace",7);
- insertRef = putName("insert",6);
intRef = putName("int",3);
ioRef = putName("io",2);
iteratorRef = putName("iterator",8);
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
@@ -94,7 +94,6 @@ opt_export str hashRef;
opt_export str identityRef;
opt_export str ifthenelseRef;
opt_export str inplaceRef;
-opt_export str insertRef;
opt_export str intRef;
opt_export str ioRef;
opt_export str iteratorRef;
diff --git a/monetdb5/optimizer/opt_querylog.c
b/monetdb5/optimizer/opt_querylog.c
--- a/monetdb5/optimizer/opt_querylog.c
+++ b/monetdb5/optimizer/opt_querylog.c
@@ -47,7 +47,7 @@ OPTquerylogImplementation(Client cntxt,
pushInstruction(mb, old[0]);
/* run the querylog.define operation */
defineQuery = copyInstruction(defineQuery);
- setFunctionId(defineQuery, insertRef);
+ setFunctionId(defineQuery, appendRef);
getArg(defineQuery,0) = newTmpVariable(mb,TYPE_any);
defineQuery->token = ASSIGNsymbol;
setModuleId(defineQuery,querylogRef);
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
@@ -490,8 +490,7 @@ isProcedure(MalBlkPtr mb, InstrPtr p)
int
isUpdateInstruction(InstrPtr p){
if ( (getModuleId(p) == batRef || getModuleId(p)==sqlRef) &&
- (getFunctionId(p) == insertRef ||
- getFunctionId(p) == inplaceRef ||
+ ( getFunctionId(p) == inplaceRef ||
getFunctionId(p) == appendRef ||
getFunctionId(p) == updateRef ||
getFunctionId(p) == replaceRef ||
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
