Changeset: e2b373d50f1d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e2b373d50f1d
Modified Files:
geom/monetdb5/30_geom.mal
monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
monetdb5/extras/rapi/50_rapi.mal
monetdb5/extras/sphinx/30_sphinx.mal
monetdb5/mal/mal_linker.c
sql/backends/monet5/40_sql.mal
sql/backends/monet5/UDF/80_udf.mal
sql/backends/monet5/generator/90_generator.mal
sql/backends/monet5/gsl/73_gsl.mal
sql/backends/monet5/vaults/70_vault.mal
sql/backends/monet5/vaults/bam/85_bam.mal
sql/backends/monet5/vaults/bam/85_bam.sql
sql/backends/monet5/vaults/bam/bam.mal
sql/backends/monet5/vaults/lidar/75_lidar.mal
sql/backends/monet5/vaults/lidar/lidar.c
sql/backends/monet5/vaults/lidar/lidar.h
sql/backends/monet5/vaults/lidar/lidar.mal
Branch: pythonudf
Log Message:
Merge with default branch.
diffs (241 lines):
diff --git a/geom/monetdb5/30_geom.mal b/geom/monetdb5/30_geom.mal
--- a/geom/monetdb5/30_geom.mal
+++ b/geom/monetdb5/30_geom.mal
@@ -5,4 +5,5 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
# This loads the MonetDB/GIS module
+library geom;
include geom;
diff --git a/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
b/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
--- a/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
+++ b/monetdb5/extras/mal_optimizer_template/91_opt_sql_append.mal
@@ -5,4 +5,5 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
# This loads the opt_sql_append optimizer module
+library opt_sql_append;
include opt_sql_append;
diff --git a/monetdb5/extras/rapi/50_rapi.mal b/monetdb5/extras/rapi/50_rapi.mal
--- a/monetdb5/extras/rapi/50_rapi.mal
+++ b/monetdb5/extras/rapi/50_rapi.mal
@@ -5,4 +5,5 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
# This loads the MonetDB/RAPI module
+library rapi;
include rapi;
diff --git a/monetdb5/extras/sphinx/30_sphinx.mal
b/monetdb5/extras/sphinx/30_sphinx.mal
--- a/monetdb5/extras/sphinx/30_sphinx.mal
+++ b/monetdb5/extras/sphinx/30_sphinx.mal
@@ -4,4 +4,5 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
+library sphinx;
include sphinx;
diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -222,7 +222,7 @@ loadLibrary(str filename, int flag)
if (handle == NULL) {
if (flag)
- throw(LOADER, "loadLibrary", RUNTIME_LOAD_ERROR " could
not locate library %s (from within file '%s')", s, filename);
+ throw(LOADER, "loadLibrary", RUNTIME_LOAD_ERROR " could
not locate library %s (from within file '%s'): %s", s, filename, dlerror());
}
MT_lock_set(&mal_contextLock);
diff --git a/sql/backends/monet5/40_sql.mal b/sql/backends/monet5/40_sql.mal
--- a/sql/backends/monet5/40_sql.mal
+++ b/sql/backends/monet5/40_sql.mal
@@ -5,4 +5,5 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
# This loads the MonetDB/SQL module
+library sql;
include sql;
diff --git a/sql/backends/monet5/UDF/80_udf.mal
b/sql/backends/monet5/UDF/80_udf.mal
--- a/sql/backends/monet5/UDF/80_udf.mal
+++ b/sql/backends/monet5/UDF/80_udf.mal
@@ -6,4 +6,5 @@
# This announces the UDF module to the MAL interpreter
+library udf;
include udf;
diff --git a/sql/backends/monet5/generator/90_generator.mal
b/sql/backends/monet5/generator/90_generator.mal
--- a/sql/backends/monet5/generator/90_generator.mal
+++ b/sql/backends/monet5/generator/90_generator.mal
@@ -4,4 +4,5 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
+library generator;
include generator;
diff --git a/sql/backends/monet5/gsl/73_gsl.mal
b/sql/backends/monet5/gsl/73_gsl.mal
--- a/sql/backends/monet5/gsl/73_gsl.mal
+++ b/sql/backends/monet5/gsl/73_gsl.mal
@@ -4,4 +4,5 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
+library gsl;
include gsl;
diff --git a/sql/backends/monet5/vaults/70_vault.mal
b/sql/backends/monet5/vaults/70_vault.mal
--- a/sql/backends/monet5/vaults/70_vault.mal
+++ b/sql/backends/monet5/vaults/70_vault.mal
@@ -5,4 +5,5 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
# This loads the MonetDB/SQL module
+#library vault;
#include vault;
diff --git a/sql/backends/monet5/vaults/bam/85_bam.mal
b/sql/backends/monet5/vaults/bam/85_bam.mal
--- a/sql/backends/monet5/vaults/bam/85_bam.mal
+++ b/sql/backends/monet5/vaults/bam/85_bam.mal
@@ -1,1 +1,8 @@
+# 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.
+
+library bam;
include bam;
diff --git a/sql/backends/monet5/vaults/bam/85_bam.sql
b/sql/backends/monet5/vaults/bam/85_bam.sql
--- a/sql/backends/monet5/vaults/bam/85_bam.sql
+++ b/sql/backends/monet5/vaults/bam/85_bam.sql
@@ -1,3 +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 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
+
CREATE SCHEMA bam;
CREATE PROCEDURE bam.bam_loader_repos(bam_repos STRING, dbschema SMALLINT)
diff --git a/sql/backends/monet5/vaults/bam/bam.mal
b/sql/backends/monet5/vaults/bam/bam.mal
--- a/sql/backends/monet5/vaults/bam/bam.mal
+++ b/sql/backends/monet5/vaults/bam/bam.mal
@@ -1,3 +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 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
+
module bam;
diff --git a/sql/backends/monet5/vaults/lidar/75_lidar.mal
b/sql/backends/monet5/vaults/lidar/75_lidar.mal
--- a/sql/backends/monet5/vaults/lidar/75_lidar.mal
+++ b/sql/backends/monet5/vaults/lidar/75_lidar.mal
@@ -1,19 +1,8 @@
-# The contents of this file are subject to the MonetDB Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.monetdb.org/Legal/MonetDBLicense
+# 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/.
#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-#
-# The Original Code is the MonetDB Database System.
-#
-# The Initial Developer of the Original Code is CWI.
-# Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-# Copyright August 2008-2015 MonetDB B.V.
-# All Rights Reserved.
+# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
# This loads the MonetDB/SQL module
library lidar;
diff --git a/sql/backends/monet5/vaults/lidar/lidar.c
b/sql/backends/monet5/vaults/lidar/lidar.c
--- a/sql/backends/monet5/vaults/lidar/lidar.c
+++ b/sql/backends/monet5/vaults/lidar/lidar.c
@@ -1,20 +1,9 @@
/*
- * The contents of this file are subject to the MonetDB Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.monetdb.org/Legal/MonetDBLicense
+ * 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/.
*
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is the MonetDB Database System.
- *
- * The Initial Developer of the Original Code is CWI.
- * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2015 MonetDB B.V.
- * All Rights Reserved.
+ * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
*/
/*
diff --git a/sql/backends/monet5/vaults/lidar/lidar.h
b/sql/backends/monet5/vaults/lidar/lidar.h
--- a/sql/backends/monet5/vaults/lidar/lidar.h
+++ b/sql/backends/monet5/vaults/lidar/lidar.h
@@ -1,20 +1,9 @@
/*
- * The contents of this file are subject to the MonetDB Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.monetdb.org/Legal/MonetDBLicense
+ * 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/.
*
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is the MonetDB Database System.
- *
- * The Initial Developer of the Original Code is CWI.
- * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2015 MonetDB B.V.
- * All Rights Reserved.
+ * Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
*/
#ifndef _LIDAR_
diff --git a/sql/backends/monet5/vaults/lidar/lidar.mal
b/sql/backends/monet5/vaults/lidar/lidar.mal
--- a/sql/backends/monet5/vaults/lidar/lidar.mal
+++ b/sql/backends/monet5/vaults/lidar/lidar.mal
@@ -1,19 +1,8 @@
-# The contents of this file are subject to the MonetDB Public License
-# Version 1.1 (the "License"); you may not use this file except in
-# compliance with the License. You may obtain a copy of the License at
-# http://www.monetdb.org/Legal/MonetDBLicense
+# 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/.
#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-# License for the specific language governing rights and limitations
-# under the License.
-#
-# The Original Code is the MonetDB Database System.
-#
-# The Initial Developer of the Original Code is CWI.
-# Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
-# Copyright August 2008-2015 MonetDB B.V.
-# All Rights Reserved.
+# Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
module lidar;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
