Skip to content

Add support for sorting of UTF16 keys #109

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

Open
degifted wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add support for sorting of UTF16 keys #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dadfc49
Update node-lmdb.h
degifted Jun 17, 2017
8f96a84
Update misc.cpp
degifted Jun 17, 2017
dd60e8a
Update dbi.cpp
degifted Jun 17, 2017
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
3 changes: 3 additions & 0 deletions src/dbi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ NAN_METHOD(DbiWrap::ctor) {
}
else {
isOpen = true;
if (keyType == NodeLmdbKeyType::StringKey) {
rc = mdb_set_compare(txn, dbi, utf16_cmp_func);
}
}

if (needsTransaction) {
Expand Down
13 changes: 13 additions & 0 deletions src/misc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,3 +305,16 @@ const uint16_t *CustomExternalStringResource::data() const {
size_t CustomExternalStringResource::length() const {
return this->l;
}

int utf16_cmp_func(const MDB_val *a, const MDB_val *b) {
size_t len = (b->mv_size > a->mv_size ? a->mv_size >> 1 : b->mv_size >> 1) - 1;
uint16_t charA, charB;
for (size_t i = 0; i < len; i++) {
charA = *((uint16_t*)a->mv_data + i);
charB = *((uint16_t*)b->mv_data + i);
if (charA != charB) {
return (charA - charB);
}
}
return a->mv_size == b->mv_size ? 0 : a->mv_size - b->mv_size;
}
2 changes: 2 additions & 0 deletions src/node-lmdb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ void setupExportMisc(Handle<Object> exports);
// Helper callback
typedef void (*argtokey_callback_t)(MDB_val &key);

int utf16_cmp_func(const MDB_val *a, const MDB_val *b);

void consoleLog(Local<Value> val);
void consoleLog(const char *msg);
void consoleLogN(int n);
Expand Down