diff --git a/binding.gyp b/binding.gyp index 40fa0ef8..b6cf8635 100644 --- a/binding.gyp +++ b/binding.gyp @@ -51,10 +51,9 @@ "src/object-store/src/results.cpp", "src/object-store/src/schema.cpp", "src/object-store/src/shared_realm.cpp", - "src/object-store/src/thread_confined.cpp", + "src/object-store/src/thread_safe_reference.cpp", "src/object-store/src/impl/collection_change_builder.cpp", "src/object-store/src/impl/collection_notifier.cpp", - "src/object-store/src/impl/handover.cpp", "src/object-store/src/impl/list_notifier.cpp", "src/object-store/src/impl/realm_coordinator.cpp", "src/object-store/src/impl/results_notifier.cpp", diff --git a/dependencies.list b/dependencies.list index cf26e439..9e680b8a 100644 --- a/dependencies.list +++ b/dependencies.list @@ -1,5 +1,5 @@ PACKAGE_NAME=realm-js VERSION=0.15.2 REALM_CORE_VERSION=2.2.0 -REALM_SYNC_VERSION=1.0.0-BETA-5.0 +REALM_SYNC_VERSION=1.0.0-BETA-6.3 REALM_OBJECT_SERVER_VERSION=1.0.0-BETA-4.8 diff --git a/react-native/android/src/main/jni/Android.mk b/react-native/android/src/main/jni/Android.mk index 2f3c80bd..929f18dd 100644 --- a/react-native/android/src/main/jni/Android.mk +++ b/react-native/android/src/main/jni/Android.mk @@ -31,7 +31,6 @@ LOCAL_SRC_FILES += src/android/jsc_override.cpp LOCAL_SRC_FILES += src/android/platform.cpp LOCAL_SRC_FILES += src/object-store/src/impl/collection_change_builder.cpp LOCAL_SRC_FILES += src/object-store/src/impl/collection_notifier.cpp -LOCAL_SRC_FILES += src/object-store/src/impl/handover.cpp LOCAL_SRC_FILES += src/object-store/src/impl/list_notifier.cpp LOCAL_SRC_FILES += src/object-store/src/impl/realm_coordinator.cpp LOCAL_SRC_FILES += src/object-store/src/impl/results_notifier.cpp @@ -50,7 +49,7 @@ LOCAL_SRC_FILES += src/object-store/src/placeholder.cpp LOCAL_SRC_FILES += src/object-store/src/results.cpp LOCAL_SRC_FILES += src/object-store/src/schema.cpp LOCAL_SRC_FILES += src/object-store/src/shared_realm.cpp -LOCAL_SRC_FILES += src/object-store/src/thread_confined.cpp +LOCAL_SRC_FILES += src/object-store/src/thread_safe_reference.cpp ifeq ($(strip $(BUILD_TYPE_SYNC)),1) LOCAL_SRC_FILES += src/object-store/src/sync/sync_manager.cpp LOCAL_SRC_FILES += src/object-store/src/sync/sync_session.cpp diff --git a/scripts/test.sh b/scripts/test.sh index 0f7c7c1e..19d71074 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -69,7 +69,7 @@ cleanup() { pkill -9 -P $$ || true # Kill react native packager - pkill node || true + pkill -x node || true rm -f "$PACKAGER_OUT" "$LOGCAT_OUT" # Cleanup temp files diff --git a/src/RealmJS.xcodeproj/project.pbxproj b/src/RealmJS.xcodeproj/project.pbxproj index 30361212..ba9d433c 100644 --- a/src/RealmJS.xcodeproj/project.pbxproj +++ b/src/RealmJS.xcodeproj/project.pbxproj @@ -39,9 +39,8 @@ 02F59EC51C88F17D007F774C /* shared_realm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F59EBD1C88F17D007F774C /* shared_realm.cpp */; }; 02F59EE21C88F2BB007F774C /* realm_coordinator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F59EDB1C88F2BA007F774C /* realm_coordinator.cpp */; }; 02F59EE31C88F2BB007F774C /* transact_log_handler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 02F59EDD1C88F2BB007F774C /* transact_log_handler.cpp */; }; + 50C671001E1D2D31003CB63C /* thread_safe_reference.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5D02C7791E1C83650048C13E /* thread_safe_reference.cpp */; }; 5D25F5A11D6284FD00EBBB30 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = F63FF3301C16434400B3B8E0 /* libz.tbd */; }; - 5DC74A781D623C9800D77A4F /* handover.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DC74A751D623C8700D77A4F /* handover.cpp */; }; - 5DC74A7A1D623CA800D77A4F /* thread_confined.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5DC74A721D623C7A00D77A4F /* thread_confined.cpp */; }; F61378791C18EAC5008BFC51 /* js in Resources */ = {isa = PBXBuildFile; fileRef = F61378781C18EAAC008BFC51 /* js */; }; F63FF2C61C12469E00B3B8E0 /* jsc_init.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 029048011C0428DF00ABDED4 /* jsc_init.cpp */; }; F63FF2C91C12469E00B3B8E0 /* js_realm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 029048071C0428DF00ABDED4 /* js_realm.cpp */; }; @@ -168,10 +167,9 @@ 02F59EDC1C88F2BB007F774C /* realm_coordinator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = realm_coordinator.hpp; sourceTree = ""; }; 02F59EDD1C88F2BB007F774C /* transact_log_handler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = transact_log_handler.cpp; sourceTree = ""; }; 02F59EDE1C88F2BB007F774C /* transact_log_handler.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = transact_log_handler.hpp; sourceTree = ""; }; - 5DC74A721D623C7A00D77A4F /* thread_confined.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = thread_confined.cpp; path = src/thread_confined.cpp; sourceTree = ""; }; - 5DC74A731D623C7A00D77A4F /* thread_confined.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = thread_confined.hpp; path = src/thread_confined.hpp; sourceTree = ""; }; - 5DC74A751D623C8700D77A4F /* handover.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = handover.cpp; sourceTree = ""; }; - 5DC74A761D623C8700D77A4F /* handover.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = handover.hpp; sourceTree = ""; }; + 5D02C7781E1C83650048C13E /* execution_context_id.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = execution_context_id.hpp; path = src/execution_context_id.hpp; sourceTree = ""; }; + 5D02C7791E1C83650048C13E /* thread_safe_reference.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = thread_safe_reference.cpp; path = src/thread_safe_reference.cpp; sourceTree = ""; }; + 5D02C77A1E1C83650048C13E /* thread_safe_reference.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = thread_safe_reference.hpp; path = src/thread_safe_reference.hpp; sourceTree = ""; }; F60102CF1CBB814A00EC01BA /* node_init.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = node_init.hpp; sourceTree = ""; }; F60102D11CBB865A00EC01BA /* jsc_init.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = jsc_init.hpp; sourceTree = ""; }; F60102E31CBBB19700EC01BA /* node_object_accessor.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = node_object_accessor.hpp; sourceTree = ""; }; @@ -450,9 +448,10 @@ 02022A6B1DA47EC8000F0C4F /* util */, F63117EA1CEB0BFA00ECB2DE /* impl */, F63117EC1CEB0C8100ECB2DE /* parser */, + 02F59EAE1C88F17D007F774C /* binding_context.hpp */, 02414B961CE6AADD00A8669F /* collection_notifications.cpp */, 02414B971CE6AADD00A8669F /* collection_notifications.hpp */, - 02F59EAE1C88F17D007F774C /* binding_context.hpp */, + 5D02C7781E1C83650048C13E /* execution_context_id.hpp */, 02F59EAF1C88F17D007F774C /* index_set.cpp */, 02F59EB01C88F17D007F774C /* index_set.hpp */, 02F59EB11C88F17D007F774C /* list.cpp */, @@ -470,8 +469,8 @@ 02F59EBC1C88F17D007F774C /* schema.hpp */, 02F59EBD1C88F17D007F774C /* shared_realm.cpp */, 02F59EBE1C88F17D007F774C /* shared_realm.hpp */, - 5DC74A721D623C7A00D77A4F /* thread_confined.cpp */, - 5DC74A731D623C7A00D77A4F /* thread_confined.hpp */, + 5D02C7791E1C83650048C13E /* thread_safe_reference.cpp */, + 5D02C77A1E1C83650048C13E /* thread_safe_reference.hpp */, ); name = "Object Store"; path = "object-store"; @@ -510,8 +509,6 @@ 02414B9A1CE6AAEF00A8669F /* collection_change_builder.hpp */, 02414B9B1CE6AAEF00A8669F /* collection_notifier.cpp */, 02414B9C1CE6AAEF00A8669F /* collection_notifier.hpp */, - 5DC74A751D623C8700D77A4F /* handover.cpp */, - 5DC74A761D623C8700D77A4F /* handover.hpp */, 02414B9D1CE6AAEF00A8669F /* list_notifier.cpp */, 02414B9E1CE6AAEF00A8669F /* list_notifier.hpp */, 02414B9F1CE6AAEF00A8669F /* results_notifier.cpp */, @@ -823,15 +820,14 @@ 02022A581DA476CD000F0C4F /* external_commit_helper.cpp in Sources */, 02022A5A1DA476CD000F0C4F /* weak_realm_notifier.cpp in Sources */, 02022A5B1DA476CD000F0C4F /* placeholder.cpp in Sources */, - 5DC74A7A1D623CA800D77A4F /* thread_confined.cpp in Sources */, 02414BA51CE6ABCF00A8669F /* collection_change_builder.cpp in Sources */, 02414BA61CE6ABCF00A8669F /* collection_notifier.cpp in Sources */, 02414BA71CE6ABCF00A8669F /* list_notifier.cpp in Sources */, 02414BA81CE6ABCF00A8669F /* results_notifier.cpp in Sources */, 02414BA91CE6ABCF00A8669F /* collection_notifications.cpp in Sources */, 02F59EE31C88F2BB007F774C /* transact_log_handler.cpp in Sources */, - 5DC74A781D623C9800D77A4F /* handover.cpp in Sources */, F63FF2E81C159C4B00B3B8E0 /* platform.mm in Sources */, + 50C671001E1D2D31003CB63C /* thread_safe_reference.cpp in Sources */, 02E315CA1DB80DDD00555337 /* sync_session.cpp in Sources */, 02F59EC31C88F17D007F774C /* results.cpp in Sources */, F63FF2E21C15921A00B3B8E0 /* base64.cpp in Sources */, @@ -922,6 +918,7 @@ "$(SRCROOT)/object-store/external/pegtl", "$(SRCROOT)/object-store/src", "$(SRCROOT)/../vendor", + "$(SRCROOT)/../vendor/core/include", ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = YES; @@ -980,6 +977,7 @@ "$(SRCROOT)/object-store/external/pegtl", "$(SRCROOT)/object-store/src", "$(SRCROOT)/../vendor", + "$(SRCROOT)/../vendor/core/include", ); IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = NO; @@ -1077,7 +1075,11 @@ isa = XCBuildConfiguration; buildSettings = { DEBUG_INFORMATION_FORMAT = dwarf; - HEADER_SEARCH_PATHS = ""; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/object-store/src", + "$(SRCROOT)/../vendor", + "$(SRCROOT)/../vendor/core/include", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; @@ -1087,7 +1089,11 @@ F63FF2F81C16405D00B3B8E0 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = ""; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/object-store/src", + "$(SRCROOT)/../vendor", + "$(SRCROOT)/../vendor/core/include", + ); OTHER_LDFLAGS = "-ObjC"; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; diff --git a/src/js_sync.hpp b/src/js_sync.hpp index af94ac39..8fc7561c 100644 --- a/src/js_sync.hpp +++ b/src/js_sync.hpp @@ -206,10 +206,6 @@ inline typename T::Function SyncClass::create_constructor(ContextType ctx) { ensure_directory_exists_for_file(default_realm_file_directory()); SyncManager::shared().configure_file_system(default_realm_file_directory(), SyncManager::MetadataMode::NoEncryption); - realm::SyncManager::shared().set_error_handler([=](int error_code, std::string message) { - std::cout << error_code << " " << message << std::endl; - }); - return sync_constructor; } @@ -302,8 +298,9 @@ void SyncClass::populate_sync_config(ContextType ctx, ObjectType realm_constr std::string raw_realm_url = Object::validated_get_string(ctx, sync_config_object, "url"); // FIXME - use make_shared - config.sync_config = std::shared_ptr(new SyncConfig{shared_user, raw_realm_url, SyncSessionStopPolicy::AfterChangesUploaded, handler, [=](auto, int error_code, std::string message, SyncSessionError) {}} - ); + config.sync_config = std::shared_ptr(new SyncConfig{shared_user, raw_realm_url, + SyncSessionStopPolicy::AfterChangesUploaded, + handler, [=](auto, SyncError) {}}); config.schema_mode = SchemaMode::Additive; config.path = realm::SyncManager::shared().path_for_realm(shared_user->identity(), raw_realm_url); } diff --git a/src/object-store b/src/object-store index c2568476..814beb5a 160000 --- a/src/object-store +++ b/src/object-store @@ -1 +1 @@ -Subproject commit c25684764924815c1decc1fe9a9f7d4b64ed7bde +Subproject commit 814beb5a1e96f0bb72cf78e206b2e710ac79e217