mdbx: Merge branch 'devel'.

2024-10-30 11:29:19 +08:00 · 2017-01-01 14:57:06 +03:00 · 2017-01-01 14:57:06 +03:00 · a23e55f1d9
commit a23e55f1d9
parent ec49580a84 ddb3c32258
32 changed files with 102 additions and 85 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,15 @@
+language: c
+sudo: false
+dist: trusty
+cache: bundler
+notifications:
+        email: false
+
+compiler:
+        - gcc
+        - clang
+
+os:
+        - linux
+
+script: if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make all lmdb check; fi
--- a/6
+++ b/6
@ -1,6 +1,6 @@
-Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
-Copyright (c) 2015,2016 Peter-Service R&D LLC.
-Copyright 2011-2016 Howard Chu, Symas Corp.
+Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+Copyright 2011-2017 Howard Chu, Symas Corp.
+Copyright 2015,2016 Peter-Service R&D LLC.
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
--- a/barriers.h
+++ b/barriers.h
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/intro.doc
+++ b/intro.doc
@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
- * Copyright 2015 Howard Chu, Symas Corp.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2015-2017 Howard Chu, Symas Corp.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/lmdb.h
+++ b/lmdb.h
@ -125,17 +125,17 @@
 *	@author	Leonid Yuriev, 'ReOpen' initiative <https://github.com/ReOpen>.
 *	Howard Chu, Symas Corp. All rights reserved.
 *
- *	@copyright 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- *	2011-2016 Howard Chu, Symas Corp. All rights reserved.
+ *	@copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ *	2011-2017 Howard Chu, Symas Corp. All rights reserved.
 *
 * ---
 *
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 *	@par Derived From:
 * This code is derived from LMDB engine written by Howard Chu, Symas Corporation.
 *
- * Copyright 2011-2016 Howard Chu, Symas Corp. All rights reserved.
+ * Copyright 2011-2017 Howard Chu, Symas Corp. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted only as authorized by the OpenLDAP
--- a/mdb.c
+++ b/mdb.c
@ -6,9 +6,9 @@
 */

 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
- * Copyright 2011-2016 Howard Chu, Symas Corp.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2011-2017 Howard Chu, Symas Corp.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/mdb_chk.c
+++ b/mdb_chk.c
@ -1,8 +1,8 @@
 /* mdbx_chk.c - memory-mapped database check tool */

 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 *
 * This file is part of libmdbx.
 *
--- a/mdb_copy.1
+++ b/mdb_copy.1
@ -1,4 +1,6 @@
-.\" Copyright 2012-2016 Howard Chu, Symas Corp. All Rights Reserved.
+.\" Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+.\" Copyright 2012-2017 Howard Chu, Symas Corp. All Rights Reserved.
+.\" Copyright 2015,2016 Peter-Service R&D LLC <http://billing.ru/>.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
 .TH MDB_COPY 1 "2014/06/20" "LMDB 0.9.14"
 .SH NAME
--- a/mdb_copy.c
+++ b/mdb_copy.c
@ -1,9 +1,9 @@
 /* mdb_copy.c - memory-mapped database backup tool */

 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
- * Copyright 2012-2016 Howard Chu, Symas Corp.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2012-2017 Howard Chu, Symas Corp.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/mdb_dump.1
+++ b/mdb_dump.1
@ -1,6 +1,6 @@
-.\" Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
-.\" Copyright (c) 2015,2016 Peter-Service R&D LLC <http://billing.ru/>.
-.\" Copyright 2014-2016 Howard Chu, Symas Corp. All Rights Reserved.
+.\" Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+.\" Copyright 2014-2017 Howard Chu, Symas Corp. All Rights Reserved.
+.\" Copyright 2015,2016 Peter-Service R&D LLC <http://billing.ru/>.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
 .TH MDB_DUMP 1 "2014/06/20" "LMDB 0.9.14"
 .SH NAME
--- a/mdb_dump.c
+++ b/mdb_dump.c
@ -1,9 +1,9 @@
 /* mdb_dump.c - memory-mapped database dump tool */

 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
- * Copyright 2011-2016 Howard Chu, Symas Corp.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2011-2017 Howard Chu, Symas Corp.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/mdb_load.1
+++ b/mdb_load.1
@ -1,6 +1,8 @@
-.TH MDB_LOAD 1 "2014/06/20" "LMDB 0.9.14"
-.\" Copyright 2014-2016 Howard Chu, Symas Corp. All Rights Reserved.
+.\" Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+.\" Copyright 2014-2017 Howard Chu, Symas Corp. All Rights Reserved.
+.\" Copyright 2015,2016 Peter-Service R&D LLC <http://billing.ru/>.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
+.TH MDB_LOAD 1 "2014/06/20" "LMDB 0.9.14"
 .SH NAME
 mdb_load \- LMDB environment import tool
 .SH SYNOPSIS
--- a/mdb_load.c
+++ b/mdb_load.c
@ -1,9 +1,9 @@
 /* mdb_load.c - memory-mapped database load tool */

 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
- * Copyright 2011-2016 Howard Chu, Symas Corp.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2011-2017 Howard Chu, Symas Corp.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/mdb_stat.1
+++ b/mdb_stat.1
@ -1,6 +1,6 @@
-.\" Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
-.\" Copyright (c) 2015,2016 Peter-Service R&D LLC <http://billing.ru/>.
-.\" Copyright 2012-2016 Howard Chu, Symas Corp. All Rights Reserved.
+.\" Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+.\" Copyright 2012-2017 Howard Chu, Symas Corp. All Rights Reserved.
+.\" Copyright 2015,2016 Peter-Service R&D LLC <http://billing.ru/>.
 .\" Copying restrictions apply.  See COPYRIGHT/LICENSE.
 .TH MDB_STAT 1 "2014/06/20" "LMDB 0.9.14"
 .SH NAME
--- a/mdb_stat.c
+++ b/mdb_stat.c
@ -1,9 +1,9 @@
 /* mdb_stat.c - memory-mapped database status tool */

 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
- * Copyright 2011-2016 Howard Chu, Symas Corp.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2011-2017 Howard Chu, Symas Corp.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/mdbx.c
+++ b/mdbx.c
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/mdbx.h
+++ b/mdbx.h
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/midl.c
+++ b/midl.c
@ -2,9 +2,9 @@
 *	@brief ldap bdb back-end ID List functions */

 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
- * Copyright 2000-2016 The OpenLDAP Foundation.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2000-2017 The OpenLDAP Foundation.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/midl.h
+++ b/midl.h
@ -10,9 +10,9 @@
 */

 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
- * Copyright 2000-2016 The OpenLDAP Foundation.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2000-2017 The OpenLDAP Foundation.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/mtest0.c
+++ b/mtest0.c
@ -1,9 +1,9 @@
 /* mtest.c - memory-mapped database tester/toy */

 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
- * Copyright 2011-2016 Howard Chu, Symas Corp.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2011-2017 Howard Chu, Symas Corp.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/mtest1.c
+++ b/mtest1.c
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/mtest2.c
+++ b/mtest2.c
@ -1,9 +1,9 @@
 /* mtest2.c - memory-mapped database tester/toy */

 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
- * Copyright 2011-2016 Howard Chu, Symas Corp.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2011-2017 Howard Chu, Symas Corp.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/mtest3.c
+++ b/mtest3.c
@ -1,9 +1,9 @@
 /* mtest3.c - memory-mapped database tester/toy */

 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
- * Copyright 2011-2016 Howard Chu, Symas Corp.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2011-2017 Howard Chu, Symas Corp.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/mtest4.c
+++ b/mtest4.c
@ -1,9 +1,9 @@
 /* mtest4.c - memory-mapped database tester/toy */

 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
- * Copyright 2011-2016 Howard Chu, Symas Corp.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2011-2017 Howard Chu, Symas Corp.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/mtest5.c
+++ b/mtest5.c
@ -1,9 +1,9 @@
 /* mtest5.c - memory-mapped database tester/toy */

 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
- * Copyright 2011-2016 Howard Chu, Symas Corp.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2011-2017 Howard Chu, Symas Corp.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/mtest6.c
+++ b/mtest6.c
@ -1,9 +1,9 @@
 /* mtest6.c - memory-mapped database tester/toy */

 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
- * Copyright 2011-2016 Howard Chu, Symas Corp.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2011-2017 Howard Chu, Symas Corp.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/reopen.h
+++ b/reopen.h
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/sample-bdb.txt
+++ b/sample-bdb.txt
@ -4,9 +4,9 @@
 */

 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
- * Copyright 2012-2016 Howard Chu, Symas Corp.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2012-2017 Howard Chu, Symas Corp.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/sample-mdb.txt
+++ b/sample-mdb.txt
@ -4,9 +4,9 @@
 */

 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
- * Copyright 2012-2016 Howard Chu, Symas Corp.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2012-2017 Howard Chu, Symas Corp.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/wbench.c
+++ b/wbench.c
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2015,2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015,2016 Peter-Service R&D LLC.
+ * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2015,2016 Peter-Service R&D LLC.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/yota_test1.c
+++ b/yota_test1.c
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015 Vladimir Romanov <https://www.linkedin.com/in/vladimirromanov>, Yota Lab.
+ * Copyright 2016-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2015 Vladimir Romanov <https://www.linkedin.com/in/vladimirromanov>, Yota Lab.
 *
 * This file is part of libmdbx.
 *
@ -16,7 +16,6 @@
 *
 * You should have received a copy of the GNU Affero General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
 */

 #include <sys/time.h>
--- a/yota_test2.c
+++ b/yota_test2.c
@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2016 Leonid Yuriev <leo@yuriev.ru>.
- * Copyright (c) 2015 Vladimir Romanov <https://www.linkedin.com/in/vladimirromanov>, Yota Lab.
+ * Copyright 2016-2017 Leonid Yuriev <leo@yuriev.ru>.
+ * Copyright 2015 Vladimir Romanov <https://www.linkedin.com/in/vladimirromanov>, Yota Lab.
 *
 * This file is part of libmdbx.
 *
@ -16,7 +16,6 @@
 *
 * You should have received a copy of the GNU Affero General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
 */

 #include <sys/time.h>