Skip to content
This repository was archived by the owner on Jul 30, 2020. It is now read-only.

Commit 22d5789

Browse files
decimaddecimad
committed
Update to new unqlite version which supposedly fixes memory leaks in unqlite_commit
1 parent eee902c commit 22d5789

File tree

2 files changed

+17
-22
lines changed

2 files changed

+17
-22
lines changed

‎third_party/unqlite/unqlite.c‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Symisc UnQLite: An Embeddable NoSQL (Post Modern) Database Engine.
33
* Copyright (C) 2012-2018, Symisc Systems http://unqlite.org/
4-
* Version 1.1.8
4+
* Version 1.1.9
55
* For information on licensing, redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES
66
* please contact Symisc Systems via:
77
* legal@symisc.net
@@ -35,10 +35,8 @@
3535
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
3636
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3737
*/
38-
/*
39-
* $SymiscID: unqlite.c v1.1.8 Win10 2108-01-21 00:02:12 stable <chm@symisc.net> $
40-
*/
41-
/* This file is an amalgamation of many separate C source files from unqlite version 1.1.6
38+
/* $SymiscID: unqlite.c v1.1.9 Win10 2108-04-27 02:35:11 stable <chm@symisc.net> $ */
39+
/* This file is an amalgamation of many separate C source files from unqlite version 1.1.9
4240
* By combining all the individual C code files into this single large file, the entire code
4341
* can be compiled as a single translation unit. This allows many compilers to do optimization's
4442
* that would not be possible if the files were compiled separately. Performance improvements
@@ -75,7 +73,7 @@
7573
/*
7674
* Symisc UnQLite: An Embeddable NoSQL (Post Modern) Database Engine.
7775
* Copyright (C) 2012-2018, Symisc Systems http://unqlite.org/
78-
* Version 1.1.8
76+
* Version 1.1.9
7977
* For information on licensing, redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES
8078
* please contact Symisc Systems via:
8179
* legal@symisc.net
@@ -109,7 +107,7 @@
109107
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
110108
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
111109
*/
112-
/* $SymiscID: unqlite.h v1.2 Win10 2108-01-21 23:59:12 stable <chm@symisc.net> $ */
110+
/* $SymiscID: unqlite.h v1.3 Win10 2108-04-27 02:35:11 stable <chm@symisc.net> $ */
113111
#include <stdarg.h> /* needed for the definition of va_list */
114112
/*
115113
* Compile time engine version, signature, identification in the symisc source tree
@@ -125,21 +123,21 @@
125123
* version number and Y is the minor version number and Z is the release
126124
* number.
127125
*/
128-
#define UNQLITE_VERSION "1.1.8"
126+
#define UNQLITE_VERSION "1.1.9"
129127
/*
130128
* The UNQLITE_VERSION_NUMBER C preprocessor macro resolves to an integer
131129
* with the value (X*1000000 + Y*1000 + Z) where X, Y, and Z are the same
132130
* numbers used in [UNQLITE_VERSION].
133131
*/
134-
#define UNQLITE_VERSION_NUMBER 1001008
132+
#define UNQLITE_VERSION_NUMBER 1001009
135133
/*
136134
* The UNQLITE_SIG C preprocessor macro evaluates to a string
137135
* literal which is the public signature of the unqlite engine.
138136
* This signature could be included for example in a host-application
139137
* generated Server MIME header as follows:
140138
* Server: YourWebServer/x.x unqlite/x.x.x \r\n
141139
*/
142-
#define UNQLITE_SIG "unqlite/1.1.8"
140+
#define UNQLITE_SIG "unqlite/1.1.9"
143141
/*
144142
* UnQLite identification in the Symisc source tree:
145143
* Each particular check-in of a particular software released
@@ -51094,7 +51092,7 @@ static int lh_record_insert(
5109451092
int iCnt;
5109551093
int rc;
5109651094

51097-
/* Acquire the first page (DB hash Header) so that everything gets loaded autmatically */
51095+
/* Acquire the first page (DB hash Header) so that everything gets loaded automatically */
5109851096
rc = pEngine->pIo->xGet(pEngine->pIo->pHandle,1,0);
5109951097
if( rc != UNQLITE_OK ){
5110051098
return rc;
@@ -51217,7 +51215,7 @@ static int lhash_write_header(lhash_kv_engine *pEngine,unqlite_page *pHeader)
5121751215
/* Maximum split bucket */
5121851216
SyBigEndianPack64(zRaw,pEngine->max_split_bucket);
5121951217
zRaw += 8;
51220-
/* Initialiaze the bucket map */
51218+
/* Initialize the bucket map */
5122151219
pMap = &pEngine->sPageMap;
5122251220
/* Fill in the structure */
5122351221
pMap->iNum = pHeader->pgno;
@@ -51327,10 +51325,6 @@ static int lhash_kv_init(unqlite_kv_engine *pEngine,int iPageSize)
5132751325

5132851326
/* This structure is always zeroed, go to the initialization directly */
5132951327
SyMemBackendInitFromParent(&pHash->sAllocator,unqliteExportMemBackend());
51330-
//#if defined(UNQLITE_ENABLE_THREADS)
51331-
// /* Already protected by the upper layers */
51332-
// SyMemBackendDisbaleMutexing(&pHash->sAllocator);
51333-
//#endif
5133451328
pHash->iPageSize = iPageSize;
5133551329
/* Default hash function */
5133651330
pHash->xHash = lhash_bin_hash;
@@ -57196,6 +57190,7 @@ static int pager_commit_phase1(Pager *pPager)
5719657190
break;
5719757191
}
5719857192
pager_unlink_page(pPager, p);
57193+
pager_release_page(pPager, p);
5719957194
}
5720057195
}
5720157196
/* If the file on disk is not the same size as the database image,
@@ -60205,7 +60200,7 @@ UNQLITE_PRIVATE int unqliteRegisterJx9Functions(unqlite_vm *pVm)
6020560200
/*
6020660201
* Symisc unQLite: An Embeddable NoSQL (Post Modern) Database Engine.
6020760202
* Copyright (C) 2012-2018, Symisc Systems http://unqlite.org/
60208-
* Version 1.1.8
60203+
* Version 1.1.9
6020960204
* For information on licensing, redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES
6021060205
* please contact Symisc Systems via:
6021160206
* legal@symisc.net

‎third_party/unqlite/unqlite.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/*
99
* Symisc UnQLite: An Embeddable NoSQL (Post Modern) Database Engine.
1010
* Copyright (C) 2012-2018, Symisc Systems http://unqlite.org/
11-
* Version 1.1.8
11+
* Version 1.1.9
1212
* For information on licensing, redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES
1313
* please contact Symisc Systems via:
1414
* legal@symisc.net
@@ -42,7 +42,7 @@
4242
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
4343
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4444
*/
45-
/* $SymiscID: unqlite.h v1.2 Win10 2108-01-21 23:59:12 stable <chm@symisc.net> $ */
45+
/* $SymiscID: unqlite.h v1.3 Win10 2108-04-27 02:35:11 stable <chm@symisc.net> $ */
4646
#include <stdarg.h> /* needed for the definition of va_list */
4747
/*
4848
* Compile time engine version, signature, identification in the symisc source tree
@@ -58,21 +58,21 @@
5858
* version number and Y is the minor version number and Z is the release
5959
* number.
6060
*/
61-
#define UNQLITE_VERSION "1.1.8"
61+
#define UNQLITE_VERSION "1.1.9"
6262
/*
6363
* The UNQLITE_VERSION_NUMBER C preprocessor macro resolves to an integer
6464
* with the value (X*1000000 + Y*1000 + Z) where X, Y, and Z are the same
6565
* numbers used in [UNQLITE_VERSION].
6666
*/
67-
#define UNQLITE_VERSION_NUMBER 1001008
67+
#define UNQLITE_VERSION_NUMBER 1001009
6868
/*
6969
* The UNQLITE_SIG C preprocessor macro evaluates to a string
7070
* literal which is the public signature of the unqlite engine.
7171
* This signature could be included for example in a host-application
7272
* generated Server MIME header as follows:
7373
* Server: YourWebServer/x.x unqlite/x.x.x \r\n
7474
*/
75-
#define UNQLITE_SIG "unqlite/1.1.8"
75+
#define UNQLITE_SIG "unqlite/1.1.9"
7676
/*
7777
* UnQLite identification in the Symisc source tree:
7878
* Each particular check-in of a particular software released

0 commit comments

Comments
 (0)