@ohos-ports/lmdb 2.5.3 → 2.8.5-beta.0

package/src/lmdb-js.cpp

@@ -1,64 +1,64 @@
-#include "lmdb-js.h"
-
-using namespace Napi;
-
-int Logging::initLogging() {
-	char* logging = getenv("LMDB_JS_LOGGING");
-	if (logging)
-		fprintf(stderr, "Start logging for lmdb-js\n");
-	return !!logging;
-}
-int Logging::debugLogging = Logging::initLogging();
-
-Object InitAll(Napi::Env env, Object exports) {
-	if (Logging::debugLogging)
-		fprintf(stderr, "Start initialization\n");
-	// Initializes the module
-	// Export Env as constructor for EnvWrap
-	EnvWrap::setupExports(env, exports);
-
-	// Export Cursor as constructor for CursorWrap
-	CursorWrap::setupExports(env, exports);
-	TxnWrap::setupExports(env, exports);
-	DbiWrap::setupExports(env, exports);
-	CursorWrap::setupExports(env, exports);
-	Compression::setupExports(env, exports);
-
-	// Export misc things
-	setupExportMisc(env, exports);
-	if (Logging::debugLogging)
-		fprintf(stderr, "Finished initialization\n");
-	return exports;
-}
-NAPI_MODULE_INIT() {
-	Value exp = Value::From(env, exports);
-	return InitAll(env, exp.As<Object>());
-}
-
-#ifndef _WIN32
-extern "C" void node_module_register(void* m) {
-	//fprintf(stderr, "This is just a dummy function to be called if node isn't there so deno can load this module\n");
-}
-#endif
-
-// This file contains code from the node-lmdb project
-// Copyright (c) 2013-2017 Timur Kristóf
-// Licensed to you under the terms of the MIT license
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
+#include "lmdb-js.h"
+
+using namespace Napi;
+
+int Logging::initLogging() {
+	char* logging = getenv("LMDB_JS_LOGGING");
+	if (logging)
+		fprintf(stderr, "Start logging for lmdb-js\n");
+	return !!logging;
+}
+int Logging::debugLogging = Logging::initLogging();
+
+Object InitAll(Napi::Env env, Object exports) {
+	if (Logging::debugLogging)
+		fprintf(stderr, "Start initialization\n");
+	// Initializes the module
+	// Export Env as constructor for EnvWrap
+	EnvWrap::setupExports(env, exports);
+
+	// Export Cursor as constructor for CursorWrap
+	CursorWrap::setupExports(env, exports);
+	TxnWrap::setupExports(env, exports);
+	DbiWrap::setupExports(env, exports);
+	CursorWrap::setupExports(env, exports);
+	Compression::setupExports(env, exports);
+
+	// Export misc things
+	setupExportMisc(env, exports);
+	if (Logging::debugLogging)
+		fprintf(stderr, "Finished initialization\n");
+	return exports;
+}
+NAPI_MODULE_INIT() {
+	Value exp = Value::From(env, exports);
+	return InitAll(env, exp.As<Object>());
+}
+
+#ifndef _WIN32
+extern "C" void node_module_register(void* m) {
+	//fprintf(stderr, "This is just a dummy function to be called if node isn't there so deno can load this module\n");
+}
+#endif
+
+// This file contains code from the node-lmdb project
+// Copyright (c) 2013-2017 Timur Kristóf
+// Licensed to you under the terms of the MIT license
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.

package/src/lmdb-js.h

@@ -1,31 +1,10 @@
-
-// This file is part of lmdb-js
-// Copyright (c) 2013-2017 Timur Kristóf
-// Licensed to you under the terms of the MIT license
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
 #ifndef NODE_LMDB_H
 #define NODE_LMDB_H
 
 #include <vector>
+#include <unordered_map>
 #include <algorithm>
+#include <ctime>
 #include <napi.h>
 #include <node_api.h>
 
@@ -37,6 +16,9 @@
 
 using namespace Napi;
 
+// set the threshold of when to use shared buffers (for uncompressed entries larger than this value)
+const size_t SHARED_BUFFER_THRESHOLD = 0x4000;
+
 #ifndef __CPTHREAD_H__
 #define __CPTHREAD_H__
 
@@ -53,6 +35,9 @@ typedef void pthread_condattr_t;
 typedef HANDLE pthread_t;
 typedef CONDITION_VARIABLE pthread_cond_t;
 
+#endif
+#ifndef mdb_size_t
+typedef size_t mdb_size_t;
 #endif
 
 #define NAPI_FUNCTION(name) napi_value name(napi_env env, napi_callback_info info)
@@ -61,6 +46,7 @@ typedef CONDITION_VARIABLE pthread_cond_t;
 	napi_value args[count];\
 	napi_get_cb_info(env, info, &argc, args, NULL, NULL);
 #define GET_UINT32_ARG(target, position) napi_get_value_uint32(env, args[position], (uint32_t*) &target)
+#define GET_INT32_ARG(target, position) napi_get_value_int32(env, args[position], (int32_t*) &target)
 #define GET_INT64_ARG(position)\
     int64_t i64;\
     napi_get_value_int64(env, args[position], &i64);
@@ -78,20 +64,22 @@ typedef CONDITION_VARIABLE pthread_cond_t;
 	napi_define_properties(env, exports, 1, &desc); }
 
 #ifdef _WIN32
-
+const uint64_t TICKS_PER_SECOND = 1000;
 int pthread_mutex_init(pthread_mutex_t *mutex, pthread_mutexattr_t *attr);
 int pthread_mutex_destroy(pthread_mutex_t *mutex);
 int pthread_mutex_lock(pthread_mutex_t *mutex);
 int pthread_mutex_unlock(pthread_mutex_t *mutex);
 
-int pthread_cond_init(pthread_cond_t *cond, pthread_condattr_t *attr);
 int pthread_cond_destroy(pthread_cond_t *cond);
 int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex);
 int pthread_cond_signal(pthread_cond_t *cond);
 int pthread_cond_broadcast(pthread_cond_t *cond);
-
+#else
+const uint64_t TICKS_PER_SECOND = 1000000000;
 #endif
+uint64_t get_time64();
 
+int cond_init(pthread_cond_t *cond);
 int cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, uint64_t ns);
 
 #endif /* __CPTHREAD_H__ */
@@ -145,16 +133,20 @@ void consoleLogN(int n);
 void setFlagFromValue(int *flags, int flag, const char *name, bool defaultValue, Object options);
 void writeValueToEntry(const Value &str, MDB_val *val);
 LmdbKeyType keyTypeFromOptions(const Value &val, LmdbKeyType defaultKeyType = LmdbKeyType::DefaultKey);
-bool getVersionAndUncompress(MDB_val &data, DbiWrap* dw);
+int getVersionAndUncompress(MDB_val &data, DbiWrap* dw);
 int compareFast(const MDB_val *a, const MDB_val *b);
-Value setGlobalBuffer(const CallbackInfo& info);
-Value lmdbError(const CallbackInfo& info);
+napi_value setGlobalBuffer(napi_env env, napi_callback_info info);
+napi_value lmdbError(napi_env env, napi_callback_info info);
 napi_value createBufferForAddress(napi_env env, napi_callback_info info);
-napi_value getViewAddress(napi_env env, napi_callback_info info);
+napi_value getBufferAddress(napi_env env, napi_callback_info info);
+napi_value getAddress(napi_env env, napi_callback_info info);
 napi_value detachBuffer(napi_env env, napi_callback_info info);
+napi_value enableThreadSafeCalls(napi_env env, napi_callback_info info);
+napi_value startRead(napi_env env, napi_callback_info info);
+napi_value setReadCallback(napi_env env, napi_callback_info info);
 Value getAddress(const CallbackInfo& info);
 Value lmdbNativeFunctions(const CallbackInfo& info);
-Value enableDirectV8(const CallbackInfo& info);
+napi_value enableDirectV8(napi_env env, napi_callback_info info);
 
 #ifndef thread_local
 #ifdef __GNUC__
@@ -194,6 +186,7 @@ class SharedEnv {
 	uint64_t dev;
 	uint64_t inode;
 	int count;
+    bool hasWrites;
 };
 
 const int INTERRUPT_BATCH = 9998;
@@ -203,6 +196,7 @@ const int RESUME_BATCH = 9996;
 const int USER_HAS_LOCK = 9995;
 const int SEPARATE_FLUSHED = 1;
 const int DELETE_ON_CLOSE = 2;
+const int OPEN_FAILED = 0x10000;
 
 class WriteWorker {
   public:
@@ -212,28 +206,21 @@ class WriteWorker {
 	MDB_txn* AcquireTxn(int* flags);
 	void UnlockTxn();
 	int WaitForCallbacks(MDB_txn** txn, bool allowCommit, uint32_t* target);
-	virtual void ReportError(const char* error);
 	virtual void SendUpdate();
 	int interruptionStatus;
 	bool finishedProgress;
+	int resultCode;
 	bool hasError;
+	napi_ref callback;
+	napi_async_work work;
+	napi_threadsafe_function progress;
 	EnvWrap* envForTxn;
 	virtual ~WriteWorker();
 	uint32_t* instructions;
 	int progressStatus;
 	MDB_env* env;
 	static int DoWrites(MDB_txn* txn, EnvWrap* envForTxn, uint32_t* instruction, WriteWorker* worker);
-};
-class AsyncWriteWorker : public WriteWorker, public AsyncProgressWorker<char> {
-  public:
-	AsyncWriteWorker(MDB_env* env, EnvWrap* envForTxn, uint32_t* instructions, const Function& callback);
-	void Execute(const AsyncProgressWorker::ExecutionProgress& execution);
-	void OnProgress(const char* data, size_t count);
-	void OnOK();
-	void ReportError(const char* error);
-	void SendUpdate();
-  private:
-	ExecutionProgress* executionProgress;
+	static bool threadSafeCallsEnabled;
 };
 class TxnTracked {
   public:
@@ -244,6 +231,8 @@ class TxnTracked {
 	TxnTracked *parent;
 };
 
+
+typedef void* (get_shared_buffers_t)();
 /*
 	`Env`
 	Represents a database environment.
@@ -252,8 +241,23 @@ class TxnTracked {
 typedef struct env_tracking_t {
 	pthread_mutex_t* envsLock;
 	std::vector<SharedEnv> envs;
+	get_shared_buffers_t* getSharedBuffers;
 } env_tracking_t;
 
+typedef struct buffer_info_t { // definition of a buffer that is available/used in JS
+	int32_t id;
+	bool isSharedMap;
+	char* end;
+	MDB_env* env;
+	napi_ref ref;
+} buffer_info_t;
+
+typedef struct js_buffers_t { // there is one instance of this for each JS (worker) thread, holding all the active buffers
+	std::unordered_map<char*, buffer_info_t> buffers;
+	int nextId;
+	pthread_mutex_t modification_lock;
+} js_buffers_t;
+
 class EnvWrap : public ObjectWrap<EnvWrap> {
 private:
 	// List of open read transactions
@@ -266,7 +270,8 @@ private:
 
 	// Cleans up stray transactions
 	void cleanupStrayTxns();
-    static void cleanupEnvWraps(void* data);
+	void consolidateTxns();
+	static void cleanupEnvWraps(void* data);
 
 	friend class TxnWrap;
 	friend class DbiWrap;
@@ -277,6 +282,7 @@ public:
 	// The wrapped object
 	MDB_env *env;
 	// Current write transaction
+	static thread_local js_buffers_t* sharedBuffers;
 	static env_tracking_t* envTracking;
 	TxnWrap *currentWriteTxn;
 	TxnTracked *writeTxn;
@@ -287,14 +293,18 @@ public:
 	MDB_txn* currentReadTxn;
 	WriteWorker* writeWorker;
 	bool readTxnRenewed;
+    bool hasWrites;
+	bool trackMetrics;
+	uint64_t timeTxnWaiting;
 	unsigned int jsFlags;
 	char* keyBuffer;
 	int pageSize;
-	MDB_txn* getReadTxn();
+	time_t lastReaderCheck;
+	MDB_txn* getReadTxn(int64_t tw_address = 0);
 
 	// Sets up exports for the Env constructor
 	static void setupExports(Napi::Env env, Object exports);
-	void closeEnv();
+	void closeEnv(bool hasLock = false);
 	int openEnv(int flags, int jsFlags, const char* path, char* keyBuffer, Compression* compression, int maxDbs,
 		int maxReaders, mdb_size_t mapSize, int pageSize, char* encryptionKey);
 	
@@ -391,10 +401,11 @@ public:
 		* Callback to be executed after the sync is complete.
 	*/
 	Napi::Value startWriting(const CallbackInfo& info);
+	Napi::Value resumeWriting(const CallbackInfo& info);
 	static napi_value compress(napi_env env, napi_callback_info info);
 	static napi_value write(napi_env env, napi_callback_info info);
 	static napi_value onExit(napi_env env, napi_callback_info info);
-	Napi::Value resetCurrentReadTxn(const CallbackInfo& info);
+	static int32_t toSharedBuffer(MDB_env* env, uint32_t* keyBuffer, MDB_val data);
 };
 
 const int TXN_ABORTABLE = 1;
@@ -434,6 +445,7 @@ public:
 	// Remove the current TxnWrap from its EnvWrap
 	void removeFromEnvWrap();
 	int begin(EnvWrap *ew, unsigned int flags);
+	MDB_env* getEnv();
 
 	/*
 		Commits the transaction.
@@ -460,7 +472,7 @@ public:
 	static void setupExports(Napi::Env env, Object exports);
 };
 
-const int HAS_VERSIONS = 0x1000;
+const int HAS_VERSIONS = 0x100;
 /*
 	`Dbi`
 	Represents a database instance in an environment.
@@ -517,7 +529,7 @@ public:
 	Napi::Value stat(const CallbackInfo& info);
 	int prefetch(uint32_t* keys);
 	int open(int flags, char* name, bool hasVersions, LmdbKeyType keyType, Compression* compression);
-	int32_t doGetByBinary(uint32_t keySize);
+	int32_t doGetByBinary(uint32_t keySize, uint32_t ifNotTxnId, int64_t txnAddress);
 	static void setupExports(Napi::Env env, Object exports);
 };
 
@@ -597,3 +609,25 @@ public:
 };
 
 #endif // NODE_LMDB_H
+
+// Portions of this file are from node-lmdb
+// Copyright (c) 2013-2017 Timur Kristóf
+// Licensed to you under the terms of the MIT license
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.