Changeset: ec3f58868c39 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec3f58868c39
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
monetdb5/modules/mal/mal_init.mal
monetdb5/optimizer/opt_pipes.c
Branch: default
Log Message:
Finalize oltp optimizer merge
The optimizer is disabled until the front-end issues
regarding autocommit have been dealt with.
diffs (83 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -8119,6 +8119,14 @@ Ready.
[ "netcdf", "importvar", "command netcdf.importvar(filename:str,
varid:int):str ", "NCDFimportVarStmt;", "Import variable: compose
create array string" ]
[ "netcdf", "importvariable", "pattern
netcdf.importvariable(fileid:int, varname:str):void ", "NCDFimportVariable;",
"Import variable: create array and load data from variable varname of file
fileid" ]
[ "netcdf", "test", "command netcdf.test(filename:str):int ",
"NCDFtest;", "Returns number of variables in a given NetCDF dataset (file)"
]
+[ "oltp", "disable", "pattern oltp.disable():void ", "OLTPdisable;",
"Disable the OLTP delay monitor" ]
+[ "oltp", "enable", "pattern oltp.enable():void ", "OLTPenable;",
"Enable the OLTP delay monitor" ]
+[ "oltp", "init", "pattern oltp.init():void ", "OLTPinit;",
"Initialize the lock table" ]
+[ "oltp", "isenabled", "command oltp.isenabled():int ",
"OLTPis_enabled;", "Query the OLTP state" ]
+[ "oltp", "lock", "pattern oltp.lock(lck:int...):void ", "OLTPlock;",
"Wait for all write locks needed" ]
+[ "oltp", "release", "pattern oltp.release(lck:int...):void ",
"OLTPrelease;", "Release for all write locks needed" ]
+[ "oltp", "reset", "pattern oltp.reset():void ", "OLTPreset;",
"Reset the OLTP lock table" ]
+[ "oltp", "table", "pattern oltp.table() (start:bat[:timestamp],
usr:bat[:str], unit:bat[:int], cnt:bat[:int]) ", "OLTPtable;", "Show status
of lock table" ]
[ "optimizer", "aliases", "pattern optimizer.aliases():str ",
"OPTwrapper;", "" ]
[ "optimizer", "aliases", "pattern optimizer.aliases(mod:str,
fcn:str):str ", "OPTwrapper;", "Alias removal optimizer" ]
[ "optimizer", "candidates", "pattern optimizer.candidates():str ",
"OPTwrapper;", "" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -10481,6 +10481,14 @@ Ready.
[ "netcdf", "importvar", "command netcdf.importvar(filename:str,
varid:int):str ", "NCDFimportVarStmt;", "Import variable: compose
create array string" ]
[ "netcdf", "importvariable", "pattern
netcdf.importvariable(fileid:int, varname:str):void ", "NCDFimportVariable;",
"Import variable: create array and load data from variable varname of file
fileid" ]
[ "netcdf", "test", "command netcdf.test(filename:str):int ",
"NCDFtest;", "Returns number of variables in a given NetCDF dataset (file)"
]
+[ "oltp", "disable", "pattern oltp.disable():void ", "OLTPdisable;",
"Disable the OLTP delay monitor" ]
+[ "oltp", "enable", "pattern oltp.enable():void ", "OLTPenable;",
"Enable the OLTP delay monitor" ]
+[ "oltp", "init", "pattern oltp.init():void ", "OLTPinit;",
"Initialize the lock table" ]
+[ "oltp", "isenabled", "command oltp.isenabled():int ",
"OLTPis_enabled;", "Query the OLTP state" ]
+[ "oltp", "lock", "pattern oltp.lock(lck:int...):void ", "OLTPlock;",
"Wait for all write locks needed" ]
+[ "oltp", "release", "pattern oltp.release(lck:int...):void ",
"OLTPrelease;", "Release for all write locks needed" ]
+[ "oltp", "reset", "pattern oltp.reset():void ", "OLTPreset;",
"Reset the OLTP lock table" ]
+[ "oltp", "table", "pattern oltp.table() (start:bat[:timestamp],
usr:bat[:str], unit:bat[:int], cnt:bat[:int]) ", "OLTPtable;", "Show status
of lock table" ]
[ "optimizer", "aliases", "pattern optimizer.aliases():str ",
"OPTwrapper;", "" ]
[ "optimizer", "aliases", "pattern optimizer.aliases(mod:str,
fcn:str):str ", "OPTwrapper;", "Alias removal optimizer" ]
[ "optimizer", "candidates", "pattern optimizer.candidates():str ",
"OPTwrapper;", "" ]
diff --git a/monetdb5/modules/mal/mal_init.mal
b/monetdb5/modules/mal/mal_init.mal
--- a/monetdb5/modules/mal/mal_init.mal
+++ b/monetdb5/modules/mal/mal_init.mal
@@ -93,6 +93,7 @@ include tokenizer;
include srvpool;
include mal_mapi;
+include oltp;
# Any extensions (MAL scripts) that should be automatically loaded upon
# startup can be placed in the autoload directory. One typically finds
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
@@ -88,7 +88,7 @@ static struct PIPELINES {
"optimizer.profiler();"
"optimizer.candidates();"
// "optimizer.jit();" awaiting the new batcalc api
-// "optimizer.oltp();"
+// "optimizer.oltp();"awaiting the autocommit front-end changes
"optimizer.garbageCollector();",
"stable", NULL, NULL, 1},
/*
@@ -122,6 +122,7 @@ static struct PIPELINES {
"optimizer.profiler();"
"optimizer.candidates();"
// "optimizer.jit();" awaiting the new batcalc api
+// "optimizer.oltp();"awaiting the autocommit front-end changes
"optimizer.garbageCollector();",
"stable", NULL, NULL, 1},
/* The no_mitosis pipe line is (and should be kept!) identical to the
@@ -160,6 +161,7 @@ static struct PIPELINES {
"optimizer.generator();"
"optimizer.candidates();"
// "optimizer.jit();" awaiting the new batcalc api
+// "optimizer.oltp();"awaiting the autocommit front-end changes
"optimizer.garbageCollector();",
"stable", NULL, NULL, 1},
/* The sequential pipe line is (and should be kept!) identical to the
@@ -197,6 +199,7 @@ static struct PIPELINES {
"optimizer.profiler();"
"optimizer.candidates();"
// "optimizer.jit();" awaiting the new batcalc api
+// "optimizer.oltp();"awaiting the autocommit front-end changes
"optimizer.garbageCollector();",
"stable", NULL, NULL, 1},
/* Experimental pipelines stressing various components under
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
