Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

compiling with new version of LMDB #7

Open
wants to merge 2 commits into
base: mdb
Choose a base branch
from
Open

compiling with new version of LMDB #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08ca310
compiling with new version of LMDB
kroggen Mar 15, 2018
b3161e0
fix lock file suffix
Nov 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions src/btree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#include "btreeInt.h"
#include "vdbeInt.h"
#define MDB_MAXKEYSIZE 2000
#define MDB_USE_HASH 1
#ifndef _WIN32
#define MDB_USE_POSIX_SEM 1
#endif
#include "mdb.c"
#include "midl.c"

Expand Down Expand Up @@ -32,6 +34,8 @@ MDB_env *g_tmp_env;
#define SQLITE_DEFAULT_PROXYDIR_PERMISSIONS 0755
#endif

#define LOCKSUFF "-lock"

#define BT_MAX_PATH 512

static int errmap(int err)
Expand Down Expand Up @@ -211,7 +215,7 @@ int sqlite3BtreePutData(BtCursor *pCsr, u32 offset, u32 amt, void *z){
return errmap(rc);

node = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]);
mdb_node_read(mc->mc_txn, node, &data);
mdb_node_read(mc, node, &data);
if (data.mv_size < offset+amt)
return SQLITE_CORRUPT_BKPT;

Expand Down Expand Up @@ -699,7 +703,7 @@ int sqlite3BtreeData(BtCursor *pCur, u32 offset, u32 amt, void *pBuf){
MDB_node *node = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]);
int rc = SQLITE_OK;

mdb_node_read(mc->mc_txn, node, &data);
mdb_node_read(mc, node, &data);
if (offset+amt <= data.mv_size) {
memcpy(pBuf, (char *)data.mv_data+offset, amt);
} else {
Expand Down Expand Up @@ -759,7 +763,7 @@ const void *sqlite3BtreeDataFetch(BtCursor *pCur, int *pAmt){
}
if(mc->mc_flags & C_INITIALIZED) {
MDB_node *node = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]);
mdb_node_read(mc->mc_txn, node, &data);
mdb_node_read(mc, node, &data);
*pAmt = data.mv_size;
return data.mv_data;
} else {
Expand All @@ -784,7 +788,7 @@ int sqlite3BtreeDataSize(BtCursor *pCur, u32 *pSize){
MDB_val data;
if(mc->mc_flags & C_INITIALIZED) {
MDB_node *node = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]);
mdb_node_read(mc->mc_txn, node, &data);
mdb_node_read(mc, node, &data);
*pSize = data.mv_size;
}
LOG("done",0);
Expand Down Expand Up @@ -1067,7 +1071,7 @@ static void squashIndexKey(UnpackedRecord *pun, int file_format, MDB_val *key)
if (serial_type >= 12 && pMem->n >72) {
v.mv_data = (char *)pMem->z + 64;
v.mv_size = pMem->n - 64;
h = mdb_hash_val(&v, MDB_HASH_INIT);
h = mdb_hash(v.mv_data, v.mv_size);
pMem->n = 72;
memcpy(v.mv_data, &h, sizeof(h));
changed = 1;
Expand Down Expand Up @@ -1174,7 +1178,7 @@ int sqlite3BtreeInsert(
sqlite3DbFree(pCur->pKeyInfo->db, pFree);
else if (nZero && rc == 0) {
MDB_node *node = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]);
mdb_node_read(mc->mc_txn, node, &data);
mdb_node_read(mc, node, &data);
memset((char *)data.mv_data+nData, 0, nZero);
}
LOG("rc=%d",rc);
Expand Down