Changeset: 0b71f393386b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0b71f393386b
Modified Files:
configure.ag
Branch: default
Log Message:
Merge with Dec2011 branch.
diffs (truncated from 315 to 300 lines):
diff --git a/buildtools/Mx/Def.c b/buildtools/Mx/Def.c
--- a/buildtools/Mx/Def.c
+++ b/buildtools/Mx/Def.c
@@ -363,7 +363,6 @@ MakeDefs(char *name)
break;
default:
Fatal("MakeDefs", "Unknown directive:%c%c", MARK, dir);
- break;
}
}
d = NwDef(Efile, mod, sec, mx_line, mx_file);
diff --git a/buildtools/conf/rules.mk b/buildtools/conf/rules.mk
--- a/buildtools/conf/rules.mk
+++ b/buildtools/conf/rules.mk
@@ -26,7 +26,7 @@ MX = $(top_builddir)/buildtools/Mx/Mx
# first, also with bison-generated files. This is crucial
# to prevent inconsistent (re-)definitions of macros.
%.tab.c: %.y
- $(LOCKFILE) waiting
+ touch waiting.$$$$ && until ln waiting.$$$$ waiting 2>/dev/null; do
sleep 1; done && rm waiting.$$$$
$(YACC) $(YFLAGS) $(AM_YFLAGS) $< || { $(RM) waiting ; exit 1 ; }
if [ -f y.tab.c ]; then $(MV) y.tab.c $*.tab.c ; fi
$(MV) $*.tab.c $*.tab.c.tmp
@@ -37,14 +37,14 @@ MX = $(top_builddir)/buildtools/Mx/Mx
$(RM) waiting
%.tab.h: %.y
- $(LOCKFILE) waiting
+ touch waiting.$$$$ && until ln waiting.$$$$ waiting 2>/dev/null; do
sleep 1; done && rm waiting.$$$$
$(YACC) $(YFLAGS) $(AM_YFLAGS) $< || { $(RM) waiting ; exit 1 ; }
if [ -f y.tab.h ]; then $(MV) y.tab.h $*.tab.h ; fi
[ ! -f y.tab.c ] || $(RM) y.tab.c
$(RM) waiting
%.yy.c: %.l
- $(LOCKFILE) waiting
+ touch waiting.$$$$ && until ln waiting.$$$$ waiting 2>/dev/null; do
sleep 1; done && rm waiting.$$$$
$(LEX) $(LFLAGS) $(AM_LFLAGS) $< || { $(RM) waiting ; exit 1 ; }
if [ -f $(LEX_OUTPUT_ROOT).c ]; then $(MV) $(LEX_OUTPUT_ROOT).c $*.yy.c
; fi
$(MV) $*.yy.c $*.yy.c.tmp
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -1203,7 +1203,6 @@ AC_PATH_PROG(BASH,bash, /usr/bin/bash, $
AC_CHECK_PROG(RM,rm,rm -f)
AC_CHECK_PROG(MV,mv,mv -f)
AC_PROG_LN_S
-AC_CHECK_PROG(LOCKFILE,lockfile,lockfile -r 2,echo)
AC_CHECK_PROGS(RPMBUILD,rpmbuild rpm)
@@ -3139,8 +3138,3 @@ case "`make -v 2>&1`" in
echo
;;
esac
-
-if test x"$LOCKFILE" = x"echo" ; then
- echo "'lockfile' not found (usually part of a package named procmail)"
- echo "Please do NOT parallelise the build process! (use -j1 with make)"
-fi
diff --git a/sql/test/BugTracker-2011/Tests/All
b/sql/test/BugTracker-2011/Tests/All
--- a/sql/test/BugTracker-2011/Tests/All
+++ b/sql/test/BugTracker-2011/Tests/All
@@ -61,3 +61,5 @@ like_or.Bug-2924
alter_table_add_column.Bug-2919
update_with_count.Bug-2928
user_create_temp_table.Bug-2916
+exists-select.Bug-2933
+jena-optional-1-test.Bug-2915
diff --git a/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.sql
b/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.sql
@@ -0,0 +1,29 @@
+CREATE TABLE _rank2933 (pre INTEGER, post INTEGER);
+INSERT INTO _rank2933 VALUES (22, 37);
+INSERT INTO _rank2933 VALUES (23, 24);
+INSERT INTO _rank2933 VALUES (33, 34);
+
+SELECT
+ count(*)
+FROM
+ _rank2933 AS _rank1,
+ _rank2933 AS _rank2
+WHERE
+ NOT _rank1.pre = _rank2.pre AND
+ EXISTS (SELECT pre FROM _rank2933 AS ancestor WHERE
+ ancestor.pre < _rank1.pre AND _rank1.pre < ancestor.post AND
+ ancestor.pre < _rank2.pre AND _rank2.pre < ancestor.post);
+
+SELECT
+ count(*)
+FROM
+ _rank2933 AS _rank1,
+ _rank2933 AS _rank2
+WHERE
+ NOT _rank1.pre = _rank2.pre AND
+ EXISTS (SELECT pre FROM _rank2933 AS ancestor WHERE
+ ancestor.pre < _rank1.pre AND _rank1.pre < ancestor.post
+ INTERSECT SELECT pre FROM _rank2933 AS ancestor WHERE
+ ancestor.pre < _rank2.pre AND _rank2.pre < ancestor.post);
+
+DROP TABLE _rank2933;
diff --git a/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.err
b/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'exists-select.Bug-2933` in directory 'test/BugTracker-2011`
itself:
+
+
+# 17:14:07 >
+# 17:14:07 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/sjoerd/Monet-candidate/var/MonetDB" "--set" "mapi_open=true"
"--set" "mapi_port=39212" "--set" "monet_prompt=" "--trace" "--forcemito"
"--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2011" "--set"
"mal_listing=0"
+# 17:14:07 >
+
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = /ufs/sjoerd/Monet-candidate/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 = /ufs/sjoerd/Monet-candidate/var/MonetDB
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 39212
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_test_BugTracker-2011
+# cmdline opt mal_listing = 0
+
+# 17:14:07 >
+# 17:14:07 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=madrid"
"--port=39212"
+# 17:14:07 >
+
+
+# 17:14:07 >
+# 17:14:07 > "Done."
+# 17:14:07 >
+
diff --git a/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
b/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
@@ -0,0 +1,71 @@
+stdout of test 'exists-select.Bug-2933` in directory 'test/BugTracker-2011`
itself:
+
+
+# 17:14:07 >
+# 17:14:07 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"gdk_dbfarm=/ufs/sjoerd/Monet-candidate/var/MonetDB" "--set" "mapi_open=true"
"--set" "mapi_port=39212" "--set" "monet_prompt=" "--trace" "--forcemito"
"--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2011" "--set"
"mal_listing=0"
+# 17:14:07 >
+
+# MonetDB 5 server v11.7.0 (hg id: f2b586f1fb51)
+# This is an unreleased version
+# Serving database 'mTests_test_BugTracker-2011', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 15.662 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://madrid.ins.cwi.nl:39212/
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+# loading sql script: 09_like.sql
+# loading sql script: 10_math.sql
+# loading sql script: 11_times.sql
+# loading sql script: 12_url.sql
+# loading sql script: 13_date.sql
+# loading sql script: 14_inet.sql
+# loading sql script: 15_history.sql
+# loading sql script: 16_tracelog.sql
+# loading sql script: 17_compress.sql
+# loading sql script: 18_dictionary.sql
+# loading sql script: 19_cluster.sql
+# loading sql script: 20_vacuum.sql
+# loading sql script: 21_dependency_functions.sql
+# loading sql script: 22_clients.sql
+# loading sql script: 23_skyserver.sql
+# loading sql script: 24_zorder.sql
+# loading sql script: 25_debug.sql
+# loading sql script: 40_geom.sql
+# loading sql script: 80_udf.sql
+# loading sql script: 99_system.sql
+
+# 17:14:07 >
+# 17:14:07 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=madrid"
"--port=39212"
+# 17:14:07 >
+
+#CREATE TABLE _rank2933 (pre INTEGER, post INTEGER);
+#INSERT INTO _rank2933 VALUES (22, 37);
+[ 1 ]
+#INSERT INTO _rank2933 VALUES (23, 24);
+[ 1 ]
+#INSERT INTO _rank2933 VALUES (33, 34);
+[ 1 ]
+#SELECT
+% . # table_name
+% single_value # name
+% tinyint # type
+% 1 # length
+[ 2 ]
+#SELECT
+% . # table_name
+% single_value # name
+% tinyint # type
+% 1 # length
+[ 2 ]
+#DROP TABLE _rank2933;
+
+# 17:14:07 >
+# 17:14:07 > "Done."
+# 17:14:07 >
+
diff --git a/sql/test/BugTracker-2011/Tests/jena-optional-1-test.Bug-2915.sql
b/sql/test/BugTracker-2011/Tests/jena-optional-1-test.Bug-2915.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2011/Tests/jena-optional-1-test.Bug-2915.sql
@@ -0,0 +1,77 @@
+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
+-5216419694041718175 "http://example/z1"; "" "" 2
+-8287201118401564753 "http://example/q2"; "" "" 2
+7121703792433320712 "http://example/z2"; "" "" 2
+-4064636373028764940 "http://example/z"; "" "" 2
+-3401798235167296541 "abc" "" "" 3
+CREATE TABLE "triples" (
+ "s" BIGINT NOT NULL,
+ "p" BIGINT NOT NULL,
+ "o" BIGINT NOT NULL,
+ CONSTRAINT "triples_s_p_o_pkey" PRIMARY KEY ("s", "p", "o")
+);
+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
+-4064636373028764940 2004134117598721274 -3401798235167296541
+CREATE TABLE "quads" (
+ "g" BIGINT NOT NULL,
+ "s" BIGINT NOT NULL,
+ "p" BIGINT NOT NULL,
+ "o" BIGINT NOT NULL,
+ CONSTRAINT "quads_g_s_p_o_pkey" PRIMARY KEY ("g", "s", "p", "o")
+);
+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
+ Nodes AS R_2
+ ON ( T_2.o = R_2.hash )
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
