Changeset: 13fb26962a0f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=13fb26962a0f
Modified Files:
monetdb5/optimizer/opt_pipes.c
sql/backends/monet5/sql_cquery.c
Branch: trails
Log Message:
Revert the optimization pipeline
diffs (79 lines):
diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c
--- a/monetdb5/optimizer/opt_pipes.c
+++ b/monetdb5/optimizer/opt_pipes.c
@@ -67,6 +67,7 @@ static struct PIPELINES {
{"default_pipe",
"optimizer.inline();"
"optimizer.remap();"
+ "optimizer.cquery();"
"optimizer.costModel();"
"optimizer.coercions();"
"optimizer.evaluate();"
@@ -95,7 +96,6 @@ static struct PIPELINES {
// "optimizer.jit();" awaiting the new batcalc api
// "optimizer.oltp();"awaiting the autocommit front-end changes
"optimizer.wlc();"
- "optimizer.cquery();"
"optimizer.garbageCollector();",
"stable", NULL, NULL, 1},
/*
@@ -104,6 +104,7 @@ static struct PIPELINES {
{"volcano_pipe",
"optimizer.inline();"
"optimizer.remap();"
+ "optimizer.cquery();"
"optimizer.costModel();"
"optimizer.coercions();"
"optimizer.evaluate();"
@@ -133,7 +134,6 @@ static struct PIPELINES {
// "optimizer.jit();" awaiting the new batcalc api
// "optimizer.oltp();"awaiting the autocommit front-end changes
"optimizer.wlc();"
- "optimizer.cquery();"
"optimizer.garbageCollector();",
"stable", NULL, NULL, 1},
/* The no_mitosis pipe line is (and should be kept!) identical to the
@@ -149,6 +149,7 @@ static struct PIPELINES {
{"no_mitosis_pipe",
"optimizer.inline();"
"optimizer.remap();"
+ "optimizer.cquery();"
"optimizer.costModel();"
"optimizer.coercions();"
"optimizer.evaluate();"
@@ -176,7 +177,6 @@ static struct PIPELINES {
// "optimizer.jit();" awaiting the new batcalc api
// "optimizer.oltp();"awaiting the autocommit front-end changes
"optimizer.wlc();"
- "optimizer.cquery();"
"optimizer.garbageCollector();",
"stable", NULL, NULL, 1},
/* The sequential pipe line is (and should be kept!) identical to the
@@ -192,6 +192,7 @@ static struct PIPELINES {
{"sequential_pipe",
"optimizer.inline();"
"optimizer.remap();"
+ "optimizer.cquery();"
"optimizer.costModel();"
"optimizer.coercions();"
"optimizer.evaluate();"
@@ -218,7 +219,6 @@ static struct PIPELINES {
// "optimizer.jit();" awaiting the new batcalc api
// "optimizer.oltp();"awaiting the autocommit front-end changes
"optimizer.wlc();"
- "optimizer.cquery();"
"optimizer.garbageCollector();",
"stable", NULL, NULL, 1},
/* Experimental pipelines stressing various components under
diff --git a/sql/backends/monet5/sql_cquery.c b/sql/backends/monet5/sql_cquery.c
--- a/sql/backends/monet5/sql_cquery.c
+++ b/sql/backends/monet5/sql_cquery.c
@@ -54,7 +54,7 @@
#include "mtime.h"
#include "mal_client.h"
-static const str statusname[8] = {"starting", "paused", "running", "pausing",
"error", "stopping", "stopping", "stopping"};
+static const str statusname[8] = {"starting", "running", "running", "paused",
"error", "stopping", "stopping", "stopping"};
static str CQstartScheduler(void);
static int pnstatus = CQINIT;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
