Use a notify method on the user buffer

kriszyp · May 22, 2024 · 1ca8163 · 1ca8163
1 parent bcd9df7
commit 1ca8163
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 19 deletions.
diff --git a/read.js b/read.js
@@ -394,23 +394,25 @@ export function addReadMethods(
 
 		getUserSharedBuffer(id, defaultBuffer, options) {
 			let keySize;
-			if (options?.envKey) keySize = this.writeKey(id, keyBytes, 0);
-			else {
-				keyBytes.dataView.setUint32(0, this.db.dbi);
-				keySize = this.writeKey(id, keyBytes, 4);
-			}
-			return getUserSharedBuffer(
+			const setKeyBytes = () => {
+				if (options?.envKey) keySize = this.writeKey(id, keyBytes, 0);
+				else {
+					keyBytes.dataView.setUint32(0, this.db.dbi);
+					keySize = this.writeKey(id, keyBytes, 4);
+				}
+			};
+			setKeyBytes();
+			let sharedBuffer = getUserSharedBuffer(
 				env.address,
 				keySize,
 				defaultBuffer,
 				options?.callback,
 			);
-		},
-
-		notifyUserCallbacks(id) {
-			keyBytes.dataView.setUint32(0, this.db.dbi);
-			let keySize = this.writeKey(id, keyBytes, 4);
-			return notifyUserCallbacks(env.address, keySize);
+			sharedBuffer.notify = () => {
+				setKeyBytes();
+				return notifyUserCallbacks(env.address, keySize);
+			};
+			return sharedBuffer;
 		},
 
 		attemptLock(id, version, callback) {

diff --git a/src/writer.cpp b/src/writer.cpp
@@ -527,8 +527,7 @@ void WriteWorker::Write() {
 	std::atomic_fetch_or((std::atomic<uint32_t>*) instructions, (uint32_t) TXN_COMMITTED);
 	if (had_changes) {
 		ExtendedEnv* extended_env = (ExtendedEnv*) mdb_env_get_userctx(env);
-		std::string key("__committed__");
-		extended_env->notifyUserCallbacks(key);
+		extended_env->notifyUserCallbacks(std::string("__committed__"));
 	}
 }
 

diff --git a/test/index.test.js b/test/index.test.js
@@ -907,12 +907,16 @@ describe('lmdb-js', function () {
 				let notified;
 				let shared_buffer;
 				await new Promise((resolve) => {
-					db.getUserSharedBuffer('with-callback', shared_number.buffer, {
-						callback() {
-							resolve();
+					shared_buffer = db.getUserSharedBuffer(
+						'with-callback',
+						shared_number.buffer,
+						{
+							callback() {
+								resolve();
+							},
 						},
-					});
-					db.notifyUserCallbacks('with-callback');
+					);
+					shared_buffer.notify();
 				});
 			});
 			it('prefetch', async function () {