Changeset: 2fdc3a1184c0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2fdc3a1184c0
Modified Files:
        clients/Tests/MAL-signatures.stable.out
        clients/Tests/MAL-signatures.stable.out.int128
        clients/Tests/SQL-dump.stable.out
        clients/Tests/SQL-dump.stable.out.int128
        monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
        sql/test/Tests/oltp.stable.out
Branch: oltp
Log Message:

Approve output


diffs (173 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
@@ -8159,10 +8159,10 @@ Ready.
 [ "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",      "lock", "pattern oltp.lock(lck:str...):void ",  "OLTPlock;",    
"Wait for all write locks needed"       ]
-[ "oltp",      "release",      "pattern oltp.release(lck:str...):void ",       
"OLTPrelease;", "Release for all write locks needed"    ]
+[ "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],lck:bat[:str],cnt:bat[:int],qry:bat[:str]) 
",        "OLTPtable;",   "Show status of lock table"     ]
+[ "oltp",      "table",        "pattern oltp.table() 
(start:bat[:timestamp],usr:bat[:str],unit:bat[:int],cnt:bat[:int],qry:bat[:str])
 ",       "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
@@ -10526,10 +10526,10 @@ Ready.
 [ "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",      "lock", "pattern oltp.lock(lck:str...):void ",  "OLTPlock;",    
"Wait for all write locks needed"       ]
-[ "oltp",      "release",      "pattern oltp.release(lck:str...):void ",       
"OLTPrelease;", "Release for all write locks needed"    ]
+[ "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],lck:bat[:str],cnt:bat[:int],qry:bat[:str]) 
",        "OLTPtable;",   "Show status of lock table"     ]
+[ "oltp",      "table",        "pattern oltp.table() 
(start:bat[:timestamp],usr:bat[:str],unit:bat[:int],cnt:bat[:int],qry:bat[:str])
 ",       "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/SQL-dump.stable.out 
b/clients/Tests/SQL-dump.stable.out
--- a/clients/Tests/SQL-dump.stable.out
+++ b/clients/Tests/SQL-dump.stable.out
@@ -988,7 +988,7 @@ create function newurl(protocol string, 
 create function newurl(protocol string, hostname string, file string) returns 
url external name url."new";
 create procedure sys.oltp_disable() external name oltp.disable;
 create procedure sys.oltp_enable() external name oltp.enable;
-create function sys.oltp_locks() returns table(started timestamp, username 
string, lockid string, cnt integer, query string) external name oltp."table";
+create function sys.oltp_locks() returns table(started timestamp, username 
string, lockid integer, cnt integer, query string) external name oltp."table";
 create procedure sys.oltp_reset() external name oltp.reset;
 create function sys.optimizer_stats () returns table (rewrite string, count 
int) external name sql.dump_opt_stats;
 create function sys.optimizers () returns table (name string, def string, 
status string) external name sql.optimizers;
@@ -2205,7 +2205,7 @@ drop function pcre_replace(string, strin
 [ "sys",       "octet_length", "nbytes",       "str",  0,      1,      false,  
false,  false   ]
 [ "sys",       "oltp_disable", "create procedure sys.oltp_disable() external 
name oltp.disable;",      "oltp", 1,      2,      true,   false,  false   ]
 [ "sys",       "oltp_enable",  "create procedure sys.oltp_enable() external 
name oltp.enable;",        "oltp", 1,      2,      true,   false,  false   ]
-[ "sys",       "oltp_locks",   "create function sys.oltp_locks() returns 
table(started timestamp, username string, lockid string, cnt integer, query 
string) external name oltp.\"table\";",   "oltp", 1,      5,      false,  
false,  false   ]
+[ "sys",       "oltp_locks",   "create function sys.oltp_locks() returns 
table(started timestamp, username string, lockid integer, cnt integer, query 
string) external name oltp.\"table\";",  "oltp", 1,      5,      false,  false, 
 false   ]
 [ "sys",       "oltp_reset",   "create procedure sys.oltp_reset() external 
name oltp.reset;",  "oltp", 1,      2,      true,   false,  false   ]
 [ "sys",       "optimizer_stats",      "create function sys.optimizer_stats () 
returns table (rewrite string, count int) external name sql.dump_opt_stats;",   
"sql",  1,      5,      false,  false,  false   ]
 [ "sys",       "optimizers",   "create function sys.optimizers () returns 
table (name string, def string, status string) external name sql.optimizers;",  
     "sql",  1,      5,      false,  false,  false   ]
@@ -3756,7 +3756,7 @@ drop function pcre_replace(string, strin
 [ "sys",       "octet_length", "arg_1",        "varchar",      0,      0,      
1,      NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL    ]
 [ "sys",       "oltp_disable", NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL    ]
 [ "sys",       "oltp_enable",  NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL    ]
-[ "sys",       "oltp_locks",   "username",     "clob", 0,      0,      0,      
"lockid",       "clob", 0,      0,      0,      "cnt",  "int",  32,     0,      
0,      "query",        "clob", 0,      0,      0,      NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL    ]
+[ "sys",       "oltp_locks",   "username",     "clob", 0,      0,      0,      
"lockid",       "int",  32,     0,      0,      "cnt",  "int",  32,     0,      
0,      "query",        "clob", 0,      0,      0,      NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL    ]
 [ "sys",       "oltp_reset",   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL    ]
 [ "sys",       "optimizer_stats",      "count",        "int",  32,     0,      
0,      NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL    ]
 [ "sys",       "optimizers",   "def",  "clob", 0,      0,      0,      
"status",       "clob", 0,      0,      0,      NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL    ]
diff --git a/clients/Tests/SQL-dump.stable.out.int128 
b/clients/Tests/SQL-dump.stable.out.int128
--- a/clients/Tests/SQL-dump.stable.out.int128
+++ b/clients/Tests/SQL-dump.stable.out.int128
@@ -989,7 +989,7 @@ create function newurl(protocol string, 
 create function newurl(protocol string, hostname string, file string) returns 
url external name url."new";
 create procedure sys.oltp_disable() external name oltp.disable;
 create procedure sys.oltp_enable() external name oltp.enable;
-create function sys.oltp_locks() returns table(started timestamp, username 
string, lockid string, cnt integer, query string) external name oltp."table";
+create function sys.oltp_locks() returns table(started timestamp, username 
string, lockid integer, cnt integer, query string) external name oltp."table";
 create procedure sys.oltp_reset() external name oltp.reset;
 create function sys.optimizer_stats () returns table (rewrite string, count 
int) external name sql.dump_opt_stats;
 create function sys.optimizers () returns table (name string, def string, 
status string) external name sql.optimizers;
@@ -2232,7 +2232,7 @@ drop function pcre_replace(string, strin
 [ "sys",       "octet_length", "nbytes",       "str",  0,      1,      false,  
false,  false   ]
 [ "sys",       "oltp_disable", "create procedure sys.oltp_disable() external 
name oltp.disable;",      "oltp", 1,      2,      true,   false,  false   ]
 [ "sys",       "oltp_enable",  "create procedure sys.oltp_enable() external 
name oltp.enable;",        "oltp", 1,      2,      true,   false,  false   ]
-[ "sys",       "oltp_locks",   "create function sys.oltp_locks() returns 
table(started timestamp, username string, lockid string, cnt integer, query 
string) external name oltp.\"table\";",   "oltp", 1,      5,      false,  
false,  false   ]
+[ "sys",       "oltp_locks",   "create function sys.oltp_locks() returns 
table(started timestamp, username string, lockid integer, cnt integer, query 
string) external name oltp.\"table\";",  "oltp", 1,      5,      false,  false, 
 false   ]
 [ "sys",       "oltp_reset",   "create procedure sys.oltp_reset() external 
name oltp.reset;",  "oltp", 1,      2,      true,   false,  false   ]
 [ "sys",       "optimizer_stats",      "create function sys.optimizer_stats () 
returns table (rewrite string, count int) external name sql.dump_opt_stats;",   
"sql",  1,      5,      false,  false,  false   ]
 [ "sys",       "optimizers",   "create function sys.optimizers () returns 
table (name string, def string, status string) external name sql.optimizers;",  
     "sql",  1,      5,      false,  false,  false   ]
@@ -3964,7 +3964,7 @@ drop function pcre_replace(string, strin
 [ "sys",       "octet_length", "arg_1",        "varchar",      0,      0,      
1,      NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL    ]
 [ "sys",       "oltp_disable", NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL    ]
 [ "sys",       "oltp_enable",  NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL    ]
-[ "sys",       "oltp_locks",   "username",     "clob", 0,      0,      0,      
"lockid",       "clob", 0,      0,      0,      "cnt",  "int",  32,     0,      
0,      "query",        "clob", 0,      0,      0,      NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL    ]
+[ "sys",       "oltp_locks",   "username",     "clob", 0,      0,      0,      
"lockid",       "int",  32,     0,      0,      "cnt",  "int",  32,     0,      
0,      "query",        "clob", 0,      0,      0,      NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL    ]
 [ "sys",       "oltp_reset",   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL    ]
 [ "sys",       "optimizer_stats",      "count",        "int",  32,     0,      
0,      NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL    ]
 [ "sys",       "optimizers",   "def",  "clob", 0,      0,      0,      
"status",       "clob", 0,      0,      0,      NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   NULL,   
NULL    ]
diff --git 
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out 
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -64,7 +64,7 @@ Ready.
 % 126 # length
 function user.s8_1():void;
     X_38:void := querylog.define("explain copy into ttt from 
\\'/tmp/xyz\\';","default_pipe",18);
-    oltp.lock("sys#ttt");
+    oltp.lock(534);
 barrier X_58 := language.dataflow();
     X_0 := sql.mvc();
     (X_21:bat[:int],X_22:bat[:int],X_23:bat[:int]) := 
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0,nil:str);
@@ -78,7 +78,7 @@ catch MALexception:str;
 exit MALexception:str;
 catch SQLexception:str;
 exit SQLexception:str;
-    oltp.release("sys#ttt");
+    oltp.release(534);
 end user.s8_1;
 #inline               actions= 0 time=1 usec 
 #candidates           actions= 1 time=14 usec 
@@ -131,7 +131,7 @@ end user.s8_1;
 % 126 # length
 function user.s24_1():void;
     X_38:void := querylog.define("explain copy into ttt from 
\\'/tmp/xyz\\';","user_1",18);
-    oltp.lock("sys#ttt");
+    oltp.lock(534);
 barrier X_58 := language.dataflow();
     X_0 := sql.mvc();
     (X_21:bat[:int],X_22:bat[:int],X_23:bat[:int]) := 
sql.copy_from(nil,"|","\\n",nil:str,"null","/tmp/xyz",-1,0,0,0,nil:str);
@@ -145,7 +145,7 @@ catch MALexception:str;
 exit MALexception:str;
 catch SQLexception:str;
 exit SQLexception:str;
-    oltp.release("sys#ttt");
+    oltp.release(534);
 end user.s24_1;
 #inline               actions= 0 time=1 usec 
 #candidates           actions= 1 time=14 usec 
diff --git a/sql/test/Tests/oltp.stable.out b/sql/test/Tests/oltp.stable.out
--- a/sql/test/Tests/oltp.stable.out
+++ b/sql/test/Tests/oltp.stable.out
@@ -75,10 +75,10 @@ Ready.
 #select username,lockid,cnt,query from oltp_locks();
 % .L,  .L,     .L,     .L # table_name
 % username,    lockid, cnt,    query # name
-% clob,        clob,   int,    clob # type
-% 12,  0,      1,      0 # length
-[ "sqlcatalog#",       NULL,   1,      NULL    ]
-[ "sys#tmp_oltp",      NULL,   2,      NULL    ]
+% clob,        int,    int,    clob # type
+% 0,   3,      1,      0 # length
+[ NULL,        225,    1,      NULL    ]
+[ NULL,        801,    2,      NULL    ]
 #insert into tmp_oltp values(4);
 [ 1    ]
 #insert into tmp_oltp values(5);
@@ -97,15 +97,15 @@ Ready.
 #select username,lockid,cnt,query from oltp_locks();
 % .L,  .L,     .L,     .L # table_name
 % username,    lockid, cnt,    query # name
-% clob,        clob,   int,    clob # type
-% 12,  0,      1,      0 # length
-[ "sys#tmp_oltp",      NULL,   1,      NULL    ]
-[ "sqlcatalog#",       NULL,   1,      NULL    ]
+% clob,        int,    int,    clob # type
+% 0,   3,      1,      0 # length
+[ NULL,        225,    1,      NULL    ]
+[ NULL,        801,    1,      NULL    ]
 #select username,lockid,cnt,query from oltp_locks();
 % .L,  .L,     .L,     .L # table_name
 % username,    lockid, cnt,    query # name
-% clob,        clob,   int,    clob # type
-% 0,   0,      1,      0 # length
+% clob,        int,    int,    clob # type
+% 0,   1,      1,      0 # length
 
 # 21:18:59 >  
 # 21:18:59 >  "Done."
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to