Changeset: 91ed80c2af53 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=91ed80c2af53
Modified Files:
sql/src/backends/monet5/vaults/Tests/vault00.stable.err
sql/src/backends/monet5/vaults/Tests/vault00.stable.out
Branch: default
Log Message:
Merge.
diffs (269 lines):
diff -r 713e92afed0d -r 91ed80c2af53 MonetDB5/src/mal/mal_instruction.mx
--- a/MonetDB5/src/mal/mal_instruction.mx Wed Jul 14 15:07:45 2010 +0200
+++ b/MonetDB5/src/mal/mal_instruction.mx Wed Jul 14 15:33:50 2010 +0200
@@ -1052,8 +1052,8 @@
p->fcn = 0;
p->blk = 0;
p->typechk= TYPE_UNKNOWN;
- p->modname = NULL;
- p->fcnname = NULL;
+ setModuleId(p, NULL);
+ setFunctionId(p, NULL);
}
void
diff -r 713e92afed0d -r 91ed80c2af53 MonetDB5/src/optimizer/opt_constants.mx
--- a/MonetDB5/src/optimizer/opt_constants.mx Wed Jul 14 15:07:45 2010 +0200
+++ b/MonetDB5/src/optimizer/opt_constants.mx Wed Jul 14 15:33:50 2010 +0200
@@ -81,8 +81,7 @@
for( k= n-1; k>=0; k--){
y= cst[k];
if ( x->type == y->type &&
- x->value.vtype == y->value.vtype &&
- ATOMcmp(x->value.vtype,
VALget(&x->value), VALget(&y->value)) == 0){
+ ATOMcmp(x->type, VALget(&x->value),
VALget(&y->value)) == 0){
#ifdef DEBUG_OPT_CONSTANTS
stream_printf(cntxt->fdout,"matching elements %s %d %d ",
getVarName(mb,i), i,k);
ATOMprint(x->value.vtype,VALget(&x->value),cntxt->fdout);
diff -r 713e92afed0d -r 91ed80c2af53
sql/src/backends/monet5/vaults/Tests/vault00.mal
--- a/sql/src/backends/monet5/vaults/Tests/vault00.mal Wed Jul 14 15:07:45
2010 +0200
+++ b/sql/src/backends/monet5/vaults/Tests/vault00.mal Wed Jul 14 15:33:50
2010 +0200
@@ -1,1 +1,3 @@
-s:= vault.getdirectory();
+
+s:= vault.getDirectory();
+io.print(s);
diff -r 713e92afed0d -r 91ed80c2af53
sql/src/backends/monet5/vaults/Tests/vault00.stable.err
--- a/sql/src/backends/monet5/vaults/Tests/vault00.stable.err Wed Jul 14
15:07:45 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-stderr of test 'vault00` in directory 'src/backends/monet5/vaults` itself:
-
-
-# 13:40:11 >
-# 13:40:11 > mserver5 "--config=/ufs/mk/current//Linux/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/mk/current//Linux/lib/MonetDB5:/ufs/mk/current//Linux/lib/MonetDB5/lib:/ufs/mk/current//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/current//Linux/var/MonetDB5/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=36604 --set xrpc_port=46940
--set monet_prompt= --set mal_listing=2 --trace
--dbname=mTests_src_backends_monet5_vaults vault00.mal
-# 13:40:11 >
-
-# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
-# builtin opt gdk_version = 1.39.0
-# builtin opt prefix = /ufs/mk/current//Linux
-# builtin opt exec_prefix = ${prefix}
-# builtin opt gdk_dbname = demo
-# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
-# builtin opt gdk_debug = 0
-# builtin opt gdk_alloc_map = no
-# builtin opt gdk_vmtrim = yes
-# builtin opt monet_admin = adm
-# builtin opt monet_prompt = >
-# builtin opt monet_welcome = yes
-# builtin opt monet_mod_path = ${exec_prefix}/lib/MonetDB
-# builtin opt monet_daemon = no
-# builtin opt host = localhost
-# builtin opt mapi_port = 50000
-# builtin opt mapi_clients = 2
-# builtin opt mapi_open = false
-# builtin opt mapi_autosense = false
-# builtin opt sql_debug = 0
-# builtin opt standoff_ns =
-# builtin opt standoff_start = start
-# builtin opt standoff_end = end
-# config opt prefix = /ufs/mk/current//Linux
-# config opt config = ${prefix}/etc/monetdb5.conf
-# config opt prefix = /ufs/mk/current//Linux
-# config opt exec_prefix = ${prefix}
-# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
-# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
-# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
-# config opt mero_controlport = 50001
-# config opt sql_optimizer = default_pipe
-# config opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
-# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt no_mitosis_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt sequential_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,history,multiplex,garbageCollector
-# config opt nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
-# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector
-# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector
-# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt datacell_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt mapreduce_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mapreduce,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt datacyclotron_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
-# config opt derive_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,derivePath,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt dictionary_pipe =
inline,remap,dictionary,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
-# config opt compression_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,compression,dataflow,history,multiplex,garbageCollector
-# cmdline opt config = /ufs/mk/current//Linux/etc/monetdb5.conf
-# cmdline opt gdk_nr_threads = 0
-# cmdline opt monet_mod_path =
/ufs/mk/current//Linux/lib/MonetDB5:/ufs/mk/current//Linux/lib/MonetDB5/lib:/ufs/mk/current//Linux/lib/MonetDB5/bin
-# cmdline opt gdk_dbfarm = /ufs/mk/current//Linux/var/MonetDB5/dbfarm
-# cmdline opt mapi_open = true
-# cmdline opt xrpc_open = true
-# cmdline opt mapi_port = 36604
-# cmdline opt xrpc_port = 46940
-# cmdline opt monet_prompt =
-# cmdline opt mal_listing = 2
-# cmdline opt gdk_dbname = mTests_src_backends_monet5_vaults
-#warning: please don't forget to set your vault key!
-#(see /ufs/mk/current//Linux/etc/monetdb5.conf)
-
-# 13:40:12 >
-# 13:40:12 > Done.
-# 13:40:12 >
-
diff -r 713e92afed0d -r 91ed80c2af53
sql/src/backends/monet5/vaults/Tests/vault00.stable.out
--- a/sql/src/backends/monet5/vaults/Tests/vault00.stable.out Wed Jul 14
15:07:45 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-stdout of test 'vault00` in directory 'src/backends/monet5/vaults` itself:
-
-
-# 13:40:11 >
-# 13:40:11 > mserver5 "--config=/ufs/mk/current//Linux/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/ufs/mk/current//Linux/lib/MonetDB5:/ufs/mk/current//Linux/lib/MonetDB5/lib:/ufs/mk/current//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/current//Linux/var/MonetDB5/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=36604 --set xrpc_port=46940
--set monet_prompt= --set mal_listing=2 --trace
--dbname=mTests_src_backends_monet5_vaults vault00.mal
-# 13:40:11 >
-
-# MonetDB server v5.21.0, based on kernel v1.39.0
-# Serving database 'mTests_src_backends_monet5_vaults', using 4 threads
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Found 7.751 GiB available main-memory.
-# Copyright (c) 1993-July 2008 CWI.
-# Copyright (c) August 2008-2010 MonetDB B.V., all rights reserved
-# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:36604/
-# MonetDB/SQL module v2.39.0 loaded
-# MonetDB/GIS module v0.19.0 loaded
-function user.main():void;
- s := vault.getdirectory();
- io.print(s);
-end main;
-[
"/ufs/mk/current//Linux/var/MonetDB5/dbfarm/mTests_src_backends_monet5_vaults/vault"
]
-
-# 13:40:12 >
-# 13:40:12 > Done.
-# 13:40:12 >
-
diff -r 713e92afed0d -r 91ed80c2af53
sql/src/test/Dependencies/Tests/Dependencies.stable.err
--- a/sql/src/test/Dependencies/Tests/Dependencies.stable.err Wed Jul 14
15:07:45 2010 +0200
+++ b/sql/src/test/Dependencies/Tests/Dependencies.stable.err Wed Jul 14
15:33:50 2010 +0200
@@ -10,55 +10,55 @@
# 23:01:45 > Mtimeout -timeout 60 ./Dependencies.SQL Dependencies
# 23:01:45 >
-MAPI = mone...@eir:36604
+MAPI = mone...@localhost:30913
QUERY = DROP USER monetdb;
ERROR = !DROP USER: MALException:removeUser:cannot remove yourself
-MAPI = mone...@eir:36604
+MAPI = mone...@localhost:30913
QUERY = DROP SCHEMA test;
ERROR = !SQLException:sql.catalog:DROP SCHEMA: unable to drop schema 'test'
(there are database objects which depend on it
-MAPI = monet_t...@eir:36604
+MAPI = monet_t...@localhost:30913
QUERY = CREATE SCHEMA "test_2" AUTHORIZATION "public";
ERROR = !CREATE SCHEMA: insufficient privileges for user 'monet_test'
-MAPI = monet_t...@eir:36604
+MAPI = monet_t...@localhost:30913
QUERY = DROP USER monetdb;
ERROR = !DROP USER: InvalidCredentialsException:requireAdmin:access denied for
user 'monet_test'
-MAPI = mone...@eir:36604
+MAPI = mone...@localhost:30913
QUERY = CREATE INDEX id_age_index ON v1(id,age);
ERROR = !CREATE INDEX: cannot create index on view 'v1'
-MAPI = mone...@eir:36604
+MAPI = mone...@localhost:30913
QUERY = ALTER TABLE t1 DROP COLUMN id;
ERROR = !ALTER TABLE: cannot drop column 'id': there are database objects
which depend on it
-MAPI = mone...@eir:36604
+MAPI = mone...@localhost:30913
QUERY = ALTER TABLE v1 DROP COLUMN age;
ERROR = !ALTER TABLE: cannot drop column from VIEW 'v1'
-MAPI = mone...@eir:36604
+MAPI = mone...@localhost:30913
QUERY = ALTER TABLE t2 ADD FOREIGN KEY(age_v1) REFERENCES v1(age);
ERROR = !CONSTRAINT FOREIGN KEY: could not find referenced PRIMARY KEY in
table 'v1'
-MAPI = mone...@eir:36604
+MAPI = mone...@localhost:30913
QUERY = DROP TABLE t1;
ERROR = !SQLException:sql.catalog:DROP TABLE: FOREIGN KEY t2.t2_id_t1_fkey
depends on t1
-MAPI = mone...@eir:36604
+MAPI = mone...@localhost:30913
QUERY = DROP VIEW v1;
ERROR = !SQLException:sql.catalog:unable to drop view v1 (there are database
objects which depend on it)
-MAPI = mone...@eir:36604
+MAPI = mone...@localhost:30913
QUERY = DROP TABLE t2;
ERROR = !SQLException:sql.catalog:DROP TABLE: unable to drop table t2 (there
are database objects which depend on it)
-MAPI = mone...@eir:36604
+MAPI = mone...@localhost:30913
QUERY = DROP FUNCTION f1;
ERROR = !DROP FUNCTION: there are database objects dependent on function f1;
-MAPI = mone...@eir:36604
+MAPI = mone...@localhost:30913
QUERY = DROP INDEX id_age_index;
ERROR = !DROP INDEX: no such index 'id_age_index'
-MAPI = mone...@eir:36604
+MAPI = mone...@localhost:30913
QUERY = DROP VIEW v1;
ERROR = !SQLException:sql.catalog:unable to drop view v1 (there are database
objects which depend on it)
-MAPI = mone...@eir:36604
+MAPI = mone...@localhost:30913
QUERY = DROP TABLE t1;
ERROR = !SQLException:sql.catalog:DROP TABLE: unable to drop table t1 (there
are database objects which depend on it)
-MAPI = mone...@eir:36604
+MAPI = mone...@localhost:30913
QUERY = DROP function f1;
ERROR = !DROP FUNCTION: there are database objects dependent on function f1;
-MAPI = mone...@eir:36604
+MAPI = mone...@localhost:30913
QUERY = DROP SCHEMA test_2;
ERROR = !SQLException:sql.catalog:DROP SCHEMA: name test_2 does not exist
diff -r 713e92afed0d -r 91ed80c2af53
sql/src/test/Dependencies/Tests/Dependencies.stable.out
--- a/sql/src/test/Dependencies/Tests/Dependencies.stable.out Wed Jul 14
15:07:45 2010 +0200
+++ b/sql/src/test/Dependencies/Tests/Dependencies.stable.out Wed Jul 14
15:33:50 2010 +0200
@@ -164,12 +164,12 @@
% varchar, varchar, char # type
% 9, 8, 8 # length
[ "id", "querylog", "DEP_VIEW" ]
-[ "id", "querylog", "DEP_VIEW" ]
[ "defined", "querylog", "DEP_VIEW" ]
[ "name", "querylog", "DEP_VIEW" ]
[ "query", "querylog", "DEP_VIEW" ]
[ "parse", "querylog", "DEP_VIEW" ]
[ "optimize", "querylog", "DEP_VIEW" ]
+[ "id", "querylog", "DEP_VIEW" ]
[ "ctime", "querylog", "DEP_VIEW" ]
[ "arguments", "querylog", "DEP_VIEW" ]
[ "execute", "querylog", "DEP_VIEW" ]
@@ -185,9 +185,8 @@
% .c, sys.k, . # table_name
% name, name, single_value # name
% varchar, varchar, char # type
-% 3, 20, 7 # length
+% 2, 20, 7 # length
[ "id", "t1_id_pkey", "DEP_KEY" ]
-[ "vid", "vault_vid_pkey", "DEP_KEY" ]
[ "id", "queryhistory_id_pkey", "DEP_KEY" ]
#SELECT c.name, i.name, 'DEP_INDEX' from columns as c, keycolumns as kc, idxs
as i where kc."column" = c.name AND kc.id = i.id AND c.table_id = i.table_id
AND i.name not in (select name from keys);
% .c, .i, . # table_name
@@ -344,8 +343,9 @@
% sys.f, sys.tri, . # table_name
% name, name, single_value # name
% varchar, varchar, char # type
-% 5, 12, 11 # length
+% 6, 12, 11 # length
[ "<>", "trigger_test", "DEP_TRIGGER" ]
+[ "isnull", "trigger_test", "DEP_TRIGGER" ]
[ "count", "trigger_test", "DEP_TRIGGER" ]
% sys.k, sys.fk, . # table_name
% name, name, single_value # name
@@ -498,8 +498,7 @@
% .c, sys.k, . # table_name
% name, name, single_value # name
% varchar, varchar, char # type
-% 3, 20, 7 # length
-[ "vid", "vault_vid_pkey", "DEP_KEY" ]
+% 2, 20, 7 # length
[ "id", "queryhistory_id_pkey", "DEP_KEY" ]
#SELECT c.name, i.name, 'DEP_INDEX' from columns as c, keycolumns as kc, idxs
as i where kc."column" = c.name AND kc.id = i.id AND c.table_id = i.table_id
AND i.name not in (select name from keys);
% .c, .i, . # table_name
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
