Changeset: e227470e9d1d for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/e227470e9d1d Modified Files: clients/examples/C/bincopydata.c clients/examples/C/bincopydata.h clients/examples/C/bincopyloops.c clients/examples/C/bincopytemporaldata.c clients/examples/C/bincopyuuid.c clients/examples/C/streamcat.c clients/examples/perl/client.pl clients/examples/perl/dbitest_extensive.pl clients/examples/perl/dbitest_small.pl clients/examples/perl/malsample.pl clients/examples/perl/smack00.pl clients/examples/perl/smack01.pl clients/examples/perl/sqlsample.pl common/utils/copybinary_support.h common/utils/monetdb_hgversion.h.in misc/python/fixlicense.py misc/selinux/monetdb.fc.in misc/selinux/monetdb.te monetdb5/optimizer/opt_bincopyfrom.c monetdb5/optimizer/opt_bincopyfrom.h sql/backends/monet5/sql_bincopyfrom.c sql/common/exception_buffer.c sql/scripts/76_dump.sql testing/explain.py testing/malmapi.py testing/mapicursor.py testing/tfducktest.py testing/utils.py Branch: Jul2021 Log Message:
Fixed/added copyright notices. diffs (truncated from 432 to 300 lines): diff --git a/clients/examples/C/bincopydata.c b/clients/examples/C/bincopydata.c --- a/clients/examples/C/bincopydata.c +++ b/clients/examples/C/bincopydata.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 - 2021 MonetDB B.V. + */ + #include "bincopydata.h" #ifdef _MSC_VER diff --git a/clients/examples/C/bincopydata.h b/clients/examples/C/bincopydata.h --- a/clients/examples/C/bincopydata.h +++ b/clients/examples/C/bincopydata.h @@ -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 - 2021 MonetDB B.V. + */ + #include "monetdb_config.h" #include "copybinary.h" #include "copybinary_support.h" diff --git a/clients/examples/C/bincopyloops.c b/clients/examples/C/bincopyloops.c --- a/clients/examples/C/bincopyloops.c +++ b/clients/examples/C/bincopyloops.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 - 2021 MonetDB B.V. + */ #include "bincopydata.h" diff --git a/clients/examples/C/bincopytemporaldata.c b/clients/examples/C/bincopytemporaldata.c --- a/clients/examples/C/bincopytemporaldata.c +++ b/clients/examples/C/bincopytemporaldata.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 - 2021 MonetDB B.V. + */ + #include "bincopydata.h" static copy_binary_timestamp diff --git a/clients/examples/C/bincopyuuid.c b/clients/examples/C/bincopyuuid.c --- a/clients/examples/C/bincopyuuid.c +++ b/clients/examples/C/bincopyuuid.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 - 2021 MonetDB B.V. + */ + #include "bincopydata.h" typedef union { diff --git a/clients/examples/C/streamcat.c b/clients/examples/C/streamcat.c --- a/clients/examples/C/streamcat.c +++ b/clients/examples/C/streamcat.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 - 2021 MonetDB B.V. + */ + #include "monetdb_config.h" #include "stream.h" diff --git a/clients/examples/perl/client.pl b/clients/examples/perl/client.pl --- a/clients/examples/perl/client.pl +++ b/clients/examples/perl/client.pl @@ -1,4 +1,11 @@ #!/usr/bin/perl + +# 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 - 2021 MonetDB B.V. + # This script implements the supersmack benchmark obtained from Mysql use Mapi; diff --git a/clients/examples/perl/dbitest_extensive.pl b/clients/examples/perl/dbitest_extensive.pl --- a/clients/examples/perl/dbitest_extensive.pl +++ b/clients/examples/perl/dbitest_extensive.pl @@ -1,4 +1,11 @@ #!/usr/bin/perl + +# 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 - 2021 MonetDB B.V. + # MonetDB DBI test script # --------------------- # This scripts will call all methods as defined in DBI 1.37 (Perl 5.8.1) @@ -1164,9 +1171,10 @@ if(!$error){ =item C<bind_param_inout> DBI states: -"It is expected that few drivers will support this method. The only driver cur -rently known to do so is DBD::Oracle (DBD::ODBC may support it in a future -release). Therefore it should not be used for database independent applications." +"It is expected that few drivers will support this method. The only +driver currently known to do so is DBD::Oracle (DBD::ODBC may support +it in a future release). Therefore it should not be used for database +independent applications." As bin_param also fails at the moment this is skipped for now. diff --git a/clients/examples/perl/dbitest_small.pl b/clients/examples/perl/dbitest_small.pl --- a/clients/examples/perl/dbitest_small.pl +++ b/clients/examples/perl/dbitest_small.pl @@ -1,5 +1,11 @@ #!/usr/bin/perl -w +# 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 - 2021 MonetDB B.V. + use strict; use DBI; use DBI qw(:sql_types); diff --git a/clients/examples/perl/malsample.pl b/clients/examples/perl/malsample.pl --- a/clients/examples/perl/malsample.pl +++ b/clients/examples/perl/malsample.pl @@ -6,6 +6,12 @@ # # Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +# 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 - 2021 MonetDB B.V. + use strict; use warnings; use DBI(); diff --git a/clients/examples/perl/smack00.pl b/clients/examples/perl/smack00.pl --- a/clients/examples/perl/smack00.pl +++ b/clients/examples/perl/smack00.pl @@ -1,4 +1,11 @@ #!/usr/bin/perl + +# 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 - 2021 MonetDB B.V. + # This script implements the supersmack benchmark obtained from Mysql use Mapi; diff --git a/clients/examples/perl/smack01.pl b/clients/examples/perl/smack01.pl --- a/clients/examples/perl/smack01.pl +++ b/clients/examples/perl/smack01.pl @@ -1,4 +1,11 @@ #!/usr/bin/perl + +# 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 - 2021 MonetDB B.V. + # This script implements the supersmack benchmark obtained from Mysql use Mapi; diff --git a/clients/examples/perl/sqlsample.pl b/clients/examples/perl/sqlsample.pl --- a/clients/examples/perl/sqlsample.pl +++ b/clients/examples/perl/sqlsample.pl @@ -6,6 +6,12 @@ # # Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. +# 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 - 2021 MonetDB B.V. + use strict; use warnings; use DBI(); diff --git a/common/utils/copybinary_support.h b/common/utils/copybinary_support.h --- a/common/utils/copybinary_support.h +++ b/common/utils/copybinary_support.h @@ -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 - 2021 MonetDB B.V. + */ + #ifndef COPYBINARY_SUPPORT_H #define COPYBINARY_SUPPORT_H diff --git a/common/utils/monetdb_hgversion.h.in b/common/utils/monetdb_hgversion.h.in --- a/common/utils/monetdb_hgversion.h.in +++ b/common/utils/monetdb_hgversion.h.in @@ -1,1 +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 - 2021 MonetDB B.V. + */ + #cmakedefine MERCURIAL_ID "@MERCURIAL_ID@" diff --git a/misc/python/fixlicense.py b/misc/python/fixlicense.py --- a/misc/python/fixlicense.py +++ b/misc/python/fixlicense.py @@ -126,7 +126,7 @@ def getcomments(file, pre = None, post = ext = '' if pre is None and post is None and start is None and end is None: if file.endswith('.in') and os.path.basename(file[:-3]) in suffixrules: - ext = os.path.basename(file) + ext = os.path.basename(file[:-3]) elif os.path.basename(file) in suffixrules: ext = os.path.basename(file) else: @@ -414,7 +414,11 @@ def listfile(file, pre = None, post = No except IOError: print('Cannot open file %s' % file, file=sys.stderr) return - data = f.read() + try: + data = f.read() + except UnicodeDecodeError: + print('File %s not Unicode' % file, file=sys.stderr) + return if PERL_COPYRIGHT in data: notice = PERL_COPYRIGHT elif COPYRIGHT_NOTICE in data: diff --git a/misc/selinux/monetdb.fc.in b/misc/selinux/monetdb.fc.in --- a/misc/selinux/monetdb.fc.in +++ b/misc/selinux/monetdb.fc.in @@ -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 - 2021 MonetDB B.V. + @CMAKE_INSTALL_FULL_BINDIR@/monetdbd -- gen_context(system_u:object_r:monetdbd_exec_t,s0) @CMAKE_INSTALL_FULL_BINDIR@/mserver5 -- gen_context(system_u:object_r:mserver5_exec_t,s0) @CMAKE_INSTALL_FULL_LIBDIR@/systemd/system/monetdbd.* gen_context(system_u:object_r:monetdbd_unit_file_t,s0) diff --git a/misc/selinux/monetdb.te b/misc/selinux/monetdb.te --- a/misc/selinux/monetdb.te +++ b/misc/selinux/monetdb.te @@ -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 - 2021 MonetDB B.V. + policy_module(monetdb, 1.1) # The above line declares that this file is a SELinux policy file. Its # name is monetdb, so the file should be saved as monetdb.te diff --git a/monetdb5/optimizer/opt_bincopyfrom.c b/monetdb5/optimizer/opt_bincopyfrom.c --- a/monetdb5/optimizer/opt_bincopyfrom.c +++ b/monetdb5/optimizer/opt_bincopyfrom.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 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. + * Copyright 1997 - July 2008 CWI, August 2008 - 2021 MonetDB B.V. */ _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
