From 0131a10aa2e87896936aca74b35bfa3fa3ee6fc0 Mon Sep 17 00:00:00 2001 From: Christoph Rupp Date: Sun, 4 Jun 2017 16:50:49 +0200 Subject: [PATCH] Release 2.2.2 --- ChangeLog | 25 +++++ README | 2 +- documentation/Doxyfile | 2 +- dotnet/upscaledb-dotnet/NativeMethods.cs | 92 +++++++++---------- include/ups/types.h | 21 +++-- include/ups/upscaledb.h | 25 ++--- include/ups/upscaledb.hpp | 23 ++--- include/ups/upscaledb_int.h | 21 +++-- include/ups/upscaledb_srv.h | 25 ++--- include/ups/upscaledb_uqi.h | 23 ++--- java/java/de/crupp/upscaledb/Environment.java | 2 +- java/java/win32.bat | 2 +- java/unittests/win32.bat | 2 +- tools/tests/ups_info/db1-f.txt | 2 +- tools/tests/ups_info/db1.txt | 2 +- tools/tests/ups_info/env3-f.txt | 2 +- tools/tests/ups_info/env3.txt | 2 +- tools/tests/ups_info/extkeys-f.txt | 2 +- tools/tests/ups_info/extkeys.txt | 2 +- upscaledb.spec | 2 +- win32/msvc2013/dll.vcxproj | 16 ++-- win32/msvc2013/lib.vcxproj | 18 ++-- win32/msvc2013/server_dll.vcxproj | 16 ++-- win32/msvc2013/server_lib.vcxproj | 16 ++-- 24 files changed, 188 insertions(+), 157 deletions(-) diff --git a/ChangeLog b/ChangeLog index af54487b9..c61f60c0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +Jun 04, 2017 - chris --------------------------------------------------- + release of upscaledb-2.2.2 +- New API for bulk inserts +- Fixed several bugs +- Fixed compilation for C++11 +- Fixed crc32 failure when reusing deleted blobs spanning multiple pages +- Fixed a bug when recovering duplicates that were inserted with one of the + UPS_DUPLICATE_INSERT_* flags +- Minor improvements for the journalling performance +- Fixed compilation issues w/ gcc 6.2.1 (Thanks, Roel Brook) +- Improved performance of duplicate keys +- Performance improvements when appending keys at the end of the database +- The flags UPS_HINT_APPEND and UPS_HINT_PREPEND are now deprecated +- Removed the libuv dependency; switched to boost::asio instead +- Performance improvements when using many duplicate keys (with a + duplicate table spanning multiple pages) +- Committed transactions are now batched before they are flushed to disk +- The integer compression codecs UPS_COMPRESSOR_UINT32_GROUPVARINT and + UPS_COMPRESSOR_UINT32_STREAMVBYTE are now deprecated +- The integer compression codec UPS_COMPRESSOR_UINT32_MASKEDVBYTE is now a + synonym for UPS_COMPRESSOR_UINT32_VARBYTE, but uses the MaskedVbyte + library under the hood. +- Added Mingw compiler support (thanks, topilski) +- License is now Apache Public License 2.0 + Jan 25, 2016 - chris --------------------------------------------------- release of upscaledb-2.2.1 diff --git a/README b/README index 982217b28..d70f1849d 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -upscaledb 2.2.1 Fr 10. Mär 21:33:03 CET 2017 +upscaledb 2.2.2 Fr 10. Mär 21:33:03 CET 2017 (C) Christoph Rupp, chris@crupp.de; http://www.upscaledb.com This is the README file of upscaledb. diff --git a/documentation/Doxyfile b/documentation/Doxyfile index 5185d990f..4db9a80c1 100644 --- a/documentation/Doxyfile +++ b/documentation/Doxyfile @@ -31,7 +31,7 @@ PROJECT_NAME = "upscaledb" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 2.2.1 +PROJECT_NUMBER = 2.2.2 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/dotnet/upscaledb-dotnet/NativeMethods.cs b/dotnet/upscaledb-dotnet/NativeMethods.cs index 0924767e6..178033a9b 100644 --- a/dotnet/upscaledb-dotnet/NativeMethods.cs +++ b/dotnet/upscaledb-dotnet/NativeMethods.cs @@ -31,7 +31,7 @@ static NativeMethods() { // See http://stackoverflow.com/questions/10852634/ var subdir = (IntPtr.Size == 8) ? "x64" : "x86"; if (System.IO.Directory.Exists(subdir)) { - LoadLibrary(subdir + "/upscaledb-2.2.1.dll"); + LoadLibrary(subdir + "/upscaledb-2.2.2.dll"); } else { @@ -69,7 +69,7 @@ unsafe struct OperationLow public Int32 result; } - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_db_bulk_operations", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_db_bulk_operations", CallingConvention = CallingConvention.Cdecl)] static private unsafe extern int BulkOperationsLow(IntPtr handle, IntPtr txnhandle, OperationLow* operations, SizeT operations_length, int flags); @@ -150,11 +150,11 @@ static public unsafe int BulkOperations(IntPtr handle, IntPtr txnhandle, Operati } } - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_set_error_handler", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_set_error_handler", CallingConvention = CallingConvention.Cdecl)] static public extern void SetErrorHandler(ErrorHandler eh); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_strerror", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_strerror", CallingConvention=CallingConvention.Cdecl)] static public extern IntPtr StringErrorImpl(int error); @@ -163,48 +163,48 @@ static public string StringError(int error) { return System.Runtime.InteropServices.Marshal.PtrToStringAnsi(s); } - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_get_version", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_get_version", CallingConvention = CallingConvention.Cdecl)] static public extern void GetVersion(out int major, out int minor, out int revision); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_env_create", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_env_create", CallingConvention = CallingConvention.Cdecl)] static public extern int EnvCreate(out IntPtr handle, String fileName, int flags, int mode, Parameter[] parameters); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_env_open", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_env_open", CallingConvention = CallingConvention.Cdecl)] static public extern int EnvOpen(out IntPtr handle, String fileName, int flags, Parameter[] parameters); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_env_create_db", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_env_create_db", CallingConvention = CallingConvention.Cdecl)] static public extern int EnvCreateDatabase(IntPtr handle, out IntPtr dbhandle, short name, int flags, Parameter[] parameters); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_env_open_db", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_env_open_db", CallingConvention = CallingConvention.Cdecl)] static public extern int EnvOpenDatabase(IntPtr handle, out IntPtr dbhandle, short name, int flags, Parameter[] parameters); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_env_rename_db", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_env_rename_db", CallingConvention = CallingConvention.Cdecl)] static public extern int EnvRenameDatabase(IntPtr handle, short oldName, short newName); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_env_erase_db", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_env_erase_db", CallingConvention = CallingConvention.Cdecl)] static public extern int EnvEraseDatabase(IntPtr handle, short name, int flags); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_env_flush", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_env_flush", CallingConvention = CallingConvention.Cdecl)] static public extern int EnvFlush(IntPtr handle, int flags); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_env_get_database_names", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_env_get_database_names", CallingConvention = CallingConvention.Cdecl)] static public extern int EnvGetDatabaseNamesLow(IntPtr handle, IntPtr dbnames, ref int count); @@ -225,55 +225,55 @@ static public int EnvGetDatabaseNames(IntPtr handle, out short[] names) { return 0; } - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_env_close", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_env_close", CallingConvention = CallingConvention.Cdecl)] static public extern int EnvClose(IntPtr handle, int flags); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_txn_begin", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_txn_begin", CallingConvention = CallingConvention.Cdecl)] static public extern int TxnBegin(out IntPtr txnhandle, IntPtr envhandle, String filename, IntPtr reserved, int flags); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_txn_commit", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_txn_commit", CallingConvention = CallingConvention.Cdecl)] static public extern int TxnCommit(IntPtr handle, int flags); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_txn_abort", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_txn_abort", CallingConvention = CallingConvention.Cdecl)] static public extern int TxnAbort(IntPtr handle, int flags); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_db_get_error", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_db_get_error", CallingConvention = CallingConvention.Cdecl)] static public extern int GetLastError(IntPtr handle); // TODO this is new, but lots of effort b/c of complex // marshalling. if you need this function pls drop me a mail. /* - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_db_get_parameters", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_db_get_parameters", CallingConvention = CallingConvention.Cdecl)] static public extern int GetParameters(IntPtr handle, Parameter[] parameters); */ - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_db_get_env", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_db_get_env", CallingConvention = CallingConvention.Cdecl)] static public extern IntPtr GetEnv(IntPtr handle); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_register_compare", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_register_compare", CallingConvention = CallingConvention.Cdecl)] static public extern int RegisterCompare(String name, CompareFunc foo); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_env_select_range", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_env_select_range", CallingConvention = CallingConvention.Cdecl)] static public extern int EnvSelectRange(IntPtr handle, String query, IntPtr begin, IntPtr end, out IntPtr result); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_db_set_compare_func", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_db_set_compare_func", CallingConvention = CallingConvention.Cdecl)] static public extern int SetCompareFunc(IntPtr handle, CompareFunc foo); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_db_find", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_db_find", CallingConvention = CallingConvention.Cdecl)] static private extern int FindLow(IntPtr handle, IntPtr txnhandle, ref KeyStruct key, ref RecordStruct record, int flags); @@ -304,7 +304,7 @@ static public unsafe int Find(IntPtr handle, IntPtr txnhandle, } } - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_db_insert", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_db_insert", CallingConvention = CallingConvention.Cdecl)] static private extern int InsertLow(IntPtr handle, IntPtr txnhandle, ref KeyStruct key, ref RecordStruct record, int flags); @@ -344,7 +344,7 @@ static public unsafe int InsertRecNo(IntPtr handle, IntPtr txnhandle, } } - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_db_erase", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_db_erase", CallingConvention = CallingConvention.Cdecl)] static private extern int EraseLow(IntPtr handle, IntPtr txnhandle, ref KeyStruct key, int flags); @@ -359,40 +359,40 @@ static public unsafe int Erase(IntPtr handle, IntPtr txnhandle, } } - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_db_count", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_db_count", CallingConvention = CallingConvention.Cdecl)] static public extern int GetCount(IntPtr handle, IntPtr txnhandle, int flags, out Int64 count); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_db_close", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_db_close", CallingConvention = CallingConvention.Cdecl)] static public extern int Close(IntPtr handle, int flags); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_cursor_create", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_cursor_create", CallingConvention = CallingConvention.Cdecl)] static public extern int CursorCreate(out IntPtr chandle, IntPtr dbhandle, IntPtr txnhandle, int flags); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_cursor_clone", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_cursor_clone", CallingConvention = CallingConvention.Cdecl)] static public extern int CursorClone(IntPtr handle, out IntPtr clone); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_cursor_move", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_cursor_move", CallingConvention = CallingConvention.Cdecl)] static private extern int CursorMoveLow(IntPtr handle, IntPtr key, IntPtr record, int flags); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_cursor_move", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_cursor_move", CallingConvention = CallingConvention.Cdecl)] static private extern int CursorMoveLow(IntPtr handle, ref KeyStruct key, IntPtr record, int flags); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_cursor_move", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_cursor_move", CallingConvention = CallingConvention.Cdecl)] static private extern int CursorMoveLow(IntPtr handle, IntPtr key, ref RecordStruct record, int flags); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_cursor_move", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_cursor_move", CallingConvention = CallingConvention.Cdecl)] static private extern int CursorMoveLow(IntPtr handle, ref KeyStruct key, ref RecordStruct record, int flags); @@ -445,7 +445,7 @@ static unsafe public int CursorGet(IntPtr handle, int flags, ref byte[] keyArray return st; } - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_cursor_overwrite", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_cursor_overwrite", CallingConvention = CallingConvention.Cdecl)] static private extern int CursorOverwriteLow(IntPtr handle, ref RecordStruct record, int flags); @@ -459,7 +459,7 @@ static unsafe public int CursorOverwrite(IntPtr handle, byte[] data, int flags) } } - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_cursor_find", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_cursor_find", CallingConvention = CallingConvention.Cdecl)] static private extern int CursorFindLow(IntPtr handle, ref KeyStruct key, ref RecordStruct record, int flags); @@ -491,7 +491,7 @@ static unsafe public int CursorFind(IntPtr handle, ref byte[] keydata, } } - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_cursor_insert", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_cursor_insert", CallingConvention = CallingConvention.Cdecl)] static private extern int CursorInsertLow(IntPtr handle, ref KeyStruct key, ref RecordStruct record, int flags); @@ -509,32 +509,32 @@ static public unsafe int CursorInsert(IntPtr handle, } } - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_cursor_erase", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_cursor_erase", CallingConvention = CallingConvention.Cdecl)] static public extern int CursorErase(IntPtr handle, int flags); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_cursor_get_duplicate_count", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_cursor_get_duplicate_count", CallingConvention = CallingConvention.Cdecl)] static public extern int CursorGetDuplicateCount(IntPtr handle, out int count, int flags); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "ups_cursor_close", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "ups_cursor_close", CallingConvention = CallingConvention.Cdecl)] static public extern int CursorClose(IntPtr handle); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "uqi_result_get_row_count", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "uqi_result_get_row_count", CallingConvention = CallingConvention.Cdecl)] static public extern int ResultGetRowCount(IntPtr handle); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "uqi_result_get_key_type", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "uqi_result_get_key_type", CallingConvention = CallingConvention.Cdecl)] static public extern int ResultGetKeyType(IntPtr handle); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "uqi_result_get_record_type", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "uqi_result_get_record_type", CallingConvention = CallingConvention.Cdecl)] static public extern int ResultGetRecordType(IntPtr handle); - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "uqi_result_get_key", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "uqi_result_get_key", CallingConvention = CallingConvention.Cdecl)] static private extern void ResultGetKeyLow(IntPtr handle, int row, ref KeyStruct key); @@ -548,7 +548,7 @@ static unsafe public byte[] ResultGetKey(IntPtr handle, int row) { return data; } - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "uqi_result_get_record", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "uqi_result_get_record", CallingConvention = CallingConvention.Cdecl)] static private extern void ResultGetRecordLow(IntPtr handle, int row, ref RecordStruct record); @@ -562,7 +562,7 @@ static unsafe public byte[] ResultGetRecord(IntPtr handle, int row) { return data; } - [DllImport("upscaledb-2.2.1.dll", EntryPoint = "uqi_result_close", + [DllImport("upscaledb-2.2.2.dll", EntryPoint = "uqi_result_close", CallingConvention = CallingConvention.Cdecl)] static public extern void ResultClose(IntPtr handle); } diff --git a/include/ups/types.h b/include/ups/types.h index de8a77a60..4bdec0c87 100644 --- a/include/ups/types.h +++ b/include/ups/types.h @@ -1,16 +1,17 @@ /* - * Copyright (C) 2005-2016 Christoph Rupp (chris@crupp.de). - * All Rights Reserved. + * Copyright (C) 2005-2017 Christoph Rupp (chris@crupp.de). * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * * See the file COPYING for License information. */ diff --git a/include/ups/upscaledb.h b/include/ups/upscaledb.h index a73c49c93..f8b2af38d 100644 --- a/include/ups/upscaledb.h +++ b/include/ups/upscaledb.h @@ -1,16 +1,17 @@ /* - * Copyright (C) 2005-2016 Christoph Rupp (chris@crupp.de). - * All Rights Reserved. + * Copyright (C) 2005-2017 Christoph Rupp (chris@crupp.de). * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * * See the file COPYING for License information. */ @@ -19,7 +20,7 @@ * @file upscaledb.h * @brief Include file for upscaledb embedded database * @author Christoph Rupp, chris@crupp.de - * @version 2.2.1 + * @version 2.2.2 * * @mainpage * @@ -142,7 +143,7 @@ extern "C" { */ #define UPS_VERSION_MAJ 2 #define UPS_VERSION_MIN 2 -#define UPS_VERSION_REV 1 +#define UPS_VERSION_REV 2 #define UPS_FILE_VERSION 5 /** diff --git a/include/ups/upscaledb.hpp b/include/ups/upscaledb.hpp index 9e357478a..aca2ec9cb 100644 --- a/include/ups/upscaledb.hpp +++ b/include/ups/upscaledb.hpp @@ -1,16 +1,17 @@ /* - * Copyright (C) 2005-2016 Christoph Rupp (chris@crupp.de). - * All Rights Reserved. + * Copyright (C) 2005-2017 Christoph Rupp (chris@crupp.de). * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * * See the file COPYING for License information. */ @@ -18,7 +19,7 @@ /** * @file upscaledb.hpp * @author Christoph Rupp, chris@crupp.de - * @version 2.2.1 + * @version 2.2.2 * * This C++ wrapper class is a very tight wrapper around the C API. It does * not attempt to be STL compatible. diff --git a/include/ups/upscaledb_int.h b/include/ups/upscaledb_int.h index fec88764d..5fae2427b 100644 --- a/include/ups/upscaledb_int.h +++ b/include/ups/upscaledb_int.h @@ -1,16 +1,17 @@ /* - * Copyright (C) 2005-2016 Christoph Rupp (chris@crupp.de). - * All Rights Reserved. + * Copyright (C) 2005-2017 Christoph Rupp (chris@crupp.de). * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * * See the file COPYING for License information. */ diff --git a/include/ups/upscaledb_srv.h b/include/ups/upscaledb_srv.h index 09a0cefe3..4be2ecac1 100644 --- a/include/ups/upscaledb_srv.h +++ b/include/ups/upscaledb_srv.h @@ -1,16 +1,17 @@ /* - * Copyright (C) 2005-2016 Christoph Rupp (chris@crupp.de). - * All Rights Reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Copyright (C) 2005-2017 Christoph Rupp (chris@crupp.de). + * + * Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * * See the file COPYING for License information. */ diff --git a/include/ups/upscaledb_uqi.h b/include/ups/upscaledb_uqi.h index 3f4229e1b..13a8a5fea 100644 --- a/include/ups/upscaledb_uqi.h +++ b/include/ups/upscaledb_uqi.h @@ -1,16 +1,17 @@ /* - * Copyright (C) 2005-2016 Christoph Rupp (chris@crupp.de). - * All Rights Reserved. + * Copyright (C) 2005-2017 Christoph Rupp (chris@crupp.de). * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * * See the file COPYING for License information. */ @@ -19,7 +20,7 @@ * @file upscaledb_uqi.h * @brief Include file for upscaledb Query Interface * @author Christoph Rupp, chris@crupp.de - * @version 2.2.1 + * @version 2.2.2 * * This API is EXPERIMENTAL!! The interface is not yet stable. */ diff --git a/java/java/de/crupp/upscaledb/Environment.java b/java/java/de/crupp/upscaledb/Environment.java index 63501ab65..64c1c3c70 100644 --- a/java/java/de/crupp/upscaledb/Environment.java +++ b/java/java/de/crupp/upscaledb/Environment.java @@ -335,7 +335,7 @@ public Database openDatabase(short name, int flags) * *

* More information about flags, parameters and possible exceptions: - * C documentation + * C documentation * * @return a Database object */ diff --git a/java/java/win32.bat b/java/java/win32.bat index d5991c365..c35f7de48 100644 --- a/java/java/win32.bat +++ b/java/java/win32.bat @@ -1,7 +1,7 @@ @echo off -set VERSION=2.2.1 +set VERSION=2.2.2 if [%JDK%] == [] goto l1 goto start diff --git a/java/unittests/win32.bat b/java/unittests/win32.bat index f40cf991e..3d463547b 100644 --- a/java/unittests/win32.bat +++ b/java/unittests/win32.bat @@ -3,7 +3,7 @@ copy ..\..\win32\out\java_dll_debug\upscaledb-java.dll . -set CP=.;../java/upscaledb-2.2.1.jar;junit-4.4.jar +set CP=.;../java/upscaledb-2.2.2.jar;junit-4.4.jar echo 1 if ["%JDK%"] == [] goto l1 goto start diff --git a/tools/tests/ups_info/db1-f.txt b/tools/tests/ups_info/db1-f.txt index 4215bfcaf..0df8e7114 100644 --- a/tools/tests/ups_info/db1-f.txt +++ b/tools/tests/ups_info/db1-f.txt @@ -1,6 +1,6 @@ environment page_size: 16384 - version: 2.2.1 + version: 2.2.2 max databases: 540 database 1 (0x1) diff --git a/tools/tests/ups_info/db1.txt b/tools/tests/ups_info/db1.txt index a152b45ab..af38a1a43 100644 --- a/tools/tests/ups_info/db1.txt +++ b/tools/tests/ups_info/db1.txt @@ -1,6 +1,6 @@ environment page_size: 16384 - version: 2.2.1 + version: 2.2.2 max databases: 540 database 1 (0x1) diff --git a/tools/tests/ups_info/env3-f.txt b/tools/tests/ups_info/env3-f.txt index 4e0375de5..12ac181e4 100644 --- a/tools/tests/ups_info/env3-f.txt +++ b/tools/tests/ups_info/env3-f.txt @@ -1,6 +1,6 @@ environment page_size: 16384 - version: 2.2.1 + version: 2.2.2 max databases: 540 database 1 (0x1) diff --git a/tools/tests/ups_info/env3.txt b/tools/tests/ups_info/env3.txt index ae2045da6..ff2c78e93 100644 --- a/tools/tests/ups_info/env3.txt +++ b/tools/tests/ups_info/env3.txt @@ -1,6 +1,6 @@ environment page_size: 16384 - version: 2.2.1 + version: 2.2.2 max databases: 540 database 1 (0x1) diff --git a/tools/tests/ups_info/extkeys-f.txt b/tools/tests/ups_info/extkeys-f.txt index 9889d96c7..3edcf739c 100644 --- a/tools/tests/ups_info/extkeys-f.txt +++ b/tools/tests/ups_info/extkeys-f.txt @@ -1,6 +1,6 @@ environment page_size: 16384 - version: 2.2.1 + version: 2.2.2 max databases: 540 database 1 (0x1) diff --git a/tools/tests/ups_info/extkeys.txt b/tools/tests/ups_info/extkeys.txt index 5f4f01cac..b01a33bd2 100644 --- a/tools/tests/ups_info/extkeys.txt +++ b/tools/tests/ups_info/extkeys.txt @@ -1,6 +1,6 @@ environment page_size: 16384 - version: 2.2.1 + version: 2.2.2 max databases: 540 database 1 (0x1) diff --git a/upscaledb.spec b/upscaledb.spec index 1e1e98b4d..34ebddbd0 100644 --- a/upscaledb.spec +++ b/upscaledb.spec @@ -1,7 +1,7 @@ Summary: upscaledb embedded database engine Name: upscaledb -Version: 2.2.1 +Version: 2.2.2 Release: 1%{?dist} Source0: https://upscaledb.com/public/dl/%{name}-%{version}.tar.gz URL: https://upscaledb.com diff --git a/win32/msvc2013/dll.vcxproj b/win32/msvc2013/dll.vcxproj index 64bd7a3b4..80e7e09cf 100644 --- a/win32/msvc2013/dll.vcxproj +++ b/win32/msvc2013/dll.vcxproj @@ -76,10 +76,10 @@ out\dll_x64\ tmp\dll_x64\ false - upscaledb-2.2.1 - upscaledb-2.2.1 - upscaledb-2.2.1 - upscaledb-2.2.1 + upscaledb-2.2.2 + upscaledb-2.2.2 + upscaledb-2.2.2 + upscaledb-2.2.2 $(VC_IncludePath);$(WindowsSDK_IncludePath);../..;../../include;../../src;../../win32/msvc2013;../../3rdparty/simdcomp/include;../../../upscaledb-alien/snappy;../../../upscaledb-alien/zlib;../../../upscaledb-alien/openssl/include;../../../upscaledb-alien/protobuf/msvc2013/include;../../../upscaledb-alien/boost @@ -108,7 +108,7 @@ EditAndContinue - $(OutDir)upscaledb-2.2.1.dll + $(OutDir)upscaledb-2.2.2.dll ..\..\..\upscaledb-alien\snappy\msvc2013\snappy_debug.lib;..\..\..\upscaledb-alien\zlib\msvc2013\zlib.lib;..\..\..\upscaledb-alien\openssl\win32\lib\libeay32.lib;tmp\libvbyte_debug\libvbyte.lib;tmp\libfor_debug\libfor.lib;libboost_thread-vc120-mt-gd-1_58.lib;ws2_32.lib;%(AdditionalDependencies);Wldap32.lib true Windows @@ -137,7 +137,7 @@ ..\..\..\upscaledb-alien\snappy\msvc2013\snappy_x64_debug.lib;..\..\..\upscaledb-alien\zlib\msvc2013\zlib_x64.lib;..\..\..\upscaledb-alien\openssl\win64\lib\libeay32.lib;libboost_thread-vc120-mt-gd-1_58.lib;tmp\libvbyte_debug_x64\libvbyte.lib;tmp\libfor_debug_x64\libfor.lib;ws2_32.lib;%(AdditionalDependencies);Wldap32.lib - $(OutDir)upscaledb-2.2.1.dll + $(OutDir)upscaledb-2.2.2.dll ../../../upscaledb-alien/boost/msvc2013/x64 true Windows @@ -159,7 +159,7 @@ ..\..\..\upscaledb-alien\snappy\msvc2013\snappy.lib;..\..\..\upscaledb-alien\zlib\msvc2013\zlib.lib;..\..\..\upscaledb-alien\openssl\win32\lib\libeay32.lib;libboost_thread-vc120-mt-1_58.lib;tmp\libvbyte\libvbyte.lib;tmp\libfor\libfor.lib;ws2_32.lib;%(AdditionalDependencies);Wldap32.lib - $(OutDir)upscaledb-2.2.1.dll + $(OutDir)upscaledb-2.2.2.dll ../../../upscaledb-alien/boost/msvc2013/x86 true Windows @@ -185,7 +185,7 @@ ..\..\..\upscaledb-alien\snappy\msvc2013\snappy_x64.lib;..\..\..\upscaledb-alien\zlib\msvc2013\zlib_x64.lib;..\..\..\upscaledb-alien\openssl\win64\lib\libeay32.lib;libboost_thread-vc120-mt-1_58.lib;tmp\libvbyte_x64\libvbyte.lib;tmp\libfor_x64\libfor.lib;ws2_32.lib;%(AdditionalDependencies);Wldap32.lib - $(OutDir)upscaledb-2.2.1.dll + $(OutDir)upscaledb-2.2.2.dll ../../../upscaledb-alien/boost/msvc2013/x64 true Windows diff --git a/win32/msvc2013/lib.vcxproj b/win32/msvc2013/lib.vcxproj index 04a421e64..47b2d6f8c 100644 --- a/win32/msvc2013/lib.vcxproj +++ b/win32/msvc2013/lib.vcxproj @@ -72,10 +72,10 @@ tmp\lib\ out\lib_x64\ tmp\lib_x64\ - libupscaledb-2.2.1 - libupscaledb-2.2.1 - libupscaledb-2.2.1 - libupscaledb-2.2.1 + libupscaledb-2.2.2 + libupscaledb-2.2.2 + libupscaledb-2.2.2 + libupscaledb-2.2.2 $(VC_IncludePath);$(WindowsSDK_IncludePath);../..;../../include;../../src;../../win32/msvc2013;../../3rdparty/simdcomp/include;../../../upscaledb-alien/snappy;../../../upscaledb-alien/zlib;../../../upscaledb-alien/openssl/include;../../../upscaledb-alien/protobuf/msvc2013/include;../../../upscaledb-alien/boost @@ -107,9 +107,9 @@ true - $(OutDir)libupscaledb-2.2.1.lib + $(OutDir)libupscaledb-2.2.2.lib ..\..\..\upscaledb-alien\snappy\msvc2013\snappy_debug.lib;..\..\..\upscaledb-alien\zlib\msvc2013\zlib.lib;libboost_thread-vc120-mt-gd-1_58.lib;..\..\..\upscaledb-alien\openssl\win32\lib\libeay32.lib;tmp\libvbyte_debug\libvbyte.lib;tmp\libfor_debug\libfor.lib;ws2_32.lib;%(AdditionalDependencies);Wldap32.lib - $(OutDir)libupscaledb-2.2.1.lib + $(OutDir)libupscaledb-2.2.2.lib ../../../upscaledb-alien/boost/msvc2013/x86 @@ -135,7 +135,7 @@ ..\..\..\upscaledb-alien\snappy\msvc2013\snappy_x64_debug.lib;..\..\..\upscaledb-alien\zlib\msvc2013\zlib_x64.lib;../../../upscaledb-alien/boost/msvc2013/x64/libboost_thread-vc120-mt-gd-1_58.lib;..\..\..\upscaledb-alien\openssl\win64\lib\libeay32.lib;tmp\libvbyte_debug_x64\libvbyte.lib;tmp\libfor_debug_x64\libfor.lib;ws2_32.lib;%(AdditionalDependencies);Wldap32.lib - $(OutDir)\libupscaledb-2.2.1.lib + $(OutDir)\libupscaledb-2.2.2.lib ../../../upscaledb-alien/boost/msvc2013/x64 @@ -155,7 +155,7 @@ ..\..\..\upscaledb-alien\snappy\msvc2013\snappy.lib;..\..\..\upscaledb-alien\zlib\msvc2013\zlib.lib;..\..\..\upscaledb-alien\openssl\win32\lib\libeay32.lib;libboost_thread-vc120-mt-1_58.lib;tmp\libvbyte\libvbyte.lib;tmp\libfor\libfor.lib;ws2_32.lib;%(AdditionalDependencies);Wldap32.lib - $(OutDir)libupscaledb-2.2.1.lib + $(OutDir)libupscaledb-2.2.2.lib ../../../upscaledb-alien/boost/msvc2013/x86 true @@ -179,7 +179,7 @@ ..\..\..\upscaledb-alien\snappy\msvc2013\snappy_x64.lib;..\..\..\upscaledb-alien\openssl\win64\lib\libeay32.lib;..\..\..\upscaledb-alien\zlib\msvc2013\zlib_x64.lib;libboost_thread-vc120-mt-1_58.lib;tmp\libvbyte_x64\libvbyte.lib;tmp\libfor_x64\libfor.lib;ws2_32.lib;%(AdditionalDependencies);Wldap32.lib - $(OutDir)libupscaledb-2.2.1.lib + $(OutDir)libupscaledb-2.2.2.lib ../../../upscaledb-alien/boost/msvc2013/x64 diff --git a/win32/msvc2013/server_dll.vcxproj b/win32/msvc2013/server_dll.vcxproj index 0229fbda6..1027caafa 100644 --- a/win32/msvc2013/server_dll.vcxproj +++ b/win32/msvc2013/server_dll.vcxproj @@ -76,10 +76,10 @@ tmp\server_dll_x64\ false false - upsserver-2.2.1 - upsserver-2.2.1 - upsserver-2.2.1 - upsserver-2.2.1 + upsserver-2.2.2 + upsserver-2.2.2 + upsserver-2.2.2 + upsserver-2.2.2 $(VC_IncludePath);$(WindowsSDK_IncludePath);../../include;../../src;../../win32/msvc2013;../../../upscaledb-alien/openssl/include;../../../upscaledb-alien/protobuf/msvc2013/include;../../../upscaledb-alien/boost; @@ -108,7 +108,7 @@ EditAndContinue - $(OutDir)upsserver-2.2.1.dll + $(OutDir)upsserver-2.2.2.dll ../../../upscaledb-alien/boost/msvc2013/x86;%(AdditionalLibraryDirectories) true Windows @@ -132,7 +132,7 @@ ProgramDatabase - $(OutDir)upsserver-2.2.1.dll + $(OutDir)upsserver-2.2.2.dll ../../../upscaledb-alien/boost/msvc2013/x64; true Windows @@ -154,7 +154,7 @@ ProgramDatabase - $(OutDir)upsserver-2.2.1.dll + $(OutDir)upsserver-2.2.2.dll ../../../upscaledb-alien/boost/msvc2013/x86;%(AdditionalLibraryDirectories) true Windows @@ -178,7 +178,7 @@ ProgramDatabase - $(OutDir)upsserver-2.2.1.dll + $(OutDir)upsserver-2.2.2.dll ../../../upscaledb-alien/boost/msvc2013/x64; true Windows diff --git a/win32/msvc2013/server_lib.vcxproj b/win32/msvc2013/server_lib.vcxproj index 918754f61..1406ed8c3 100644 --- a/win32/msvc2013/server_lib.vcxproj +++ b/win32/msvc2013/server_lib.vcxproj @@ -72,10 +72,10 @@ tmp\server_lib\ out\server_lib_x64\ tmp\server_lib_x64\ - libupsserver-2.2.1 - libupsserver-2.2.1 - libupsserver-2.2.1 - libupsserver-2.2.1 + libupsserver-2.2.2 + libupsserver-2.2.2 + libupsserver-2.2.2 + libupsserver-2.2.2 $(VC_IncludePath);$(WindowsSDK_IncludePath);../../include;../../src;../../win32/msvc2013;../../../upscaledb-alien/openssl/include;../../../upscaledb-alien/protobuf/msvc2013/include;../../../upscaledb-alien/boost; @@ -107,7 +107,7 @@ true - $(OutDir)libupsserver-2.2.1.lib + $(OutDir)libupsserver-2.2.2.lib ../../../upscaledb-alien/boost;%(AdditionalLibraryDirectories) ws2_32.lib;%(AdditionalDependencies);;Iphlpapi.lib;Psapi.lib @@ -134,7 +134,7 @@ ws2_32.lib;Iphlpapi.lib;psapi.lib;%(AdditionalDependencies) - $(OutDir)libupsserver-2.2.1.lib + $(OutDir)libupsserver-2.2.2.lib ../../../upscaledb-alien/boost/x64;%(AdditionalLibraryDirectories) @@ -153,7 +153,7 @@ true - $(OutDir)libupsserver-2.2.1.lib + $(OutDir)libupsserver-2.2.2.lib ws2_32.lib;%(AdditionalDependencies);Iphlpapi.lib;Psapi.lib ../../../upscaledb-alien/boost;%(AdditionalLibraryDirectories); @@ -177,7 +177,7 @@ ws2_32.lib;Iphlpapi.lib;psapi.lib;%(AdditionalDependencies) - $(OutDir)libupsserver-2.2.1.lib + $(OutDir)libupsserver-2.2.2.lib ../../../upscaledb-alien/boost/x64;%(AdditionalLibraryDirectories)