Changeset: 17834a7158f7 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/17834a7158f7 Modified Files: gdk/gdk_bat.c sql/backends/monet5/sql.c sql/storage/bat/bat_logger.c tools/monetdbe/monetdbe.c Branch: default Log Message:
Merge with Jul2021 branch. diffs (truncated from 2032 to 300 lines): diff --git a/ChangeLog.Jul2021 b/ChangeLog.Jul2021 --- a/ChangeLog.Jul2021 +++ b/ChangeLog.Jul2021 @@ -1,6 +1,3 @@ # ChangeLog file for devel # This file is updated with Maddlog -* Thu Apr 15 2021 svetlin <[email protected]> -- preserve in query comments - diff --git a/clients/ChangeLog.Jul2021 b/clients/ChangeLog.Jul2021 --- a/clients/ChangeLog.Jul2021 +++ b/clients/ChangeLog.Jul2021 @@ -1,3 +1,8 @@ # ChangeLog file for clients # This file is updated with Maddlog +* Tue Jul 20 2021 Sjoerd Mullender <[email protected]> +- The MonetDB stethoscope has been removed. There is now a separate + package available with PIP (monetdb_stethoscope) or as an RPM or DEB + package (stethoscope) from the monetdb.org repository. + 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/gdk/ChangeLog.Jul2021 b/gdk/ChangeLog.Jul2021 --- a/gdk/ChangeLog.Jul2021 +++ b/gdk/ChangeLog.Jul2021 @@ -1,6 +1,18 @@ # ChangeLog file for GDK # This file is updated with Maddlog +* Tue Jul 20 2021 Sjoerd Mullender <[email protected]> +- A new type, called msk, was introduced. This is a bit mask type. + In a bat with type msk, each row occupies a single bit, so 8 rows are + stored in a single byte. There is no NULL value for this type. +- The function of the BAT iterator (type BATiter, function bat_iterator) + has been expanded. The iterator now contains more information about + the BAT, and it contains a pointer to the heaps (theap and tvheap) + that are stable, at least in the sense that they will remain available + even when parallel threads update the BAT and cause those heaps to grow + (and therefore possibly move in memory). A call to bat_iterator must + now be accompanied by a call to bat_iterator_end. + * Mon Mar 29 2021 Sjoerd Mullender <[email protected]> - Implemented function BUNreplacemultiincr to replace multiple values in a BAT in one go, starting at a given position. diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c --- a/gdk/gdk_bat.c +++ b/gdk/gdk_bat.c @@ -772,7 +772,7 @@ wrongtype(int t1, int t2) BAT * COLcopy(BAT *b, int tt, bool writable, role_t role) { - BUN bunstocopy = BUN_NONE; + bool slowcopy = false; BAT *bn = NULL; BATiter bi; @@ -810,50 +810,45 @@ COLcopy(BAT *b, int tt, bool writable, r } } else { /* check whether we need case (4); BUN-by-BUN copy (by - * setting bunstocopy != BUN_NONE) */ + * setting slowcopy to false) */ _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
