Changeset: c3384f5bd2e1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c3384f5bd2e1
Modified Files:
Branch: headless
Log Message:
Merge with default branch.
diffs (truncated from 1395 to 300 lines):
diff --git a/clients/RunMtest.bat.in b/clients/RunMtest.bat.in
--- a/clients/RunMtest.bat.in
+++ b/clients/RunMtest.bat.in
@@ -15,7 +15,7 @@
set PATH=%buildbase%\testing;%PATH%
-set PATH=%builddir%\examples\C;%PATH%
+set
PATH=%builddir%\examples\C;%builddir%\examples\php;%builddir%\examples\python;%builddir%\perl\Tests;%PATH%
set PATH=%builddir%\mapiclient;%PATH%
set PATH=%builddir%\mapilib;%PATH%
diff --git a/clients/RunMtest.in b/clients/RunMtest.in
--- a/clients/RunMtest.in
+++ b/clients/RunMtest.in
@@ -33,7 +33,7 @@
done
# enhance various paths to find our stuff
-PATH="${builddir}/mapiclient:${builddir}/examples/C:${builddir}/perl/Tests:${buildbase}/testing:$PATH"
+PATH="${builddir}/mapiclient:${builddir}/examples/C:${builddir}/examples/php:${builddir}/examples/python:${builddir}/perl/Tests:${buildbase}/testing:$PATH"
export PATH
PYTHONPATH="${builddir}/python/build/lib:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
diff --git a/geom/RunMtest.bat.in b/geom/RunMtest.bat.in
--- a/geom/RunMtest.bat.in
+++ b/geom/RunMtest.bat.in
@@ -42,10 +42,13 @@
copy /y %srcdir%\..\sql\backends\monet5\??_*.mal
%buildbase%\sql\backends\monet5\autoload
if not exist %buildbase%\sql\backends\monet5\vaults\autoload mkdir
%buildbase%\sql\backends\monet5\vaults\autoload
copy /y %srcdir%\..\sql\backends\monet5\vaults\??_*.mal
%buildbase%\sql\backends\monet5\vaults\autoload
+if "@HAVE_MSEED_FALSE@"=="" del /y
%buildbase%\sql\backends\monet5\vaults\autoload\71_mseed.mal
+if "@HAVE_CFITSIO_FALSE@"=="" del /y
%buildbase%\sql\backends\monet5\vaults\autoload\72_fits.mal
REM enable auto-loading of SQL createdb scripts before `make install`
if not exist %buildbase%\sql\sql\createdb mkdir %buildbase%\sql\sql\createdb
copy /y %srcdir%\..\sql\sql\??_*.sql %buildbase%\sql\sql\createdb
+if "@HAVE_RAPTOR_FALSE@"="" del /y %buildbase%\sql\sql\createdb\30_rdf.sql
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\optimizer\.libs
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\optimizer
@@ -73,7 +76,7 @@
set PATH=%buildbase%\tools\mserver;%PATH%
:skip_5
-set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\clients\perl\Tests;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\clients\examples\php;%buildbase%\clients\examples\python;%buildbase%\clients\perl\Tests;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
diff --git a/geom/RunMtest.in b/geom/RunMtest.in
--- a/geom/RunMtest.in
+++ b/geom/RunMtest.in
@@ -58,9 +58,14 @@
mkdir -p ${buildbase}/sql/$d/autoload
cp -f ${srcdir}/../sql/$d/[0-9][0-9]_*.mal
${buildbase}/sql/$d/autoload/ 2>/dev/null
done
+# disable auto-loading of non-available modules
+@HAVE_MSEED_FALSE@ rm -f
${buildbase}/sql/backends/monet5/vaults/autoload/71_mseed.mal
+@HAVE_CFITSIO_FALSE@ rm -f
${buildbase}/sql/backends/monet5/vaults/autoload/72_fits.mal
# enable auto-loading of SQL createdb scripts before `make install`
mkdir -p ${buildbase}/sql/sql/createdb
cp -f ${srcdir}/../sql/sql/[0-9][0-9]_*.sql ${buildbase}/sql/sql/createdb/
2>/dev/null
+# disable auto-loading of non-available SQL createdb scripts
+@HAVE_RAPTOR_FALSE@ rm -f ${buildbase}/sql/sql/createdb/30_rdf.sql
# where compiled monetdb5 modules are to be found
for d in optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf extras/xml
do
@@ -76,7 +81,7 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
libpath="${MOD_PATH}"
-PATH="${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/clients/perl/Tests:${buildbase}/testing:$PATH"
+PATH="${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/clients/examples/php:${buildbase}/clients/examples/python:${buildbase}/clients/perl/Tests:${buildbase}/testing:$PATH"
export PATH
PYTHONPATH="${buildbase}/clients/python/build/lib:${buildbase}/testing:${srcdir}/../testing:${PYTHONPATH}"
diff --git a/monetdb5/RunMtest.bat.in b/monetdb5/RunMtest.bat.in
--- a/monetdb5/RunMtest.bat.in
+++ b/monetdb5/RunMtest.bat.in
@@ -36,7 +36,7 @@
if not exist %builddir%\extras\xml\autoload mkdir
%builddir%\extras\xml\autoload
copy /y %srcdir%\extras\xml\??_*.mal %builddir%\extras\xml\autoload
-set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\clients\perl\Tests;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\clients\examples\php;%buildbase%\clients\examples\python;%buildbase%\clients\perl\Tests;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\mal;%PATH%
diff --git a/monetdb5/RunMtest.in b/monetdb5/RunMtest.in
--- a/monetdb5/RunMtest.in
+++ b/monetdb5/RunMtest.in
@@ -35,7 +35,7 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
-binpath="${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/clients/perl/Tests:${buildbase}/testing"
+binpath="${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/clients/examples/php:${buildbase}/clients/examples/python:${buildbase}/clients/perl/Tests:${buildbase}/testing"
libpath="${MOD_PATH}:${builddir}/mal/.libs"
PATH="${binpath}:$PATH"
diff --git a/sql/RunMtest.bat.in b/sql/RunMtest.bat.in
--- a/sql/RunMtest.bat.in
+++ b/sql/RunMtest.bat.in
@@ -24,10 +24,13 @@
copy /y %srcdir%\backends\monet5\??_*.mal %builddir%\backends\monet5\autoload
if not exist %builddir%\backends\monet5\vaults\autoload mkdir
%builddir%\backends\monet5\vaults\autoload
copy /y %srcdir%\backends\monet5\vaults\??_*.mal
%builddir%\backends\monet5\vaults\autoload
+if "@HAVE_MSEED_FALSE@"=="" del /y
%builddir%\backends\monet5\vaults\autoload\71_mseed.mal
+if "@HAVE_CFITSIO_FALSE@"=="" del /y
%builddir%\backends\monet5\vaults\autoload\72_fits.mal
REM enable auto-loading of SQL createdb scripts before `make install`
if not exist %builddir%\sql\createdb mkdir %builddir%\sql\createdb
copy /y %srcdir%\sql\??_*.sql %builddir%\sql\createdb
+if "@HAVE_RAPTOR_FALSE@"="" del /y %builddir%\sql\createdb\30_rdf.sql
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\optimizer\.libs
set MOD_PATH=%MOD_PATH%;%buildbase%\monetdb5\optimizer
@@ -52,7 +55,7 @@
if not exist %buildbase%\monetdb5\extras\xml\autoload mkdir
%buildbase%\monetdb5\extras\xml\autoload
copy /y %srcdir%\..\monetdb5\extras\xml\??_*.mal
%buildbase%\monetdb5\extras\xml\autoload
-set
PATH=%buildbase%\tools\mserver;%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\clients\perl\Tests;%buildbase%\testing;%PATH%
+set
PATH=%buildbase%\tools\mserver;%buildbase%\clients\mapiclient;%buildbase%\clients\examples\C;%buildbase%\clients\examples\php;%buildbase%\clients\examples\python;%buildbase%\clients\perl\Tests;%buildbase%\testing;%PATH%
set PATH=%MOD_PATH%;%PATH%
set PATH=%builddir%\server;%PATH%
diff --git a/sql/RunMtest.in b/sql/RunMtest.in
--- a/sql/RunMtest.in
+++ b/sql/RunMtest.in
@@ -32,10 +32,15 @@
mkdir -p ${builddir}/$d/autoload
cp -f ${srcdir}/$d/[0-9][0-9]_*.mal ${builddir}/$d/autoload/ 2>/dev/null
done
+# disable auto-loading of non-available modules
+@HAVE_MSEED_FALSE@ rm -f
${builddir}/backends/monet5/vaults/autoload/71_mseed.mal
+@HAVE_CFITSIO_FALSE@ rm -f
${builddir}/backends/monet5/vaults/autoload/72_fits.mal
# enable auto-loading of SQL createdb scripts before `make install`
mkdir -p ${builddir}/sql/createdb
cp -f ${srcdir}/sql/[0-9][0-9]_*.sql ${builddir}/sql/createdb/ 2>/dev/null
+# disable auto-loading of non-available SQL createdb scripts
+@HAVE_RAPTOR_FALSE@ rm -f ${builddir}/sql/createdb/30_rdf.sql
# where compiled monetdb5 modules are to be found
for d in optimizer scheduler modules/atoms modules/kernel modules/mal
extras/crackers extras/rdf extras/xml
@@ -48,7 +53,7 @@
# enhance various paths to find our stuff
MOD_PATH="${MOD_PATH#:}"
-binpath="${builddir}/backends/monet5:${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/clients/perl/Tests:${buildbase}/testing"
+binpath="${builddir}/backends/monet5:${buildbase}/tools/mserver:${buildbase}/clients/mapiclient:${buildbase}/clients/examples/C:${buildbase}/clients/examples/php:${buildbase}/clients/examples/python:${buildbase}/clients/perl/Tests:${buildbase}/testing"
libpath="${MOD_PATH}:${builddir}/server/.libs"
PATH="${binpath}:$PATH"
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -4363,9 +4363,10 @@
around this inner relation.
*/
if (!is_project(inner->op)) {
- if (outer && pre_prj)
+ if (outer && pre_prj) {
inner = rel_project(sql->sa, inner,
pre_prj);
- else
+ pre_prj = rel_projections(sql, inner,
NULL, 1, 1);
+ } else
inner = rel_project(sql->sa, inner,
new_exp_list(sql->sa));
}
rel_project_add_exp(sql, inner, ce);
diff --git
a/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
b/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
--- a/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
+++ b/sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out
@@ -114,12 +114,6 @@
# 14:58:14 >
START TRANSACTION;
-CREATE SCHEMA "rdf" AUTHORIZATION "monetdb";
-SET SCHEMA "rdf";
-CREATE TABLE "rdf"."graph" (
- "gname" CHARACTER LARGE OBJECT,
- "gid" INTEGER
-);
SET SCHEMA "sys";
CREATE TABLE "sys"."allnewtriples" (
"id" INTEGER NOT NULL,
diff --git
a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
--- a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
+++ b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out
@@ -29,7 +29,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 97 # length
+% 98 # length
insert(
| table(sys.cm_tmp) [ cm_tmp.i, cm_tmp.%TID% NOT NULL ]
| union (
diff --git
a/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
b/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
---
a/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
+++
b/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
@@ -50,7 +50,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 66 # length
+% 67 # length
project (
| group by (
| | table(sys.sorted) [ sorted.a, sorted.b, sorted.%TID% NOT NULL ]
@@ -59,7 +59,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 66 # length
+% 67 # length
project (
| group by (
| | table(sys.sorted) [ sorted.a, sorted.b, sorted.%TID% NOT NULL ]
diff --git
a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
--- a/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
+++ b/sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
@@ -33,7 +33,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 48 # length
+% 49 # length
project (
| table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
) [ oblo.a ]
@@ -41,7 +41,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 50 # length
+% 51 # length
top N (
| project (
| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
@@ -51,7 +51,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 50 # length
+% 51 # length
top N (
| project (
| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
@@ -61,7 +61,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 50 # length
+% 51 # length
top N (
| project (
| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
@@ -71,7 +71,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 50 # length
+% 51 # length
top N (
| project (
| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
@@ -81,7 +81,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 48 # length
+% 49 # length
project (
| table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
) [ oblo.a ASC ] [ oblo.a ]
@@ -89,7 +89,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 50 # length
+% 51 # length
top N (
| project (
| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
@@ -99,7 +99,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 50 # length
+% 51 # length
top N (
| project (
| | table(sys.oblo) [ oblo.a, oblo.%TID% NOT NULL ]
@@ -109,7 +109,7 @@
% .plan # table_name
% rel # name
% clob # type
-% 50 # length
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
