Changeset: e29cc9799764 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e29cc9799764
Modified Files:
Branch: sciql
Log Message:
Merge from default branch.
diffs (185 lines):
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -482,8 +482,8 @@ exp_count(int *cnt, int seqnr, sql_exp *
return 0;
}
case e_column:
- *cnt += 1;
- return 1;
+ *cnt += 20;
+ return 20;
case e_atom:
*cnt += 10;
return 10;
@@ -1030,9 +1030,8 @@ reorder_join(mvc *sql, sql_rel *rel)
list_append(rels, rel->r);
cnt = list_length(exps);
rel->exps = find_fk(sql->sa, rels, exps);
- if (list_length(rel->exps) != cnt) {
- rel->exps = list_dup(exps, (fdup)NULL);
- }
+ if (list_length(rel->exps) != cnt)
+ rel->exps = order_join_expressions(sql->sa, exps, rels);
} else {
get_relations(rel, rels);
if (list_length(rels) > 1) {
diff --git
a/sql/test/BugTracker-2011/Tests/jena-optional-1-test.Bug-2915.stable.err
b/sql/test/BugTracker-2011/Tests/jena-optional-1-test.Bug-2915.stable.err
--- a/sql/test/BugTracker-2011/Tests/jena-optional-1-test.Bug-2915.stable.err
+++ b/sql/test/BugTracker-2011/Tests/jena-optional-1-test.Bug-2915.stable.err
@@ -1,1 +1,37 @@
-Details to be provided when server stops crashing.
+stderr of test 'jena-optional-1-test.Bug-2915` in directory
'test/BugTracker-2011` itself:
+
+
+# 20:59:26 >
+# 20:59:26 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=32047" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2011"
"--set" "mal_listing=0"
+# 20:59:26 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm =
/home/niels/scratch/rc-clean/Linux-x86_64/var/monetdb5/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt gdk_dbfarm =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 32047
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2011
+# cmdline opt mal_listing = 0
+
+# 20:59:26 >
+# 20:59:26 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=32047"
+# 20:59:26 >
+
+
+# 20:59:27 >
+# 20:59:27 > "Done."
+# 20:59:27 >
+
diff --git
a/sql/test/BugTracker-2011/Tests/jena-optional-1-test.Bug-2915.stable.out
b/sql/test/BugTracker-2011/Tests/jena-optional-1-test.Bug-2915.stable.out
--- a/sql/test/BugTracker-2011/Tests/jena-optional-1-test.Bug-2915.stable.out
+++ b/sql/test/BugTracker-2011/Tests/jena-optional-1-test.Bug-2915.stable.out
@@ -1,1 +1,112 @@
-Details to be provided when server stops crashing.
+stdout of test 'jena-optional-1-test.Bug-2915` in directory
'test/BugTracker-2011` itself:
+
+
+# 20:59:26 >
+# 20:59:26 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" "--set"
"mapi_open=true" "--set" "mapi_port=32047" "--set" "monet_prompt=" "--trace"
"--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2011"
"--set" "mal_listing=0"
+# 20:59:26 >
+
+# MonetDB 5 server v11.7.0
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2011', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 3.778 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2011 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://niels.nesco.mine.nu:32047/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 20:59:26 >
+# 20:59:26 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels"
"--port=32047"
+# 20:59:26 >
+
+#START TRANSACTION;
+#CREATE TABLE "nodes" (
+# "hash" BIGINT NOT NULL,
+# "lex" CHARACTER LARGE OBJECT NOT NULL,
+# "lang" VARCHAR(10) NOT NULL,
+# "datatype" VARCHAR(200),
+# "type" INTEGER NOT NULL,
+# CONSTRAINT "nodes_hash_pkey" PRIMARY KEY ("hash")
+#);
+#COPY 13 RECORDS INTO "nodes" FROM stdin USING DELIMITERS '\t','\n','"';
+#-8395209716130787220 "http://example/x"; "" "" 2
+#2004134117598721274 "http://example/p"; "" "" 2
+#435905340492217258 "1" ""
"http://www.w3.org/2001/XMLSchema#integer"; 5
+#745852752491398227 "2" ""
"http://www.w3.org/2001/XMLSchema#integer"; 5
+#-5334307821581591471 "3" ""
"http://www.w3.org/2001/XMLSchema#integer"; 5
+#4788264553748351656 "http://example/a"; "" "" 2
+#8936870869765386580 "http://example/b"; "" "" 2
+#3816485599920428794 "http://example/q1"; "" "" 2
+[ 13 ]
+#COPY 13 RECORDS INTO "nodes" FROM stdin USING DELIMITERS '\t','\n','"';
+#-8395209716130787220 "http://example/x"; "" "" 2
+#2004134117598721274 "http://example/p"; "" "" 2
+#435905340492217258 "1" ""
"http://www.w3.org/2001/XMLSchema#integer"; 5
+#745852752491398227 "2" ""
"http://www.w3.org/2001/XMLSchema#integer"; 5
+#-5334307821581591471 "3" ""
"http://www.w3.org/2001/XMLSchema#integer"; 5
+#4788264553748351656 "http://example/a"; "" "" 2
+#8936870869765386580 "http://example/b"; "" "" 2
+#3816485599920428794 "http://example/q1"; "" "" 2
+#CREATE INDEX "objsubj" ON "triples" ("o", "s");
+#CREATE INDEX "predobj" ON "triples" ("p", "o");
+#COPY 9 RECORDS INTO "triples" FROM stdin USING DELIMITERS '\t','\n','"';
+#-8395209716130787220 2004134117598721274 435905340492217258
+#-8395209716130787220 2004134117598721274 745852752491398227
+#-8395209716130787220 2004134117598721274 -5334307821581591471
+#-8395209716130787220 2004134117598721274 4788264553748351656
+#-8395209716130787220 2004134117598721274 8936870869765386580
+#4788264553748351656 3816485599920428794 -5216419694041718175
+#4788264553748351656 -8287201118401564753 7121703792433320712
+#8936870869765386580 3816485599920428794 -5216419694041718175
+[ 9 ]
+#COPY 9 RECORDS INTO "triples" FROM stdin USING DELIMITERS '\t','\n','"';
+#-8395209716130787220 2004134117598721274 435905340492217258
+#-8395209716130787220 2004134117598721274 745852752491398227
+#-8395209716130787220 2004134117598721274 -5334307821581591471
+#-8395209716130787220 2004134117598721274 4788264553748351656
+#-8395209716130787220 2004134117598721274 8936870869765386580
+#4788264553748351656 3816485599920428794 -5216419694041718175
+#4788264553748351656 -8287201118401564753 7121703792433320712
+#8936870869765386580 3816485599920428794 -5216419694041718175
+#CREATE INDEX "graobjsubj" ON "quads" ("g", "o", "s");
+#CREATE INDEX "grapredobj" ON "quads" ("g", "p", "o");
+#CREATE INDEX "objsubjpred" ON "quads" ("o", "s", "p");
+#CREATE INDEX "predobjsubj" ON "quads" ("p", "o", "s");
+#CREATE INDEX "subjpredobj" ON "quads" ("s", "p", "o");
+#SELECT R_1.lex AS V_1_lex, R_1.datatype AS V_1_datatype,
+#R_1.lang AS V_1_lang, R_1.type AS V_1_type,
+# R_2.lex AS V_2_lex, R_2.datatype AS V_2_datatype, R_2.lang AS V_2_lang,
+#R_2.type AS V_2_type
+#FROM
+# ( SELECT T_1.s AS X_1
+# FROM Triples AS T_1
+# WHERE ( T_1.p = 2004134117598721274
+# AND T_1.o = 435905340492217258 )
+# ) AS T_1
+# LEFT OUTER JOIN
+# Triples AS T_2
+# ON ( T_2.p = 3816485599920428794
+# AND T_1.X_1 = T_2.s )
+# LEFT OUTER JOIN
+# Nodes AS R_1
+# ON ( T_1.X_1 = R_1.hash )
+# LEFT OUTER JOIN
+% .r_1, .r_1, .r_1, .r_1, .r_2, .r_2, .r_2, .r_2 #
table_name
+% v_1_lex, v_1_datatype, v_1_lang, v_1_type, v_2_lex,
v_2_datatype, v_2_lang, v_2_type # name
+% clob, varchar, varchar, int, clob, varchar,
varchar, int # type
+% 16, 0, 0, 1, 16, 40, 0, 1 # length
+[ "http://example/x";, "", "", 2, "1",
"http://www.w3.org/2001/XMLSchema#integer";, "", 5 ]
+[ "http://example/x";, "", "", 2, "2",
"http://www.w3.org/2001/XMLSchema#integer";, "", 5 ]
+[ "http://example/x";, "", "", 2, "3",
"http://www.w3.org/2001/XMLSchema#integer";, "", 5 ]
+[ "http://example/x";, "", "", 2, "http://example/a";, "",
"", 2 ]
+[ "http://example/x";, "", "", 2, "http://example/b";, "",
"", 2 ]
+#ROLLBACK;
+
+# 20:59:27 >
+# 20:59:27 > "Done."
+# 20:59:27 >
+
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
