From d8e13bc7bba28deba720a284995802e05f13bf5a Mon Sep 17 00:00:00 2001 From: Mark Rowe Date: Wed, 28 Dec 2016 08:28:44 -0800 Subject: [PATCH] Switch to using object store's master branch (#748) * Switch to using object store's master branch. * Switch to caching Realm instances per JavaScript execution context. --- .gitmodules | 2 +- binding.gyp | 1 - react-native/android/src/main/jni/Android.mk | 1 - src/RealmJS.xcodeproj/project.pbxproj | 8 -------- src/js_realm.hpp | 17 ++++++++--------- src/js_types.hpp | 3 +++ src/jsc/jsc_context.hpp | 6 ++++++ src/node/node_context.hpp | 8 +++++++- src/object-store | 2 +- 9 files changed, 26 insertions(+), 22 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1475d7b4..ee9f57c3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,4 +7,4 @@ [submodule "src/object-store"] path = src/object-store url = https://github.com/realm/realm-object-store.git - branch = js + branch = master diff --git a/binding.gyp b/binding.gyp index 4a822e68..40fa0ef8 100644 --- a/binding.gyp +++ b/binding.gyp @@ -63,7 +63,6 @@ "src/object-store/src/parser/parser.cpp", "src/object-store/src/parser/query_builder.cpp", "src/object-store/src/util/format.cpp", - "src/object-store/src/util/thread_id.cpp", ], "conditions": [ ["OS=='linux'", { diff --git a/react-native/android/src/main/jni/Android.mk b/react-native/android/src/main/jni/Android.mk index 3769d1dd..2f3c80bd 100644 --- a/react-native/android/src/main/jni/Android.mk +++ b/react-native/android/src/main/jni/Android.mk @@ -41,7 +41,6 @@ LOCAL_SRC_FILES += src/object-store/src/impl/epoll/external_commit_helper.cpp LOCAL_SRC_FILES += src/object-store/src/parser/parser.cpp LOCAL_SRC_FILES += src/object-store/src/parser/query_builder.cpp LOCAL_SRC_FILES += src/object-store/src/util/format.cpp -LOCAL_SRC_FILES += src/object-store/src/util/thread_id.cpp LOCAL_SRC_FILES += src/object-store/src/collection_notifications.cpp LOCAL_SRC_FILES += src/object-store/src/index_set.cpp LOCAL_SRC_FILES += src/object-store/src/list.cpp diff --git a/src/RealmJS.xcodeproj/project.pbxproj b/src/RealmJS.xcodeproj/project.pbxproj index a1a1b3fb..c1ecda87 100644 --- a/src/RealmJS.xcodeproj/project.pbxproj +++ b/src/RealmJS.xcodeproj/project.pbxproj @@ -13,7 +13,6 @@ 02022A671DA47BD7000F0C4F /* parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02022A611DA47B8B000F0C4F /* parser.cpp */; }; 02022A681DA47BD7000F0C4F /* query_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02022A631DA47B8B000F0C4F /* query_builder.cpp */; }; 02022A7C1DA47EC8000F0C4F /* format.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02022A731DA47EC8000F0C4F /* format.cpp */; }; - 02022A7D1DA47EC8000F0C4F /* thread_id.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02022A791DA47EC8000F0C4F /* thread_id.cpp */; }; 02409DC21BCF11D6005F3B3E /* RealmJSCoreTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 02409DC11BCF11D6005F3B3E /* RealmJSCoreTests.m */; }; 02414B881CE68CA200A8669F /* dates-v5.realm in Resources */ = {isa = PBXBuildFile; fileRef = 02414B871CE68CA200A8669F /* dates-v5.realm */; }; 02414BA51CE6ABCF00A8669F /* collection_change_builder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02414B991CE6AAEF00A8669F /* collection_change_builder.cpp */; }; @@ -97,9 +96,6 @@ 02022A741DA47EC8000F0C4F /* format.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = format.hpp; sourceTree = ""; }; 02022A761DA47EC8000F0C4F /* event_loop_signal.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = event_loop_signal.hpp; sourceTree = ""; }; 02022A781DA47EC8000F0C4F /* event_loop_signal.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = event_loop_signal.hpp; sourceTree = ""; }; - 02022A791DA47EC8000F0C4F /* thread_id.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = thread_id.cpp; sourceTree = ""; }; - 02022A7A1DA47EC8000F0C4F /* thread_id.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = thread_id.hpp; sourceTree = ""; }; - 02022A7B1DA47EC8000F0C4F /* thread_local.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = thread_local.hpp; sourceTree = ""; }; 02409DC11BCF11D6005F3B3E /* RealmJSCoreTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RealmJSCoreTests.m; path = ios/RealmJSCoreTests.m; sourceTree = ""; }; 02414B871CE68CA200A8669F /* dates-v5.realm */ = {isa = PBXFileReference; lastKnownFileType = file; path = "dates-v5.realm"; sourceTree = ""; }; 02414B961CE6AADD00A8669F /* collection_notifications.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = collection_notifications.cpp; path = src/collection_notifications.cpp; sourceTree = ""; }; @@ -290,9 +286,6 @@ 02022A741DA47EC8000F0C4F /* format.hpp */, 02022A751DA47EC8000F0C4F /* generic */, 02022A771DA47EC8000F0C4F /* node */, - 02022A791DA47EC8000F0C4F /* thread_id.cpp */, - 02022A7A1DA47EC8000F0C4F /* thread_id.hpp */, - 02022A7B1DA47EC8000F0C4F /* thread_local.hpp */, ); name = util; path = src/util; @@ -853,7 +846,6 @@ 02E315D21DB80DF200555337 /* sync_file.cpp in Sources */, 02F59EC21C88F17D007F774C /* object_store.cpp in Sources */, 02022A7C1DA47EC8000F0C4F /* format.cpp in Sources */, - 02022A7D1DA47EC8000F0C4F /* thread_id.cpp in Sources */, 02E315CB1DB80DDD00555337 /* sync_user.cpp in Sources */, 02E315D31DB80DF200555337 /* sync_metadata.cpp in Sources */, 02F59EC11C88F17D007F774C /* object_schema.cpp in Sources */, diff --git a/src/js_realm.hpp b/src/js_realm.hpp index 6ff5ae5c..3584eee3 100644 --- a/src/js_realm.hpp +++ b/src/js_realm.hpp @@ -405,18 +405,17 @@ void RealmClass::constructor(ContextType ctx, ObjectType this_object, size_t config.path = normalize_path(config.path); ensure_directory_exists_for_file(config.path); + config.execution_context = reinterpret_cast(Context::get_execution_context_id(ctx)); + SharedRealm realm = realm::Realm::get_shared_realm(config); GlobalContextType global_context = Context::get_global_context(ctx); - BindingContext *binding_context = realm->m_binding_context.get(); - RealmDelegate *js_binding_context = dynamic_cast *>(binding_context); + if (!realm->m_binding_context) { + realm->m_binding_context.reset(new RealmDelegate(realm, global_context)); + } - if (!binding_context) { - js_binding_context = new RealmDelegate(realm, global_context); - realm->m_binding_context.reset(js_binding_context); - } - else if (!js_binding_context || js_binding_context->m_context != global_context) { - throw std::runtime_error("Realm is already open in another context on this thread: " + config.path); - } + RealmDelegate *js_binding_context = dynamic_cast *>(realm->m_binding_context.get()); + REALM_ASSERT(js_binding_context); + REALM_ASSERT(js_binding_context->m_context == global_context); // If a new schema was provided, then use its defaults and constructors. if (schema_updated) { diff --git a/src/js_types.hpp b/src/js_types.hpp index 4c5434a1..76f7d47b 100644 --- a/src/js_types.hpp +++ b/src/js_types.hpp @@ -18,6 +18,8 @@ #pragma once +#include "execution_context_id.hpp" + #include #include #include @@ -66,6 +68,7 @@ struct Context { using GlobalContextType = typename T::GlobalContext; static GlobalContextType get_global_context(ContextType); + static AbstractExecutionContextID get_execution_context_id(ContextType); }; template diff --git a/src/jsc/jsc_context.hpp b/src/jsc/jsc_context.hpp index 563bbdfe..0849afa7 100644 --- a/src/jsc/jsc_context.hpp +++ b/src/jsc/jsc_context.hpp @@ -28,5 +28,11 @@ inline JSGlobalContextRef jsc::Context::get_global_context(JSContextRef ctx) { return JSContextGetGlobalContext(ctx); } +template<> +inline AbstractExecutionContextID jsc::Context::get_execution_context_id(JSContextRef ctx) +{ + return reinterpret_cast(get_global_context(ctx)); +} + } // js } // realm diff --git a/src/node/node_context.hpp b/src/node/node_context.hpp index b77b1b64..093792e2 100644 --- a/src/node/node_context.hpp +++ b/src/node/node_context.hpp @@ -27,6 +27,12 @@ template<> inline v8::Local node::Context::get_global_context(v8::Isolate* isolate) { return isolate->GetCurrentContext(); } - + +template<> +inline AbstractExecutionContextID node::Context::get_execution_context_id(v8::Isolate* isolate) +{ + return reinterpret_cast(isolate); +} + } // js } // realm diff --git a/src/object-store b/src/object-store index 5ba86e73..c2568476 160000 --- a/src/object-store +++ b/src/object-store @@ -1 +1 @@ -Subproject commit 5ba86e730071733997a9275d19dab801e1f3b851 +Subproject commit c25684764924815c1decc1fe9a9f7d4b64ed7bde