Changeset: 668f5608c6da for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=668f5608c6da
Added Files:
sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.out.int128
Removed Files:
sql/benchmarks/wisconsin/Tests/All
sql/benchmarks/wisconsin/Tests/load.prologue5
sql/benchmarks/wisconsin/Tests/load.sql.src
sql/benchmarks/wisconsin/Tests/load.stable.err
sql/benchmarks/wisconsin/Tests/load.stable.out
sql/benchmarks/wisconsin/Tests/load.timeout
sql/benchmarks/wisconsin/Tests/wisconsin-select.reqtests
sql/benchmarks/wisconsin/Tests/wisconsin-select.sql.src
sql/benchmarks/wisconsin/Tests/wisconsin-select.stable.err
sql/benchmarks/wisconsin/Tests/wisconsin-select.stable.out
sql/benchmarks/wisconsin/Tests/wisconsin-update.reqtests
sql/benchmarks/wisconsin/Tests/wisconsin-update.sql.src
sql/benchmarks/wisconsin/Tests/wisconsin-update.stable.err
sql/benchmarks/wisconsin/Tests/wisconsin-update.stable.out
sql/benchmarks/wisconsin/load.sql
sql/benchmarks/wisconsin/wisconsin-select.sql
sql/benchmarks/wisconsin/wisconsin-update.sql
sql/benchmarks/wisconsin/wisconsin.sql
Modified Files:
gdk/gdk_bbp.c
gdk/gdk_interprocess.h
monetdb5/optimizer/opt_candidates.c
sql/backends/monet5/UDF/pyapi/50_pyapi.mal
sql/backends/monet5/UDF/pyapi/Makefile.ag
sql/backends/monet5/UDF/pyapi/connection.c
sql/backends/monet5/UDF/pyapi/connection.h
sql/backends/monet5/UDF/pyapi/convert_loops.h
sql/backends/monet5/UDF/pyapi/emit.c
sql/backends/monet5/UDF/pyapi/emit.h
sql/backends/monet5/UDF/pyapi/formatinput.c
sql/backends/monet5/UDF/pyapi/formatinput.h
sql/backends/monet5/UDF/pyapi/pyapi.c
sql/backends/monet5/UDF/pyapi/pyapi.h
sql/backends/monet5/UDF/pyapi/pyapi.mal
sql/backends/monet5/UDF/pyapi/pyapi_locatepython.bat
sql/backends/monet5/UDF/pyapi/pyloader.c
sql/backends/monet5/UDF/pyapi/pytypes.c
sql/backends/monet5/UDF/pyapi/pytypes.h
sql/backends/monet5/UDF/pyapi/type_conversion.c
sql/backends/monet5/UDF/pyapi/type_conversion.h
sql/backends/monet5/UDF/pyapi/undef.h
sql/backends/monet5/UDF/pyapi/unicode.c
sql/backends/monet5/UDF/pyapi/unicode.h
sql/common/sql_list.c
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2016/Tests/inner_join_cross_join.Bug-6140.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.stable.out.32bit
Branch: default
Log Message:
Merge with Dec2016 branch.
diffs (truncated from 78053 to 300 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -3174,11 +3174,15 @@ BBPrecover(int farmid)
gdk_return
BBPrecover_subdir(void)
{
- str subdirpath = GDKfilepath(0, NULL, SUBDIR, NULL);
- DIR *dirp = opendir(subdirpath);
+ str subdirpath;
+ DIR *dirp;
struct dirent *dent;
gdk_return ret = GDK_SUCCEED;
+ subdirpath = GDKfilepath(0, NULL, SUBDIR, NULL);
+ if (subdirpath == NULL)
+ return GDK_FAIL;
+ dirp = opendir(subdirpath);
GDKfree(subdirpath);
if (dirp == NULL) {
return GDK_SUCCEED; /* nothing to do */
diff --git a/gdk/gdk_interprocess.h b/gdk/gdk_interprocess.h
--- a/gdk/gdk_interprocess.h
+++ b/gdk/gdk_interprocess.h
@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * Copyright 2008-2015 MonetDB B.V.
+ * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
*/
/*
diff --git a/monetdb5/optimizer/opt_candidates.c
b/monetdb5/optimizer/opt_candidates.c
--- a/monetdb5/optimizer/opt_candidates.c
+++ b/monetdb5/optimizer/opt_candidates.c
@@ -27,47 +27,50 @@ OPTcandidatesImplementation(Client cntxt
(void) stk; /* to fool compilers */
for (i = 0; i < mb->stop; i++) {
p = getInstrPtr(mb,i);
- if( p->token == ASSIGNsymbol && isVarCList(mb,getArg(p,1)))
- setVarCList(mb,getArg(p,0));
+ if( p->token == ASSIGNsymbol) {
+ int j;
+ for (j = 0; j < p->retc && j + p->retc < p->argc; j++)
+ if (isVarCList(mb,getArg(p,p->retc + j)))
+ setVarCList(mb,getArg(p,j));
+ }
if( getModuleId(p) == sqlRef){
if(getFunctionId(p) == tidRef)
setVarCList(mb,getArg(p,0));
- if(getFunctionId(p) == subdeltaRef)
+ else if(getFunctionId(p) == subdeltaRef)
setVarCList(mb,getArg(p,0));
- if(getFunctionId(p) == emptybindRef && p->retc == 2)
+ else if(getFunctionId(p) == emptybindRef && p->retc ==
2)
setVarCList(mb,getArg(p,0));
- if(getFunctionId(p) == bindRef && p->retc == 2)
+ else if(getFunctionId(p) == bindRef && p->retc == 2)
setVarCList(mb,getArg(p,0));
}
- if( getModuleId(p) == algebraRef ){
+ else if( getModuleId(p) == algebraRef ){
if(getFunctionId(p) == selectRef || getFunctionId(p) ==
thetaselectRef)
setVarCList(mb,getArg(p,0));
- if(getFunctionId(p) == likeselectRef ||
getFunctionId(p) == likethetaselectRef)
+ else if(getFunctionId(p) == likeselectRef ||
getFunctionId(p) == likethetaselectRef)
setVarCList(mb,getArg(p,0));
- if(getFunctionId(p) == intersectRef )
+ else if(getFunctionId(p) == intersectRef )
setVarCList(mb,getArg(p,0));
- if(getFunctionId(p) == uniqueRef )
+ else if(getFunctionId(p) == uniqueRef )
setVarCList(mb,getArg(p,0));
- if(getFunctionId(p) == firstnRef )
+ else if(getFunctionId(p) == firstnRef )
setVarCList(mb,getArg(p,0));
- if(getFunctionId(p) == semijoinRef )
+ else if(getFunctionId(p) == mergecandRef )
setVarCList(mb,getArg(p,0));
- if(getFunctionId(p) == differenceRef )
+ else if(getFunctionId(p) == intersectcandRef )
setVarCList(mb,getArg(p,0));
}
- if( getModuleId(p) == batRef){
- if(getFunctionId(p) == mergecandRef )
- setVarCList(mb,getArg(p,0));
- if(getFunctionId(p) == intersectcandRef )
+ else if( getModuleId(p) == generatorRef){
+ if(getFunctionId(p) == selectRef || getFunctionId(p) ==
thetaselectRef)
setVarCList(mb,getArg(p,0));
}
- if( getModuleId(p) == groupRef){
- if(getFunctionId(p) == subgroupRef || getFunctionId(p)
== subgroupdoneRef)
- setVarCList(mb,getArg(p,1));
+ else if (getModuleId(p) == sampleRef) {
+ if (getFunctionId(p) == subuniformRef)
+ setVarCList(mb, getArg(p, 0));
}
- if( getModuleId(p) == generatorRef){
- if(getFunctionId(p) == selectRef || getFunctionId(p) ==
thetaselectRef)
- setVarCList(mb,getArg(p,0));
+ else if (getModuleId(p) == groupRef && p->retc > 1) {
+ if (getFunctionId(p) == subgroupRef || getFunctionId(p)
== subgroupdoneRef ||
+ getFunctionId(p) == groupRef || getFunctionId(p) ==
groupdoneRef)
+ setVarCList(mb, getArg(p, 1));
}
}
diff --git a/sql/backends/monet5/UDF/pyapi/50_pyapi.mal
b/sql/backends/monet5/UDF/pyapi/50_pyapi.mal
--- a/sql/backends/monet5/UDF/pyapi/50_pyapi.mal
+++ b/sql/backends/monet5/UDF/pyapi/50_pyapi.mal
@@ -2,7 +2,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-# Copyright 2008-2015 MonetDB B.V.
+# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
# This loads the MonetDB/PyAPI module
include pyapi;
diff --git a/sql/backends/monet5/UDF/pyapi/Makefile.ag
b/sql/backends/monet5/UDF/pyapi/Makefile.ag
--- a/sql/backends/monet5/UDF/pyapi/Makefile.ag
+++ b/sql/backends/monet5/UDF/pyapi/Makefile.ag
@@ -2,7 +2,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-# Copyright 2008-2015 MonetDB B.V.
+# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
INCLUDES = \
../../../../../clients/mapilib \
diff --git a/sql/backends/monet5/UDF/pyapi/connection.c
b/sql/backends/monet5/UDF/pyapi/connection.c
--- a/sql/backends/monet5/UDF/pyapi/connection.c
+++ b/sql/backends/monet5/UDF/pyapi/connection.c
@@ -1,3 +1,10 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
+ */
#include "pyapi.h"
#include "conversion.h"
diff --git a/sql/backends/monet5/UDF/pyapi/connection.h
b/sql/backends/monet5/UDF/pyapi/connection.h
--- a/sql/backends/monet5/UDF/pyapi/connection.h
+++ b/sql/backends/monet5/UDF/pyapi/connection.h
@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * Copyright 2008-2015 MonetDB B.V.
+ * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
*/
/*
diff --git a/sql/backends/monet5/UDF/pyapi/convert_loops.h
b/sql/backends/monet5/UDF/pyapi/convert_loops.h
--- a/sql/backends/monet5/UDF/pyapi/convert_loops.h
+++ b/sql/backends/monet5/UDF/pyapi/convert_loops.h
@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * Copyright 2008-2015 MonetDB B.V.
+ * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
*/
/*
diff --git a/sql/backends/monet5/UDF/pyapi/emit.c
b/sql/backends/monet5/UDF/pyapi/emit.c
--- a/sql/backends/monet5/UDF/pyapi/emit.c
+++ b/sql/backends/monet5/UDF/pyapi/emit.c
@@ -1,3 +1,10 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
+ */
#include "emit.h"
#include "conversion.h"
diff --git a/sql/backends/monet5/UDF/pyapi/emit.h
b/sql/backends/monet5/UDF/pyapi/emit.h
--- a/sql/backends/monet5/UDF/pyapi/emit.h
+++ b/sql/backends/monet5/UDF/pyapi/emit.h
@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * Copyright 2008-2015 MonetDB B.V.
+ * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
*/
/*
diff --git a/sql/backends/monet5/UDF/pyapi/formatinput.c
b/sql/backends/monet5/UDF/pyapi/formatinput.c
--- a/sql/backends/monet5/UDF/pyapi/formatinput.c
+++ b/sql/backends/monet5/UDF/pyapi/formatinput.c
@@ -1,3 +1,10 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
+ */
#include "formatinput.h"
#include "type_conversion.h"
diff --git a/sql/backends/monet5/UDF/pyapi/formatinput.h
b/sql/backends/monet5/UDF/pyapi/formatinput.h
--- a/sql/backends/monet5/UDF/pyapi/formatinput.h
+++ b/sql/backends/monet5/UDF/pyapi/formatinput.h
@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * Copyright 2008-2015 MonetDB B.V.
+ * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
*/
/*
diff --git a/sql/backends/monet5/UDF/pyapi/pyapi.c
b/sql/backends/monet5/UDF/pyapi/pyapi.c
--- a/sql/backends/monet5/UDF/pyapi/pyapi.c
+++ b/sql/backends/monet5/UDF/pyapi/pyapi.c
@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * Copyright 2008-2015 MonetDB B.V.
+ * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
*/
#include "pyapi.h"
diff --git a/sql/backends/monet5/UDF/pyapi/pyapi.h
b/sql/backends/monet5/UDF/pyapi/pyapi.h
--- a/sql/backends/monet5/UDF/pyapi/pyapi.h
+++ b/sql/backends/monet5/UDF/pyapi/pyapi.h
@@ -1,10 +1,9 @@
-
/*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * Copyright 2008-2015 MonetDB B.V.
+ * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
*/
/*
diff --git a/sql/backends/monet5/UDF/pyapi/pyapi.mal
b/sql/backends/monet5/UDF/pyapi/pyapi.mal
--- a/sql/backends/monet5/UDF/pyapi/pyapi.mal
+++ b/sql/backends/monet5/UDF/pyapi/pyapi.mal
@@ -2,7 +2,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-# Copyright 2008-2015 MonetDB B.V.
+# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
module pyapi;
diff --git a/sql/backends/monet5/UDF/pyapi/pyapi_locatepython.bat
b/sql/backends/monet5/UDF/pyapi/pyapi_locatepython.bat
--- a/sql/backends/monet5/UDF/pyapi/pyapi_locatepython.bat
+++ b/sql/backends/monet5/UDF/pyapi/pyapi_locatepython.bat
@@ -1,3 +1,9 @@
+@REM This Source Code Form is subject to the terms of the Mozilla Public
+@REM License, v. 2.0. If a copy of the MPL was not distributed with this
+@REM file, You can obtain one at http://mozilla.org/MPL/2.0/.
+@REM
+@REM Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
+
@echo off
setlocal ENABLEEXTENSIONS
diff --git a/sql/backends/monet5/UDF/pyapi/pyloader.c
b/sql/backends/monet5/UDF/pyapi/pyloader.c
--- a/sql/backends/monet5/UDF/pyapi/pyloader.c
+++ b/sql/backends/monet5/UDF/pyapi/pyloader.c
@@ -1,3 +1,11 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
+ */
+
#include "pyapi.h"
#include "conversion.h"
#include "connection.h"
diff --git a/sql/backends/monet5/UDF/pyapi/pytypes.c
b/sql/backends/monet5/UDF/pyapi/pytypes.c
--- a/sql/backends/monet5/UDF/pyapi/pytypes.c
+++ b/sql/backends/monet5/UDF/pyapi/pytypes.c
@@ -1,3 +1,10 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
