Changeset: 4ceab0917be9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4ceab0917be9
Modified Files:
monetdb5/optimizer/opt_aliases.c
monetdb5/optimizer/opt_candidates.c
monetdb5/optimizer/opt_coercion.c
monetdb5/optimizer/opt_commonTerms.c
monetdb5/optimizer/opt_constants.c
monetdb5/optimizer/opt_costModel.c
monetdb5/optimizer/opt_dataflow.c
monetdb5/optimizer/opt_deadcode.c
monetdb5/optimizer/opt_emptybind.c
monetdb5/optimizer/opt_evaluate.c
monetdb5/optimizer/opt_garbageCollector.c
monetdb5/optimizer/opt_generator.c
monetdb5/optimizer/opt_inline.c
monetdb5/optimizer/opt_jit.c
monetdb5/optimizer/opt_json.c
monetdb5/optimizer/opt_macro.c
monetdb5/optimizer/opt_matpack.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_multiplex.c
monetdb5/optimizer/opt_oltp.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_profiler.c
monetdb5/optimizer/opt_projectionpath.c
monetdb5/optimizer/opt_pushselect.c
monetdb5/optimizer/opt_querylog.c
monetdb5/optimizer/opt_reduce.c
monetdb5/optimizer/opt_remap.c
monetdb5/optimizer/opt_remoteQueries.c
monetdb5/optimizer/opt_reorder.c
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/opt_volcano.c
Branch: malparsing
Log Message:
Revert error checking and pipeline compilation
The errors detected during chkProgram are passed using the mb->errors.
Pipeline compilation uses the new compileString()
diffs (truncated from 827 to 300 lines):
diff --git a/monetdb5/optimizer/opt_aliases.c b/monetdb5/optimizer/opt_aliases.c
--- a/monetdb5/optimizer/opt_aliases.c
+++ b/monetdb5/optimizer/opt_aliases.c
@@ -73,9 +73,9 @@ OPTaliasesImplementation(Client cntxt, M
/* Defense line against incorrect plans */
/* Plan is unaffected */
- //msg =chkTypes(cntxt->nspace, mb, FALSE);
- //msg = chkFlow(mb);
- //msg = chkDeclarations(mb);
+ //chkTypes(cntxt->nspace, mb, FALSE);
+ //chkFlow(mb);
+ //chkDeclarations(mb);
//
/* keep all actions taken as a post block comment
* and update statics */
diff --git a/monetdb5/optimizer/opt_candidates.c
b/monetdb5/optimizer/opt_candidates.c
--- a/monetdb5/optimizer/opt_candidates.c
+++ b/monetdb5/optimizer/opt_candidates.c
@@ -76,8 +76,8 @@ OPTcandidatesImplementation(Client cntxt
/* Defense line against incorrect plans */
/* plan remains unaffected */
- //msg =chkTypes(mb, FALSE);
- //msg = chkFlow(mb);
+ //chkTypes(mb, FALSE);
+ //chkFlow(mb);
//msg = chkDeclarations(mb);
/* keep all actions taken as a post block comment */
usec = GDKusec()- usec;
diff --git a/monetdb5/optimizer/opt_coercion.c
b/monetdb5/optimizer/opt_coercion.c
--- a/monetdb5/optimizer/opt_coercion.c
+++ b/monetdb5/optimizer/opt_coercion.c
@@ -192,11 +192,9 @@ OPTcoercionImplementation(Client cntxt,M
/* Defense line against incorrect plans */
if( actions > 0){
- msg = chkTypes(cntxt->nspace, mb, FALSE);
- if( msg == MAL_SUCCEED)
- msg = chkFlow(mb);
- if( msg == MAL_SUCCEED)
- msg = chkDeclarations(mb);
+ chkTypes(cntxt->nspace, mb, FALSE);
+ chkFlow(mb);
+ chkDeclarations(mb);
}
/* keep all actions taken as a post block comment */
usec = GDKusec()- usec;
diff --git a/monetdb5/optimizer/opt_commonTerms.c
b/monetdb5/optimizer/opt_commonTerms.c
--- a/monetdb5/optimizer/opt_commonTerms.c
+++ b/monetdb5/optimizer/opt_commonTerms.c
@@ -178,11 +178,9 @@ OPTcommonTermsImplementation(Client cntx
freeInstruction(old[i]);
/* Defense line against incorrect plans */
if( actions > 0 ){
- msg = chkTypes(cntxt->nspace, mb, FALSE);
- if( msg == MAL_SUCCEED)
- msg = chkFlow(mb);
- if( msg == MAL_SUCCEED)
- msg = chkDeclarations(mb);
+ chkTypes(cntxt->nspace, mb, FALSE);
+ chkFlow(mb);
+ chkDeclarations(mb);
}
/* keep all actions taken as a post block comment */
usec = GDKusec()- usec;
diff --git a/monetdb5/optimizer/opt_constants.c
b/monetdb5/optimizer/opt_constants.c
--- a/monetdb5/optimizer/opt_constants.c
+++ b/monetdb5/optimizer/opt_constants.c
@@ -89,9 +89,9 @@ OPTconstantsImplementation(Client cntxt,
}
/* Defense line against incorrect plans */
/* Plan remains unaffected */
- // msg =chkTypes(cntxt->nspace, mb, FALSE);
- // msg = chkFlow(mb);
- // msg = chkDeclarations(mb);
+ // chkTypes(cntxt->nspace, mb, FALSE);
+ // chkFlow(mb);
+ // chkDeclarations(mb);
/* keep all actions taken as a post block comment */
usec = GDKusec()- usec;
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
@@ -145,9 +145,9 @@ OPTcostModelImplementation(Client cntxt,
}
/* Defense line against incorrect plans */
/* plan remains unaffected */
- //msg = chkTypes(cntxt->nspace, mb, FALSE);
- //msg = chkFlow(mb);
- //msg = chkDeclarations(mb);
+ //chkTypes(cntxt->nspace, mb, FALSE);
+ //chkFlow(mb);
+ //chkDeclarations(mb);
/* keep all actions taken as a post block comment */
usec = GDKusec()- usec;
snprintf(buf,256,"%-20s actions=1 time=" LLFMT " usec","costmodel",usec);
diff --git a/monetdb5/optimizer/opt_dataflow.c
b/monetdb5/optimizer/opt_dataflow.c
--- a/monetdb5/optimizer/opt_dataflow.c
+++ b/monetdb5/optimizer/opt_dataflow.c
@@ -312,11 +312,9 @@ OPTdataflowImplementation(Client cntxt,
freeInstruction(old[i]);
/* Defense line against incorrect plans */
if( actions > 0 ){
- msg = chkTypes(cntxt->nspace, mb, FALSE);
- if( msg == MAL_SUCCEED)
- msg = chkFlow(mb);
- if( msg == MAL_SUCCEED)
- msg = chkDeclarations(mb);
+ chkTypes(cntxt->nspace, mb, FALSE);
+ chkFlow(mb);
+ chkDeclarations(mb);
}
#ifdef DEBUG_OPT_DATAFLOW
fprintf(stderr,"#dataflow output %s\n", mb->errors?"ERROR":"");
diff --git a/monetdb5/optimizer/opt_deadcode.c
b/monetdb5/optimizer/opt_deadcode.c
--- a/monetdb5/optimizer/opt_deadcode.c
+++ b/monetdb5/optimizer/opt_deadcode.c
@@ -107,9 +107,9 @@ OPTdeadcodeImplementation(Client cntxt,
/* Defense line against incorrect plans */
/* we don't create or change existing structures */
if( actions > 0 ){
- //msg =chkTypes(cntxt->nspace, mb, FALSE);
- msg = chkFlow(mb);
- //msg = chkDeclarations(mb);
+ //chkTypes(cntxt->nspace, mb, FALSE);
+ chkFlow(mb);
+ //chkDeclarations(mb);
}
/* keep all actions taken as a post block comment */
usec = GDKusec()- usec;
diff --git a/monetdb5/optimizer/opt_emptybind.c
b/monetdb5/optimizer/opt_emptybind.c
--- a/monetdb5/optimizer/opt_emptybind.c
+++ b/monetdb5/optimizer/opt_emptybind.c
@@ -326,8 +326,7 @@ OPTemptybindImplementation(Client cntxt,
}
#ifdef DEBUG_OPT_EMPTYBIND
- msg = chkTypes(cntxt->fdout, cntxt->nspace,mb,TRUE);
- GDKfree(msg);
+ chkTypes(cntxt->fdout, cntxt->nspace,mb,TRUE);
fprintf(stderr, "#Optimize Query Emptybind done\n");
fprintFunction(stderr, mb, 0, LIST_MAL_DEBUG);
#endif
@@ -339,11 +338,9 @@ OPTemptybindImplementation(Client cntxt,
GDKfree(empty);
GDKfree(updated);
/* Defense line against incorrect plans */
- msg = chkTypes(cntxt->nspace, mb, FALSE);
- if( msg == MAL_SUCCEED)
- msg = chkFlow(mb);
- if( msg == MAL_SUCCEED)
- msg = chkDeclarations(mb);
+ chkTypes(cntxt->nspace, mb, FALSE);
+ chkFlow(mb);
+ chkDeclarations(mb);
/* keep all actions taken as a post block comment */
wrapup:
usec = GDKusec()- usec;
diff --git a/monetdb5/optimizer/opt_evaluate.c
b/monetdb5/optimizer/opt_evaluate.c
--- a/monetdb5/optimizer/opt_evaluate.c
+++ b/monetdb5/optimizer/opt_evaluate.c
@@ -108,10 +108,8 @@ OPTremoveUnusedBlocks(Client cntxt, MalB
for (; j < i; j++)
mb->stmt[j] = NULL;
}
- if (action) {
- msg = chkTypes(cntxt->nspace, mb, TRUE);
- return msg;
- }
+ if (action)
+ chkTypes(cntxt->nspace, mb, TRUE);
return msg;
}
@@ -245,9 +243,9 @@ OPTevaluateImplementation(Client cntxt,
/* Defense line against incorrect plans */
/* Plan is unaffected */
- // msg = chkTypes(cntxt->nspace, mb, FALSE);
- // msg = chkFlow(mb);
- // msg = chkDeclarations(mb);
+ // chkTypes(cntxt->nspace, mb, FALSE);
+ // chkFlow(mb);
+ // chkDeclarations(mb);
/* keep all actions taken as a post block comment */
usec = GDKusec()- usec;
diff --git a/monetdb5/optimizer/opt_garbageCollector.c
b/monetdb5/optimizer/opt_garbageCollector.c
--- a/monetdb5/optimizer/opt_garbageCollector.c
+++ b/monetdb5/optimizer/opt_garbageCollector.c
@@ -138,11 +138,11 @@ OPTgarbageCollectorImplementation(Client
fprintf(stderr,"%10s eolife %3d begin %3d lastupd %3d end
%3d\n",
getVarName(mb,k), mb->var[k]->eolife,
getBeginScope(mb,k), getLastUpdate(mb,k),
getEndScope(mb,k));
- msg = chkFlow(mb);
- if ( msg ){
- fprintf(stderr,"%s\n",msg);
- GDKfree(msg);
- msg = MAL_SUCCEED;
+ chkFlow(mb);
+ if ( mb->errors != MAL_SUCCEED ){
+ fprintf(stderr,"%s\n",mb->errors);
+ GDKfree(mb->errors);
+ mb->errors = MAL_SUCCEED;
}
fprintFunction(stderr,mb, 0, LIST_MAL_ALL);
fprintf(stderr, "End of GCoptimizer\n");
@@ -161,11 +161,9 @@ OPTgarbageCollectorImplementation(Client
setVariableScope(mb);
/* Defense line against incorrect plans */
if( actions+1 > 0){
- msg = chkTypes(cntxt->nspace, mb, FALSE);
- if( msg == MAL_SUCCEED)
- msg = chkFlow(mb);
- if( msg == MAL_SUCCEED)
- msg = chkDeclarations(mb);
+ chkTypes(cntxt->nspace, mb, FALSE);
+ chkFlow(mb);
+ chkDeclarations(mb);
}
/* keep all actions taken as a post block comment */
usec = GDKusec()- usec;
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
@@ -166,9 +166,9 @@ OPTgeneratorImplementation(Client cntxt,
/* Defense line against incorrect plans */
/* all new/modified statements are already checked */
- //msg = chkTypes(cntxt->nspace, mb, FALSE);
- //msg = chkFlow(mb);
- //msg = chkDeclarations(mb);
+ //chkTypes(cntxt->nspace, mb, FALSE);
+ //chkFlow(mb);
+ //chkDeclarations(mb);
/* keep all actions taken as a post block comment */
usec = GDKusec()- usec;
snprintf(buf,256,"%-20s actions=%2d time=" LLFMT "
usec","generator",actions, usec);
diff --git a/monetdb5/optimizer/opt_inline.c b/monetdb5/optimizer/opt_inline.c
--- a/monetdb5/optimizer/opt_inline.c
+++ b/monetdb5/optimizer/opt_inline.c
@@ -94,11 +94,9 @@ OPTinlineImplementation(Client cntxt, Ma
/* Defense line against incorrect plans */
if( actions > 0){
- msg = chkTypes(cntxt->nspace, mb, FALSE);
- if( msg == MAL_SUCCEED)
- msg = chkFlow(mb);
- if( msg == MAL_SUCCEED)
- msg = chkDeclarations(mb);
+ chkTypes(cntxt->nspace, mb, FALSE);
+ chkFlow(mb);
+ chkDeclarations(mb);
}
/* keep all actions taken as a post block comment */
usec = GDKusec()- usec;
diff --git a/monetdb5/optimizer/opt_jit.c b/monetdb5/optimizer/opt_jit.c
--- a/monetdb5/optimizer/opt_jit.c
+++ b/monetdb5/optimizer/opt_jit.c
@@ -76,7 +76,7 @@ OPTjitImplementation(Client cntxt, MalBl
}
OPTDEBUGjit{
- msg = chkTypes(cntxt->nspace,mb,TRUE);
+ chkTypes(cntxt->nspace,mb,TRUE);
GDKfree(msg);
msg = MAL_SUCCEED;
fprintf(stderr, "#Optimize JIT done\n");
@@ -85,11 +85,9 @@ OPTjitImplementation(Client cntxt, MalBl
GDKfree(old);
/* Defense line against incorrect plans */
- msg = chkTypes(cntxt->nspace, mb, FALSE);
- if( msg == MAL_SUCCEED)
- msg = chkFlow(mb);
- if( msg == MAL_SUCCEED)
- msg = chkDeclarations(mb);
+ chkTypes(cntxt->nspace, mb, FALSE);
+ chkFlow(mb);
+ chkDeclarations(mb);
/* keep all actions taken as a post block comment */
usec = GDKusec()- usec;
snprintf(buf,256,"%-20s actions=%2d time=" LLFMT " usec","jit",actions,
usec);
diff --git a/monetdb5/optimizer/opt_json.c b/monetdb5/optimizer/opt_json.c
--- a/monetdb5/optimizer/opt_json.c
+++ b/monetdb5/optimizer/opt_json.c
@@ -73,11 +73,9 @@ OPTjsonImplementation(Client cntxt, MalB
GDKfree(old);
/* Defense line against incorrect plans */
if( actions > 0){
- msg = chkTypes(cntxt->nspace, mb, FALSE);
- if( msg == MAL_SUCCEED)
- msg = chkFlow(mb);
- if( msg == MAL_SUCCEED)
- msg = chkDeclarations(mb);
+ chkTypes(cntxt->nspace, mb, FALSE);
+ chkFlow(mb);
+ chkDeclarations(mb);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
